@capillarytech/creatives-library 7.10.27 → 7.10.29

package/package.json

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

package/v2Containers/SmsTrai/Create/index.js

@@ -88,6 +88,16 @@ export const SmsTraiCreate = (props) => {
       (column) => column.toLowerCase().trim() === columnName,
     );
 
+  const getIndexesofColumns = (allColumnNames, columnNames) => {
+    const indexes = [];
+    allColumnNames.forEach((colName, index) => {
+      if (columnNames.includes(colName.toLowerCase().trim())) {
+        indexes.push(index);
+      }
+    });
+    return indexes;
+  };
+
   const headerValidationHandler = (senderIdString) => {
     //each row must contain atleast 1 header
     //each header can be either 6 letters or 6 numbers, no mixing
@@ -166,7 +176,7 @@ export const SmsTraiCreate = (props) => {
       transformedResults[0],
       selectedTemplateIdAlias,
     );
-    const statusIndex = getIndexofColumn(
+    const statusIndexes = getIndexesofColumns(
       transformedResults[0],
       selectedStatusAlias,
     );
@@ -180,29 +190,20 @@ export const SmsTraiCreate = (props) => {
       const errorArray = [];
       const columnErrorArray = [];
       let rejectionReasons = '';
+      let statusErrorIndicator = true;
       //adding rejection reasons
       transformedResults[row].forEach((cell, index) => {
         if (index === headerIndex && headerValidationHandler(cell)) {
           columnErrorArray.push(
             `${selectedHeaderAlias.toUpperCase()} is mandatory and each ${selectedHeaderAlias.toUpperCase()} must contain either 6 letters or 6 digits. It cannot contain special characters. `,
           );
-        } else if (
-          index === statusIndex &&
-          cell.toLowerCase() !== ACTIVE &&
-          cell.toLowerCase() !== REGISTERED &&
-          cell.toLowerCase() !== APPROVED
-        ) {
-          columnErrorArray.push(
-            `Only templates with active/registered/approved status will be created.`,
-          );
+        } else if (statusIndexes.includes(index) && [ACTIVE, REGISTERED, APPROVED].includes(cell.toLowerCase())) {
+          statusErrorIndicator = false;
         } else if (index === templateIdIndex && templateIdValidation(cell)) {
           columnErrorArray.push(
             `${selectedTemplateIdAlias.toUpperCase()} is mandatory and ${selectedTemplateIdAlias.toUpperCase()} must be numeric.`,
           );
-        } else if (
-          !cell &&
-          ![headerIndex, templateIdIndex, statusIndex].includes(index)
-        ) {
+        } else if (!cell && ![headerIndex, templateIdIndex, ...statusIndexes].includes(index)) {
           errorArray.push(`"${transformedResults[0][index]}"`);
         } else if (index === templateNameIndex && cell) {
           if (templateNameObj[cell]) {
@@ -214,6 +215,11 @@ export const SmsTraiCreate = (props) => {
         }
       });
 
+      if (statusErrorIndicator) {
+        columnErrorArray.push(
+          `Only templates with active/registered/approved status will be created.`,
+        );
+      }
       if (errorArray.length !== 0) {
         rejectionReasons = `${rejectionReasons} Please include these mandatory fields value: ${errorArray.join(
           ' ',
@@ -409,7 +415,7 @@ export const SmsTraiCreate = (props) => {
       transformedResults,
       headerAliasPresent[0],
       templateIdAliasPresent[0],
-      statusAliasPresent[0],
+      statusAliasPresent,
     );
   };
 
@@ -786,9 +792,7 @@ export const SmsTraiCreate = (props) => {
             {formatMessage(messages.uploadInstructions)}
           </CapHeading>
           <div className="upload-instruction-list">
-            <InstructionComp
-              message={formatMessage(messages.deferEdit)}
-            />
+            <InstructionComp message={formatMessage(messages.deferEdit)} />
             <InstructionComp
               message={
                 <FormattedMessage