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

package/package.json

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

package/utils/common.js

@@ -166,10 +166,12 @@ export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails
     }
   });
   let combinedTags = result;
-  if (offerDetails.length && offerDetails[0].type === 'BADGES') {
-    combinedTags = transformBadgeTags(offerDetails, result);
-  } else {
-    combinedTags = transformCouponTags(offerDetails, result);
+  if (offerDetails.length) {
+    if (offerDetails?.[0].type === 'BADGES') {
+      combinedTags = transformBadgeTags(offerDetails, result);
+    } else {
+      combinedTags = transformCouponTags(offerDetails, result);
+    }
   }
   return getTreeStructureData(combinedTags);
 }
@@ -195,7 +197,7 @@ function transformCouponTags(offerDetails, allTags) {
     return {
       ...obj,
       ...tempObj,
-      couponSeriesId: id,
+      incentiveSeriesId: id,
     };
   };
   offerDetails.forEach((offer) => {
@@ -218,7 +220,7 @@ function transformCouponTags(offerDetails, allTags) {
       'tag-header': true,
       'name': couponNameFinal || couponId,
       'desc': couponNameFinal || couponId,
-      'couponSeriesId': couponId,
+      'incentiveSeriesId': couponId,
       'subtags': couponSubTags,
       'resolved': true,
       'couponTags': true,
@@ -247,10 +249,10 @@ export function transformBadgeTags(badgeDetails, allTags) {
   };
   badgeDetails.forEach((offer) => {
     const { badgeId, badgeName } = offer;
-    const couponSubTags = {};
+    const badgeSubTags = {};
     badgeTagsKeys.forEach((badgeTagKey) => {
       const badgeSubTagsObj = withBadgeId(allTags?.Badge?.subtags[badgeTagKey], badgeId);
-      couponSubTags[badgeTagKey] = badgeSubTagsObj;
+      badgeSubTags[badgeTagKey] = badgeSubTagsObj;
     });
     const key = badgeName || badgeId;
     badgeTags[key] = {
@@ -258,13 +260,14 @@ export function transformBadgeTags(badgeDetails, allTags) {
       'name': badgeName,
       'desc': badgeName,
       'incentiveSeriesId': badgeId,
-      'subtags': couponSubTags,
+      'subtags': badgeSubTags,
       'resolved': true,
-      'badgeTags': true,
+      'couponTags': true,
     };
   });
   // eslint-disable-next-line no-param-reassign
   allTags.Badge.subtags = badgeTags;
+  return allTags;
 }
 
 function populateTagForChildren(targetTag, tagsObject, tagValue) {

package/utils/tests/common.mockdata.js

@@ -102,6 +102,265 @@ 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",
+      ],
+      "tag-header": true,
+      "supportedModules": [
+        {
+          context: "outbound",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "line",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "journey",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "journey",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "journey",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "mobilepush",
+          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: "655b617e48bc1275ad0c717c",
+    type: "TAG",
+    definition: {
+      "label": {
+        "en": "Days Until Expiry",
+        "ja-JP": "有効期限までの日数",
+      },
+      "value": "Days_until_expiry",
+      "subtags": [],
+      "tag-header": false,
+      "supportedModules": [
+        {
+          context: "outbound",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "line",
+          mandatory: false,
+        },
+        {
+          context: "outbound",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "default",
+          layout: "wechat",
+          mandatory: false,
+        },
+        {
+          context: "journey",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "journey",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "journey",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "sms",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "email",
+          mandatory: false,
+        },
+        {
+          context: "loyalty",
+          layout: "mobilepush",
+          mandatory: false,
+        },
+      ],
+    },
+    scope: {
+      verticals: [],
+      orgId: -1,
+      tag: "STANDARD",
+    },
+    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: [
+        {
+          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 tagsToFilter = ["timeSpan_Start"];
 
 export const output1 = [

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: [{badgeId: '12', badgeName: 'moye_moye', type: "BADGES"}]})).toEqual(mockdata.badgesOutput);
+  });
   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

@@ -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.incentiveSeriesId ? `${key}(${val.incentiveSeriesId})` : `${key}`}
+            key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
             disabled={childDisabled}
           >
           </CapTreeNode>);

package/v2Containers/TagList/index.js

@@ -50,11 +50,14 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       this.setState({loading: true});
     }
     if (!_.isEqual(nextProps.injectedTags, this.props.injectedTags)) {
+
       this.setState({loading: false});
     }
     if (!_.isEqual(nextProps.tags, this.props.tags)) {
+
       this.setState({loading: false});
     }
+
   }
   componentDidUpdate(prevProps) {
     if (this.props.tags !== prevProps.tags || this.props.injectedTags !== prevProps.injectedTags || this.props.selectedOfferDetails !== prevProps.selectedOfferDetails) {
@@ -87,11 +90,11 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       tags = this.populateTags(props.tags);
     }
     console.log(`selected Badges: ${props.selectedOfferDetails}, ${JSON.stringify(tags)}`);
-    if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) && (tags && tags.coupon)) {
+    if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) ) {
       console.log(`selected offers: ${JSON.stringify(props.selectedOfferDetails)}`);
-      if (props.selectedOfferDetails[0]?.type === 'BADGES') {
+      if ((props?.selectedOfferDetails[0]?.type === 'BADGES') && (tags && tags?.badge) ) {
         transformBadgeTags(props.selectedOfferDetails, tags);
-      } else {
+      } else if (tags && tags?.coupon) {
         this.transformCouponTags(props.selectedOfferDetails, tags);
       }
     }
@@ -123,8 +126,8 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       }
       if (!tag['tag-header']) {
         mainTags[tag.value] = {
-          name: tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
-          desc: tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
+          "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
+          "desc": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,
         };
       } else if (tag['tag-header'] && mainTags[tag.value]) {
         mainTags[tag.value].subtags = _.concat(mainTags[tag.value].subtags, tag.subtags);
@@ -133,7 +136,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,
         };
       }
     });
@@ -204,8 +207,8 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       };
     };
     offerDetails.forEach((offer) => {
-      const { id, couponName, description, incentiveSeriesId } = offer;
-      const couponId = id || incentiveSeriesId;
+      const { id, couponName, description, couponSeriesId } = offer;
+      const couponId = id || couponSeriesId;
       const couponSubTags = {};
       couponTagsKeys.forEach((couponTagKey) => {
         const couponSubTagsObj = withCouponId(allTags.coupon.subtags[couponTagKey], couponId);