@capillarytech/creatives-library 7.17.66-alpha.2 → 7.17.66-alpha.4

package/package.json

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

package/utils/common.js

@@ -248,7 +248,7 @@ export function transformBadgeTags(badgeDetails, allTags) {
     };
   };
   badgeDetails.forEach((offer) => {
-    const { badgeId, badgeName } = offer;
+    const { badgeId, badgeName } = offer || {};
     const badgeSubTags = {};
     badgeTagsKeys.forEach((badgeTagKey) => {
       const badgeSubTagsObj = withBadgeId(allTags?.Badge?.subtags[badgeTagKey], badgeId);

package/utils/tests/common.mockdata.js

@@ -116,27 +116,53 @@ export const badgesTags = [
       "subtags": [
         "Badge_expiry_date",
         "Days_until_expiry",
+        "badges_enroll_expiring_in_days",
       ],
       "tag-header": true,
       "supportedModules": [
+        {
+          context: "loyalty",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "mobilepush",
+          mandatory: false,
+        },
         {
           context: "outbound",
           layout: "sms",
           mandatory: false,
         },
+        {
+          context: "default",
+          layout: "sms",
+          mandatory: false,
+        },
         {
           context: "outbound",
           layout: "email",
           mandatory: false,
         },
+        {
+          context: "default",
+          layout: "email",
+          mandatory: false,
+        },
         {
           context: "outbound",
           layout: "mobilepush",
           mandatory: false,
         },
         {
-          context: "outbound",
-          layout: "line",
+          context: "default",
+          layout: "mobilepush",
           mandatory: false,
         },
         {
@@ -150,20 +176,67 @@ export const badgesTags = [
           mandatory: false,
         },
         {
-          context: "journey",
-          layout: "sms",
+          context: "outbound",
+          layout: "line",
           mandatory: false,
         },
         {
-          context: "journey",
-          layout: "email",
+          context: "default",
+          layout: "line",
           mandatory: false,
         },
         {
-          context: "journey",
-          layout: "mobilepush",
+          context: "outbound",
+          layout: "ebill",
           mandatory: false,
         },
+        {
+          context: "default",
+          layout: "ebill",
+          mandatory: false,
+        },
+      ],
+    },
+    scope: {
+      verticals: [],
+      orgId: -1,
+      tag: "STANDARD",
+    },
+    isActive: true,
+    createdBy: 15000449,
+    updatedBy: 15000449,
+    createdAt: "2022-06-24T10:28:45.738Z",
+    updatedAt: "2022-06-24T10:28:45.738Z",
+  },
+  {
+    _id: "655b0afec0af192ba585cc98",
+    type: "TAG",
+    definition: {
+      "label": {
+        "en": "Badge Expiry Date",
+        "ja-JP": "バッジの有効期限",
+      },
+      "value": "Badge_expiry_date",
+      "subtags": [
+        "badge_expiry_mm_slash_dd_slash_yyyy",
+        "badge_expiry_dd_slash_mm_slash_yyyy",
+        "badge_expiry_yyyy_hyphen_mm_hyphen_dd",
+        "badge_expiry_mm_slash_dd_slash_yy",
+        "badge_expiry_dd_space_Mon_space_yyyy",
+        "badge_expiry_Day_comma_space_Mon_space_dd_comma_space_yy",
+        "badge_expiry_Dd_dot_mm_dot_yy",
+        "badge_expiry_dd_space_Mon",
+        "badges_enroll_expiry_date.FORMAT_1",
+        "badges_enroll_expiry_date.FORMAT_2",
+        "badges_enroll_expiry_date.FORMAT_3",
+        "badges_enroll_expiry_date.FORMAT_4",
+        "badges_enroll_expiry_date.FORMAT_5",
+        "badges_enroll_expiry_date.FORMAT_6",
+        "badges_enroll_expiry_date.FORMAT_7",
+        "badges_enroll_expiry_date.FORMAT_8",
+      ],
+      "tag-header": true,
+      "supportedModules": [
         {
           context: "loyalty",
           layout: "sms",
@@ -179,28 +252,84 @@ export const badgesTags = [
           layout: "mobilepush",
           mandatory: false,
         },
+        {
+          context: "outbound",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "line",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "line",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "ebill",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "ebill",
+          mandatory: false,
+        },
       ],
     },
     scope: {
-      verticals: [],
-      orgId: -1,
       tag: "STANDARD",
+      orgId: -1,
+      verticals: [],
     },
     isActive: true,
-    createdBy: 15000449,
-    updatedBy: 15000449,
-    createdAt: "2022-06-24T10:28:45.738Z",
-    updatedAt: "2022-06-24T10:28:45.738Z",
   },
   {
     _id: "655b617e48bc1275ad0c717c",
     type: "TAG",
     definition: {
       "label": {
-        "en": "Days Until Expiry",
+        "en": "Days_until_expiry",
         "ja-JP": "有効期限までの日数",
       },
-      "value": "Days_until_expiry",
+      "value": "badges_enroll_expiring_in_days",
       "subtags": [],
       "tag-header": false,
       "supportedModules": [
@@ -209,19 +338,29 @@ export const badgesTags = [
           layout: "sms",
           mandatory: false,
         },
+        {
+          context: "default",
+          layout: "sms",
+          mandatory: false,
+        },
         {
           context: "outbound",
           layout: "email",
           mandatory: false,
         },
+        {
+          context: "default",
+          layout: "email",
+          mandatory: false,
+        },
         {
           context: "outbound",
           layout: "mobilepush",
           mandatory: false,
         },
         {
-          context: "outbound",
-          layout: "line",
+          context: "default",
+          layout: "mobilepush",
           mandatory: false,
         },
         {
@@ -235,41 +374,111 @@ export const badgesTags = [
           mandatory: false,
         },
         {
-          context: "journey",
-          layout: "sms",
+          context: "outbound",
+          layout: "line",
           mandatory: false,
         },
         {
-          context: "journey",
-          layout: "email",
+          context: "default",
+          layout: "line",
           mandatory: false,
         },
         {
-          context: "journey",
-          layout: "mobilepush",
+          context: "outbound",
+          layout: "ebill",
           mandatory: false,
         },
         {
-          context: "loyalty",
+          context: "default",
+          layout: "ebill",
+          mandatory: false,
+        },
+      ],
+    },
+    scope: {
+      verticals: [],
+      orgId: -1,
+      tag: "STANDARD",
+    },
+    isActive: true,
+  },
+  {
+    _id: "65818c77915d01082d1d34de",
+    type: "TAG",
+    definition: {
+      "label": {
+        en: "mm/dd/yyyy",
+      },
+      "value": "badges_enroll_expiry_date.FORMAT_1",
+      "subtags": [],
+      "tag-header": false,
+      "supportedModules": [
+        {
+          context: "outbound",
           layout: "sms",
           mandatory: false,
         },
         {
-          context: "loyalty",
+          context: "default",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
           layout: "email",
           mandatory: false,
         },
         {
-          context: "loyalty",
+          context: "default",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+        {
+          context: "default",
           layout: "mobilepush",
           mandatory: false,
         },
+        {
+          context: "outbound",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "line",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "line",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "ebill",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "ebill",
+          mandatory: false,
+        },
       ],
     },
     scope: {
-      verticals: [],
-      orgId: -1,
       tag: "STANDARD",
+      orgId: -1,
+      verticals: [],
     },
     isActive: true,
   },
@@ -339,28 +548,8 @@ export const OfferTag = [{
   updatedAt: "2018-03-15T06:04:28.484Z",
 },
 ];
-export const offerOutput = [{"children": [{"disabled": undefined, "title": "mac", "value": "{{undefined}}"}], "disabled": false, "selectable": false, "title": "Coupons", "value": "{{coupon}}"}];
-export const badgesOutput = [{
-  children: [
-    {
-      children: [
-        {
-          disabled: false,
-          title: "Days Until Expiry",
-          value: "{{Days_until_expiry}}",
-        },
-      ],
-      disabled: undefined,
-      selectable: false,
-      title: "moye_moye",
-      value: "{{undefined}}",
-    },
-  ],
-  disabled: false,
-  selectable: false,
-  title: "Badge",
-  value: "{{Badge}}",
-}];
+export const offerOutput = [{children: [{disabled: undefined, title: "mac", value: "{{undefined}}"}], disabled: false, selectable: false, title: "Coupons", value: "{{coupon}}"}];
+export const badgesOutput = [{children: [{children: [{children: [{disabled: false, title: "mm/dd/yyyy", value: "{{badges_enroll_expiry_date.FORMAT_1}}"}], disabled: false, selectable: false, title: "Badge Expiry Date", value: "{{Badge_expiry_date}}"}, {disabled: false, title: "Days_until_expiry", value: "{{badges_enroll_expiring_in_days}}"}], disabled: undefined, selectable: false, title: "moye_moye", value: "{{undefined}}"}], disabled: false, selectable: false, title: "Badge", value: "{{Badge}}"}];
 export const tagsToFilter = ["timeSpan_Start"];
 
 export const output1 = [

package/utils/tests/common.test.js

@@ -13,7 +13,7 @@ describe("getTreeStructuredTags test", () => {
   });
 
   it("test for getTreeStructuredTags when incentive attached is BADGES", () => {
-    expect(getTreeStructuredTags({tagsList: mockdata.badgesTags, offerDetails: [{badgeId: '12', badgeName: 'moye_moye', type: "BADGES"}]})).toEqual(mockdata.badgesOutput);
+    expect(getTreeStructuredTags({tagsList: mockdata.badgesTags, offerDetails: [{badgeId: '12', badgeName: 'moye_moye', type: "BADGES"}]})).toEqual([{"children": [{"children": [{"children": [{"disabled": false, "title": "mm/dd/yyyy", "value": "{{badges_enroll_expiry_date.FORMAT_1}}"}], "disabled": false, "selectable": false, "title": "Badge Expiry Date", "value": "{{Badge_expiry_date}}"}, {"disabled": false, "title": "Days_until_expiry", "value": "{{badges_enroll_expiring_in_days}}"}], "disabled": undefined, "selectable": false, "title": "moye_moye", "value": "{{undefined}}"}], "disabled": false, "selectable": false, "title": "Badge", "value": "{{Badge}}"}]);
   });
   it("test for filterTags", () => {
     expect(filterTags(mockdata.tagsToFilter, mockdata.tagsList)).toEqual([mockdata.tagsList[1]]);

package/v2Components/FormBuilder/index.js

@@ -1093,8 +1093,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   }
 
   skipTags(tag) {
-    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN","^[A-Za-z].*\\([\\d]*\\)"];
-
+    const regexGroups = ["dynamic_expiry_date_after_\\d+_days.FORMAT_\\d", "unsubscribe\\(#[a-zA-Z\\d]{6}\\)","Link_to_[a-zA-z]","SURVEY.*.TOKEN","^[A-Za-z].*\\([a-zA-Z\\d]*\\)"];
     //const regexGroups = [];
     let skipped = false;
     _.forEach(regexGroups, (group) => {

package/v2Containers/TagList/index.js

@@ -89,10 +89,8 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     if (props.tags && props.tags.length > 0) {
       tags = this.populateTags(props.tags);
     }
-    console.log(`selected Badges: ${props.selectedOfferDetails}, ${JSON.stringify(tags)}`);
     if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) ) {
-      console.log(`selected offers: ${JSON.stringify(props.selectedOfferDetails)}`);
-      if ((props?.selectedOfferDetails[0]?.type === 'BADGES') && (tags && tags?.badge) ) {
+      if ((props?.selectedOfferDetails[0]?.type === 'BADGES') && (tags && tags?.Badge) ) {
         transformBadgeTags(props.selectedOfferDetails, tags);
       } else if (tags && tags?.coupon) {
         this.transformCouponTags(props.selectedOfferDetails, tags);