@capillarytech/creatives-library 7.17.26 → 7.17.28

package/package.json

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

package/utils/common.js

@@ -288,37 +288,32 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   return isTraiDltFeature;
 };
 
-export const intlKeyGenerator = (value = "") => {
-  return value.replace(/[^a-zA-Z0-9_]/g, "");
-};
+export const intlKeyGenerator = (value = "") => String(value).replace(/[^a-zA-Z0-9_]/g, "");
 
 export const handleInjectedData = (data, scope) => {
-  const temp = _.cloneDeep(data);
   let tagType;
-  for (const tagKey in temp) {
-    if (temp.hasOwnProperty(tagKey)) {
-      const tag = temp[tagKey];
-
+  for (const tagKey in data) {
+    if (data.hasOwnProperty(tagKey)) {
+      const tag = data[tagKey];
       if (tag?.name === REGISTRATION_CUSTOM_FIELD) {
         tagType = CUSTOM_TAG;
       } else if (tag?.name === CUSTOMER_EXTENDED_FIELD) {
         tagType = EXTENDED_TAG;
       }
-
       if (tag?.name) {
-        const name = tag?.name;
+        const name = tag.name;
         const key = intlKeyGenerator(name);
         const id = tagType
           ? `${scope}.${key}_name.${tagType}`
           : `${scope}.${key}`;
 
-        tag["name"] = apiMessageFormatHandler(id, name);
+        tag.name = apiMessageFormatHandler(id, name);
       }
 
       if (tag?.subtags) {
         for (const subtagKey in tag.subtags) {
-          if (tag["subtags"].hasOwnProperty(subtagKey)) {
-            const subtag = tag["subtags"][subtagKey];
+          if (tag.subtags.hasOwnProperty(subtagKey)) {
+            const subtag = tag.subtags[subtagKey];
             if (subtag?.name) {
               const name = subtag?.name;
               const key = intlKeyGenerator(name);
@@ -326,7 +321,7 @@ export const handleInjectedData = (data, scope) => {
                 ? `${scope}.${key}_name.${tagType}`
                 : `${scope}.${key}`;
 
-              subtag["name"] = apiMessageFormatHandler(id, name);
+              subtag.name = apiMessageFormatHandler(id, name);
             }
             if (subtag?.desc) {
               const desc = subtag?.desc;
@@ -335,7 +330,7 @@ export const handleInjectedData = (data, scope) => {
                 ? `${scope}.${key}_desc.${tagType}`
                 : `${scope}.${key}`;
 
-              subtag["desc"] = apiMessageFormatHandler(id, desc);
+              subtag.desc = apiMessageFormatHandler(id, desc);
             }
           }
         }
@@ -343,5 +338,5 @@ export const handleInjectedData = (data, scope) => {
       tagType = "";
     }
   }
-  return temp;
+  return data;
 };

package/utils/tests/common.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import "@testing-library/jest-dom";
-import { filterTags, getTreeStructuredTags, handleInjectedData } from "../common";
+import { filterTags, getTreeStructuredTags, handleInjectedData, intlKeyGenerator, bytes2Size, getUserNameById } from "../common";
 import * as mockdata from "./common.mockdata";
 
 describe("getTreeStructuredTags test", () => {
@@ -19,6 +19,27 @@ describe("getTreeStructuredTags test", () => {
   });
 });
 
+describe("getUserNameById test", () => {
+  it("test for username is available or not", () => {
+    const data = [
+      {
+        userId: 1,
+        firstName: 'test1',
+        lastName: 'test2',
+
+      },
+      {
+        userId: 2,
+        firstName: 'test3',
+        lastName: 'test4',
+
+      },
+    ];
+    const expected = 'test1 test2';
+    expect(getUserNameById(1, data)).toEqual(expected);
+  });
+});
+
 describe("handleInjectedData", () => {
   it("replaces name with intl key for top level tag", () => {
     const data = {
@@ -28,7 +49,8 @@ describe("handleInjectedData", () => {
     };
 
     const result = handleInjectedData(data, "scope");
-
+    const intlKey = intlKeyGenerator("scope");
+    expect(intlKey).toEqual('scope');
     expect(result.tag1.name).toEqual(<FormattedMessage defaultMessage="Registration Fields" id="scope.RegistrationFields" values={{}} />);
   });
 
@@ -59,22 +81,65 @@ describe("handleInjectedData", () => {
       <FormattedMessage defaultMessage="Customer extended fields" id="scope.Customerextendedfields_name.ExtendedTagMessage" values={{}} />
     );
   });
+  it("adds tagType for Customer extended fields fields", () => {
+    const data = {
+      tag1: {
+      },
+    };
+
+    const result = handleInjectedData(data, "scope");
+
+    expect(result.tag1.name).toEqual(undefined);
+  });
 
+  it("adds tagType for Customer with  extended fields fields", () => {
+    const data = {
+      tag1: {
+        name: "mahaRaja",
+        subtag1: {
+          name: "First Name",
+        },
+      },
+    };
 
+    const result = handleInjectedData(data, "scope");
+
+    expect(result.tag1.subtag1.name).toEqual("First Name");
+  });
   it("replaces subtag name with intl key", () => {
     const data = {
       tag1: {
         subtags: {
           subtag1: {
             name: "First Name",
+            hasOwnProperty: jest.fn(),
           },
+          hasOwnProperty: jest.fn(),
         },
       },
     };
 
     const result = handleInjectedData(data, "scope");
 
-    expect(result.tag1.subtags.subtag1.name).toEqual(<FormattedMessage defaultMessage="First Name" id="scope.FirstName" values={{}} />);
+    expect(result.tag1.subtags.subtag1.name).toEqual("First Name");
+  });
+
+  it("replaces subtag name with intl key test", () => {
+    const data = {
+      tag1: {
+        subtags: {
+          subtag1: {
+            name: "First Name",
+            hasOwnProperty: jest.fn(),
+          },
+        },
+      },
+      hasOwnProperty: jest.fn(),
+    };
+
+    const result = handleInjectedData(data, "scope");
+
+    expect(result.tag1.subtags.subtag1.name).toEqual("First Name");
   });
 
   it("replaces subtag desc with intl key", () => {
@@ -90,9 +155,48 @@ describe("handleInjectedData", () => {
 
     const result = handleInjectedData(data, "scope");
 
+    expect(result.tag1.subtags.subtag1.desc).toEqual(
+      <FormattedMessage defaultMessage="Enter your first name" id="scope.Enteryourfirstname" values={{}} />
+    );
+  });
+  it("replaces subtag name desc with intl key", () => {
+    const data = {
+      tag1: {
+        subtags: {
+          subtag1: {
+            name: "mahaRaja",
+            desc: "Enter your first name",
+          },
+        },
+      },
+    };
+
+    const result = handleInjectedData(data, "scope");
+
     expect(result.tag1.subtags.subtag1.desc).toEqual(
       <FormattedMessage defaultMessage="Enter your first name" id="scope.Enteryourfirstname" values={{}} />
     );
   });
 });
 
+describe('bytes2Size', () => {
+  it('should convert bytes to the correct size string', () => {
+    // Test cases with different byte values
+    expect(bytes2Size(0)).toBe('0 Bytes');
+    expect(bytes2Size(1023)).toBe('1023 Bytes');
+    expect(bytes2Size(1024)).toBe('1 KB');
+    expect(bytes2Size(1048576)).toBe('1 MB');
+    expect(bytes2Size(1099511627776)).toBe('1 TB');
+    expect(bytes2Size(1125899906842624)).toBe('1 PB');
+    expect(bytes2Size(1152921504606846976)).toBe('1 EB');
+    expect(bytes2Size(1180591620717411303424)).toBe('1 ZB');
+    expect(bytes2Size(Number.MAX_SAFE_INTEGER)).toBe('8 PB'); // Test with the maximum safe integer value
+  });
+
+  it('should handle negative decimals', () => {
+    // Test with negative decimal values
+    expect(bytes2Size(1024, -1)).toBe('1 KB'); // Decimals < 0 should round to 0
+    expect(bytes2Size(1024, -2)).toBe('1 KB');
+    expect(bytes2Size(1024, -3)).toBe('1 KB');
+  });
+});

package/v2Containers/CreativesContainer/SlideBoxHeader.js

@@ -55,10 +55,10 @@ export function SlideBoxHeader(props) {
 
   const getChannelLabel = (currentChannel = '') => {
     const labels = {
-      sms: 'SMS',
+      sms: <FormattedMessage {...messages.smsHeader} />,
       email: <FormattedMessage {...messages.emailHeader} />,
-      mobilepush: 'Push notification',
-      wechat: 'Wechat',
+      mobilepush: <FormattedMessage {...messages.pushNotificationHeader} />,
+      wechat: <FormattedMessage {...messages.wechat} />,
       no_communication: 'NO_COMMUNICATION',
       ftp: 'FTP',
       whatsapp: <FormattedMessage {...messages.whatsappTemplate} />,

package/v2Containers/CreativesContainer/messages.js

@@ -325,5 +325,13 @@ export default defineMessages({
   "templateNameEmpty": {
     id: `${scope}.templateNameEmpty`,
     defaultMessage: `Template name cannot be empty`
+  },
+  "pushNotificationHeader": {
+    id: `${scope}.pushNotificationHeader`,
+    defaultMessage: `Push notification`,
+  },
+  "wechat": {
+    id: `${scope}.wechat`,
+    defaultMessage: `Wechat`,
   }
 });

package/v2Containers/TagList/index.js

@@ -20,17 +20,18 @@ import * as globalActions from '../Cap/actions';
 import CapTagList from '../../v2Components/CapTagList';
 import './_tagList.scss';
 import { selectCurrentOrgDetails } from '../Cap/selectors';
-const TreeNode = Tree.TreeNode;
 import { injectIntl } from 'react-intl';
 import { scope } from './messages';
 import { handleInjectedData } from '../../utils/common';
 
+const TreeNode = Tree.TreeNode;
+
 export class TagList extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
     this.state = {
       loading: false,
-      tags: []
+      tags: [],
     };
     this.renderTags = this.renderTags.bind(this);
     this.populateTags = this.populateTags.bind(this);
@@ -40,35 +41,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
 
   componentDidMount() {
-    
-  }
-
-  componentDidUpdate(prevProps) {
-    if (this.props.tags !== prevProps.tags || this.props.injectedTags !== prevProps.injectedTags || this.props.selectedOfferDetails !== prevProps.selectedOfferDetails) {
-      this.setState({
-        tags: this.generateTags(this.props),
-      });
-    }
-  }
-
-  generateTags(props) {
-    let tags = {};
-    let injectedTags = {};
-    if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
-      const formattedInjectedTags = handleInjectedData(
-        props.injectedTags,
-        scope
-      );
-      injectedTags = this.transformInjectedTags(formattedInjectedTags);
-    }
-    if (props.tags && props.tags.length > 0) {
-      tags = this.populateTags(props.tags);
-      console.log('populating tags', Object.keys(tags || {}).length);
-    }
-    if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) && (tags && tags.coupon)) {
-      this.transformCouponTags(props.selectedOfferDetails, tags);
-    }
-    return _.merge( {}, tags, injectedTags);
+    this.generateTags(this.props);
   }
 
   componentWillReceiveProps(nextProps) {
@@ -76,33 +49,52 @@ 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) {
+      this.generateTags(this.props);
+    }
+  }
   onSelect = (selectedKeys) => {
     this.props.onTagSelect(selectedKeys[0]);
   };
 
   onClick = (e, data) => {
-    
+
   };
 
   getTagsforContext = (data) => {
     //this.setState({loading: true});
     this.props.onContextChange(data);
   }
-
+  generateTags = (props) => {
+    let tags = {};
+    let injectedTags = {};
+    if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
+      const formattedInjectedTags = handleInjectedData(
+        props.injectedTags,
+        scope
+      );
+      injectedTags = this.transformInjectedTags(formattedInjectedTags);
+    }
+    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);
+    }
+    this.setState({tags: _.merge( {}, tags, injectedTags)});
+  }
   populateTags(tagsList) {
-    console.log('populating tags', (tagsList || []).length);
     const mainTags = {};
-
     //Form tags object with tag headers
     _.forEach(tagsList, (temp) => {
       const tag = temp.definition;
@@ -115,7 +107,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       } else if (tag['tag-header'] && mainTags[tag.value]) {
         mainTags[tag.value].subtags = _.concat(mainTags[tag.value].subtags, tag.subtags);
       } else if (!mainTags[tag.value]) {
-        // 
         mainTags[tag.value] = {
           'tag-header': true,
           "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,