@adobe/alloy 2.9.0-alpha.0 → 2.9.0-alpha.3

package/libEs5/components/Personalization/createComponent.js

@@ -26,7 +26,8 @@ var _default = function _default(_ref) {
       onClickHandler = _ref.onClickHandler,
       isAuthoringModeEnabled = _ref.isAuthoringModeEnabled,
       mergeQuery = _ref.mergeQuery,
-      viewCache = _ref.viewCache;
+      viewCache = _ref.viewCache,
+      showContainers = _ref.showContainers;
   return {
     lifecycle: {
       onBeforeEvent: function onBeforeEvent(_ref2) {
@@ -38,12 +39,15 @@ var _default = function _default(_ref) {
             onResponse = _ref2$onResponse === void 0 ? _utils.noop : _ref2$onResponse,
             _ref2$onRequestFailur = _ref2.onRequestFailure,
             onRequestFailure = _ref2$onRequestFailur === void 0 ? _utils.noop : _ref2$onRequestFailur;
-        // Include proositions on all responses, overridden with data as needed
+        // Include propositions on all responses, overridden with data as needed
         onResponse(function () {
           return {
             propositions: []
           };
         });
+        onRequestFailure(function () {
+          return showContainers();
+        });
 
         if (isAuthoringModeEnabled()) {
           logger.warn(_loggerMessage.AUTHORING_ENABLED); // If we are in authoring mode we disable personalization
@@ -64,12 +68,14 @@ var _default = function _default(_ref) {
         if (personalizationDetails.shouldFetchData()) {
           var decisionsDeferred = (0, _utils.defer)();
           viewCache.storeViews(decisionsDeferred.promise);
+          onRequestFailure(function () {
+            return decisionsDeferred.reject();
+          });
           fetchDataHandler({
             decisionsDeferred: decisionsDeferred,
             personalizationDetails: personalizationDetails,
             event: event,
-            onResponse: onResponse,
-            onRequestFailure: onRequestFailure
+            onResponse: onResponse
           });
           return;
         }

package/libEs5/components/Personalization/createFetchDataHandler.js

@@ -16,15 +16,13 @@ governing permissions and limitations under the License.
 var _default = function _default(_ref) {
   var config = _ref.config,
       responseHandler = _ref.responseHandler,
-      showContainers = _ref.showContainers,
       hideContainers = _ref.hideContainers,
       mergeQuery = _ref.mergeQuery;
   return function (_ref2) {
     var decisionsDeferred = _ref2.decisionsDeferred,
         personalizationDetails = _ref2.personalizationDetails,
         event = _ref2.event,
-        onResponse = _ref2.onResponse,
-        onRequestFailure = _ref2.onRequestFailure;
+        onResponse = _ref2.onResponse;
     var prehidingStyle = config.prehidingStyle;
 
     if (personalizationDetails.isRenderDecisions()) {
@@ -40,10 +38,6 @@ var _default = function _default(_ref) {
         response: response
       });
     });
-    onRequestFailure(function () {
-      decisionsDeferred.reject();
-      showContainers();
-    });
   };
 };
 

package/libEs5/components/Personalization/createOnClickHandler.js

@@ -6,6 +6,8 @@ var _utils = require("../../utils");
 
 var _eventType = require("./constants/eventType");
 
+var _scope = require("./constants/scope");
+
 /*
 Copyright 2020 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -32,9 +34,20 @@ var _default = function _default(_ref) {
       var decisionsMeta = collectClicks(clickedElement, selectors, getClickMetasBySelector);
 
       if ((0, _utils.isNonEmptyArray)(decisionsMeta)) {
-        event.mergeXdm({
+        var xdm = {
           eventType: _eventType.INTERACT
-        });
+        };
+        var scope = decisionsMeta[0].scope;
+
+        if (scope !== _scope.default) {
+          xdm.web = {
+            webPageDetails: {
+              viewName: scope
+            }
+          };
+        }
+
+        event.mergeXdm(xdm);
         mergeDecisionsMeta(event, decisionsMeta);
       }
     }

package/libEs5/components/Personalization/createViewChangeHandler.js

@@ -17,12 +17,10 @@ governing permissions and limitations under the License.
 */
 var _default = function _default(_ref) {
   var executeCachedViewDecisions = _ref.executeCachedViewDecisions,
-      viewCache = _ref.viewCache,
-      showContainers = _ref.showContainers;
+      viewCache = _ref.viewCache;
   return function (_ref2) {
     var personalizationDetails = _ref2.personalizationDetails,
-        onResponse = _ref2.onResponse,
-        onRequestFailure = _ref2.onRequestFailure;
+        onResponse = _ref2.onResponse;
     var viewName = personalizationDetails.getViewName();
     return viewCache.getView(viewName).then(function (currentViewDecisions) {
       if (personalizationDetails.isRenderDecisions()) {
@@ -46,9 +44,6 @@ var _default = function _default(_ref) {
           })
         };
       });
-      onRequestFailure(function () {
-        showContainers();
-      });
     });
   };
 };

package/libEs5/components/Personalization/index.js

@@ -117,7 +117,6 @@ var createPersonalization = function createPersonalization(_ref) {
   var fetchDataHandler = (0, _createFetchDataHandler.default)({
     config: config,
     responseHandler: responseHandler,
-    showContainers: _flicker.showContainers,
     hideContainers: _flicker.hideContainers,
     mergeQuery: _event.mergeQuery
   });
@@ -129,8 +128,7 @@ var createPersonalization = function createPersonalization(_ref) {
   });
   var viewChangeHandler = (0, _createViewChangeHandler.default)({
     executeCachedViewDecisions: executeCachedViewDecisions,
-    viewCache: viewCache,
-    showContainers: _flicker.showContainers
+    viewCache: viewCache
   });
   return (0, _createComponent.default)({
     logger: logger,
@@ -139,7 +137,8 @@ var createPersonalization = function createPersonalization(_ref) {
     onClickHandler: onClickHandler,
     isAuthoringModeEnabled: _isAuthoringModeEnabled.default,
     mergeQuery: _event.mergeQuery,
-    viewCache: viewCache
+    viewCache: viewCache,
+    showContainers: _flicker.showContainers
   });
 };
 

package/libEs5/constants/libraryVersion.js

@@ -15,5 +15,5 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-var _default = "2.9.0-alpha.0";
+var _default = "2.9.0-alpha.3";
 exports.default = _default;

package/libEs6/components/Personalization/createComponent.js

@@ -19,7 +19,8 @@ export default (({
   onClickHandler,
   isAuthoringModeEnabled,
   mergeQuery,
-  viewCache
+  viewCache,
+  showContainers
 }) => {
   return {
     lifecycle: {
@@ -30,10 +31,11 @@ export default (({
         onResponse = noop,
         onRequestFailure = noop
       }) {
-        // Include proositions on all responses, overridden with data as needed
+        // Include propositions on all responses, overridden with data as needed
         onResponse(() => ({
           propositions: []
         }));
+        onRequestFailure(() => showContainers());
 
         if (isAuthoringModeEnabled()) {
           logger.warn(AUTHORING_ENABLED); // If we are in authoring mode we disable personalization
@@ -54,12 +56,12 @@ export default (({
         if (personalizationDetails.shouldFetchData()) {
           const decisionsDeferred = defer();
           viewCache.storeViews(decisionsDeferred.promise);
+          onRequestFailure(() => decisionsDeferred.reject());
           fetchDataHandler({
             decisionsDeferred,
             personalizationDetails,
             event,
-            onResponse,
-            onRequestFailure
+            onResponse
           });
           return;
         }

package/libEs6/components/Personalization/createFetchDataHandler.js

@@ -12,7 +12,6 @@ governing permissions and limitations under the License.
 export default (({
   config,
   responseHandler,
-  showContainers,
   hideContainers,
   mergeQuery
 }) => {
@@ -20,8 +19,7 @@ export default (({
     decisionsDeferred,
     personalizationDetails,
     event,
-    onResponse,
-    onRequestFailure
+    onResponse
   }) => {
     const {
       prehidingStyle
@@ -39,9 +37,5 @@ export default (({
       personalizationDetails,
       response
     }));
-    onRequestFailure(() => {
-      decisionsDeferred.reject();
-      showContainers();
-    });
   };
 });

package/libEs6/components/Personalization/createOnClickHandler.js

@@ -11,6 +11,7 @@ governing permissions and limitations under the License.
 */
 import { isNonEmptyArray } from "../../utils";
 import { INTERACT } from "./constants/eventType";
+import PAGE_WIDE_SCOPE from "./constants/scope";
 export default (({
   mergeDecisionsMeta,
   collectClicks,
@@ -28,9 +29,20 @@ export default (({
       const decisionsMeta = collectClicks(clickedElement, selectors, getClickMetasBySelector);
 
       if (isNonEmptyArray(decisionsMeta)) {
-        event.mergeXdm({
+        const xdm = {
           eventType: INTERACT
-        });
+        };
+        const scope = decisionsMeta[0].scope;
+
+        if (scope !== PAGE_WIDE_SCOPE) {
+          xdm.web = {
+            webPageDetails: {
+              viewName: scope
+            }
+          };
+        }
+
+        event.mergeXdm(xdm);
         mergeDecisionsMeta(event, decisionsMeta);
       }
     }

package/libEs6/components/Personalization/createViewChangeHandler.js

@@ -12,13 +12,11 @@ governing permissions and limitations under the License.
 import addRenderAttemptedToDecisions from "./utils/addRenderAttemptedToDecisions";
 export default (({
   executeCachedViewDecisions,
-  viewCache,
-  showContainers
+  viewCache
 }) => {
   return ({
     personalizationDetails,
-    onResponse,
-    onRequestFailure
+    onResponse
   }) => {
     const viewName = personalizationDetails.getViewName();
     return viewCache.getView(viewName).then(currentViewDecisions => {
@@ -43,9 +41,6 @@ export default (({
           })
         };
       });
-      onRequestFailure(() => {
-        showContainers();
-      });
     });
   };
 });

package/libEs6/components/Personalization/index.js

@@ -93,7 +93,6 @@ const createPersonalization = ({
   const fetchDataHandler = createFetchDataHandler({
     config,
     responseHandler,
-    showContainers,
     hideContainers,
     mergeQuery
   });
@@ -105,8 +104,7 @@ const createPersonalization = ({
   });
   const viewChangeHandler = createViewChangeHandler({
     executeCachedViewDecisions,
-    viewCache,
-    showContainers
+    viewCache
   });
   return createComponent({
     logger,
@@ -115,7 +113,8 @@ const createPersonalization = ({
     onClickHandler,
     isAuthoringModeEnabled,
     mergeQuery,
-    viewCache
+    viewCache,
+    showContainers
   });
 };
 

package/libEs6/constants/libraryVersion.js

@@ -11,4 +11,4 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-export default "2.9.0-alpha.0";
+export default "2.9.0-alpha.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.9.0-alpha.0",
+  "version": "2.9.0-alpha.3",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",
@@ -64,7 +64,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.8.0",
+    "@adobe/alloy": "^2.9.0-alpha.2",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",