@capillarytech/creatives-library 7.9.18 → 7.9.20

package/package.json

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

package/utils/common.js

@@ -240,3 +240,10 @@ export const bytes2Size = (bytes, decimals = 2) => {
 
   return `${Math.ceil((bytes / Math.pow(k, i)).toFixed(dm))} ${sizes[i]}`;
 };
+
+export const isTraiDLTEnable = (isFullMode, smsRegister) => {
+  const isTraiDltFeatureForOrg = hasTraiDltFeature();
+  const isTariEnableforLib = (!isFullMode && smsRegister === "DLT" ) || isFullMode;
+  const isTraiDltFeature = isTraiDltFeatureForOrg && isTariEnableforLib;
+  return isTraiDltFeature;
+};

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -202,13 +202,15 @@ function SlideBoxContent(props) {
 
   const getChannelPreviewContent = (templateDataObject) => {
     switch (templateDataObject.type.toUpperCase()) {
-      case constants.SMS:
-        if (!commonUtil.hasTraiDltFeature() || get(templateDataObject, `versions.base['updated-sms-editor']`) === "") {
+      case constants.SMS: {
+        const isTraiDlt = commonUtil.isTraiDLTEnable(isFullMode, smsRegister);
+
+        const updatedSMSEditior = get(templateDataObject, `versions.base['updated-sms-editor']`, '');
+        if (!isTraiDlt || updatedSMSEditior === "") {
           return get(templateDataObject, `versions.base['sms-editor']`);
-        } else {
-          return templateDataObject.versions.base['updated-sms-editor']?.join('');
         }
-        return get(templateDataObject, `versions.base['sms-editor']`);
+        return updatedSMSEditior.join('');
+      }
       case constants.LINE: {
         const lineContents = get(templateDataObject, `versions.base.content.messages`, [{}]);
         const previewContent = [];
@@ -468,6 +470,7 @@ function SlideBoxContent(props) {
         onTestContentClicked={onTestContentClicked}
         onCreateComplete={onCreateComplete}
         smsRegister={smsRegister}
+        onShowTemplates={onShowTemplates}
       />
         )}
 
@@ -721,5 +724,6 @@ SlideBoxContent.propTypes = {
   fbAdManager: PropTypes.string,
   showDisabledFBInfo: PropTypes.boolean,
   orgUnitId: PropTypes.any,
+  smsRegister: PropTypes.any,
 };
 export default SlideBoxContent;

package/v2Containers/CreativesContainer/SlideBoxHeader.js

@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import messages from './messages';
 import { MAP_TEMPLATE } from '../WeChat/Wrapper/constants';
 import { NO_COMMUNICATION, FTP } from '../App/constants';
-import { hasTraiDltFeature } from '../../utils/common';
+import { isTraiDLTEnable } from '../../utils/common';
 const PrefixWrapper = styled.div`
   margin-right: 16px;
 `;
@@ -25,11 +25,12 @@ function getChannelLabel(channel = '') {
 
 
 function SlideBoxHeader(props) {
-  const { slidBoxContent, templateData, onShowTemplates, creativesMode, isFullMode, showPrefix, shouldShowTemplateName, channel, templateNameRenderProp, weChatTemplateType, onWeChatMaptemplateStepChange, weChatMaptemplateStep, templateStep } = props;
+  const { slidBoxContent, templateData, onShowTemplates, creativesMode, isFullMode, showPrefix, shouldShowTemplateName, channel, templateNameRenderProp, weChatTemplateType, onWeChatMaptemplateStepChange, weChatMaptemplateStep, templateStep, smsRegister } = props;
   const showTemplateNameHeader = isFullMode && shouldShowTemplateName;
   const mapTemplateCreate = !showTemplateNameHeader && slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
-  const isTraiDltFeature = hasTraiDltFeature();
-  const showCreateTraiSMSHeader = isTraiDltFeature && channel.toLowerCase() === "sms";
+  const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
+  const showCreateTraiSMSHeader = isTraiDlt && channel.toLowerCase() === "sms";
+
   return (
     <div key="creatives-container-slidebox-header-content">
       {slidBoxContent === 'templates' && !showTemplateNameHeader && (
@@ -103,5 +104,6 @@ SlideBoxHeader.propTypes = {
   channel: PropTypes.string,
   shouldShowTemplateName: PropTypes.bool,
   templateNameRenderProp: PropTypes.func,
+  smsRegister: PropTypes.any,
 };
 export default SlideBoxHeader;

package/v2Containers/CreativesContainer/index.js

@@ -795,6 +795,7 @@ class Creatives extends React.Component {
               weChatTemplateType={weChatTemplateType}
               showPrefix={!isUploading} // not show back button when email template is being uploaded
               templateStep={this.creativesTemplateSteps[templateStep]}
+              smsRegister={smsRegister}
             />}
           content={
             <SlideBoxContent

package/v2Containers/SmsTrai/Create/index.js

@@ -18,7 +18,6 @@ import CapNotification from '@capillarytech/cap-ui-library/CapNotification';
 import Papa from 'papaparse';
 import cloneDeep from 'lodash/cloneDeep';
 import {
-  CAP_SPACE_12,
   CAP_SPACE_16,
   CAP_SPACE_24,
   CAP_SPACE_32,
@@ -48,7 +47,13 @@ import messages from './messages';
 import withCreatives from '../../../hoc/withCreatives';
 
 export const SmsTraiCreate = (props) => {
-  const { intl, actions, onCreateComplete } = props;
+  const {
+    intl,
+    actions,
+    onCreateComplete,
+    isFullMode,
+    onShowTemplates,
+  } = props;
   const { formatMessage } = intl;
   const [files, setFiles] = useState([]);
   const [errorText, setErrorText] = useState('');
@@ -361,9 +366,7 @@ export const SmsTraiCreate = (props) => {
           tempArray.push(fileData[row]);
         }
       }
-      tempArray = tempArray.map((row) => {
-        return 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, ' '))
@@ -453,7 +456,11 @@ export const SmsTraiCreate = (props) => {
       { templates: savedData },
       (resp, errorMessage) => {
         createCallback({ errorMessage });
-        onCreateComplete();
+        if (isFullMode) {
+          onCreateComplete();
+        } else {
+          onShowTemplates();
+        }
       },
     );
   };
@@ -531,7 +538,7 @@ export const SmsTraiCreate = (props) => {
           {previewFileIndex !== null && (
             <>
               <CapRow span={24} className="upload-type-group-create-container">
-                <div className="upload-file-preview">
+                <>
                   <CapDivider
                     type="horizontal"
                     className="upload-file-preview-divider-1"
@@ -636,7 +643,7 @@ export const SmsTraiCreate = (props) => {
                     className="upload-file-preview-divider-2"
                   />
                   {errorText && <CapError>{errorText}</CapError>}
-                </div>
+                </>
               </CapRow>
             </>
           )}

package/v2Containers/SmsWrapper/index.js

@@ -6,7 +6,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import SmsCreate from '../Sms/Create';
-import { hasTraiDltFeature } from '../../utils/common';
+import { isTraiDLTEnable } from '../../utils/common';
 import SmsEdit from '../Sms/Edit';
 import SmsTraiCreate from '../SmsTrai/Create';
 import SmsTraiEdit from '../SmsTrai/Edit';
@@ -28,6 +28,7 @@ const SmsWrapper = (props) => {
     onCreateComplete,
     handleClose,
     smsRegister,
+    onShowTemplates,
   } = props;
 
   const smsProps = {
@@ -44,15 +45,15 @@ const SmsWrapper = (props) => {
     onPreviewContentClicked,
     onTestContentClicked,
   };
-  const isTraiDltFeatureForOrg = hasTraiDltFeature();
-  const isTariEnableforLib = (!isFullMode && smsRegister === "DLT" ) || isFullMode;
-  const isTraiDltFeature = isTraiDltFeatureForOrg && isTariEnableforLib;
+  const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
   return <>
     {
-      isCreateSms && (isTraiDltFeature ?
+      isCreateSms && (isTraiDlt ?
         <SmsTraiCreate
           isComponent
-          {...smsProps}/> :
+          {...smsProps}
+          onShowTemplates={onShowTemplates}
+          /> :
           <SmsCreate
             isComponent {
               ...smsProps
@@ -60,7 +61,7 @@ const SmsWrapper = (props) => {
           />
       )
     }
-    {isEditSms && (isTraiDltFeature ?
+    {isEditSms && (isTraiDlt ?
       <SmsTraiEdit
         {...smsProps}
         params={{id: templateData._id}}

package/v2Containers/Templates/index.js

@@ -208,11 +208,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     }
   }
   checkDLTfeatureEnable = () => {
-    const isTraiDltFeatureForOrg = commonUtil.hasTraiDltFeature();
     const {smsRegister, isFullMode} = this.props;
-    const isTariEnableforLib = (!isFullMode && smsRegister === "DLT" ) || isFullMode;
-    const isTraiDltFeature = isTraiDltFeatureForOrg && isTariEnableforLib;
-    return isTraiDltFeature;
+    const isTraiDlt = commonUtil.isTraiDLTEnable(isFullMode, smsRegister);
+    return isTraiDlt;
   }
   componentDidMount() {
     if (this.props.location.query.type === 'embedded' && this.isEnabledInLibraryModule("setLocale")) {
@@ -2277,6 +2275,7 @@ Templates.propTypes = {
   router: PropTypes.object,
   viberActions: PropTypes.object,
   facebookActions: PropTypes.object,
+  smsRegister: PropTypes.any,
 };
 
 const mapStateToProps = createStructuredSelector({