@capillarytech/creatives-library 7.17.69 → 7.17.71

package/containers/App/constants.js

@@ -83,7 +83,17 @@ export const BADGES_RELATED_TAGS = [
   "badge_expiry_Dd_dot_mm_dot_yy",
   "badge_expiry_dd_space_Mon",
   "Days_until_expiry",
+  "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",
+  "badges_enroll_expiring_in_days",
 ];
+export const BADGES_ENROLL = 'BADGES_ENROLL';
 
 export const CUSTOMER_BARCODE_TAG = "customer_barcode";
 export const COPY_OF = "Copy of";

package/package.json

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

package/utils/common.js

@@ -16,6 +16,7 @@ import {
   JP_LOCALE_HIDE_FEATURE,
   ENABLE_CUSTOMER_BARCODE_TAG,
   BADGES_UI_ENABLED,
+  BADGES_ENROLL,
 } from '../containers/App/constants';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -166,8 +167,12 @@ export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails
     }
   });
   let combinedTags = result;
-  if (offerDetails.length) {
-    combinedTags = transformCouponTags(offerDetails, result);
+  if (offerDetails?.length) {
+    if (offerDetails?.[0]?.type === BADGES_ENROLL) {
+      combinedTags = transformBadgeTags(offerDetails, result);
+    } else {
+      combinedTags = transformCouponTags(offerDetails, result);
+    }
   }
   return getTreeStructureData(combinedTags);
 }
@@ -193,7 +198,7 @@ function transformCouponTags(offerDetails, allTags) {
     return {
       ...obj,
       ...tempObj,
-      couponSeriesId: id,
+      incentiveSeriesId: id,
     };
   };
   offerDetails.forEach((offer) => {
@@ -216,7 +221,7 @@ function transformCouponTags(offerDetails, allTags) {
       'tag-header': true,
       'name': couponNameFinal || couponId,
       'desc': couponNameFinal || couponId,
-      'couponSeriesId': couponId,
+      'incentiveSeriesId': couponId,
       'subtags': couponSubTags,
       'resolved': true,
       'couponTags': true,
@@ -227,6 +232,44 @@ function transformCouponTags(offerDetails, allTags) {
   return allTags;
 }
 
+export function transformBadgeTags(badgeDetails = [], allTags) {
+  const badgeTags = {};
+  const badgeTagsKeys = Object.keys(_.get(allTags, 'Badge.subtags', []));
+  const withBadgeId = (obj, id) => {
+    const tempObj = {};
+    if (obj?.subtags) {
+      tempObj.subtags = _.mapValues(obj.subtags, (tag) => ({
+        ...withBadgeId(tag, id),
+      }));
+    }
+    return {
+      ...obj,
+      ...tempObj,
+      incentiveSeriesId: id,
+    };
+  };
+  badgeDetails.forEach((offer) => {
+    const { badgesMetaId, badgeName } = offer || {};
+    const badgeSubTags = {};
+    badgeTagsKeys.forEach((badgeTagKey) => {
+      const badgeSubTagsObj = withBadgeId(allTags?.Badge?.subtags?.[badgeTagKey], badgesMetaId);
+      badgeSubTags[badgeTagKey] = badgeSubTagsObj;
+    });
+    badgeTags[badgesMetaId] = {
+      'tag-header': true,
+      'name': badgeName,
+      'desc': badgeName,
+      'incentiveSeriesId': badgesMetaId,
+      'subtags': badgeSubTags,
+      'resolved': true,
+      'couponTags': true,
+    };
+  });
+  // eslint-disable-next-line no-param-reassign
+  allTags.Badge.subtags = badgeTags;
+  return allTags;
+}
+
 function populateTagForChildren(targetTag, tagsObject, tagValue) {
   const tag = targetTag;
   if (tag && tag['tag-header'] && !tag.resolved) {

package/utils/tests/common.mockdata.js

@@ -102,6 +102,454 @@ export const tagsList = [
     updatedAt: "2018-01-22T11:43:05.611Z",
   },
 ];
+
+export const badgesTags = [
+  {
+    _id: "655b080695c9df613dbbed4d",
+    type: "TAG",
+    definition: {
+      "label": {
+        "en": "Badge",
+        "ja-JP": "バッジ",
+      },
+      "value": "Badge",
+      "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: "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",
+    },
+    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",
+          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: "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: {
+      tag: "STANDARD",
+      orgId: -1,
+      verticals: [],
+    },
+    isActive: true,
+  },
+  {
+    _id: "655b617e48bc1275ad0c717c",
+    type: "TAG",
+    definition: {
+      "label": {
+        "en": "Days_until_expiry",
+        "ja-JP": "有効期限までの日数",
+      },
+      "value": "badges_enroll_expiring_in_days",
+      "subtags": [],
+      "tag-header": false,
+      "supportedModules": [
+        {
+          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",
+    },
+    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: "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: {
+      tag: "STANDARD",
+      orgId: -1,
+      verticals: [],
+    },
+    isActive: true,
+  },
+];
+export const OfferTag = [{
+  _id: "5aaa0cec7472bc0eab75f55b",
+  type: "TAG",
+  definition: {
+    "supportedModules": [
+      {
+        context: "journey",
+        layout: "sms",
+        mandatory: false,
+      },
+      {
+        context: "journey",
+        layout: "email",
+        mandatory: false,
+      },
+      {
+        context: "journey",
+        layout: "mobilepush",
+        mandatory: false,
+      },
+      {
+        context: "default",
+        layout: "sms",
+        mandatory: false,
+      },
+      {
+        context: "outbound",
+        layout: "sms",
+        mandatory: false,
+      },
+      {
+        context: "outbound",
+        layout: "line",
+        mandatory: false,
+      },
+      {
+        context: "default",
+        layout: "line",
+        mandatory: false,
+      },
+    ],
+    "tag-header": true,
+    "subtags": [
+      "voucher",
+      "valid_till_date",
+      "valid_days_from_create",
+    ],
+    "value": "coupon",
+    "label": {
+      "en": "Coupons",
+      "ja-JP": "クーポン",
+    },
+  },
+  scope: {
+    tag: "STANDARD",
+    orgId: -1,
+    verticals: [],
+  },
+  isActive: true,
+  createdBy: 15000449,
+  updatedBy: 15000449,
+  createdAt: "2018-03-15T06:04:28.484Z",
+  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: [{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 = [
@@ -123,3 +571,42 @@ export const output2 = [
     value: "{{optout}}",
   },
 ];
+export const offer = [
+  { badgesMetaId: "12", badgeName: "moye_moye", type: "BADGES_ENROLL" },
+];
+export const expectedOffer = [
+  {
+    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}}",
+  },
+];

package/utils/tests/common.test.js

@@ -11,12 +11,19 @@ describe("getTreeStructuredTags test", () => {
   it("test for getTreeStructuredTags when tagsList is empty", () => {
     expect(getTreeStructuredTags({tagsList: []})).toEqual([]);
   });
+
+  it("test for getTreeStructuredTags when incentive attached is BADGES", () => {
+    expect(getTreeStructuredTags({tagsList: mockdata.badgesTags, offerDetails: mockdata.offer})).toEqual(mockdata.expectedOffer);
+  });
   it("test for filterTags", () => {
     expect(filterTags(mockdata.tagsToFilter, mockdata.tagsList)).toEqual([mockdata.tagsList[1]]);
   });
   it("test for filterTags when tagsToFilter and tagsList is empty", () => {
     expect(filterTags([], [])).toEqual([]);
   });
+  it("test for getTreeStructuredTags when incentive attached is offer", () => {
+    expect(getTreeStructuredTags({tagsList: mockdata.OfferTag, offerDetails: [{id: '12', couponName: 'mac'}]})).toEqual(mockdata.offerOutput);
+  });
 });
 
 describe("getUserNameById test", () => {

package/v2Components/CapTagList/index.js

@@ -202,9 +202,9 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         const temp = this.renderTags(val.subtags, '', disabled);
         const tagValue = (
           <CapTreeNode
-            title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.name}</CapTooltip> : val.name}
+            title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val?.name}</CapTooltip> : val?.name}
             tag={val}
-            key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}
+            key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
             disabled={disabled}
           >
             {temp}
@@ -223,7 +223,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             title={childDisabled ? <CapTooltip title={key === CUSTOMER_BARCODE_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
             tag={val}
             isLeaf
-            key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}
+            key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
             disabled={childDisabled}
           >
           </CapTreeNode>);

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].*\\([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

@@ -22,8 +22,8 @@ import './_tagList.scss';
 import { selectCurrentOrgDetails } from '../Cap/selectors';
 import { injectIntl } from 'react-intl';
 import { scope } from './messages';
-import { handleInjectedData, hasGiftVoucherFeature, hasPromoFeature, hasBadgesFeature } from '../../utils/common';
-import { GIFT_VOUCHER_RELATED_TAGS, PROMO_ENGINE_RELATED_TAGS, BADGES_RELATED_TAGS } from '../../containers/App/constants';
+import { handleInjectedData, hasGiftVoucherFeature, hasPromoFeature, hasBadgesFeature, transformBadgeTags } from '../../utils/common';
+import { GIFT_VOUCHER_RELATED_TAGS, PROMO_ENGINE_RELATED_TAGS, BADGES_RELATED_TAGS, BADGES_ENROLL } from '../../containers/App/constants';
 
 const TreeNode = Tree.TreeNode;
 
@@ -79,6 +79,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   generateTags = (props) => {
     let tags = {};
     let injectedTags = {};
+    const {selectedOfferDetails } = props;
     if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
       const formattedInjectedTags = handleInjectedData(
         props.injectedTags,
@@ -89,8 +90,12 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     if (props.tags && props.tags.length > 0) {
       tags = this.populateTags(props.tags);
     }
-    if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) && (tags && tags.coupon)) {
-      this.transformCouponTags(props.selectedOfferDetails, tags);
+    if (selectedOfferDetails && !_.isEmpty(selectedOfferDetails) ) {
+      if ((selectedOfferDetails[0]?.type === BADGES_ENROLL) && (tags && tags?.Badge) ) {
+        transformBadgeTags(selectedOfferDetails, tags);
+      } else if (tags && tags?.coupon) {
+        this.transformCouponTags(selectedOfferDetails, tags);
+      }
     }
     this.setState({tags: _.merge( {}, tags, injectedTags)});
   }
@@ -130,7 +135,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
           'tag-header': true,
           "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
           "desc": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
-          "subtags": tag.subtags,
+          "subtags": tag?.subtags,
         };
       }
     });
@@ -197,7 +202,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       return {
         ...obj,
         ...tempObj,
-        couponSeriesId: id,
+        incentiveSeriesId: id,
       };
     };
     offerDetails.forEach((offer) => {
@@ -214,7 +219,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
         'tag-header': true,
         'name': couponNameFinal || couponId,
         'desc': couponNameFinal || couponId,
-        'couponSeriesId': couponId,
+        'incentiveSeriesId': couponId,
         'subtags': couponSubTags,
         'resolved': true,
         'couponTags': true,
@@ -306,7 +311,7 @@ TagList.propTypes = {
   modalProps: PropTypes.any,
   currentOrgDetails: PropTypes.object,
   channel: PropTypes.string,
-  disabled: PropTypes.bool
+  disabled: PropTypes.bool,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/Templates/index.js

@@ -592,11 +592,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         };
       }
 
-      const {name, sourceAccountIdentifier, configs: {
+      const {name, sourceAccountIdentifier, configs } = weCrmAccountsList?.[0] || {};
+      const {
         token,
         wecrm_app_id,
         wecrm_token
-      } } = weCrmAccountsList?.[0];
+      } = configs || {};
       if (weCrmChannels.includes(selectedChannel)) {
           if ([WHATSAPP_LOWERCASE].includes(selectedChannel)) {
             if (hostName === '') {