@capillarytech/creatives-library 8.0.33 → 8.0.34-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": "8.0.33",
+  "version": "8.0.34-alpha.1",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/tests/integration/TemplateCreation/TemplateCreation.integration.test.js

@@ -40,7 +40,7 @@ const initializeCreatives = () => {
   render(
     <Provider store={store}>
       <Router history={history}>
-        <TemplatesV2 />
+        <TemplatesV2 authData={{'user': {'accessiblePermissions': ['CREATIVES_UI_VIEW']}}}/>
       </Router>
     </Provider>,
   );
@@ -124,12 +124,11 @@ describe("Creatives testing template creation", () => {
 
     //start of rcs template creation
     fireEvent.click(rcs);
-    await waitFor(() => {
-      const createButton = creativesScreen.findByRole('button', {
-        name: /create new/i,
-      });
-      userEvent.click(createButton);
-    }, { timeout: 50000, interval: 1000 });
+    const createButton = await creativesScreen.findByRole('button', {
+      name: /create new/i,
+    });
+    await waitFor(() => expect(createButton).toBeEnabled(),{timeout: 50000, interval: 500});
+    userEvent.click(createButton);
     // expect(await creativesScreen.findByText(/Creative name/i, undefined, {timeout: 10000})).toBeInTheDocument();
     const templateNameInput = await creativesScreen.findByTestId(
       /template_name/,
@@ -184,6 +183,7 @@ describe("Creatives testing template creation", () => {
     const createButton = creativesScreen.getByRole('button', {
       name: /create new/i,
     });
+    await waitFor(() => expect(createButton).toBeEnabled(),{ timeout: 50000, interval: 500 });
     await userEvent.click(createButton);
     const templateNameInput = await creativesScreen.findByTestId(
       /template_name/,
@@ -257,6 +257,7 @@ describe("Creatives testing template creation", () => {
     const createButton = creativesScreen.getByRole('button', {
       name: /create new/i,
     });
+    await waitFor(() => expect(createButton).toBeEnabled(),{ timeout: 50000, interval: 500 });
     await userEvent.click(createButton);
     const doneButton = creativesScreen.getByRole('button', {
       name: globalMessages.done.defaultMessage,
@@ -365,9 +366,11 @@ describe("Creatives testing template creation", () => {
 
     // navigating to Viber channel
     await userEvent.click(LineTab);
-    const createButton = creativesScreen.getByRole('button', {
+    const createButton = await creativesScreen.findByRole('button', {
       name: /create new/i,
     });
+  
+    await waitFor(() => expect(createButton).toBeEnabled(),{ timeout: 50000, interval: 500 });
     fireEvent.click(createButton);
     const doneButton = creativesScreen.getByRole('button', {
       name: globalMessages.done.defaultMessage,

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

@@ -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", () => {
@@ -388,12 +388,12 @@ describe("checkSupport", () => {
 
   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 response = { data: [{ name: "entryTrigger.lifetimePoints", children: [{name: "userId"}] }]};
     const tagObject = {};
-    const eventContextTags = [{ tagName: "entryTrigger_lifetimePoints", children: [{name: "userId"}] }];
+    const eventContextTags = [{ tagName: "entryTrigger.lifetimePoints", children: [{name: "userId"}] }];
     const isLiquidFlow = true;
     const result = checkSupport(response, tagObject, eventContextTags, isLiquidFlow);
-    expect(result).toEqual( [ "entryTrigger_lifetimePoints" ]);
+    expect(result).toEqual( [ "entryTrigger.lifetimePoints" ]);
   });
 
   it("should add only parent tag to supportedList if isLiquidFlow false", () => {
@@ -486,7 +486,7 @@ describe("getTagMapValue", () => {
 
 describe("skipTags", () => {
   it("should return false for event context tags", () => {
-    const tag = "entryTrigger_uniqueTagPrefix(raindrops_match)";
+    const tag = "entryTrigger.uniqueTagPrefix(raindrops_match)";
     const result = skipTags(tag);
     expect(result).toEqual(false);
   });

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

@@ -117,8 +117,8 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       eventContextTags.forEach((tag) => {
         if (tag?.tagName) {
           eventContextTagsObj.EventContextTags.subtags[tag?.tagName] = {
-              name: tag?.tagName,
-              desc: tag?.tagName,
+              name: tag?.label,
+              desc: tag?.label,
               resolved: true
           }
         }

package/v2Containers/TagList/tests/mockdata.js

@@ -158,7 +158,8 @@ export const eventContextTags = [
             },
             "list": false
         },
-        "tagName": "lifetimePurchases",
+        "tagName": "entryTrigger.lifetimePurchases",
+        label: 'lifetimePurchases',
         "isTaggable": true,
         "uniqueId": "yW_DH7vjKk__BEHAVIOURAL__monsoon",
         "isDynamicFact": false