@capillarytech/creatives-library 7.17.30 → 7.17.32

package/package.json

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

package/utils/common.js

@@ -288,7 +288,8 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   return isTraiDltFeature;
 };
 
-export const intlKeyGenerator = (value = "") => String(value).replace(/[^a-zA-Z0-9_]/g, "");
+
+export const intlKeyGenerator = (value = "") => String(value).replace(/[^a-zA-Z0-9_]/g, "").toLowerCase();
 
 export const handleInjectedData = (data, scope) => {
   let tagType;

package/utils/tests/common.test.js

@@ -51,7 +51,7 @@ 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={{}} />);
+    expect(result.tag1.name).toEqual(<FormattedMessage defaultMessage="Registration Fields" id="scope.registrationfields" values={{}} />);
   });
 
   it("adds tagType for Registration custom fields", () => {
@@ -62,9 +62,10 @@ describe("handleInjectedData", () => {
     };
 
     const result = handleInjectedData(data, "scope");
-
+    const intlKey = intlKeyGenerator();
+    expect(intlKey).toEqual('');
     expect(result.tag1.name).toEqual(
-      <FormattedMessage defaultMessage="Registration custom fields" id="scope.Registrationcustomfields_name.CustomTagMessage" values={{}} />
+      <FormattedMessage defaultMessage="Registration custom fields" id="scope.registrationcustomfields_name.CustomTagMessage" values={{}} />
     );
   });
 
@@ -78,7 +79,7 @@ describe("handleInjectedData", () => {
     const result = handleInjectedData(data, "scope");
 
     expect(result.tag1.name).toEqual(
-      <FormattedMessage defaultMessage="Customer extended fields" id="scope.Customerextendedfields_name.ExtendedTagMessage" values={{}} />
+      <FormattedMessage defaultMessage="Customer extended fields" id="scope.customerextendedfields_name.ExtendedTagMessage" values={{}} />
     );
   });
   it("adds tagType for Customer extended fields fields", () => {
@@ -156,7 +157,7 @@ describe("handleInjectedData", () => {
     const result = handleInjectedData(data, "scope");
 
     expect(result.tag1.subtags.subtag1.desc).toEqual(
-      <FormattedMessage defaultMessage="Enter your first name" id="scope.Enteryourfirstname" values={{}} />
+      <FormattedMessage defaultMessage="Enter your first name" id="scope.enteryourfirstname" values={{}} />
     );
   });
   it("replaces subtag name desc with intl key", () => {
@@ -174,7 +175,7 @@ describe("handleInjectedData", () => {
     const result = handleInjectedData(data, "scope");
 
     expect(result.tag1.subtags.subtag1.desc).toEqual(
-      <FormattedMessage defaultMessage="Enter your first name" id="scope.Enteryourfirstname" values={{}} />
+      <FormattedMessage defaultMessage="Enter your first name" id="scope.enteryourfirstname" values={{}} />
     );
   });
 });

package/v2Components/CapTagList/index.js

@@ -25,7 +25,7 @@ import {
   JAPANESE_HELP_TEXT,
   TAG_TRANSLATION_DOC,
 } from "../../containers/TagList/constants";
-import { HIDE_FOR_JP_LOCALE } from '../../v2Containers/App/constants';
+import { JP_LOCALE_HIDE_FEATURE } from '../../v2Containers/App/constants';
 import { hidingDateTagsForJpLocale } from '../../v2Containers/TagList/utils';
 
 
@@ -175,7 +175,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   renderTags(tags, searchString = '') {
     const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags } = this?.props?.disableTagsDetails;
     const { accessibleFeatures = [] } = this?.props?.currentOrgDetails || {};
-    const hideDateTagsForJpLocale = accessibleFeatures.includes(HIDE_FOR_JP_LOCALE);
+    const hideDateTagsForJpLocale = accessibleFeatures.includes(JP_LOCALE_HIDE_FEATURE);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     let clonedTags = _.cloneDeep(tags);

package/v2Containers/App/constants.js

@@ -54,7 +54,7 @@ export const LINE = 'line';
 export const EMAIL = 'email';
 export const ASSETS = 'assets';
 
-export const HIDE_FOR_JP_LOCALE = 'HIDE_FOR_JP_LOCALE';
+export const JP_LOCALE_HIDE_FEATURE = 'JP_LOCALE_HIDE_FEATURE';
 
 export const TRACK_EDIT_SMS = 'editSms';
 export const TRACK_EDIT_EMAIL = 'editEmail';

package/v2Containers/TagList/index.js

@@ -98,7 +98,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     //Form tags object with tag headers
     _.forEach(tagsList, (temp) => {
       const tag = temp.definition;
-      const { locale : userLocale } = this.props.intl;
+      const { locale : userLocale } = this.props?.intl || {};
       if (!tag['tag-header']) {
         mainTags[tag.value] = {
           "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,

package/v2Containers/TemplatesV2/index.js

@@ -29,7 +29,7 @@ import FTP from '../FTP';
 import Gallery from '../Assets/Gallery';
 import withStyles from '../../hoc/withStyles';
 import styles, { CapTabStyle } from './TemplatesV2.style';
-import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, HIDE_FOR_JP_LOCALE } from '../App/constants';
+import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, JP_LOCALE_HIDE_FEATURE } from '../App/constants';
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import { getObjFromQueryParams } from '../../utils/v2common';
 import { selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
@@ -119,8 +119,8 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
     const { accessibleFeatures = [] } = currentOrgDetails || {};
     // This data will be available when it will be accessed in library mode
     const { currentOrgDetails: { accessibleFeatures: libModeAccessibleFeatures = [] } = {} } = cap || {};
-    const hideEngagementChannel = accessibleFeatures.includes(HIDE_FOR_JP_LOCALE) || libModeAccessibleFeatures.includes(HIDE_FOR_JP_LOCALE);
-    // Show only line and email channel content with both channel tabs if the HIDE_FOR_JP_LOCALE feature is enabled;
+    const hideEngagementChannel = accessibleFeatures.includes(JP_LOCALE_HIDE_FEATURE) || libModeAccessibleFeatures.includes(JP_LOCALE_HIDE_FEATURE);
+    // Show only line and email channel content with both channel tabs if the JP_LOCALE_HIDE_FEATURE feature is enabled;
     filteredPanes = hideEngagementChannel ? filteredPanes?.filter((pane) => [EMAIL, LINE, ASSETS].includes(pane?.key) && pane) : filteredPanes;
     defaultChannel = hideEngagementChannel ? EMAIL : defaultChannel;
 

package/v2Containers/TemplatesV2/tests/mockData.js

@@ -599,7 +599,7 @@ export const authData = {
       "ENABLE_PRODUCT_SUPPORT_VIDEOS",
       "ENABLE_RANDOM_COUPON_CODE",
       "HIDE_DEFAULT_EMAIL_TEMPLATES",
-      "HIDE_FOR_JP_LOCALE",
+      "JP_LOCALE_HIDE_FEATURE",
     ],
     org_loyalty_v2_status: true,
     module_details: [
@@ -680,6 +680,6 @@ export const currentOrgDetails = {
     "JOURNEY_UI",
     "LOYALTY_PROMOTION_ENABLED",
     "HIDE_DEFAULT_EMAIL_TEMPLATES",
-    "HIDE_FOR_JP_LOCALE",
+    "JP_LOCALE_HIDE_FEATURE",
   ],
 };

package/v2Containers/Whatsapp/index.js

@@ -838,6 +838,8 @@ export const Whatsapp = (props) => {
       errorMessage = formatMessage(
         globalMessages.emptyTemplateNameErrorMessage,
       );
+    } else if (value.length < 3 && host === HOST_GUPSHUP) {
+      errorMessage = formatMessage(messages.templateNameMinCharacters);
     } else if (!templateNameRegex.test(value)) {
       errorMessage = formatMessage(messages.templateNameRegexErrorMessage);
     }
@@ -872,6 +874,7 @@ export const Whatsapp = (props) => {
 
   const templateMessageErrorHandler = (value) => {
     let errorMessage = false;
+    const percentSignRegex = /%/;
     if (value === '') {
       errorMessage = formatMessage(messages.emptyTemplateMessageErrorMessage);
     } else if (
@@ -879,6 +882,9 @@ export const Whatsapp = (props) => {
       TEMPLATE_MESSAGE_MAX_LENGTH
     ) {
       errorMessage = formatMessage(messages.templateMessageLengthError);
+    } else if ( host === HOST_GUPSHUP && percentSignRegex.test(value)
+    ) {
+      errorMessage = formatMessage(messages.noPercentSign);
     } else {
       const validVarArr = value.match(validVarRegex) || [];
       const validVarSet = [...new Set(validVarArr)];

package/v2Containers/Whatsapp/messages.js

@@ -15,6 +15,10 @@ export default defineMessages({
     defaultMessage:
       'Template name can only contain lowercase alphanumeric characters and underscores',
   },
+  templateNameMinCharacters: {
+    id: `${prefix}.templateNameMinCharacters`,
+    defaultMessage: 'Template name should contain atleast 3 characters',
+  },
   templateCategoryLabel: {
     id: `${prefix}.templateCategoryLabel`,
     defaultMessage: 'Template category',
@@ -189,6 +193,10 @@ export default defineMessages({
     id: `${prefix}.noContentBetweenVars`,
     defaultMessage: 'Add atleast 1 character between 2 variables',
   },
+  noPercentSign: {
+    id: `${prefix}.noPercentSign`,
+    defaultMessage: 'Please remove % sign from the message content',
+  },
   sequenceVars: {
     id: `${prefix}.sequenceVars`,
     defaultMessage: