@capillarytech/creatives-library 7.16.5 → 7.16.7

package/package.json

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

package/v2Components/CapWhatsappCTA/index.js

@@ -20,7 +20,7 @@ import globalMessages from '../../v2Containers/Cap/messages';
 import whatsappMsg from '../../v2Containers/Whatsapp/messages';
 import messages from './messages';
 import './index.scss';
-import { isUrl } from '../../v2Containers/Line/Container/Wrapper/utils';
+import { isUrl,isValidText } from '../../v2Containers/Line/Container/Wrapper/utils';
 import TagList from '../../v2Containers/TagList';
 import {
   CTA_OPTIONS,
@@ -55,6 +55,7 @@ export const CapWhatsappCTA = (props) => {
   const invalidVarRegex = /{{(.*?)}}/g;
 
   const [urlError, setUrlError] = useState(false);
+  const [buttonError, setButtonError] = useState(false);
 
   const updateHelper = (type, value, index) => {
     let clonedCta = cloneDeep(ctaData[index]);
@@ -141,6 +142,11 @@ export const CapWhatsappCTA = (props) => {
 
   const onButtonTextChange = ({ target }) => {
     const { value, id } = target;
+    let errorMessage = false;
+    if (!isValidText(value)) {
+      errorMessage = formatMessage(messages.ctaButtonErrorMessage);
+    }
+    setButtonError(errorMessage);
     updateHelper('text', value, id);
   };
 
@@ -179,6 +185,8 @@ export const CapWhatsappCTA = (props) => {
       return true;
     } else if (ctaType === WEBSITE && (url === '' || urlError)) {
       return true;
+    } else if (text === '' || buttonError) {
+      return true;
     }
     return false;
   };
@@ -325,6 +333,7 @@ export const CapWhatsappCTA = (props) => {
                   value={text}
                   size="large"
                   maxLength={BTN_MAX_LENGTH}
+                  errorMessage={buttonError}
                 />
                 {renderLength(text.length, BTN_MAX_LENGTH)}
               </CapColumn>

package/v2Components/CapWhatsappCTA/messages.js

@@ -53,6 +53,10 @@ export default defineMessages({
     id: `${prefix}.ctaWebsiteUrlErrorMessage`,
     defaultMessage: 'URL is not valid',
   },
+  ctaButtonErrorMessage: {
+    id: `${prefix}.ctaButtonErrorMessage`,
+    defaultMessage: "Newlines, Emojis, or Special characters not allowed",
+  },
   addButton: {
     id: `${prefix}.addButton`,
     defaultMessage: 'Add button',

package/v2Containers/App/constants.js

@@ -8,7 +8,7 @@ export const GET_SIDEBAR_FAILURE = 'app/App/GET_SIDEBAR_FAILURE';
 
 export const getTopbarMenuDataValue = () => ([
       { label: <FormattedMessage {...globalMessages.campaigns} />, link: '/campaigns/ui/list', key: 'campaigns' },
-      { label: <FormattedMessage {...globalMessages.journeys} />, link: '/journeys/ui', key: 'journeys' },
+      { label: <FormattedMessage {...globalMessages.journeys} />, link: '/journey/ui', key: 'journeys' },
       { label: <FormattedMessage {...globalMessages.audience} />, link: '/audience-manager/list', key: 'audience' },
       { label: <FormattedMessage {...globalMessages.incentive} />, link: '/coupons/ui/', key: 'incentive' },
       { label: <FormattedMessage {...globalMessages.creatives} />, link: '/creatives/ui/v2', key: 'creatives' },

package/v2Containers/Email/index.js

@@ -36,6 +36,7 @@ import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
 import { gtmPush } from '../../utils/gtmTrackers';
 const {CapCustomCardList} = CapCustomCard;
 import {transformEmailTemplates, storeS3FileSizeDetails, CREATIVES_S3_ASSET_FILESIZES} from '../../utils/cdnTransformation';
+import { createNewFile } from '../../utils/common';
 
 export class Email extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -1150,14 +1151,15 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   uploadImages(e, {files}) {
     e.preventDefault();
     const _URL = window.URL || window.webkitURL;
-    const file = files[0];
-    const fileSize = file && (file.size / ( 1024 * 1024 ));
+    const tempFile = files[0];
+    const fileSize = tempFile && (tempFile.size / ( 1024 * 1024 ));
     if (fileSize > 5) {
       const message = this.props.intl.formatMessage(messages.uploadSizeError);
       CapNotification.error({key: 'uploadImageIssue', message});
       document.getElementById("fileName").value = "";
       return;
     }
+    const [file] = createNewFile(files);
     const img = new Image();
     const that = this;
     img.src = _URL.createObjectURL(file);

package/v2Containers/Line/Container/Wrapper/tests/index.test.js

@@ -5,6 +5,7 @@ import configureStore from '../../../../../store';
 import { mountWithIntl } from '../../../../../helpers/intl-enzym-test-helpers';
 import { LineWrapper } from '../index';
 import { mockData } from './mockData';
+import {isValidText} from '../utils';
 
 let store;
 beforeAll(() => {
@@ -55,4 +56,27 @@ describe('line wrapper test/>', () => {
     renderHelper('template');
     expect(renderedComponent).toMatchSnapshot();
   });
+  
+  describe('isValidText', () => {
+    it('should return true for valid text', () => {
+      const validText = 'This is a valid text 123';
+      expect(isValidText(validText)).toBe(true);
+    });
+  
+    it('should return false for text with special characters', () => {
+      const textWithSpecialChars = 'Invalid text @#$';
+      expect(isValidText(textWithSpecialChars)).toBe(false);
+    });
+  
+    it('should return false for text with emojis', () => {
+      const textWithEmojis = 'Invalid text 😊';
+      expect(isValidText(textWithEmojis)).toBe(false);
+    });
+  
+    it('should return true for an empty string', () => {
+      const emptyString = '';
+      expect(isValidText(emptyString)).toBe(true);
+    });
+  });
+  
 });

package/v2Containers/Line/Container/Wrapper/utils.js

@@ -70,4 +70,11 @@ export const getTabPanes = (props) => {
 export const isUrl = (url) => {
   const res = url.match(/(http(s)?:\/\/.)(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g);
   return res;
-}
+};
+
+//Checks if the given text is valid, allowing only alphanumeric characters and whitespace
+export const isValidText = (text) => {
+  const regex = /^(?:[a-zA-Z0-9\s]*)$/;
+  return regex.test(text);
+};
+