Synced with Staging branch and integrate with new Track API

.gitignore

@@ -149,3 +149,6 @@ out/
 # Ignore VSCode settings
 .vscode/
 .vscode/settings.json
+
+# ignore ds store
+.DS_Store

apps/AEPSampleAppNewArchEnabled/app/MessagingView.tsx

@@ -10,19 +10,27 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 
-import React from "react";
-import { Button, Text, View, ScrollView } from "react-native";
-import { MobileCore } from "@adobe/react-native-aepcore";
+import React from 'react';
+import {Button, Text, View, ScrollView} from 'react-native';
+import {MobileCore} from '@adobe/react-native-aepcore';
 import {
-  Messaging,
-  PersonalizationSchema,
-} from "@adobe/react-native-aepmessaging";
-import styles from "../styles/styles";
-import { useRouter } from "expo-router";
+  Messaging, 
+  PersonalizationSchema, 
+  MessagingEdgeEventType,
+  PropositionItem,
+  Message,
+  ContentCard,
+  HTMLProposition,
+  JSONPropositionItem
+} from '@adobe/react-native-aepmessaging'
+import { MessagingProposition } from '@adobe/react-native-aepmessaging';
+import styles from '../styles/styles';
+import { useRouter } from 'expo-router';
 
 const SURFACES = ["android-cbe-preview", "cbe/json", "android-cc"];
 const SURFACES_WITH_CONTENT_CARDS = ["android-cc"];
 
+
 const messagingExtensionVersion = async () => {
   const version = await Messaging.extensionVersion();
   console.log(`AdobeExperienceSDK: Messaging version: ${version}`);
@@ -35,31 +43,25 @@ const refreshInAppMessages = () => {
 
 const setMessagingDelegate = () => {
   Messaging.setMessagingDelegate({
-    onDismiss: (msg) => console.log("dismissed!", msg),
-    onShow: (msg) => {
-      console.log("show", msg);
-      Messaging.handleJavascriptMessage(
-        msg.id,
-        "myInappCallback",
-        (content) => {
-          console.log("Received webview content:", content);
-        }
-      );
+    onDismiss: msg => console.log('dismissed!', msg),
+    onShow: msg => {
+      console.log('show', msg);
+      msg.handleJavascriptMessage('myInappCallback', (content: string) => {
+        console.log('Received webview content in onShow:', content);
+      });
     },
     shouldShowMessage: () => true,
     shouldSaveMessage: () => true,
     urlLoaded: (url, message) => console.log(url, message),
   });
   console.log("messaging delegate set");
 };
-
 const getPropositionsForSurfaces = async () => {
   const messages = await Messaging.getPropositionsForSurfaces(SURFACES);
-  console.log(JSON.stringify(messages));
+  console.log('getPropositionsForSurfaces', JSON.stringify(messages));
 };
-
 const trackAction = async () => {
-  MobileCore.trackAction("tuesday", { full: true });
+  MobileCore.trackAction('iamjs', {full: true});
 };
 
 const updatePropositionsForSurfaces = async () => {
@@ -89,12 +91,9 @@ const trackContentCardInteraction = async () => {
     for (const proposition of propositions) {
       for (const propositionItem of proposition.items) {
         if (propositionItem.schema === PersonalizationSchema.CONTENT_CARD) {
-          Messaging.trackContentCardInteraction(proposition, propositionItem);
-          console.log(
-            "trackContentCardInteraction",
-            proposition,
-            propositionItem
-          );
+          // Cast to ContentCard for the legacy tracking method
+          Messaging.trackContentCardInteraction(proposition, propositionItem as any);
+          console.log('trackContentCardInteraction', proposition, propositionItem);
         }
       }
     }
@@ -113,14 +112,35 @@ const trackContentCardDisplay = async () => {
     for (const proposition of propositions) {
       for (const propositionItem of proposition.items) {
         if (propositionItem.schema === PersonalizationSchema.CONTENT_CARD) {
-          Messaging.trackContentCardDisplay(proposition, propositionItem);
-          console.log("trackContentCardDisplay", proposition, propositionItem);
+          // Cast to ContentCard for the legacy tracking method
+          Messaging.trackContentCardDisplay(proposition, propositionItem as any);
+          console.log('trackContentCardDisplay', proposition, propositionItem);
         }
       }
     }
   }
 };
 
+
+// Method demonstrating unified tracking using PropositionItem methods
+const unifiedTrackingExample = async () => {
+  const messages = await Messaging.getPropositionsForSurfaces(SURFACES);  
+  for (const surface of SURFACES) { 
+    const propositions = messages[surface] || [];
+
+    for (const proposition of propositions) {
+      const propositionWrapper = new MessagingProposition(proposition);       
+      if (propositionWrapper.items.length > 0) {
+        const propositionItem = propositionWrapper.items[0];
+        propositionItem.track(MessagingEdgeEventType.DISPLAY); 
+        propositionItem.track('content_card_clicked', MessagingEdgeEventType.INTERACT, null);
+      }
+    }
+  }
+}
+
+
+
 function MessagingView() {
   const router = useRouter();
 
@@ -146,14 +166,9 @@ function MessagingView() {
         <Button title="getCachedMessages()" onPress={getCachedMessages} />
         <Button title="getLatestMessage()" onPress={getLatestMessage} />
         <Button title="trackAction()" onPress={trackAction} />
-        <Button
-          title="trackPropositionInteraction()"
-          onPress={trackContentCardInteraction}
-        />
-        <Button
-          title="trackContentCardDisplay()"
-          onPress={trackContentCardDisplay}
-        />
+        <Button title="trackPropositionInteraction()" onPress={trackContentCardInteraction} />
+        <Button title="trackContentCardDisplay()" onPress={trackContentCardDisplay} />
+        <Button title="Unified Tracking Example" onPress={unifiedTrackingExample} />
       </ScrollView>
     </View>
   );

apps/AEPSampleAppNewArchEnabled/app/OptimizeView.tsx

@@ -15,6 +15,7 @@ import {
   Optimize,
   DecisionScope,
   Proposition,
+  Offer,
 } from '@adobe/react-native-aepoptimize';
 import {WebView} from 'react-native-webview';
 import styles from '../styles/styles';
@@ -73,7 +74,7 @@ export default () => {
     decisionScopeImage,
     decisionScopeHtml,
     decisionScopeJson,
-    decisionScopeTargetMbox,
+    decisionScopeTargetMbox
   ];
 
   const optimizeExtensionVersion = async () => {
@@ -84,19 +85,36 @@ export default () => {
 
   const updatePropositions = () => {
     Optimize.updatePropositions(decisionScopes);
-    console.log('Updated Proposition for decisionScopes:', decisionScopes);
+    console.log('Updated Propositions');
+  };
+
+  const testUpdatePropositionsCallback = () => {
+    console.log('Testing updatePropositions with callback...');
+    Optimize.updatePropositions(
+      decisionScopes,
+      undefined,
+      undefined,
+      (response) => {
+        console.log('Callback received:', response);
+      },
+      (error) => {
+        console.log('Error:', error);
+      }
+    );
   };
 
   const getPropositions = async () => {
     const propositions: Map<string, Proposition> =
       await Optimize.getPropositions(decisionScopes);
+    console.log(propositions.size, ' propositions size');
     if (propositions) {
-      console.log("get propositions", JSON.stringify(Object.fromEntries(propositions), null, 2));
       setTextProposition(propositions.get(decisionScopeText.getName()));
       setImageProposition(propositions.get(decisionScopeImage.getName()));
       setHtmlProposition(propositions.get(decisionScopeHtml.getName()));
       setJsonProposition(propositions.get(decisionScopeJson.getName()));
       setTargetProposition(propositions.get(decisionScopeTargetMbox.getName()));
+      const propositionObject = Object.fromEntries(propositions);
+      console.log('propositions', JSON.stringify(propositionObject, null, 2));
     }
   };
 
@@ -120,49 +138,34 @@ export default () => {
 
   const multipleOffersDisplayed = async () => {
     const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
-    const offerPairs: Array<{proposition: Proposition, offerId: string}> = [];
-
+    const offers: Array<Offer> = [];
     propositionsMap.forEach((proposition: Proposition) => {
-      if (proposition && proposition.items) {
+      if (proposition && proposition.items && proposition.items.length > 0) {
         proposition.items.forEach((offer) => {
-          offerPairs.push({
-            proposition: proposition,
-            offerId: offer.id
-          });
+          offers.push(offer);
         });
       }
     });
-
-    console.log('Extracted offer pairs:', offerPairs);
-
-    if (offerPairs.length > 0) {
-      Optimize.displayed(offerPairs);
-      console.log(`Called multipleOffersDisplayed with ${offerPairs.length} offers`);
-    } else {
-      console.log('No offers found to display');
-    }
+    console.log('offers', offers);
+    Optimize.displayed(offers);
   };
 
-  const generateDisplayInteractionXdmForMultipleOffers = async () => {
+  const multipleOffersGenerateDisplayInteractionXdm = async () => {
     const propositionsMap: Map<string, Proposition> = await Optimize.getPropositions(decisionScopes);
-    const offerPairs: Array<{proposition: Proposition, offerId: string}> = [];
-
+    const offers: Array<Offer> = [];
     propositionsMap.forEach((proposition: Proposition) => {
-      if (proposition && proposition.items) {
+      if (proposition && proposition.items && proposition.items.length > 0) {
         proposition.items.forEach((offer) => {
-          offerPairs.push({
-            proposition: proposition,
-            offerId: offer.id
-          });
+          offers.push(offer);
         });
       }
     });
-
-    const xdm = await Optimize.generateDisplayInteractionXdm(offerPairs);
-    if (xdm) {
-      console.log('Generated Display Interaction XDM for Multiple Offers:', JSON.stringify(xdm, null, 2));
+    console.log('offers', offers);
+    const displayInteractionXdm = await Optimize.generateDisplayInteractionXdm(offers);
+    if (displayInteractionXdm) {
+      console.log('displayInteractionXdm', JSON.stringify(displayInteractionXdm, null, 2));
     } else {
-      console.log('Error in generating Display interaction XDM for multiple offers.');
+      console.log('displayInteractionXdm is null');
     }
   };
 
@@ -377,6 +380,9 @@ export default () => {
       <View style={{margin: 5}}>
         <Button title="Update Propositions" onPress={updatePropositions} />
       </View>
+      <View style={{margin: 5}}>
+        <Button title="Test Update Propositions Callback" onPress={testUpdatePropositionsCallback} />
+      </View>
       <View style={{margin: 5}}>
         <Button title="Get Propositions" onPress={getPropositions} />
       </View>
@@ -388,20 +394,20 @@ export default () => {
       </View>
       <View style={{margin: 5}}>
         <Button
-          title="Multiple Offers Displayed"
-          onPress={multipleOffersDisplayed}
+          title="Subscribe to Proposition Update"
+          onPress={onPropositionUpdate}
         />
       </View>
       <View style={{margin: 5}}>
         <Button
-          title="Generate Display Interaction XDM for Multiple Offers"
-          onPress={generateDisplayInteractionXdmForMultipleOffers}
+          title="Multiple Offers Displayed"
+          onPress={multipleOffersDisplayed}
         />
       </View>
       <View style={{margin: 5}}>
         <Button
-          title="Subscribe to Proposition Update"
-          onPress={onPropositionUpdate}
+          title="Multiple Offers Generate Display Interaction XDM"
+          onPress={multipleOffersGenerateDisplayInteractionXdm}
         />
       </View>
       <Text style={{...styles.welcome, fontSize: 20}}>

apps/AEPSampleAppNewArchEnabled/app/_layout.tsx

@@ -58,6 +58,32 @@ export default function RootLayout() {
       .then(() => {
         console.log("update propositions after - SUCCESS");
         console.log("Propositions updated successfully in layout");
+
+        // // Set up messaging delegate after SDK initialization
+        // const unsubscribe = Messaging.setMessagingDelegate({
+        //   onDismiss: (message) => {
+        //     console.log('Message dismissed:', message);
+        //   },
+        //   onShow: (message) => {
+        //     console.log('Message shown:', message);
+        //   },
+        //   shouldShowMessage: (message) => {
+        //     console.log('Should show message:', message);
+        //     return true; // Always show messages in sample app
+        //   },
+        //   shouldSaveMessage: (message) => {
+        //     console.log('Should save message:', message);
+        //     return true; // Always save messages in sample app
+        //   },
+        //   urlLoaded: (url, message) => {
+        //     console.log('URL loaded:', url, 'for message:', message);
+        //   },
+        // });
+
+        // console.log("Messaging delegate set up successfully");
+
+        // Store unsubscribe function if needed for cleanup
+        // You could return it from useEffect if you need to clean up on unmount
       })
       .catch((error) => {
         console.error("AEP SDK Initialization error:", error);