@capillarytech/creatives-library 7.17.222 → 7.17.223-alpha.1

package/containers/App/constants.js

@@ -110,4 +110,4 @@ export const BADGES_ISSUE = 'BADGES_ISSUE';
 
 export const CUSTOMER_BARCODE_TAG = "customer_barcode";
 export const COPY_OF = "Copy of";
-export const ENTRY_TRIGGER_TAG_REGEX = /\bentryTrigger_\w+(_\w+)?(\(\w+\))?/g;
+export const ENTRY_TRIGGER_TAG_REGEX = /\bentryTrigger\.\w+(?:\.\w+)?(?:\(\w+\))?/g;

package/package.json

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

package/utils/tagValidations.js

@@ -203,7 +203,7 @@ const indexOfEnd = (targetString, string) => {
 }
 
 export const skipTags = (tag) => {
-  // If the tag contains the word "entryTrigger_", then it's an event context tag and should not be skipped.
+  // If the tag contains the word "entryTrigger.", then it's an event context tag and should not be skipped.
   if (tag?.match(ENTRY_TRIGGER_TAG_REGEX)) {
     return false;
   }

package/utils/tests/tagValidations.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import '@testing-library/jest-dom';
-import { checkSupport, extractNames, getTagMapValue, preprocessHtml, validateIfTagClosed,validateTags} from '../tagValidations';
+import { checkSupport, extractNames, getTagMapValue, preprocessHtml, validateIfTagClosed,validateTags, skipTags } from '../tagValidations';
 import { eventContextTags } from '../../v2Containers/TagList/tests/mockdata';
 
 describe("check if curly brackets are balanced", () => {
@@ -51,7 +51,7 @@ describe("validateTags", () => {
     },
   ];
   it("should return valid response when all tags are present", () => {
-    const content = "Hello {{tag1}}, {{tag2}}, {{tag3}} {{lifetimePurchases}}";
+    const content = "Hello {{tag1}}, {{tag2}}, {{tag3}} {{entryTrigger.lifetimePurchases}}";
 
     const injectedTagsParams = [];
     const location = { query: { module: "DEFAULT" } };
@@ -276,11 +276,11 @@ describe("checkSupport", () => {
 
   it("should return event context tags even if tagObject is empty", () => {
     const response = {
-      data: [{ name: "tag1" }, { name: "lifetimePurchases" }],
+      data: [{ name: "tag1" }, { name: "entryTrigger.lifetimePurchases" }],
     };
     const tagObject = {};
     const result = checkSupport(response, tagObject, eventContextTags);
-    expect(result).toEqual(['lifetimePurchases']);
+    expect(result).toEqual(['entryTrigger.lifetimePurchases']);
   });
 
   it("should return an array of supported tags", () => {
@@ -386,6 +386,16 @@ describe("checkSupport", () => {
     expect(result).toEqual( [ 'leaderboard', 'person.userId' ]);
   });
 
+  it("should not add childName to supportedList which does not have dot in eventContextTags", () => {
+    // This case is unlikely to happen as we are not supporting tags without dot in eventContextTags
+    const response = { data: [{ name: "entryTrigger.lifetimePoints", children: [{name: "userId"}] }]};
+    const tagObject = {};
+    const eventContextTags = [{ tagName: "entryTrigger.lifetimePoints", children: [{name: "userId"}] }];
+    const isLiquidFlow = true;
+    const result = checkSupport(response, tagObject, eventContextTags, isLiquidFlow);
+    expect(result).toEqual( [ "entryTrigger.lifetimePoints" ]);
+  });
+
   it("should add only parent tag to supportedList if isLiquidFlow false", () => {
     const response = { data: [{ name: "leaderboard", children: [{name: "person.userId"}]}]};
     const tagObject = {};
@@ -472,4 +482,18 @@ describe("getTagMapValue", () => {
     const result = getTagMapValue(object);
     expect(result).toEqual({ name: "233" });
   });
+});
+
+describe("skipTags", () => {
+  it("should return false for event context tags", () => {
+    const tag = "entryTrigger.uniqueTagPrefix(raindrops_match)";
+    const result = skipTags(tag);
+    expect(result).toEqual(false);
+  });
+
+  it("should return true for tags matching regex patterns", () => {
+    const tag = "voucher(12345)";
+    const result = skipTags(tag);
+    expect(result).toEqual(true);
+  });
 });

package/v2Components/FormBuilder/index.js

@@ -1198,7 +1198,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   };
 
   skipTags(tag) {
-    // If the tag contains the word "entryTrigger_", then it's an event context tag and it should not be skipped.
+    // If the tag contains the word "entryTrigger.", then it's an event context tag and it should not be skipped.
     if (tag?.match(ENTRY_TRIGGER_TAG_REGEX)) {
       return false;
     }

package/v2Containers/TagList/index.js

@@ -104,23 +104,36 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
         this.transformCouponTags(selectedOfferDetails, tags);
       }
     }
+    // Journey event context tags also should be displayed in the Add Labels.
     if (eventContextTags?.length) {
       const TAG_HEADER_MSG_LABEL = this.props.intl.formatMessage(messages.entryEvent);
-      eventContextTagsObj.EventContextTags = {
+      eventContextTagsObj.eventContextTags = {
         name: TAG_HEADER_MSG_LABEL,
         desc: TAG_HEADER_MSG_LABEL,
         resolved: true,
         'tag-header': true,
         subtags: {},
       };
-      // Journey event context tags also should be displayed in the Add Labels.
+
       eventContextTags.forEach((tag) => {
-        if (tag?.tagName) {
-          eventContextTagsObj.EventContextTags.subtags[tag?.tagName] = {
-              name: tag?.tagName,
-              desc: tag?.tagName,
-              resolved: true
-          }
+        const { tagName, label, profileId, profileName } = tag || {};
+        if (!profileId || !tagName || !label || !profileName) return;
+        // Initializing the tags profile if it doesn't exist
+        if (!eventContextTagsObj?.eventContextTags?.subtags?.[profileId]) {
+          eventContextTagsObj.eventContextTags.subtags[profileId] = {
+            name: profileName,
+            desc: profileName,
+            resolved: true,
+            "tag-header": true,
+            subtags: {},
+          };
+        } else {
+          // Adding the current tag to the profile group
+          eventContextTagsObj.eventContextTags.subtags[profileId].subtags[tagName] = {
+            name: label,
+            desc: label,
+            resolved: true,
+          };
         }
       });
     }

package/v2Containers/TagList/tests/TagList.test.js

@@ -41,12 +41,20 @@ describe("TagList test :  UNIT", () => {
     addLabelBtnAssertion();
   });
 
-  it('should render event context tags correctly from generateTags', () => {
+  it('should render event context tags correctly from generateTags and show tags under profile', () => {
     initializeTagList({eventContextTags});
     addLabelBtnAssertion();
-    const EVENT_CONTEXT_TAG_HEADER = getByText('Entry event');
+    const EVENT_CONTEXT_TAG_HEADER = getByText(/Entry event/i);
     expect(EVENT_CONTEXT_TAG_HEADER).toBeInTheDocument();
     fireEvent.click(EVENT_CONTEXT_TAG_HEADER);
-    expect(getByText('lifetimePurchases')).toBeInTheDocument();
+    // Customer profile tags
+    const CUSTOMER_PROFILE = getByText(/Current Customer/i);
+    fireEvent.click(CUSTOMER_PROFILE);
+    expect(getByText(/lifetimePurchases/i)).toBeInTheDocument();
+
+    // Behavioural event profile tags
+    const BEHAVIOURAL_EVENT_PROFILE = getByText(/Behavioural event/i);
+    fireEvent.click(BEHAVIOURAL_EVENT_PROFILE);
+    expect(getByText(/raindrops/i)).toBeInTheDocument();
   });
 });

package/v2Containers/TagList/tests/mockdata.js

@@ -110,6 +110,8 @@ export const TagListData = {
 export const eventContextTags = [
     {
         "profileId": "BEHAVIOURAL_EVENT_PROFILE",
+        "profileName": "Behavioural event",
+        "label": "butterfly",
         "method": "getEventData",
         "field": "butterfly",
         "params": null,
@@ -129,6 +131,8 @@ export const eventContextTags = [
     },
     {
         "profileId": "BEHAVIOURAL_EVENT_PROFILE",
+        "profileName": "Behavioural event",
+        "label": 'raindrops',
         "method": "getEventData",
         "field": "raindrops",
         "params": null,
@@ -149,6 +153,7 @@ export const eventContextTags = [
     {
         "factId": "5LFP9e",
         "profileId": "CUSTOMER_PROFILE",
+        "profileName": "Current Customer",
         "params": [],
         "returnType": {
             "isList": false,
@@ -158,7 +163,8 @@ export const eventContextTags = [
             },
             "list": false
         },
-        "tagName": "lifetimePurchases",
+        "tagName": "entryTrigger.lifetimePurchases",
+        "label": 'lifetimePurchases',
         "isTaggable": true,
         "uniqueId": "yW_DH7vjKk__BEHAVIOURAL__monsoon",
         "isDynamicFact": false