@capillarytech/creatives-library 7.9.15 → 7.9.16

package/package.json

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

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -21,6 +21,7 @@ import * as constants from './constants';
 import LineContainer from '../Line/Container';
 import FTP from '../FTP';
 import Viber from '../Viber';
+import * as commonUtil from '../../utils/common';
 const CreativesWrapper = styled.div`
   .ant-popover,
   .ant-notification,
@@ -201,7 +202,11 @@ function SlideBoxContent(props) {
   const getChannelPreviewContent = (templateDataObject) => {
     switch (templateDataObject.type.toUpperCase()) {
       case constants.SMS:
-        return get(templateDataObject, `versions.base['sms-editor']`);
+        if (!commonUtil.hasTraiDltFeature() || get(templateDataObject, `versions.base['updated-sms-editor']`) === "") {
+          return get(templateDataObject, `versions.base['sms-editor']`);
+        } else {
+          return templateDataObject.versions.base['updated-sms-editor']?.join('');
+        }
       case constants.LINE: {
         const lineContents = get(templateDataObject, `versions.base.content.messages`, [{}]);
         const previewContent = [];

package/v2Containers/SmsTrai/Create/index.js

@@ -78,6 +78,32 @@ export const SmsTraiCreate = (props) => {
       (column) => column.toLowerCase().trim() === columnName,
     );
 
+  const headerValidationHandler = (senderIdString) => {
+    //each row must contain atleast 1 header
+    //each header can be either 6 letters or 6 numbers, no mixing
+    //it cannot contain special characters.
+    //eg: valid: "123456" "abcdef" invalid: "abc123" "abc$ef" "1234567"
+    if (senderIdString.length < 6) {
+      return true;
+    }
+    const lettersOnly = /^[a-zA-Z]*$/;
+    const numbersOnly = /^\d+$/;
+    let isError = false;
+    senderIdString.split(',').forEach((value) => {
+      value = value.trim();
+      if (value) {
+        if (value.length !== 6) {
+          isError = true;
+          return;
+        }
+        if (!(lettersOnly.test(value) || numbersOnly.test(value))) {
+          isError = true;
+        }
+      }
+    });
+    return isError;
+  };
+
   const checkCSVRowsValidation = (transformedResults, selectedHeaderAlias) => {
     const headerIndex = getIndexofColumn(
       transformedResults[0],
@@ -95,9 +121,9 @@ export const SmsTraiCreate = (props) => {
       let rejectionReasons = '';
       //adding rejection reasons
       transformedResults[row].forEach((cell, index) => {
-        if (index === headerIndex && cell.length < 6) {
+        if (index === headerIndex && headerValidationHandler(cell)) {
           headerErrorArray.push(
-            `${selectedHeaderAlias.toUpperCase()} is mandatory and it should be 6 characters. `,
+            `${selectedHeaderAlias.toUpperCase()} is mandatory and each ${selectedHeaderAlias.toUpperCase()} must contain either 6 letters or 6 numbers. It cannot contain special characters`,
           );
         } else if (index === approvalIndex && cell.toLowerCase() !== APPROVED) {
           approvalErrorArray.push(`Template is not approved. `);
@@ -324,7 +350,7 @@ export const SmsTraiCreate = (props) => {
 
   const downloadIssuesCSV = (event) => {
     let csvContent = [];
-    const tempArray = [];
+    let tempArray = [];
     const fileData = files[0].fileResult.data;
     const rejectionIndex = fileData[0].indexOf(CAPILLARY_REJECTION_REASON);
 
@@ -335,6 +361,9 @@ export const SmsTraiCreate = (props) => {
           tempArray.push(fileData[row]);
         }
       }
+      tempArray = tempArray.map((row) => {
+        return row.map((cell) => cell.replace(',', ' '));
+      });
       csvContent = tempArray
         .map((e) => e.join(','))
         .map((e) => e.replace(/(\r\n|\n|\r)/gm, ' '))