@adobe/alloy 2.21.0-beta.6 → 2.21.0

package/libEs5/utils/validation/createDeprecatedValidator.js

@@ -1,17 +1,8 @@
 "use strict";
 
 exports.default = void 0;
-var _isObject = require("../isObject.js");
-var _utils = require("./utils.js");
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /*
-Copyright 2023 Adobe. All rights reserved.
+/*
+Copyright 2024 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License. You may obtain a copy
 of the License at http://www.apache.org/licenses/LICENSE-2.0
@@ -21,24 +12,18 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-var _default = exports.default = function _default(oldField, oldSchema, newField) {
+var _default = exports.default = function _default() {
+  var warning = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "This field has been deprecated";
   return function deprecated(value, path) {
-    (0, _utils.assertValid)((0, _isObject.default)(value), value, path, "an object");
-    var oldValue = value[oldField],
-      newValue = value[newField],
-      otherValues = _objectWithoutProperties(value, [oldField, newField].map(_toPropertyKey));
-    var validatedOldValue = oldSchema(oldValue, path);
-    if (validatedOldValue !== undefined) {
-      var message = "The field '" + oldField + "' is deprecated. Use '" + newField + "' instead.";
+    var message = warning;
+    if (value !== undefined) {
       if (path) {
         message = "'" + path + "': " + message;
       }
-      if (newValue !== undefined && newValue !== validatedOldValue) {
-        throw new Error(message);
-      } else if (this && this.logger) {
+      if (this && this.logger) {
         this.logger.warn(message);
       }
     }
-    return _objectSpread(_defineProperty({}, newField, newValue || validatedOldValue), otherValues);
+    return value;
   };
 };

package/libEs5/utils/validation/createRenamedValidator.js

@@ -0,0 +1,44 @@
+"use strict";
+
+exports.default = void 0;
+var _isObject = require("../isObject.js");
+var _utils = require("./utils.js");
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /*
+Copyright 2023 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+var _default = exports.default = function _default(oldField, oldSchema, newField) {
+  return function deprecated(value, path) {
+    (0, _utils.assertValid)((0, _isObject.default)(value), value, path, "an object");
+    var oldValue = value[oldField],
+      newValue = value[newField],
+      otherValues = _objectWithoutProperties(value, [oldField, newField].map(_toPropertyKey));
+    var validatedOldValue = oldSchema(oldValue, path);
+    if (validatedOldValue !== undefined) {
+      var message = "The field '" + oldField + "' is deprecated. Use '" + newField + "' instead.";
+      if (path) {
+        message = "'" + path + "': " + message;
+      }
+      if (newValue !== undefined && newValue !== validatedOldValue) {
+        throw new Error(message);
+      } else if (this && this.logger) {
+        this.logger.warn(message);
+      }
+    }
+    return _objectSpread(_defineProperty({}, newField, newValue || validatedOldValue), otherValues);
+  };
+};

package/libEs5/utils/validation/index.js

@@ -4,6 +4,7 @@ exports.string = exports.objectOf = exports.number = exports.mapOfValues = expor
 var _utils = require("./utils.js");
 var _booleanValidator = require("./booleanValidator.js");
 var _callbackValidator = require("./callbackValidator.js");
+var _createAnyOfValidator = require("./createAnyOfValidator.js");
 var _createArrayOfValidator = require("./createArrayOfValidator.js");
 var _createDefaultValidator = require("./createDefaultValidator.js");
 var _createDeprecatedValidator = require("./createDeprecatedValidator.js");
@@ -14,7 +15,7 @@ var _createMaximumValidator = require("./createMaximumValidator.js");
 var _createNoUnknownFieldsValidator = require("./createNoUnknownFieldsValidator.js");
 var _createNonEmptyValidator = require("./createNonEmptyValidator.js");
 var _createObjectOfValidator = require("./createObjectOfValidator.js");
-var _createAnyOfValidator = require("./createAnyOfValidator.js");
+var _createRenamedValidator = require("./createRenamedValidator.js");
 var _createUniqueValidator = require("./createUniqueValidator.js");
 var _createUniqueItemsValidator = require("./createUniqueItemsValidator.js");
 var _domainValidator = require("./domainValidator.js");
@@ -110,6 +111,9 @@ base.default = function _default(defaultValue) {
 base.required = function required() {
   return (0, _utils.chain)(this, _requiredValidator.default);
 };
+base.deprecated = function deprecated(message) {
+  return (0, _utils.chain)(this, (0, _createDeprecatedValidator.default)(message));
+};
 
 // helper validators
 var domain = function domain() {
@@ -199,10 +203,10 @@ var createObjectOfAdditionalProperties = function createObjectOfAdditionalProper
       var newSchema = _objectSpread(_objectSpread({}, schema), otherObjectOfValidator.schema);
       return (0, _utils.nullSafeChain)(this, otherObjectOfValidator, createObjectOfAdditionalProperties(newSchema));
     },
-    deprecated: function deprecated(oldField, oldSchema, newField) {
+    renamed: function renamed(oldField, oldSchema, newField) {
       // Run the deprecated validator first so that the deprecated field is removed
       // before the objectOf validator runs.
-      return (0, _utils.reverseNullSafeChainJoinErrors)(this, (0, _createDeprecatedValidator.default)(oldField, oldSchema, newField));
+      return (0, _utils.reverseNullSafeChainJoinErrors)(this, (0, _createRenamedValidator.default)(oldField, oldSchema, newField));
     },
     schema: schema
   };

package/libEs6/components/ActivityCollector/attachClickActivityCollector.js

@@ -17,6 +17,10 @@ const createClickHandler = ({
   handleError
 }) => {
   return clickEvent => {
+    // Ignore repropagated clicks from AppMeasurement
+    if (clickEvent.s_fe) {
+      return Promise.resolve();
+    }
     // TODO: Consider safeguarding from the same object being clicked multiple times in rapid succession?
     const clickedElement = clickEvent.target;
     const event = eventManager.createEvent();

package/libEs6/components/ActivityCollector/configValidators.js

@@ -14,6 +14,21 @@ import { boolean, callback, objectOf, string } from "../../utils/validation/inde
 export const downloadLinkQualifier = string().regexp().default("\\.(exe|zip|wav|mp3|mov|mpg|avi|wmv|pdf|doc|docx|xls|xlsx|ppt|pptx)$");
 export default objectOf({
   clickCollectionEnabled: boolean().default(true),
-  onBeforeLinkClickSend: callback(),
-  downloadLinkQualifier
+  clickCollection: objectOf({
+    internalLinkEnabled: boolean().default(true),
+    externalLinkEnabled: boolean().default(true),
+    downloadLinkEnabled: boolean().default(true),
+    // TODO: Consider moving downloadLinkQualifier here.
+    sessionStorageEnabled: boolean().default(false),
+    eventGroupingEnabled: boolean().default(false),
+    filterClickProperties: callback()
+  }).default({
+    internalLinkEnabled: true,
+    externalLinkEnabled: true,
+    downloadLinkEnabled: true,
+    sessionStorageEnabled: false,
+    eventGroupingEnabled: false
+  }),
+  downloadLinkQualifier,
+  onBeforeLinkClickSend: callback().deprecated('The field "onBeforeLinkClickSend" has been deprecated. Use "clickCollection.filterClickDetails" instead.')
 });

package/libEs6/components/ActivityCollector/createClickActivityStorage.js

@@ -0,0 +1,34 @@
+/*
+Copyright 2024 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+import { CLICK_ACTIVITY_DATA } from "../../constants/sessionDataKeys.js";
+export default (({
+  storage
+}) => {
+  return {
+    save: data => {
+      const jsonData = JSON.stringify(data);
+      storage.setItem(CLICK_ACTIVITY_DATA, jsonData);
+    },
+    load: () => {
+      let jsonData = null;
+      const data = storage.getItem(CLICK_ACTIVITY_DATA);
+      if (data) {
+        jsonData = JSON.parse(data);
+      }
+      return jsonData;
+    },
+    remove: () => {
+      storage.removeItem(CLICK_ACTIVITY_DATA);
+    }
+  };
+});

package/libEs6/components/ActivityCollector/createClickedElementProperties.js

@@ -0,0 +1,218 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+const buildXdmFromClickedElementProperties = props => {
+  return {
+    eventType: "web.webinteraction.linkClicks",
+    web: {
+      webInteraction: {
+        name: props.linkName,
+        region: props.linkRegion,
+        type: props.linkType,
+        URL: props.linkUrl,
+        linkClicks: {
+          value: 1
+        }
+      }
+    }
+  };
+};
+const buildDataFromClickedElementProperties = props => {
+  return {
+    __adobe: {
+      analytics: {
+        contextData: {
+          a: {
+            activitymap: {
+              page: props.pageName,
+              link: props.linkName,
+              region: props.linkRegion,
+              pageIDType: props.pageIDType
+            }
+          }
+        }
+      }
+    }
+  };
+};
+const populateClickedElementPropertiesFromOptions = (options, props) => {
+  const {
+    xdm,
+    data,
+    clickedElement
+  } = options;
+  props.clickedElement = clickedElement;
+  if (xdm && xdm.web && xdm.web.webInteraction) {
+    const {
+      name,
+      region,
+      type,
+      URL
+    } = xdm.web.webInteraction;
+    props.linkName = name;
+    props.linkRegion = region;
+    props.linkType = type;
+    props.linkUrl = URL;
+  }
+  // DATA has priority over XDM
+  /* eslint no-underscore-dangle: 0 */
+  if (data && data.__adobe && data.__adobe.analytics) {
+    const {
+      contextData
+    } = data.__adobe.analytics;
+    if (contextData && contextData.a && contextData.a.activitymap) {
+      // Set the properties if they exists
+      const {
+        page,
+        link,
+        region,
+        pageIDType
+      } = contextData.a.activitymap;
+      props.pageName = page || props.pageName;
+      props.linkName = link || props.linkName;
+      props.linkRegion = region || props.linkRegion;
+      if (pageIDType !== undefined) {
+        props.pageIDType = pageIDType;
+      }
+    }
+  }
+};
+export default (({
+  properties,
+  logger
+} = {}) => {
+  let props = properties || {};
+  const clickedElementProperties = {
+    get pageName() {
+      return props.pageName;
+    },
+    set pageName(value) {
+      props.pageName = value;
+    },
+    get linkName() {
+      return props.linkName;
+    },
+    set linkName(value) {
+      props.linkName = value;
+    },
+    get linkRegion() {
+      return props.linkRegion;
+    },
+    set linkRegion(value) {
+      props.linkRegion = value;
+    },
+    get linkType() {
+      return props.linkType;
+    },
+    set linkType(value) {
+      props.linkType = value;
+    },
+    get linkUrl() {
+      return props.linkUrl;
+    },
+    set linkUrl(value) {
+      props.linkUrl = value;
+    },
+    get pageIDType() {
+      return props.pageIDType;
+    },
+    set pageIDType(value) {
+      props.pageIDType = value;
+    },
+    get clickedElement() {
+      return props.clickedElement;
+    },
+    set clickedElement(value) {
+      props.clickedElement = value;
+    },
+    get properties() {
+      return {
+        pageName: props.pageName,
+        linkName: props.linkName,
+        linkRegion: props.linkRegion,
+        linkType: props.linkType,
+        linkUrl: props.linkUrl,
+        pageIDType: props.pageIDType
+      };
+    },
+    isValidLink() {
+      return !!props.linkUrl && !!props.linkType && !!props.linkName && !!props.linkRegion;
+    },
+    isInternalLink() {
+      return this.isValidLink() && props.linkType === "other";
+    },
+    isValidActivityMapData() {
+      return !!props.pageName && !!props.linkName && !!props.linkRegion && props.pageIDType !== undefined;
+    },
+    get xdm() {
+      if (props.filteredXdm) {
+        return props.filteredXdm;
+      }
+      return buildXdmFromClickedElementProperties(this);
+    },
+    get data() {
+      if (props.filteredData) {
+        return props.filteredData;
+      }
+      return buildDataFromClickedElementProperties(this);
+    },
+    applyPropertyFilter(filter) {
+      if (filter && filter(props) === false) {
+        if (logger) {
+          logger.info(`Clicked element properties were rejected by filter function: ${JSON.stringify(this.properties, null, 2)}`);
+        }
+        props = {};
+      }
+    },
+    applyOptionsFilter(filter) {
+      const opts = this.options;
+      if (opts && opts.clickedElement && (opts.xdm || opts.data)) {
+        // Properties are rejected if filter is explicitly false.
+        if (filter && filter(opts) === false) {
+          if (logger) {
+            logger.info(`Clicked element properties were rejected by filter function: ${JSON.stringify(this.properties, null, 2)}`);
+          }
+          this.options = undefined;
+          return;
+        }
+        this.options = opts;
+        // This is just to ensure that any fields outside clicked element properties
+        // set by the user filter persists.
+        props.filteredXdm = opts.xdm;
+        props.filteredData = opts.data;
+      }
+    },
+    get options() {
+      const opts = {};
+      if (this.isValidLink()) {
+        opts.xdm = this.xdm;
+      }
+      if (this.isValidActivityMapData()) {
+        opts.data = this.data;
+      }
+      if (this.clickedElement) {
+        opts.clickedElement = this.clickedElement;
+      }
+      if (!opts.xdm && !opts.data) {
+        return undefined;
+      }
+      return opts;
+    },
+    set options(value) {
+      props = {};
+      if (value) {
+        populateClickedElementPropertiesFromOptions(value, props);
+      }
+    }
+  };
+  return clickedElementProperties;
+});

package/libEs6/components/ActivityCollector/createGetClickedElementProperties.js

@@ -0,0 +1,69 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+import createClickedElementProperties from "./createClickedElementProperties.js";
+export default (({
+  window,
+  getLinkName,
+  getLinkRegion,
+  getAbsoluteUrlFromAnchorElement,
+  findClickableElement,
+  determineLinkType
+}) => {
+  return ({
+    clickedElement,
+    config,
+    logger,
+    clickActivityStorage
+  }) => {
+    const {
+      onBeforeLinkClickSend: optionsFilter,
+      // Deprecated
+      clickCollection
+    } = config;
+    const {
+      filterClickDetails: propertyFilter
+    } = clickCollection;
+    const elementProperties = createClickedElementProperties({
+      logger
+    });
+    if (clickedElement) {
+      const clickableElement = findClickableElement(clickedElement);
+      if (clickableElement) {
+        elementProperties.clickedElement = clickedElement;
+        elementProperties.linkUrl = getAbsoluteUrlFromAnchorElement(window, clickableElement);
+        elementProperties.linkType = determineLinkType(window, config, elementProperties.linkUrl, clickableElement);
+        elementProperties.linkRegion = getLinkRegion(clickableElement);
+        elementProperties.linkName = getLinkName(clickableElement);
+        elementProperties.pageIDType = 0;
+        elementProperties.pageName = window.location.href;
+        // Check if we have a page-name stored from an earlier page view event
+        const storedLinkData = clickActivityStorage.load();
+        if (storedLinkData && storedLinkData.pageName) {
+          elementProperties.pageName = storedLinkData.pageName;
+          // Perhaps pageIDType should be established after customer filter is applied
+          // Like if pageName starts with "http" then pageIDType = 0
+          elementProperties.pageIDType = 1;
+        }
+        // If defined, run user provided filter function
+        if (propertyFilter) {
+          // clickCollection.filterClickDetails
+          elementProperties.applyPropertyFilter(propertyFilter);
+        } else if (optionsFilter) {
+          // onBeforeLinkClickSend
+          elementProperties.applyOptionsFilter(optionsFilter);
+        }
+      }
+    }
+    return elementProperties;
+  };
+});

package/libEs6/components/ActivityCollector/createInjectClickedElementProperties.js

@@ -0,0 +1,69 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+import activityMapExtensionEnabled from "./utils/activityMapExtensionEnabled.js";
+import isDifferentDomains from "./utils/isDifferentDomains.js";
+const isDissallowedLinkType = (clickCollection, linkType) => {
+  return linkType && (linkType === "download" && !clickCollection.downloadLinkEnabled || linkType === "exit" && !clickCollection.externalLinkEnabled || linkType === "other" && !clickCollection.internalLinkEnabled);
+};
+export default (({
+  config,
+  logger,
+  getClickedElementProperties,
+  clickActivityStorage
+}) => {
+  const {
+    clickCollectionEnabled,
+    clickCollection
+  } = config;
+  if (!clickCollectionEnabled) {
+    return () => undefined;
+  }
+  return ({
+    event,
+    clickedElement
+  }) => {
+    const elementProperties = getClickedElementProperties({
+      clickActivityStorage,
+      clickedElement,
+      config,
+      logger
+    });
+    const linkType = elementProperties.linkType;
+    // Avoid clicks to be collected for the ActivityMap interface
+    if (activityMapExtensionEnabled()) {
+      return;
+    }
+    if (elementProperties.isValidLink() && isDissallowedLinkType(clickCollection, linkType)) {
+      logger.info(`Cancelling link click event due to clickCollection.${linkType}LinkEnabled = false.`);
+    } else if (
+    // Determine if element properties should be sent with event now, or be saved
+    // and grouped with a future page view event.
+    // Event grouping is not supported for the deprecated onBeforeLinkClickSend callback
+    // because only click properties is saved and not XDM and DATA (which could have been modified).
+    // However, if the filterClickDetails callback is available we group events because it takes
+    // priority over onBeforeLinkClickSend and only supports processing click properties.
+    elementProperties.isInternalLink() && clickCollection.eventGroupingEnabled && (!config.onBeforeLinkClickSend || clickCollection.filterClickDetails) && !isDifferentDomains(window.location.hostname, elementProperties.linkUrl)) {
+      clickActivityStorage.save(elementProperties.properties);
+    } else if (elementProperties.isValidLink()) {
+      // Event will be sent
+      event.mergeXdm(elementProperties.xdm);
+      event.mergeData(elementProperties.data);
+      clickActivityStorage.save({
+        pageName: elementProperties.pageName,
+        pageIDType: elementProperties.pageIDType
+      });
+    } else if (elementProperties.isValidActivityMapData()) {
+      clickActivityStorage.save(elementProperties.properties);
+    }
+  };
+});

package/libEs6/components/ActivityCollector/createRecallAndInjectClickedElementProperties.js

@@ -0,0 +1,45 @@
+/*
+Copyright 2024 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+import createClickedElementProperties from "./createClickedElementProperties.js";
+import activityMapExtensionEnabled from "./utils/activityMapExtensionEnabled.js";
+export default (({
+  clickActivityStorage
+}) => {
+  return event => {
+    // Avoid clicks to be collected for the ActivityMap interface
+    if (activityMapExtensionEnabled()) {
+      return;
+    }
+    const properties = clickActivityStorage.load();
+    const elementProperties = createClickedElementProperties({
+      properties
+    });
+    if (elementProperties.isValidLink() || elementProperties.isValidActivityMapData()) {
+      if (elementProperties.isValidLink()) {
+        const xdm = elementProperties.xdm;
+        // Have to delete the eventType not to override the page view
+        delete xdm.eventType;
+        event.mergeXdm(xdm);
+      }
+      if (elementProperties.isValidActivityMapData()) {
+        event.mergeData(elementProperties.data);
+      }
+      // NOTE: We can't clear out all the storage here because we might still need to
+      // keep a page-name for multiple link-clicks (e.g. downloads) on the same page.
+      clickActivityStorage.save({
+        pageName: elementProperties.pageName,
+        pageIDType: elementProperties.pageIDType
+      });
+    }
+  };
+});

package/libEs6/components/ActivityCollector/{createLinkClick.js → createStorePageViewProperties.js}

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 Adobe. All rights reserved.
+Copyright 2024 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License. You may obtain a copy
 of the License at http://www.apache.org/licenses/LICENSE-2.0
@@ -9,29 +9,14 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
+
 export default (({
-  getLinkDetails,
-  config,
-  logger
+  clickActivityStorage
 }) => {
-  const {
-    clickCollectionEnabled
-  } = config;
-  if (!clickCollectionEnabled) {
-    return () => undefined;
-  }
-  return ({
-    targetElement,
-    event
-  }) => {
-    const linkDetails = getLinkDetails({
-      targetElement,
-      config,
-      logger
+  return event => {
+    clickActivityStorage.save({
+      pageName: event.getContent().xdm.web.webPageDetails.name,
+      pageIDType: 1 // 1 = name, 0 = URL
     });
-    if (linkDetails) {
-      event.mergeXdm(linkDetails.xdm);
-      event.setUserData(linkDetails.data);
-    }
   };
 });