@capillarytech/creatives-library 7.10.26 → 7.10.28

package/package.json

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

package/v2Components/FormBuilder/index.js

@@ -2430,7 +2430,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 content={content}
                 charCounterEnabled={val.charCounterEnabled}
                 unicodeEnabled={unicodeEnabled}
-                showTestAndPreviewIcon={!this.props.disablePreviewAndTest}
+                showTestAndPreviewIcon
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 onTestContentClicked={this.props.onTestContentClicked}
                 module={this.props.tagModule}
@@ -3028,7 +3028,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   content={content}
                   charCounterEnabled={val.charCounterEnabled}
                   unicodeEnabled={unicodeEnabled}
-                  showTestAndPreviewIcon={!this.props.disablePreviewAndTest}
+                  showTestAndPreviewIcon
                   onPreviewContentClicked={this.props.onPreviewContentClicked}
                   onTestContentClicked={this.props.onTestContentClicked}
                   module={this.props.tagModule}
@@ -3081,7 +3081,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     ],
                     appName: val.content.appName,
                   }}
-                  showTestAndPreviewIcon={!this.props.disablePreviewAndTest}
+                  showTestAndPreviewIcon
                   onPreviewContentClicked={this.props.onPreviewContentClicked}
                   onTestContentClicked={this.props.onTestContentClicked}
                   templateDataRaw={this.props.templateData}

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -143,7 +143,6 @@ function SlideBoxContent(props) {
       showDisabledFBInfo,
       orgUnitId,
       smsRegister,
-      disablePreviewAndTest,
     } = props;
   const type = (messageDetails.type || '').toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'default' : 'library', isEditFromCampaigns: (templateData || {}).isEditFromCampaigns};
@@ -426,7 +425,6 @@ function SlideBoxContent(props) {
           handleClose={handleClose}
           onCreateComplete={onCreateComplete}
           smsRegister={smsRegister}
-          disablePreviewAndTest={disablePreviewAndTest}
         />
       )}
       {isEditFTP && (

package/v2Containers/CreativesContainer/index.js

@@ -853,7 +853,6 @@ class Creatives extends React.Component {
               location={this.props.location}
               messageDetails={this.props.messageDetails}
               showDisabledFBInfo={this.props.showDisabledFBInfo}
-              disablePreviewAndTest={this.props.disablePreviewAndTest}
               getFormData={this.getFormData}
               onCallTaskSubmit={this.onCallTaskSubmit}
               onCreateNew={this.onCreateNew}

package/v2Containers/Sms/Create/index.js

@@ -989,7 +989,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 onTestContentClicked={this.props.onTestContentClicked}
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
-                disablePreviewAndTest={this.props.disablePreviewAndTest}
               />
             </CapColumn>
           </CapRow>
@@ -1016,7 +1015,6 @@ Create.propTypes = {
   getFormSubscriptionData: PropTypes.func,
   isLoadingMetaEntities: PropTypes.bool,
   selectedOfferDetails: PropTypes.array,
-  disablePreviewAndTest: PropTypes.bool,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/Sms/Edit/index.js

@@ -987,7 +987,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 onTestContentClicked={this.props.onTestContentClicked}
-                disablePreviewAndTest={this.props.disablePreviewAndTest}
               />
             </CapColumn>
           </CapRow>
@@ -1017,7 +1016,6 @@ Edit.propTypes = {
   // route: PropTypes.object,
   injectedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
-  disablePreviewAndTest: PropTypes.bool,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/SmsTrai/Create/index.js

@@ -39,6 +39,7 @@ import {
   APPROVED,
   ACTIVE,
   REGISTERED,
+  TEMPLATE_NAME,
   TEMPLATE_ID_ALIASES,
   TEMPLATE_MESSAGE_ALIASES,
   STATUS_ALIASES,
@@ -87,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
@@ -123,6 +134,34 @@ export const SmsTraiCreate = (props) => {
     return isError;
   };
 
+  const duplicateTemplateNameValidation = (
+    transformedResults,
+    templateNameObj,
+  ) => {
+    //filtering and extracting index of template names with more than 1 occurence
+    const duplicateTemplateNameRows =
+      Object.values(templateNameObj)
+        ?.filter((i) => i.count > 1)
+        ?.map((i) => i.csvRow)
+        ?.flat()
+        ?.sort((a, b) => a - b) || [];
+    let duplicateTemplateNameCounts = 0;
+
+    //only if there are atleast 2 duplicate template names
+    if (duplicateTemplateNameRows.length > 1) {
+      duplicateTemplateNameRows.forEach((row) => {
+        if (!transformedResults[row][transformedResults[row]?.length - 1]) {
+          duplicateTemplateNameCounts += 1;
+        }
+        transformedResults[row][
+          transformedResults[row]?.length - 1
+        ] += ` Duplicate template names are not allowed.`;
+      });
+      setTotalFailCount((prev) => prev + duplicateTemplateNameCounts);
+    }
+    return transformedResults;
+  };
+
   const checkCSVRowsValidation = (
     transformedResults,
     selectedHeaderAlias,
@@ -137,42 +176,54 @@ export const SmsTraiCreate = (props) => {
       transformedResults[0],
       selectedTemplateIdAlias,
     );
-    const statusIndex = getIndexofColumn(
+    const statusIndexes = getIndexesofColumns(
       transformedResults[0],
       selectedStatusAlias,
     );
+    const templateNameIndex = getIndexofColumn(
+      transformedResults[0],
+      TEMPLATE_NAME,
+    );
+    const templateNameObj = {};
 
     for (let row = 1; row < transformedResults.length; row += 1) {
       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
+        } else if (statusIndexes.includes(index) &&
+          (cell.toLowerCase() === ACTIVE ||
+            cell.toLowerCase() === REGISTERED ||
+            cell.toLowerCase() === APPROVED)
         ) {
-          columnErrorArray.push(
-            `Only Templates with active/registered/approved status will be created.`,
-          );
+          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]) {
+            templateNameObj[cell]['count'] += 1;
+            templateNameObj[cell]['csvRow']?.push(row);
+          } else {
+            templateNameObj[cell] = { count: 1, csvRow: [row] };
+          }
         }
       });
 
+      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(
           ' ',
@@ -190,7 +241,7 @@ export const SmsTraiCreate = (props) => {
       }
     }
     uploadValidated = true;
-    return transformedResults;
+    return duplicateTemplateNameValidation(transformedResults, templateNameObj);
   };
 
   const checkCSVValidation = (results, file) => {
@@ -368,7 +419,7 @@ export const SmsTraiCreate = (props) => {
       transformedResults,
       headerAliasPresent[0],
       templateIdAliasPresent[0],
-      statusAliasPresent[0],
+      statusAliasPresent,
     );
   };
 
@@ -745,9 +796,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

package/v2Containers/SmsWrapper/index.js

@@ -3,13 +3,13 @@
  * SmsWrapper
  *
  */
-import PropTypes from "prop-types";
-import React from "react";
-import SmsCreate from "../Sms/Create";
-import { isTraiDLTEnable } from "../../utils/common";
-import SmsEdit from "../Sms/Edit";
-import SmsTraiCreate from "../SmsTrai/Create";
-import SmsTraiEdit from "../SmsTrai/Edit";
+import PropTypes from 'prop-types';
+import React from 'react';
+import SmsCreate from '../Sms/Create';
+import { isTraiDLTEnable } from '../../utils/common';
+import SmsEdit from '../Sms/Edit';
+import SmsTraiCreate from '../SmsTrai/Create';
+import SmsTraiEdit from '../SmsTrai/Edit';
 const SmsWrapper = (props) => {
   const {
     isCreateSms,
@@ -29,14 +29,13 @@ const SmsWrapper = (props) => {
     handleClose,
     smsRegister,
     onShowTemplates,
-    disablePreviewAndTest,
   } = props;
 
   const smsProps = {
     onCreateComplete,
     setIsLoadingContent,
     location,
-    route: { name: "sms" },
+    route: { name: 'sms' },
     isGetFormData,
     getFormSubscriptionData,
     getDefaultTags,
@@ -45,38 +44,36 @@ const SmsWrapper = (props) => {
     selectedOfferDetails,
     onPreviewContentClicked,
     onTestContentClicked,
-    disablePreviewAndTest,
   };
   const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
-  return (
-    <>
-      {isCreateSms &&
-        (isTraiDlt ? (
-          <SmsTraiCreate
-            isComponent
-            {...smsProps}
-            onShowTemplates={onShowTemplates}
-          />
-        ) : (
-          <SmsCreate isComponent {...smsProps} />
-        ))}
-      {isEditSms &&
-        (isTraiDlt ? (
-          <SmsTraiEdit
-            {...smsProps}
-            params={{ id: templateData._id }}
-            templateData={templateData}
-            handleClose={handleClose}
+  return <>
+    {
+      isCreateSms && (isTraiDlt ?
+        <SmsTraiCreate
+          isComponent
+          {...smsProps}
+          onShowTemplates={onShowTemplates}
+          /> :
+          <SmsCreate
+            isComponent {
+              ...smsProps
+            }
           />
-        ) : (
-          <SmsEdit
+      )
+    }
+    {isEditSms && (isTraiDlt ?
+      <SmsTraiEdit
+        {...smsProps}
+        params={{id: templateData._id}}
+        templateData={templateData}
+        handleClose={handleClose}
+          /> : <SmsEdit
             {...smsProps}
-            params={{ id: templateData._id }}
+            params={{id: templateData._id}}
             templateData={templateData}
           />
-        ))}
-    </>
-  );
+      )}
+      </>;
 };
 
 export default SmsWrapper;