@capillarytech/creatives-library 7.10.10 → 7.10.11

package/config/app.js

@@ -17,6 +17,7 @@ const config = {
   },
   development: {
     api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/creatives',
+    //api_endpoint: 'http://localhost:2022/arya/api/v1/creatives',
     campaigns_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/campaigns',
     campaigns_api_org_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/org/campaign',
     auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.10.10",
+  "version": "7.10.11",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -12,10 +12,9 @@
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
-    "@babel/polyfill": "7.4.3",
     "@bugsnag/js": "^7.2.1",
     "@bugsnag/plugin-react": "^7.2.1",
-    "@capillarytech/cap-ui-utils": "1.4.0",
+    "@capillarytech/cap-ui-utils": "1.4.2",
     "@mailupinc/bee-plugin": "^1.2.0",
     "babel-cli": "^6.26.0",
     "chalk": "1.1.3",

package/utils/common.js

@@ -258,7 +258,7 @@ export const bytes2Size = (bytes, decimals = 2) => {
 
 export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   const isTraiDltFeatureForOrg = hasTraiDltFeature();
-  const isTariEnableforLib = (!isFullMode && smsRegister === "DLT" ) || isFullMode;
-  const isTraiDltFeature = isTraiDltFeatureForOrg && isTariEnableforLib;
+  const isTraiEnableforLib = (!isFullMode && smsRegister === "DLT") || isFullMode;
+  const isTraiDltFeature = isTraiDltFeatureForOrg && isTraiEnableforLib;
   return isTraiDltFeature;
 };

package/v2Containers/SmsTrai/Create/constants.js

@@ -1,17 +1,11 @@
-/*
- *
- * SmsTrai constants
- *
- */
-
 export const DEFAULT_ACTION = 'app/SmsTrai/DEFAULT_ACTION';
 export const APPROVAL_STATUS = 'approval status';
+export const STATUS = 'status';
 export const TEMPLATE_NAME = 'template name';
 export const TYPE = 'type';
 export const HEADER = 'header';
 export const TEMPLATE_ID = 'template id';
 export const SMS = 'SMS';
-
 export const MAPPED_SAVED_COLUMN = {
   'TEMPLATE ID': 'template_id',
   'TEMPLATE REGISTRATION NUMBER': 'template_id',
@@ -28,7 +22,6 @@ export const MAPPED_SAVED_COLUMN = {
   'CONSENT TYPE': 'consent-type',
   'COMMUNICATION TYPE': 'consent-type',
 };
-
 export const HEADER_ALIASES = [
   HEADER,
   'sender id',
@@ -36,36 +29,36 @@ export const HEADER_ALIASES = [
   'header id',
   'headers',
 ];
-
 export const TEMPLATE_ID_ALIASES = [
   'template id',
   'template registration number',
 ];
-
 export const TEMPLATE_MESSAGE_ALIASES = [
   'template message',
   'template content',
 ];
-
+export const STATUS_ALIASES = [
+  'status',
+  'template status',
+];
 export const MANDATORY_COLUMNS = [TEMPLATE_NAME, TYPE, APPROVAL_STATUS];
 export const SAVED_COLUMNS = [TEMPLATE_NAME, TYPE, 'category', 'consent type'];
-
 export const SAMPLE_CSV_DATA = [
   [
-    'TEMPLATE ID',
     'TEMPLATE NAME',
+    'TEMPLATE ID',
     'TYPE',
-    'HEADER',
+    'SENDER ID',
     'APPROVAL STATUS',
+    'STATUS',
     'TEMPLATE MESSAGE',
   ],
 ];
-
 export const DOWNLOAD_ISSUES_CSV = 'Downloaded issues.csv';
 export const SAMPLE_CSV = 'Sample.csv';
 export const CAPILLARY_REJECTION_REASON = 'CAPILLARY REJECTION REASON';
 export const APPROVED = 'approved';
-
+export const ACTIVE = 'active';
 export const CREATE_TRAI_SMS_TEMPLATE_REQUEST =
   'app/v2Containers/SmsTrai/Create/CREATE_TRAI_SMS_TEMPLATE_REQUEST';
 export const CREATE_TRAI_SMS_TEMPLATE_SUCCESS =
@@ -73,4 +66,4 @@ export const CREATE_TRAI_SMS_TEMPLATE_SUCCESS =
 export const CREATE_TRAI_SMS_TEMPLATE_FAILURE =
   'app/v2Containers/SmsTrai/Create/CREATE_TRAI_SMS_TEMPLATE_FAILURE';
 export const CLEAR_TRAI_SMS_TEMPLATE_CREATE_RESPONSE_REQUEST =
-  'app/v2Containers/SmsTrai/Create/CLEAR_TRAI_SMS_TEMPLATE_CREATE_RESPONSE_REQUEST';
+  'app/v2Containers/SmsTrai/Create/CLEAR_TRAI_SMS_TEMPLATE_CREATE_RESPONSE_REQUEST';

package/v2Containers/SmsTrai/Create/index.js

@@ -37,8 +37,10 @@ import {
   CAPILLARY_REJECTION_REASON,
   APPROVAL_STATUS,
   APPROVED,
+  ACTIVE,
   TEMPLATE_ID_ALIASES,
   TEMPLATE_MESSAGE_ALIASES,
+  STATUS_ALIASES,
   SAVED_COLUMNS,
   MAPPED_SAVED_COLUMN,
   SMS,
@@ -109,7 +111,16 @@ export const SmsTraiCreate = (props) => {
     return isError;
   };
 
-  const checkCSVRowsValidation = (transformedResults, selectedHeaderAlias) => {
+  const templateIdValidation = (templateId) => {
+    let isError = false;
+    const numbersOnly = /^\d+$/;
+    if (templateId.length !== 20 || !numbersOnly.test(templateId)) {
+      isError = true;
+    }
+    return isError;
+  };
+
+  const checkCSVRowsValidation = (transformedResults, selectedHeaderAlias, selectedTemplateIdAlias, selectedStatusAlias) => {
     const headerIndex = getIndexofColumn(
       transformedResults[0],
       selectedHeaderAlias,
@@ -118,21 +129,34 @@ export const SmsTraiCreate = (props) => {
       transformedResults[0],
       APPROVAL_STATUS,
     );
+    const templateIdIndex = getIndexofColumn(
+      transformedResults[0],
+      selectedTemplateIdAlias,
+    );
+    const statusIndex = getIndexofColumn(
+      transformedResults[0],
+      selectedStatusAlias,
+    );
 
     for (let row = 1; row < transformedResults.length; row += 1) {
       const errorArray = [];
-      const headerErrorArray = [];
-      const approvalErrorArray = [];
+      const columnErrorArray = [];
       let rejectionReasons = '';
       //adding rejection reasons
       transformedResults[row].forEach((cell, index) => {
         if (index === headerIndex && headerValidationHandler(cell)) {
-          headerErrorArray.push(
-            `${selectedHeaderAlias.toUpperCase()} is mandatory and each ${selectedHeaderAlias.toUpperCase()} must contain either 6 letters or 6 numbers. It cannot contain special characters`,
+          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 === approvalIndex && cell.toLowerCase() !== APPROVED) {
-          approvalErrorArray.push(`Templates will be created for only approved/ registered templates.`);
-        } else if (!cell && index !== headerIndex && index !== approvalIndex) {
+          columnErrorArray.push(`Templates will be created for only approved/ registered templates.`);
+        } else if (index === statusIndex && cell.toLowerCase() !== ACTIVE) {
+          columnErrorArray.push(`Only Templates with active status will be created.`);
+        } else if (index === templateIdIndex && templateIdValidation(cell)) {
+          columnErrorArray.push(
+            `${selectedTemplateIdAlias.toUpperCase()} is mandatory and ${selectedTemplateIdAlias.toUpperCase()} must contain only 20 digits.`,
+          );
+        } else if (!cell && ![headerIndex, approvalIndex, templateIdIndex, statusIndex].includes(index)) {
           errorArray.push(`"${transformedResults[0][index]}"`);
         }
       });
@@ -142,12 +166,12 @@ export const SmsTraiCreate = (props) => {
           ' ',
         )}.`;
       }
-      if (headerErrorArray.length !== 0 || approvalErrorArray.length !== 0) {
-        rejectionReasons = `${rejectionReasons} ${headerErrorArray.toString()} ${approvalErrorArray.toString()}`;
+      if (columnErrorArray.length !== 0) {
+        rejectionReasons = `${rejectionReasons} ${columnErrorArray.toString().replace(',', ' ')}`;
       }
       transformedResults[row].push(rejectionReasons);
       //if there are rejected reasons present in this row at column 6(where we store rejected reasons),  consider it as failure
-      if (transformedResults[row][6]) {
+      if (transformedResults[row][7]) {
         setTotalFailCount((prev) => prev + 1);
       }
     }
@@ -161,6 +185,7 @@ export const SmsTraiCreate = (props) => {
       const headerAliasPresent = [];
       const templateIdAliasPresent = [];
       const templateMessageAliasPresent = [];
+      const statusAliasPresent = [];
       const colCounts = {};
       //removing last empty row if each cell is empty
       if (results?.data[results.data.length - 1]?.every((cell) => !cell)) {
@@ -177,25 +202,23 @@ export const SmsTraiCreate = (props) => {
         setErrorText(formatMessage(messages.fileMaxlengthError));
         return;
       }
-      // mandatory 3 header name should be available.
+
       const cols = getAllColumnNames(results.data[0]);
 
-      for (let i = 0; i < MANDATORY_COLUMNS.length; i++) {
+      for (let i = 0; i < MANDATORY_COLUMNS.length; i += 1) {
         if (!cols.includes(MANDATORY_COLUMNS[i])) {
           mandatoryColNotPresent.push(MANDATORY_COLUMNS[i]);
         }
       }
       if (mandatoryColNotPresent.length > 0) {
         setErrorText(
-          formatMessage(messages.invalidFileErrorDescription, {
-            columns: mandatoryColNotPresent.join(','),
-          }),
+          formatMessage(messages.mandatoryColsErrorDescription),
         );
         return;
       }
 
       //one of the mandatory header alias should be available.
-      for (let i = 0; i < HEADER_ALIASES.length; i++) {
+      for (let i = 0; i < HEADER_ALIASES.length; i += 1) {
         if (cols.includes(HEADER_ALIASES[i])) {
           headerAliasPresent.push(HEADER_ALIASES[i]);
         }
@@ -236,6 +259,20 @@ export const SmsTraiCreate = (props) => {
         );
         return;
       }
+      //one of the mandatory status alias should be available.
+      for (let i = 0; i < STATUS_ALIASES.length; i += 1) {
+        if (cols.includes(STATUS_ALIASES[i])) {
+          statusAliasPresent.push(STATUS_ALIASES[i]);
+        }
+      }
+      if (statusAliasPresent.length === 0) {
+        setErrorText(
+          formatMessage(messages.statusAliasErrorDescription, {
+            statusAliases: STATUS_ALIASES.join(' / '),
+          }),
+        );
+        return;
+      }
       // count of each col to validate blank and repetitive cols
       for (const num of cols) {
         colCounts[num] = colCounts[num] ? colCounts[num] + 1 : 1;
@@ -252,27 +289,28 @@ export const SmsTraiCreate = (props) => {
       if (repetitiveColsArray.length !== 0) {
         setErrorText(
           formatMessage(messages.repetitiveColsErrorDescription, {
-            repetitiveCols: repetitiveColsArray,
+            repetitiveCols: repetitiveColsArray.join(", "),
           }),
         );
         return;
       }
       //perform required data transformation
-      return dataTransformHandler(cols, results, headerAliasPresent);
+      return dataTransformHandler(cols, results, headerAliasPresent, templateIdAliasPresent, statusAliasPresent);
     } else {
       setErrorText(formatMessage(messages.nonCsvErrorDescription));
     }
   };
 
-  const dataTransformHandler = (cols, results, headerAliasPresent) => {
-    //getting the index of the cols for 6 mandatory cols and also taking care of alias of headers of mandatory columns
+  const dataTransformHandler = (cols, results, headerAliasPresent, templateIdAliasPresent, statusAliasPresent) => {
+    //getting the index of the cols for 7 mandatory cols and also taking care of alias of headers of mandatory columns
     const indexArray = [];
-    for (let i = 0; i < cols.length; i++) {
+    for (let i = 0; i < cols.length; i += 1) {
       if (
         MANDATORY_COLUMNS.includes(cols[i]) ||
         HEADER_ALIASES.includes(cols[i]) ||
         TEMPLATE_ID_ALIASES.includes(cols[i]) ||
-        TEMPLATE_MESSAGE_ALIASES.includes(cols[i])
+        TEMPLATE_MESSAGE_ALIASES.includes(cols[i]) ||
+        STATUS_ALIASES.includes(cols[i])
       ) {
         indexArray.push(i);
       }
@@ -284,7 +322,7 @@ export const SmsTraiCreate = (props) => {
     }
     //add rejection header
     transformedResults[0].push(CAPILLARY_REJECTION_REASON);
-    return checkCSVRowsValidation(transformedResults, headerAliasPresent[0]);
+    return checkCSVRowsValidation(transformedResults, headerAliasPresent[0], templateIdAliasPresent[0], statusAliasPresent[0]);
   };
 
   //returns the headers(first row) of the uploaded file in lowercase
@@ -312,7 +350,7 @@ export const SmsTraiCreate = (props) => {
           }
           //adding validated rejection reason column to original results
           for (let i = 0; i < validatedResults.length; i += 1) {
-            results.data[i].push(validatedResults[i][6]);
+            results.data[i].push(validatedResults[i][7]);
           }
           updateSaveTemplate(true);
         }
@@ -437,7 +475,7 @@ export const SmsTraiCreate = (props) => {
         arr.forEach((data, i) => {
           obj[transformedResults[0][i]] = arr[i];
         });
-        obj['unicode-validity'] = false;
+        obj['unicode-validity'] = true;
         obj['updated-sms-editor'] = '';
         obj['var-mapped'] = {};
         obj.header = obj.header.split(',');
@@ -673,14 +711,18 @@ export const SmsTraiCreate = (props) => {
             />
             <InstructionComp
               number={2}
-              message={formatMessage(messages.firstRowInstruction)}
+              message={formatMessage(messages.uploadLimitInstruction)}
             />
             <InstructionComp
               number={3}
-              message={formatMessage(messages.secondRowInstruction)}
+              message={formatMessage(messages.mandatoryColsInstruction)}
             />
             <InstructionComp
               number={4}
+              message={formatMessage(messages.statusInstruction)}
+            />
+            <InstructionComp
+              number={5}
               message={formatMessage(messages.duplicateEntriesInstruction)}
             />
           </div>

package/v2Containers/SmsTrai/Create/messages.js

@@ -1,11 +1,5 @@
-/*
- * SmsTrai Messages
- *
- * This contains all the text for the SmsTrai component.
- */
 import { defineMessages } from 'react-intl';
 const prefix = 'app.v2containers.SmsTrai.Create';
-
 export default defineMessages({
   uploadFile: {
     id: `${prefix}.uploadFile`,
@@ -37,16 +31,20 @@ export default defineMessages({
   },
   downloadInstruction: {
     id: `${prefix}.downloadInstruction`,
-    defaultMessage: 'Download {link} file',
+    defaultMessage: 'Download {link} file.',
   },
-  firstRowInstruction: {
-    id: `${prefix}.firstRowInstruction`,
+  uploadLimitInstruction: {
+    id: `${prefix}.uploadLimitInstruction`,
+    defaultMessage: 'Upload a file of <= 500 rows.',
+  },
+  mandatoryColsInstruction: {
+    id: `${prefix}.mandatoryColsInstruction`,
     defaultMessage:
-      'Please ensure that each template has the following mandatory fields: Template name,Template ID, Type, Sender ID, Approval status, Template message.',
+      'Please ensure that each template has the following mandatory fields: Template name,Template ID, Type, Sender ID, Approval status, Status, Template message.',
   },
-  secondRowInstruction: {
-    id: `${prefix}.secondRowInstruction`,
-    defaultMessage: 'Only the "Approved" templates will be uploaded.',
+  statusInstruction: {
+    id: `${prefix}.statusInstruction`,
+    defaultMessage: 'Only the "Approved" and “Active” templates will be uploaded.',
   },
   duplicateEntriesInstruction: {
     id: `${prefix}.duplicateEntriesInstruction`,
@@ -54,16 +52,16 @@ export default defineMessages({
   },
   fileMinlengthError: {
     id: `${prefix}.fileMinlengthError`,
-    defaultMessage: 'Please select a CSV file with minimum 1 row of data and 1 row of headers',
+    defaultMessage: 'Please select a CSV file with minimum 1 row of data and 1 row of headers.',
   },
   fileMaxlengthError: {
     id: `${prefix}.fileMaxlengthError`,
     defaultMessage:
       'More then 500 records are not allowed for the selected file.',
   },
-  invalidFileErrorDescription: {
-    id: `${prefix}.invalidFileErrorDescription`,
-    defaultMessage: 'Mandatory fields ({columns}) are required for templates.',
+  mandatoryColsErrorDescription: {
+    id: `${prefix}.mandatoryColsErrorDescription`,
+    defaultMessage: 'Mandatory fields: Template name, Template ID, Type, Sender ID, Approval status, Status and Template message are required for templates.',
   },
   repetitiveColsErrorDescription: {
     id: `${prefix}.repetitiveColsErrorDescription`,
@@ -85,6 +83,11 @@ export default defineMessages({
     defaultMessage:
       'Please include mandatory field template message. It can be {templateMessageAliases}.',
   },
+  statusAliasErrorDescription: {
+    id: `${prefix}.statusAliasErrorDescription`,
+    defaultMessage:
+      'Please include mandatory field status. It can be {statusAliases}.',
+  },
   nonCsvErrorDescription: {
     id: `${prefix}.nonCsvErrorDescription`,
     defaultMessage: 'Please select a csv file.',