@capillarytech/creatives-library 8.0.74 → 8.0.75

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.74",
+  "version": "8.0.75",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/tagValidations.js

@@ -18,11 +18,13 @@ const SUBTAGS = 'subtags';
  * @param {Object} response - The response object to check.
  * @param {Object} tagObject - The tagLookupMap.
  */
-export const checkSupport = (response = {}, tagObject = {}, eventContextTags = [], isLiquidFlow = false) => {
+export const checkSupport = (response = {}, tagObject = {}, eventContextTags = [], isLiquidFlow = false, forwardedTags = {}) => {
   const supportedList = [];
   // Verifies the presence of the tag in the 'Add Labels' section.
   // Incase of journey event context the tags won't be available in the tagObject(tagLookupMap).
-  const checkNameInTagObjectOrEventContext = (name) => !!tagObject[name] || eventContextTags?.some((tag) => tag?.tagName === name);
+  //Here forwardedTags only use in case of loyalty module
+  const mappedForwardedTags = handleForwardedTags(forwardedTags);
+  const checkNameInTagObjectOrEventContext = (name) => !!tagObject[name] || eventContextTags?.some((tag) => tag?.tagName === name) || mappedForwardedTags.includes(name);
 
   // Verify if childTag is a valid sub-tag of parentTag from the 'Add Labels' section or if it's unsupported.
   const checkSubtags = (parentTag, childName) => {
@@ -33,13 +35,18 @@ export const checkSupport = (response = {}, tagObject = {}, eventContextTags = [
         supportedList.push(childName);
       }
     }
-    if (!tagObject?.[parentTag]) return false;
+    if (!tagObject?.[parentTag] && !mappedForwardedTags.includes(parentTag)) return false;
     let updatedChildName = childName;
+    let updatedWithoutDotChildName = childName;
     if (childName?.includes(".")) {
       updatedChildName = "." + childName?.split(".")?.[1];
+      updatedWithoutDotChildName = childName?.split(".")?.[1];
     }
-    const subTags = tagObject?.[parentTag]?.definition?.subtags;
-    return subTags?.includes(updatedChildName);
+    if (tagObject?.[parentTag]) {
+      const subTags = tagObject?.[parentTag]?.definition?.subtags;
+      return subTags?.includes(updatedChildName);
+    }
+    return mappedForwardedTags.includes(updatedChildName) || mappedForwardedTags.includes(updatedWithoutDotChildName) || mappedForwardedTags.includes(childName);
   };
 
   //Recursively checks if the childTag is actually a Sub-tag of the ParentTag
@@ -69,6 +76,22 @@ export const checkSupport = (response = {}, tagObject = {}, eventContextTags = [
   return supportedList;
 };
 
+const handleForwardedTags = (forwardedTags) => {
+  const result = [];
+  Object.keys(forwardedTags).forEach(key => {
+    result.push(key); // Add the main key to the result array
+    
+    // Check if there are subtags for the current key
+    if (forwardedTags[key].subtags) {
+      // If subtags exist, add all subtag keys to the result array
+      Object.keys(forwardedTags[key].subtags).forEach(subkey => {
+          result.push(subkey);
+      });
+    }
+  });
+  return result;
+}
+
 /**
  * Extracts the names from the given data.
  * @param {Array} data - The data to extract names from.

package/utils/tests/tagValidations.test.js

@@ -404,6 +404,26 @@ describe("checkSupport", () => {
     const result = checkSupport(response, tagObject, eventContextTags, isLiquidFlow);
     expect(result).toEqual( [ 'leaderboard' ]);
   });
+
+  it("test for checking loyalty tags in that are coming in forwardedTags", () => {
+    const response = { data: [{ name: "leaderboard", children: [{name: "person.userId"}]}]};
+    const tagObject = {};
+    const isLiquidFlow = true;
+    // forwardedTags contains tag hierarchy with parent tags and their subtags
+    // needed for loyalty email liquid tag resolution
+    const forwardedTags = {
+      leaderboard: {
+        name: "Leaderboard",
+        subtags: {
+          "person.userId": {
+            name: "User ID",
+          },
+        },
+      },
+    };
+    const result = checkSupport(response, tagObject, [], isLiquidFlow, forwardedTags);
+    expect(result).toEqual( [ 'leaderboard', 'person.userId' ]);
+  });
 });
 
 describe('preprocessHtml', () => {

package/v2Components/FormBuilder/index.js

@@ -1123,6 +1123,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               this.props?.metaEntities?.tagLookupMap,
               this.props?.eventContextTags,
               this.liquidFlow,
+              this.props?.isLoyaltyModule ? this.props?.forwardedTags : {}
             );
             const unsupportedLiquidTags = extractedLiquidTags?.filter(
               (tag) => !supportedLiquidTags?.includes(tag) && !this.skipTags(tag)

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -157,6 +157,7 @@ export function SlideBoxContent(props) {
       creativesMode,
       hostName = '',
       eventContextTags,
+      isLoyaltyModule,
     } = props;
   const type = (messageDetails.type || '').toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'default' : 'library', isEditFromCampaigns: (templateData || {}).isEditFromCampaigns};
@@ -613,6 +614,7 @@ export function SlideBoxContent(props) {
         moduleType={moduleType}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
         eventContextTags={eventContextTags}
+        isLoyaltyModule={isLoyaltyModule}
       />
         )}
       {(isEditEmailWithId || isEmailEditWithContent) && (
@@ -642,6 +644,7 @@ export function SlideBoxContent(props) {
         moduleType={moduleType}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
         eventContextTags={eventContextTags}
+        isLoyaltyModule={isLoyaltyModule}
       />
         )}
       {isEditMPush &&

package/v2Containers/CreativesContainer/index.js

@@ -1271,6 +1271,7 @@ export class Creatives extends React.Component {
       smsRegister,
       enableNewChannels,
       eventContextTags,
+      isLoyaltyModule,
     } = this.props;
     const mapTemplateCreate =
       slidBoxContent === "createTemplate" &&
@@ -1375,6 +1376,7 @@ export class Creatives extends React.Component {
               creativesMode={creativesMode} // An existing prop that we're using here. Required to ensure correct account details in Edit or Preview in case of Embedded mode.
               hostName={this.props?.hostName || ''}
               eventContextTags={eventContextTags}
+              isLoyaltyModule={isLoyaltyModule}
             />
           )}
           footer={this.shouldShowFooter() && (

package/v2Containers/Email/index.js

@@ -2747,6 +2747,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                   moduleType={moduleType}
                   showLiquidErrorInFooter={this.props.showLiquidErrorInFooter}
                   eventContextTags={this.props?.eventContextTags}
+                  forwardedTags={this.props?.forwardedTags}
+                  isLoyaltyModule={this.props?.isLoyaltyModule}
               /> : ''}
             </Col>
           </Row>