@capillarytech/creatives-library 7.16.3 → 7.16.4

package/package.json

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

package/utils/common.js

@@ -1,5 +1,6 @@
 import _ from 'lodash';
 import { Auth } from '@capillarytech/cap-ui-utils';
+
 import {
   STORE2DOOR_PLUS_ENABLED,
   TRAI_DLT,
@@ -263,15 +264,23 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   return isTraiDltFeature;
 };
 
-export function createNewFile(fileObject) {
-  const encodedName = fileObject.name.replace(/(.+?)(\.[^.]*$|$)/, (match, name, extension) => {
+/* function used to encode filename and check file name 
+  pattern based on the given regex */
+export function createNewFile(Files, allowedExtensionsRegex) {
+  const fileObject = Files[0];
+  let incorrectFile = false;
+
+  if (allowedExtensionsRegex && !allowedExtensionsRegex.test(fileObject?.name)) {
+    incorrectFile = true;
+    return [fileObject, incorrectFile];
+  }
+  const encodedName = fileObject?.name.replace(/(.+?)(\.[^.]*$|$)/, (match, name, extension) => {
     const filename = encodeURIComponent(name);
     return filename + extension;
   });
   const { type, ...rest } = fileObject;
   const newFile = new File([fileObject], encodedName, { type, ...rest });
   newFile.uid = fileObject.uid;
-
-  return newFile;
+  return [newFile, incorrectFile];
 }
 

package/utils/tests/v2Common.test.js

@@ -11,21 +11,43 @@ describe('Test v2common container', () => {
 });
 
 describe('Test createNewFile function', () => {
+  const allowedExtensionsRegex = /(\.png|\.jpg)$/i;
+  const tempFile = [{
+    name: '#image.png',
+    type: 'image/jpeg',
+    size: 2048,
+    uid: 'def456',
+  }];
+  const expectedFile = new File([tempFile], '%23image.png', {
+    type: 'image/jpeg',
+    size: 2048,
+    uid: 'def456',
+  });
   it('should create a new file with encoded name', () => {
-    const tempFile = {
-      name: '#image.png',
-      type: 'image/jpeg',
+    const [resultFile, incorrectFile] = createNewFile(tempFile, allowedExtensionsRegex);
+    expect(resultFile).toMatchObject(expectedFile);
+    expect(incorrectFile).toBe(false);
+  });
+  it('should return incorrect file true', () => {
+    const tempFileWrong = [{
+      name: '#song.mov',
+      type: 'video/mov',
       size: 2048,
-      uid: 'def456',
-    };
+      uid: 'def4516',
+    }];
 
-    const expectedFile = new File([tempFile], '%23image.png', {
-      type: 'image/jpeg',
+    const expectedFileWrong = new File([tempFileWrong], '%23song.mov', {
+      type: 'video/mov',
       size: 2048,
-      uid: 'def456',
+      uid: 'def4516',
     });
-    const result = createNewFile(tempFile);
-    expect(result).toMatchObject(expectedFile);
+    const [resultFile, incorrectFile] = createNewFile(tempFileWrong, allowedExtensionsRegex);
+    expect(resultFile).toMatchObject(expectedFileWrong);
+    expect(incorrectFile).toBe(true);
+  });
+  it('should return only the updated file as the validation is handled differently for some channels', () => {
+    const resultFile = createNewFile(tempFile)[0];
+    expect(resultFile).toMatchObject(expectedFile);
   });
 });
 

package/v2Components/CapDocumentUpload/index.js

@@ -70,12 +70,7 @@ function CapDocumentUpload(props) {
       e.preventDefault();
     }
     const _URL = window.URL || window.webkitURL;
-    let incorrectFile = false;
-    const tempFile = files[0];
-    if (!allowedExtensionsRegex.test(tempFile?.name)) {
-      incorrectFile = true;
-    }
-    const file = createNewFile(tempFile);
+    const [file, incorrectFile] = createNewFile(files, allowedExtensionsRegex);
     const doc = new FileReader();
     doc.src = _URL.createObjectURL(file);
     const fileParams = {
@@ -88,7 +83,6 @@ function CapDocumentUpload(props) {
         ...whatsappDocParams,
         whatsappDocImg: data?.image,
         whatsappDocPages: data?.numberOfPages,
-        nameEncoded: true,
       })
     );
     submitAction({file, type: 'document', fileParams}, incorrectFile);

package/v2Components/CapImageUpload/index.js

@@ -79,12 +79,7 @@ function CapImageUpload(props) {
       e.preventDefault();
     }
     const _URL = window.URL || window.webkitURL;
-    let incorrectFile = false;
-    const tempFile = files[0];
-    if (!allowedExtensionsRegex.test(tempFile?.name)) {
-      incorrectFile = true;
-    }
-    const file = createNewFile(tempFile);
+    const [file, incorrectFile] = createNewFile(files, allowedExtensionsRegex);
     const img = new Image();
     img.src = _URL.createObjectURL(file);
     img.onload = () => {

package/v2Components/CapVideoUpload/index.js

@@ -64,12 +64,7 @@ function CapVideoUpload(props) {
       e.preventDefault();
     }
     const _URL = window.URL || window.webkitURL;
-    let incorrectFile = false;
-    const tempFile = files[0];
-    if (!allowedExtensionsRegex.test(tempFile?.name)) {
-      incorrectFile = true;
-    }
-    const file = createNewFile(tempFile);
+    const [file, incorrectFile] = createNewFile(files, allowedExtensionsRegex);
     const video = new FileReader();
     video.src = _URL.createObjectURL(file);
     const fileParams = {

package/v2Components/FormBuilder/index.js

@@ -2169,7 +2169,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
         this.callChildEvent({tempFile, type: 'wrong file'}, val, val.submitAction);
       }
     }
-    const file = createNewFile(tempFile);
+    const file = createNewFile(files)[0];
     const img = new Image();
     img.src = _URL.createObjectURL(file);
     img.onload = () => {

package/v2Containers/Assets/Gallery/index.js

@@ -13,8 +13,10 @@ import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import moment from "moment";
 import _ from "lodash";
+import Bugsnag from '@bugsnag/js';
 import { CapHeading, CapHeader, CapInput, CapButton, CapSpin, CapIcon, CapDropdown, CapMenu, CapCustomCard, CapSlideBox, CapLabel, CapIllustration} from '@capillarytech/cap-ui-library';
 import { Popover } from 'antd';
+import { createNewFile } from '../../../utils/common';
 import makeSelectGallery from './selectors';
 import messages from './messages';
 import * as actions from './actions';
@@ -232,7 +234,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     for (const file in files) {
       if (files.hasOwnProperty(file)) {
         const tempFile = files[file];
-        const uploadFile = commonUtil.createNewFile(tempFile);
+        const [uploadFile] = createNewFile([tempFile]);
         const img = new Image();
         const that = this;
         img.src = _URL.createObjectURL(uploadFile);
@@ -396,17 +398,22 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     const by = commonUtil.getUserNameById(parseInt(this.state.selectedAsset.updatedBy, 10), commonUtil.getMergedUserList(this.props.Gallery.userList));
     const width = this.state.selectedAsset.metaInfo.width;
     const height = this.state.selectedAsset.metaInfo.height;
+    /*
+    splitting the name on . and verifying 
+    whether the filename is already encoded or not, 
+    if yes decoding it ,to be shown on ui 
+    */
     const nameParts = this.state.selectedAsset.name.split('.');
-    console.log(this.state.selectedAsset);
-    console.log(nameParts);
     let updatedTitle = this.state.selectedAsset.name;
-    console.log(nameParts[0]);
     try {
       if (encodeURIComponent(decodeURIComponent(nameParts[0])) === nameParts[0]) {
         updatedTitle = `${decodeURIComponent(nameParts[0])}.${nameParts[1]}`;
       }
     } catch (error) {
-      console.log('Error decoding the string:', error);
+      Bugsnag.leaveBreadcrumb("Error decoding the string:", error);
+      Bugsnag.notify(error, (event) => {
+        event.severity = "error";
+      });
     }
     const slideboxHeader = (<div>
       <CapHeader

package/v2Containers/Line/Container/Image/index.js

@@ -172,12 +172,7 @@ export const LineImage = ({
             e.preventDefault();
         }
         const _URL = window.URL || window.webkitURL;
-        let incorrectFile = false;
-        const tempFile = files[0];
-        if (!ALLOWED_EXTENSIONS_REGEX.test(tempFile?.name)) {
-            incorrectFile = true;
-        }
-        const file = createNewFile(tempFile);
+        const [file, incorrectFile] = createNewFile(files, ALLOWED_EXTENSIONS_REGEX);
         const img = new Image();
         img.src = _URL.createObjectURL(file);
         img.onload = () => {

package/v2Containers/Line/Container/ImageMap/index.js

@@ -241,7 +241,7 @@ export const LineImageMap = ({
                 incorrectFile = true;
             }
         }
-        const file = createNewFile(tempFile);
+        const [file] = createNewFile(files);
         const img = new Image();
         img.src = _URL.createObjectURL(file);
         img.onload = () => {

package/v2Containers/Line/Container/Video/index.js

@@ -255,12 +255,7 @@ export const LineVideo = ({
       e.preventDefault();
     }
     const _URL = window.URL || window.webkitURL;
-    let incorrectFile = false;
-    const tempFile = files[0];
-    if (!ALLOWED_EXTENSIONS_REGEX.test(tempFile?.name)) {
-      incorrectFile = true;
-    }
-    const file = createNewFile(tempFile);
+    const [file, incorrectFile] = createNewFile(files, ALLOWED_EXTENSIONS_REGEX);
     const video = new FileReader();
     video.src = _URL.createObjectURL(file);
     const fileParams = {

package/v2Containers/Viber/index.js

@@ -331,13 +331,8 @@ const Viber = (props) => {
       e.preventDefault();
     }
     const _URL = window.URL || window.webkitURL;
-    let incorrectFile = false;
-    const tempFile = files[0];
-    if (!ALLOWED_EXTENSIONS_REGEX.test(tempFile?.name)) {
-      incorrectFile = true;
-    }
+    const [file, incorrectFile] = createNewFile(files, ALLOWED_EXTENSIONS_REGEX);
     const img = new Image();
-    const file = createNewFile(tempFile);
     img.src = _URL.createObjectURL(file);
     img.onload = () => {
       const fileParams = {
@@ -666,6 +661,10 @@ const Viber = (props) => {
     if (buttonURLErrorMessage) {
       return true;
     }
+    //if template title is empty
+    if (messageTitle.trim() === '') {
+      return true;
+    }
     return false;
   };