@capillarytech/creatives-library 7.17.66-alpha.6 → 7.17.66-alpha.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.17.66-alpha.6",
+  "version": "7.17.66-alpha.7",
   "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,8 @@ export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails
     }
   });
   let combinedTags = result;
-  if (offerDetails.length) {
-    if (offerDetails?.[0].type === 'BADGES') {
+  if (offerDetails?.length) {
+    if (offerDetails?.[0]?.type === BADGES_ENROLL) {
       combinedTags = transformBadgeTags(offerDetails, result);
     } else {
       combinedTags = transformCouponTags(offerDetails, result);
@@ -231,7 +232,7 @@ function transformCouponTags(offerDetails, allTags) {
   return allTags;
 }
 
-export function transformBadgeTags(badgeDetails, allTags) {
+export function transformBadgeTags(badgeDetails = [], allTags) {
   const badgeTags = {};
   const badgeTagsKeys = Object.keys(_.get(allTags, 'Badge.subtags', []));
   const withBadgeId = (obj, id) => {
@@ -248,18 +249,17 @@ export function transformBadgeTags(badgeDetails, allTags) {
     };
   };
   badgeDetails.forEach((offer) => {
-    const { badgeId, badgeName } = offer || {};
+    const { badgeMetaId, badgeName } = offer || {};
     const badgeSubTags = {};
     badgeTagsKeys.forEach((badgeTagKey) => {
-      const badgeSubTagsObj = withBadgeId(allTags?.Badge?.subtags[badgeTagKey], badgeId);
+      const badgeSubTagsObj = withBadgeId(allTags?.Badge?.subtags?.[badgeTagKey], badgeMetaId);
       badgeSubTags[badgeTagKey] = badgeSubTagsObj;
     });
-    const key = badgeName || badgeId;
-    badgeTags[key] = {
+    badgeTags[badgeMetaId] = {
       'tag-header': true,
       'name': badgeName,
       'desc': badgeName,
-      'incentiveSeriesId': badgeId,
+      'incentiveSeriesId': badgeMetaId,
       'subtags': badgeSubTags,
       'resolved': true,
       'couponTags': true,

package/utils/tests/common.mockdata.js

@@ -571,3 +571,42 @@ export const output2 = [
     value: "{{optout}}",
   },
 ];
+export const offer = [
+  { badgeMetaId: "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

@@ -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([{"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}}"}]);
+    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]]);

package/v2Containers/TagList/index.js

@@ -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,11 +90,11 @@ 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) ) {
-      if ((props?.selectedOfferDetails[0]?.type === BADGES_ENROLL) && (tags && tags?.Badge) ) {
-        transformBadgeTags(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(props.selectedOfferDetails, tags);
+        this.transformCouponTags(selectedOfferDetails, tags);
       }
     }
     this.setState({tags: _.merge( {}, tags, injectedTags)});