@capillarytech/creatives-library 7.10.21 → 7.10.22

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.21",
+  "version": "7.10.22",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/SmsTrai/Create/constants.js

@@ -1,8 +1,6 @@
 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';
@@ -11,16 +9,17 @@ export const MAPPED_SAVED_COLUMN = {
   'TEMPLATE REGISTRATION NUMBER': 'template_id',
   'TEMPLATE NAME': 'template_name',
   'TYPE': 'type',
+  'COMMUNICATION TYPE': 'type',
   'HEADER': 'header',
   'SENDER ID': 'header',
   'SENDERS': 'header',
   'HEADER ID': 'header',
-  'HEADERS': 'header',  
+  'HEADERS': 'header',
+  'LINKED HEADERS': 'header',
   'CATEGORY': 'category',
   'TEMPLATE MESSAGE': 'sms-editor',
   'TEMPLATE CONTENT': 'sms-editor',
   'CONSENT TYPE': 'consent-type',
-  'COMMUNICATION TYPE': 'consent-type',
 };
 export const HEADER_ALIASES = [
   HEADER,
@@ -28,6 +27,7 @@ export const HEADER_ALIASES = [
   'senders',
   'header id',
   'headers',
+  'linked headers'
 ];
 export const TEMPLATE_ID_ALIASES = [
   'template id',
@@ -37,12 +37,11 @@ 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'];
+//Approval status and status columns are merged as part of CAP-77329
+export const STATUS_ALIASES = ['status', 'template status', 'approval status'];
+export const TYPE_ALIASES = ['type', 'communication type'];
+export const MANDATORY_COLUMNS = [TEMPLATE_NAME];
+export const SAVED_COLUMNS = [TEMPLATE_NAME, 'category', 'consent type'];
 export const SAMPLE_CSV_DATA = [
   [
     'TEMPLATE NAME',
@@ -59,6 +58,7 @@ export const SAMPLE_CSV = 'Sample.csv';
 export const CAPILLARY_REJECTION_REASON = 'CAPILLARY REJECTION REASON';
 export const APPROVED = 'approved';
 export const ACTIVE = 'active';
+export const REGISTERED = 'registered';
 export const CREATE_TRAI_SMS_TEMPLATE_REQUEST =
   'app/v2Containers/SmsTrai/Create/CREATE_TRAI_SMS_TEMPLATE_REQUEST';
 export const CREATE_TRAI_SMS_TEMPLATE_SUCCESS =

package/v2Containers/SmsTrai/Create/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl';
@@ -35,12 +36,13 @@ import {
   DOWNLOAD_ISSUES_CSV,
   SAMPLE_CSV,
   CAPILLARY_REJECTION_REASON,
-  APPROVAL_STATUS,
   APPROVED,
   ACTIVE,
+  REGISTERED,
   TEMPLATE_ID_ALIASES,
   TEMPLATE_MESSAGE_ALIASES,
   STATUS_ALIASES,
+  TYPE_ALIASES,
   SAVED_COLUMNS,
   MAPPED_SAVED_COLUMN,
   SMS,
@@ -121,15 +123,16 @@ export const SmsTraiCreate = (props) => {
     return isError;
   };
 
-  const checkCSVRowsValidation = (transformedResults, selectedHeaderAlias, selectedTemplateIdAlias, selectedStatusAlias) => {
+  const checkCSVRowsValidation = (
+    transformedResults,
+    selectedHeaderAlias,
+    selectedTemplateIdAlias,
+    selectedStatusAlias,
+  ) => {
     const headerIndex = getIndexofColumn(
       transformedResults[0],
       selectedHeaderAlias,
     );
-    const approvalIndex = getIndexofColumn(
-      transformedResults[0],
-      APPROVAL_STATUS,
-    );
     const templateIdIndex = getIndexofColumn(
       transformedResults[0],
       selectedTemplateIdAlias,
@@ -149,30 +152,40 @@ export const SmsTraiCreate = (props) => {
           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) {
-          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 === statusIndex &&
+          cell.toLowerCase() !== ACTIVE &&
+          cell.toLowerCase() !== REGISTERED &&
+          cell.toLowerCase() !== APPROVED
+        ) {
+          columnErrorArray.push(
+            `Only Templates with active/registered/approved status will be created.`,
+          );
         } else if (index === templateIdIndex && templateIdValidation(cell)) {
           columnErrorArray.push(
             `${selectedTemplateIdAlias.toUpperCase()} is mandatory and ${selectedTemplateIdAlias.toUpperCase()} must be numeric.`,
           );
-        } else if (!cell && ![headerIndex, approvalIndex, templateIdIndex, statusIndex].includes(index)) {
+        } else if (
+          !cell &&
+          ![headerIndex, templateIdIndex, statusIndex].includes(index)
+        ) {
           errorArray.push(`"${transformedResults[0][index]}"`);
         }
       });
 
       if (errorArray.length !== 0) {
-        rejectionReasons = `${rejectionReasons} Please include these mandatory fields: ${errorArray.join(
+        rejectionReasons = `${rejectionReasons} Please include these mandatory fields value: ${errorArray.join(
           ' ',
         )}.`;
       }
       if (columnErrorArray.length !== 0) {
-        rejectionReasons = `${rejectionReasons} ${columnErrorArray.toString().replace(',', ' ')}`;
+        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][7]) {
+      //if there are rejected reasons present in this row at last column (where we store rejected reasons),  consider it as failure
+      if (transformedResults[row][transformedResults[row]?.length - 1]) {
         setTotalFailCount((prev) => prev + 1);
       }
     }
@@ -187,6 +200,7 @@ export const SmsTraiCreate = (props) => {
       const templateIdAliasPresent = [];
       const templateMessageAliasPresent = [];
       const statusAliasPresent = [];
+      const typeAliasPresent = [];
       const colCounts = {};
       //removing last empty row if each cell is empty
       if (results?.data[results.data.length - 1]?.every((cell) => !cell)) {
@@ -212,9 +226,7 @@ export const SmsTraiCreate = (props) => {
         }
       }
       if (mandatoryColNotPresent.length > 0) {
-        setErrorText(
-          formatMessage(messages.mandatoryColsErrorDescription),
-        );
+        setErrorText(formatMessage(messages.mandatoryColErrorDescription));
         return;
       }
 
@@ -274,6 +286,20 @@ export const SmsTraiCreate = (props) => {
         );
         return;
       }
+      //one of the mandatory type alias should be available.
+      for (let i = 0; i < TYPE_ALIASES.length; i += 1) {
+        if (cols.includes(TYPE_ALIASES[i])) {
+          typeAliasPresent.push(TYPE_ALIASES[i]);
+        }
+      }
+      if (typeAliasPresent.length === 0) {
+        setErrorText(
+          formatMessage(messages.typeAliasErrorDescription, {
+            typeAliases: TYPE_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;
@@ -290,20 +316,32 @@ export const SmsTraiCreate = (props) => {
       if (repetitiveColsArray.length !== 0) {
         setErrorText(
           formatMessage(messages.repetitiveColsErrorDescription, {
-            repetitiveCols: repetitiveColsArray.join(", "),
+            repetitiveCols: repetitiveColsArray.join(', '),
           }),
         );
         return;
       }
       //perform required data transformation
-      return dataTransformHandler(cols, results, headerAliasPresent, templateIdAliasPresent, statusAliasPresent);
+      return dataTransformHandler(
+        cols,
+        results,
+        headerAliasPresent,
+        templateIdAliasPresent,
+        statusAliasPresent,
+      );
     } else {
       setErrorText(formatMessage(messages.nonCsvErrorDescription));
     }
   };
 
-  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 dataTransformHandler = (
+    cols,
+    results,
+    headerAliasPresent,
+    templateIdAliasPresent,
+    statusAliasPresent,
+  ) => {
+    //getting the index of the cols for 6 mandatory cols and also taking care of alias of headers of mandatory columns
     const indexArray = [];
     for (let i = 0; i < cols.length; i += 1) {
       if (
@@ -311,7 +349,8 @@ export const SmsTraiCreate = (props) => {
         HEADER_ALIASES.includes(cols[i]) ||
         TEMPLATE_ID_ALIASES.includes(cols[i]) ||
         TEMPLATE_MESSAGE_ALIASES.includes(cols[i]) ||
-        STATUS_ALIASES.includes(cols[i])
+        STATUS_ALIASES.includes(cols[i]) ||
+        TYPE_ALIASES.includes(cols[i])
       ) {
         indexArray.push(i);
       }
@@ -319,15 +358,22 @@ export const SmsTraiCreate = (props) => {
     //transforming data to keep only mandatory cols data using their index
     const transformedResults = [];
     for (const key in results.data) {
-      transformedResults.push(indexArray.map((i) => results.data[key][i]));
+      transformedResults.push(
+        indexArray.map((i) => results.data[key][i]?.trim()),
+      );
     }
     //add rejection header
     transformedResults[0].push(CAPILLARY_REJECTION_REASON);
-    return checkCSVRowsValidation(transformedResults, headerAliasPresent[0], templateIdAliasPresent[0], statusAliasPresent[0]);
+    return checkCSVRowsValidation(
+      transformedResults,
+      headerAliasPresent[0],
+      templateIdAliasPresent[0],
+      statusAliasPresent[0],
+    );
   };
 
   //returns the headers(first row) of the uploaded file in lowercase
-  const getAllColumnNames = (data) => data.map((x) => x.toLowerCase().trim());
+  const getAllColumnNames = (data) => data.map((x) => x?.toLowerCase()?.trim());
 
   const onDrop = (droppedFile) => {
     // Sets isFileDropped state to true to load the spinner while the file is being parsed.
@@ -351,7 +397,9 @@ 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][7]);
+            results.data[i].push(
+              validatedResults[i][validatedResults[i]?.length - 1],
+            );
           }
           updateSaveTemplate(true);
         }
@@ -405,7 +453,9 @@ export const SmsTraiCreate = (props) => {
           tempArray.push(fileData[row]);
         }
       }
-      tempArray = tempArray.map((row) => row.map((cell) => cell.replace(',', ' ')));
+      tempArray = tempArray.map((row) =>
+        row.map((cell) => cell.replace(',', ' ')),
+      );
       csvContent = tempArray
         .map((e) => e.join(','))
         .map((e) => e.replace(/(\r\n|\n|\r)/gm, ' '))
@@ -449,7 +499,8 @@ export const SmsTraiCreate = (props) => {
         SAVED_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]) ||
+        TYPE_ALIASES.includes(cols[i])
       ) {
         indexArray.push(i);
       }
@@ -463,7 +514,7 @@ export const SmsTraiCreate = (props) => {
           if (key === '0') {
             return MAPPED_SAVED_COLUMN[tempArray[key][i]?.toUpperCase()];
           }
-          return tempArray[key][i];
+          return tempArray[key][i]?.trim();
         }),
       );
     }
@@ -481,7 +532,7 @@ export const SmsTraiCreate = (props) => {
         obj['unicode-validity'] = true;
         obj['updated-sms-editor'] = '';
         obj['var-mapped'] = {};
-        obj.header = obj.header.split(',');
+        obj.header = obj.header?.replace(/\s/g, '')?.split(',');
         const history = obj;
         history.tabKey = 1;
         savedData.push({
@@ -526,10 +577,10 @@ export const SmsTraiCreate = (props) => {
 
   const InstructionComp = (inst) => (
     <CapRow className="instruction">
-      <CapColumn span={3}>
-        <span className="instruction-num">{inst.number}</span>
+      <CapColumn span={1}>
+        <span className="instruction-num"></span>
       </CapColumn>
-      <CapColumn span={21}>{inst.message}</CapColumn>
+      <CapColumn span={23}>{inst.message}</CapColumn>
     </CapRow>
   );
 
@@ -538,7 +589,7 @@ export const SmsTraiCreate = (props) => {
   return (
     <>
       <CapRow span={24} className="upload-type-group-create-container">
-        <CapColumn span={16}>
+        <CapColumn span={12}>
           <CapHeading type="h4" className="upload-file-title">
             {formatMessage(messages.uploadFile)}
           </CapHeading>
@@ -585,7 +636,7 @@ export const SmsTraiCreate = (props) => {
                     className="upload-file-preview-divider-1"
                   />
                   <CapRow>
-                    <CapColumn span={13}>
+                    <CapColumn span={10}>
                       <CapLabel.CapLabelInline type="label9">
                         {file.name}
                       </CapLabel.CapLabelInline>
@@ -603,7 +654,7 @@ export const SmsTraiCreate = (props) => {
                     {errorText && (
                       <>
                         <CapColumn
-                          span={10}
+                          span={13}
                           className="upload-failed-container"
                         >
                           <CapLabel
@@ -623,7 +674,7 @@ export const SmsTraiCreate = (props) => {
                     {!errorText && (
                       <>
                         <CapColumn
-                          span={3}
+                          span={4}
                           className="validation-count-container"
                         >
                           <CapLabel
@@ -642,7 +693,7 @@ export const SmsTraiCreate = (props) => {
                           ></CapIcon>
                         </CapColumn>
                         <CapColumn
-                          span={3}
+                          span={4}
                           className="validation-count-container"
                         >
                           <CapLabel
@@ -659,7 +710,7 @@ export const SmsTraiCreate = (props) => {
                             svgProps={{ color: CAP_RED01 }}
                           ></CapIcon>
                         </CapColumn>
-                        <CapColumn span={4}>
+                        <CapColumn span={5}>
                           {totalFailCount >= 1 && (
                             <a
                               onClick={downloadIssuesCSV}
@@ -689,16 +740,18 @@ export const SmsTraiCreate = (props) => {
             </>
           )}
         </CapColumn>
-        <CapColumn span={8} className="upload-instructions-container">
+        <CapColumn span={12} className="upload-instructions-container">
           <CapHeading type="h4">
             {formatMessage(messages.uploadInstructions)}
           </CapHeading>
           <div className="upload-instruction-list">
             <InstructionComp
-              number={1}
+              message={formatMessage(messages.deferEdit)}
+            />
+            <InstructionComp
               message={
                 <FormattedMessage
-                  {...messages.downloadInstruction}
+                  {...messages.sampleFileInstruction}
                   values={{
                     link: (
                       <a
@@ -713,21 +766,27 @@ export const SmsTraiCreate = (props) => {
               }
             />
             <InstructionComp
-              number={2}
-              message={formatMessage(messages.uploadLimitInstruction)}
+              message={formatMessage(messages.rowLimitInstruction)}
+            />
+            <InstructionComp
+              message={formatMessage(messages.mandatoryColInstruction)}
+            />
+            <InstructionComp
+              message={formatMessage(messages.statusesInstruction)}
+            />
+            <InstructionComp
+              message={formatMessage(messages.duplicateTemplateIdInstruction)}
             />
             <InstructionComp
-              number={3}
-              message={formatMessage(messages.mandatoryColsInstruction)}
+              message={formatMessage(messages.duplicateTemplateNameInstruction)}
             />
             <InstructionComp
-              number={4}
-              message={formatMessage(messages.statusInstruction)}
+              message={formatMessage(messages.trimInstruction)}
             />
             <InstructionComp
-              number={5}
-              message={formatMessage(messages.duplicateEntriesInstruction)}
+              message={formatMessage(messages.tempInstruction)}
             />
+            <div style={{ marginBottom: '200px' }} />
           </div>
         </CapColumn>
         <SMSTraiFooter>

package/v2Containers/SmsTrai/Create/index.scss

@@ -62,18 +62,18 @@
     bottom: -5px;
   }
   .upload-instructions-container {
-    padding-left: $CAP_SPACE_32;
+    padding-left: $CAP_SPACE_24;
     margin-top: 30px;
 
     .upload-instruction-list {
       list-style-type: none;
       padding-left: 0;
       .instruction {
-        margin-top: 30px;
+        margin-top: 12px;
         .instruction-num {
           display: inline-block;
-          width: 30px;
-          height: 30px;
+          width: 8px;
+          height: 8px;
           background: #dfe2e7;
           border-radius: 50%;
           display: inline-flex;

package/v2Containers/SmsTrai/Create/messages.js

@@ -29,26 +29,42 @@ export default defineMessages({
     id: `${prefix}.uploadInstructions`,
     defaultMessage: 'Upload Instructions',
   },
-  downloadInstruction: {
-    id: `${prefix}.downloadInstruction`,
-    defaultMessage: 'Download {link} file.',
+  sampleFileInstruction: {
+    id: `${prefix}.sampleFileInstruction`,
+    defaultMessage: 'Users can also download {link} file and populate data. Please ensure that datatype is not changed.',
   },
-  uploadLimitInstruction: {
-    id: `${prefix}.uploadLimitInstruction`,
-    defaultMessage: 'Upload a file of <= 500 rows.',
+  deferEdit: {
+    id: `${prefix}.deferEdit`,
+    defaultMessage: 'It is highly recommended to use a file directly downloaded from the DLT portal. Editing the file may cause data to truncate unexpectedly.',
   },
-  mandatoryColsInstruction: {
-    id: `${prefix}.mandatoryColsInstruction`,
+  rowLimitInstruction: {
+    id: `${prefix}.rowLimitInstruction`,
+    defaultMessage: 'Maximum 500 rows are allowed in a single file.',
+  },
+  mandatoryColInstruction: {
+    id: `${prefix}.mandatoryColInstruction`,
     defaultMessage:
-      'Please ensure that each template has the following mandatory fields: Template name,Template ID, Type, Sender ID, Approval status, 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.',
+  },
+  statusesInstruction: {
+    id: `${prefix}.statusesInstruction`,
+    defaultMessage: 'Only templates in the Approved/ Registered/ Active state will be uploaded.',
+  },
+  duplicateTemplateIdInstruction: {
+    id: `${prefix}.duplicateTemplateIdInstruction`,
+    defaultMessage: 'Existing templates with the same template ids will be overwritten.',
+  },
+  duplicateTemplateNameInstruction: {
+    id: `${prefix}.duplicateTemplateNameInstruction`,
+    defaultMessage: 'The template name needs to be unique. Any new template with a name matching the existing template name will not be created.',
   },
-  statusInstruction: {
-    id: `${prefix}.statusInstruction`,
-    defaultMessage: 'Only the "Approved" and “Active” templates will be uploaded.',
+  trimInstruction: {
+    id: `${prefix}.trimInstruction`,
+    defaultMessage: 'Whitespaces will be trimmed from both ends for all template cells.',
   },
-  duplicateEntriesInstruction: {
-    id: `${prefix}.duplicateEntriesInstruction`,
-    defaultMessage: 'Duplicate entries will be overwritten.',
+  tempInstruction: {
+    id: `${prefix}.tempInstruction`,
+    defaultMessage: 'In case the uploaded file with multiple templates is showing errors, but any campaign needs to be sent urgently, try uploading a single template (as required in the campaign) in Sample CSV.',
   },
   fileMinlengthError: {
     id: `${prefix}.fileMinlengthError`,
@@ -59,14 +75,9 @@ export default defineMessages({
     defaultMessage:
       'More then 500 records are not allowed for the selected file.',
   },
-  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`,
-    defaultMessage:
-      'Please remove repetitive fields ({repetitiveCols}) from the file.',
+  mandatoryColErrorDescription: {
+    id: `${prefix}.mandatoryColErrorDescription`,
+    defaultMessage: 'Please include mandatory field Template name.',
   },
   headerAliasErrorDescription: {
     id: `${prefix}.headerAliasErrorDescription`,
@@ -88,6 +99,16 @@ export default defineMessages({
     defaultMessage:
       'Please include mandatory field status. It can be {statusAliases}.',
   },
+  typeAliasErrorDescription: {
+    id: `${prefix}.typeAliasErrorDescription`,
+    defaultMessage:
+      'Please include mandatory field type. It can be {typeAliases}.',
+  },
+  repetitiveColsErrorDescription: {
+    id: `${prefix}.repetitiveColsErrorDescription`,
+    defaultMessage:
+      'Please remove repetitive fields ({repetitiveCols}) from the file.',
+  },
   nonCsvErrorDescription: {
     id: `${prefix}.nonCsvErrorDescription`,
     defaultMessage: 'Please select a csv file.',