Combine personalization display notifications together

rollup.test.config.js

@@ -48,6 +48,7 @@ if (argv.reporters && argv.reporters.split(",").includes("coverage")) {
 
 module.exports = {
   output: {
+    sourcemap: true,
     format: "iife",
     // Allow non-IE browsers and IE11
     // document.documentMode was added in IE8, and is specific to IE.

src/components/Personalization/createApplyPropositions.js

@@ -10,15 +10,17 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import composePersonalizationResultingObject from "./utils/composePersonalizationResultingObject";
 import { isNonEmptyArray, isObject } from "../../utils";
 import { DOM_ACTION, HTML_CONTENT_ITEM } from "./constants/schema";
 import PAGE_WIDE_SCOPE from "../../constants/pageWideScope";
-import { EMPTY_PROPOSITIONS } from "./validateApplyPropositionsOptions";
+import {
+  buildReturnedPropositions,
+  createProposition
+} from "./handlers/proposition";
 
-export const SUPPORTED_SCHEMAS = [DOM_ACTION, HTML_CONTENT_ITEM];
+const SUPPORTED_SCHEMAS = [DOM_ACTION, HTML_CONTENT_ITEM];
 
-export default ({ executeDecisions }) => {
+export default ({ render }) => {
   const filterItemsPredicate = item =>
     SUPPORTED_SCHEMAS.indexOf(item.schema) > -1;
 
@@ -71,20 +73,16 @@ export default ({ executeDecisions }) => {
       .filter(proposition => isNonEmptyArray(proposition.items));
   };
 
-  const applyPropositions = ({ propositions, metadata }) => {
+  return ({ propositions, metadata = {} }) => {
     const propositionsToExecute = preparePropositions({
       propositions,
       metadata
-    });
-    return executeDecisions(propositionsToExecute).then(() => {
-      return composePersonalizationResultingObject(propositionsToExecute, true);
-    });
-  };
+    }).map(proposition => createProposition(proposition, true));
 
-  return ({ propositions, metadata = {} }) => {
-    if (isNonEmptyArray(propositions)) {
-      return applyPropositions({ propositions, metadata });
-    }
-    return Promise.resolve(EMPTY_PROPOSITIONS);
+    render(propositionsToExecute);
+
+    return {
+      propositions: buildReturnedPropositions(propositionsToExecute)
+    };
   };
 };

src/components/Personalization/createComponent.js

@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import { noop, defer } from "../../utils";
+import { noop } from "../../utils";
 import createPersonalizationDetails from "./createPersonalizationDetails";
 import { AUTHORING_ENABLED } from "./constants/loggerMessage";
 import validateApplyPropositionsOptions from "./validateApplyPropositionsOptions";
@@ -60,17 +60,18 @@ export default ({
           decisionScopes,
           personalization,
           event,
-          viewCache,
+          isCacheInitialized: viewCache.isInitialized(),
           logger
         });
 
         if (personalizationDetails.shouldFetchData()) {
-          const decisionsDeferred = defer();
+          const cacheUpdate = viewCache.createCacheUpdate(
+            personalizationDetails.getViewName()
+          );
+          onRequestFailure(() => cacheUpdate.cancel());
 
-          viewCache.storeViews(decisionsDeferred.promise);
-          onRequestFailure(() => decisionsDeferred.reject());
           fetchDataHandler({
-            decisionsDeferred,
+            cacheUpdate,
             personalizationDetails,
             event,
             onResponse

src/components/Personalization/createFetchDataHandler.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Adobe. All rights reserved.
+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
@@ -9,21 +9,44 @@ 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.
 */
+import {
+  buildReturnedPropositions,
+  buildReturnedDecisions
+} from "./handlers/proposition";
+
+const DECISIONS_HANDLE = "personalization:decisions";
 
 export default ({
   prehidingStyle,
-  responseHandler,
   hideContainers,
-  mergeQuery
+  mergeQuery,
+  collect,
+  render
 }) => {
-  return ({ decisionsDeferred, personalizationDetails, event, onResponse }) => {
+  return ({ cacheUpdate, personalizationDetails, event, onResponse }) => {
     if (personalizationDetails.isRenderDecisions()) {
       hideContainers(prehidingStyle);
     }
     mergeQuery(event, personalizationDetails.createQueryDetails());
 
-    onResponse(({ response }) =>
-      responseHandler({ decisionsDeferred, personalizationDetails, response })
-    );
+    onResponse(({ response }) => {
+      const handles = response.getPayloadsByType(DECISIONS_HANDLE);
+      const propositions = cacheUpdate.update(handles);
+      if (personalizationDetails.isRenderDecisions()) {
+        render(propositions).then(decisionsMeta => {
+          if (decisionsMeta.length > 0) {
+            collect({
+              decisionsMeta,
+              viewName: personalizationDetails.getViewName()
+            });
+          }
+        });
+      }
+
+      return {
+        propositions: buildReturnedPropositions(propositions),
+        decisions: buildReturnedDecisions(propositions)
+      };
+    });
   };
 };