@capillarytech/creatives-library 7.9.20 → 7.10.0

package/package.json

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

package/utils/common.js

@@ -240,10 +240,3 @@ 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

@@ -142,7 +142,6 @@ function SlideBoxContent(props) {
       fbAdManager,
       showDisabledFBInfo,
       orgUnitId,
-      smsRegister,
     } = 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};
@@ -202,15 +201,12 @@ function SlideBoxContent(props) {
 
   const getChannelPreviewContent = (templateDataObject) => {
     switch (templateDataObject.type.toUpperCase()) {
-      case constants.SMS: {
-        const isTraiDlt = commonUtil.isTraiDLTEnable(isFullMode, smsRegister);
-
-        const updatedSMSEditior = get(templateDataObject, `versions.base['updated-sms-editor']`, '');
-        if (!isTraiDlt || updatedSMSEditior === "") {
+      case constants.SMS:
+        if (!commonUtil.hasTraiDltFeature() || get(templateDataObject, `versions.base['updated-sms-editor']`) === "") {
           return get(templateDataObject, `versions.base['sms-editor']`);
+        } else {
+          return templateDataObject.versions.base['updated-sms-editor']?.join('');
         }
-        return updatedSMSEditior.join('');
-      }
       case constants.LINE: {
         const lineContents = get(templateDataObject, `versions.base.content.messages`, [{}]);
         const previewContent = [];
@@ -351,7 +347,6 @@ function SlideBoxContent(props) {
         messageStrategy={messageStrategy}
         showDisabledFBInfo={showDisabledFBInfo}
         orgUnitId={orgUnitId}
-        smsRegister={smsRegister}
         />
       )}
       {isPreview && (
@@ -421,7 +416,6 @@ function SlideBoxContent(props) {
           onTestContentClicked={onTestContentClicked}
           handleClose={handleClose}
           onCreateComplete={onCreateComplete}
-          smsRegister={smsRegister}
         />
       )}
       {isEditFTP && (
@@ -469,8 +463,6 @@ function SlideBoxContent(props) {
         onPreviewContentClicked={onPreviewContentClicked}
         onTestContentClicked={onTestContentClicked}
         onCreateComplete={onCreateComplete}
-        smsRegister={smsRegister}
-        onShowTemplates={onShowTemplates}
       />
         )}
 
@@ -724,6 +716,5 @@ 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 { isTraiDLTEnable } from '../../utils/common';
+import { hasTraiDltFeature } from '../../utils/common';
 const PrefixWrapper = styled.div`
   margin-right: 16px;
 `;
@@ -25,12 +25,11 @@ function getChannelLabel(channel = '') {
 
 
 function SlideBoxHeader(props) {
-  const { slidBoxContent, templateData, onShowTemplates, creativesMode, isFullMode, showPrefix, shouldShowTemplateName, channel, templateNameRenderProp, weChatTemplateType, onWeChatMaptemplateStepChange, weChatMaptemplateStep, templateStep, smsRegister } = props;
+  const { slidBoxContent, templateData, onShowTemplates, creativesMode, isFullMode, showPrefix, shouldShowTemplateName, channel, templateNameRenderProp, weChatTemplateType, onWeChatMaptemplateStepChange, weChatMaptemplateStep, templateStep } = props;
   const showTemplateNameHeader = isFullMode && shouldShowTemplateName;
   const mapTemplateCreate = !showTemplateNameHeader && slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
-  const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
-  const showCreateTraiSMSHeader = isTraiDlt && channel.toLowerCase() === "sms";
-
+  const isTraiDltFeature = hasTraiDltFeature();
+  const showCreateTraiSMSHeader = isTraiDltFeature && channel.toLowerCase() === "sms";
   return (
     <div key="creatives-container-slidebox-header-content">
       {slidBoxContent === 'templates' && !showTemplateNameHeader && (
@@ -104,6 +103,5 @@ SlideBoxHeader.propTypes = {
   channel: PropTypes.string,
   shouldShowTemplateName: PropTypes.bool,
   templateNameRenderProp: PropTypes.func,
-  smsRegister: PropTypes.any,
 };
 export default SlideBoxHeader;

package/v2Containers/CreativesContainer/index.js

@@ -286,14 +286,14 @@ class Creatives extends React.Component {
               type: constants.FACEBOOK,
               edit: true,
               selectedFacebookAccount,
-              fbContentType,
+              fbContentType
             };
           } else {
             creativesTemplateData = {
               selectedMarketingObjective: templateData.selectedMarketingObjective,
               edit: true,
               type: channel,
-              fbContentType: templateData.fbContentType,
+              fbContentType: templateData.fbContentType
             };
           }
           break;
@@ -771,7 +771,7 @@ class Creatives extends React.Component {
   }
   render() {
     const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep, isLoadingContent, mobilePushCreateMode, isDiscardMessage, weChatTemplateType, weChatMaptemplateStep} = this.state;
-    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable, selectedOfferDetails, onTestContentClicked, onPreviewContentClicked, getCreativesData, fetchingCmsData, editor, smsRegister} = this.props;
+    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable, selectedOfferDetails, onTestContentClicked, onPreviewContentClicked, getCreativesData, fetchingCmsData, editor} = this.props;
     const mapTemplateCreate = slidBoxContent === 'createTemplate' && weChatTemplateType === MAP_TEMPLATE && templateStep !== 'modeSelection';
     /* TODO: Instead of passing down same props separately to each component down, write common function to these props and pass it accordingly */
     return (
@@ -795,7 +795,6 @@ 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
@@ -849,7 +848,6 @@ class Creatives extends React.Component {
               handleClose={this.handleCloseSlideBox}
               onFTPSubmit={getCreativesData}
               editor={editor}
-              smsRegister={smsRegister}
               messageStrategy={this.props.strategy}
               orgUnitId={this.props.orgUnitId}
           />

package/v2Containers/SmsTrai/Create/index.js

@@ -18,6 +18,7 @@ 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,
@@ -47,13 +48,7 @@ import messages from './messages';
 import withCreatives from '../../../hoc/withCreatives';
 
 export const SmsTraiCreate = (props) => {
-  const {
-    intl,
-    actions,
-    onCreateComplete,
-    isFullMode,
-    onShowTemplates,
-  } = props;
+  const { intl, actions, onCreateComplete } = props;
   const { formatMessage } = intl;
   const [files, setFiles] = useState([]);
   const [errorText, setErrorText] = useState('');
@@ -366,7 +361,9 @@ export const SmsTraiCreate = (props) => {
           tempArray.push(fileData[row]);
         }
       }
-      tempArray = tempArray.map((row) => row.map((cell) => cell.replace(',', ' ')));
+      tempArray = tempArray.map((row) => {
+        return row.map((cell) => cell.replace(',', ' '));
+      });
       csvContent = tempArray
         .map((e) => e.join(','))
         .map((e) => e.replace(/(\r\n|\n|\r)/gm, ' '))
@@ -456,11 +453,7 @@ export const SmsTraiCreate = (props) => {
       { templates: savedData },
       (resp, errorMessage) => {
         createCallback({ errorMessage });
-        if (isFullMode) {
-          onCreateComplete();
-        } else {
-          onShowTemplates();
-        }
+        onCreateComplete();
       },
     );
   };
@@ -538,7 +531,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"
@@ -643,7 +636,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 { isTraiDLTEnable } from '../../utils/common';
+import { hasTraiDltFeature } from '../../utils/common';
 import SmsEdit from '../Sms/Edit';
 import SmsTraiCreate from '../SmsTrai/Create';
 import SmsTraiEdit from '../SmsTrai/Edit';
@@ -26,9 +26,7 @@ const SmsWrapper = (props) => {
     onPreviewContentClicked,
     onTestContentClicked,
     onCreateComplete,
-    handleClose,
-    smsRegister,
-    onShowTemplates,
+    handleClose
   } = props;
 
   const smsProps = {
@@ -45,15 +43,13 @@ const SmsWrapper = (props) => {
     onPreviewContentClicked,
     onTestContentClicked,
   };
-  const isTraiDlt = isTraiDLTEnable(isFullMode, smsRegister);
+  const isTraiDltFeature = hasTraiDltFeature();
   return <>
     {
-      isCreateSms && (isTraiDlt ?
+      isCreateSms && (isTraiDltFeature ?
         <SmsTraiCreate
           isComponent
-          {...smsProps}
-          onShowTemplates={onShowTemplates}
-          /> :
+          {...smsProps}/> :
           <SmsCreate
             isComponent {
               ...smsProps
@@ -61,16 +57,16 @@ const SmsWrapper = (props) => {
           />
       )
     }
-    {isEditSms && (isTraiDlt ?
+    {isEditSms && (isTraiDltFeature ?
       <SmsTraiEdit
         {...smsProps}
         params={{id: templateData._id}}
         templateData={templateData}
         handleClose={handleClose}
-          /> : <SmsEdit
-            {...smsProps}
-            params={{id: templateData._id}}
-            templateData={templateData}
+          />:<SmsEdit
+        {...smsProps}
+        params={{id: templateData._id}}
+        templateData={templateData}
           />
       )}
       </>;

package/v2Containers/Templates/index.js

@@ -155,7 +155,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     this.prepareMobilePushPreviewData = this.prepareMobilePushPreviewData.bind(this);
     this.menuOnClickEvent = this.menuOnClickEvent.bind(this);
   }
-
+  
   componentWillMount() {
     if (this.state.channel === '') {
       let channel = '';
@@ -207,11 +207,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
     }
   }
-  checkDLTfeatureEnable = () => {
-    const {smsRegister, isFullMode} = this.props;
-    const isTraiDlt = commonUtil.isTraiDLTEnable(isFullMode, smsRegister);
-    return isTraiDlt;
-  }
+
   componentDidMount() {
     if (this.props.location.query.type === 'embedded' && this.isEnabledInLibraryModule("setLocale")) {
       this.setLocale();
@@ -227,7 +223,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       queryParams.page = this.state.page;
       queryParams.perPage = this.state.perPageLimit;
       const channel = this.state.channel;
-      const isTraiDltFeature = this.checkDLTfeatureEnable();
+      const isTraiDltFeature = commonUtil.hasTraiDltFeature();
       if ((this.state.channel || '').toLowerCase() === "sms" && isTraiDltFeature) {
         queryParams.traiEnable = true;
       }
@@ -590,7 +586,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (activeMode === ACCOUNT_SELECTION_MODE) {
       this.setTemplatesMode();
     }
-    const isTraiDltFeature = this.checkDLTfeatureEnable();
+    const isTraiDltFeature = commonUtil.hasTraiDltFeature();
     if ((this.state.channel || '').toLowerCase() === "sms" && isTraiDltFeature) {
       queryParams.traiEnable = true;
     }
@@ -632,7 +628,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           }
         }
       }
-
+     
       this.setState({page, templatesCount}, () => {
         queryParams.page = page;
         queryParams.perPage = this.state.perPageLimit;
@@ -674,7 +670,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     }
     if (currentChannel === SMS) {
       filteredTemplates = this.filterSMSTemplates(templates);
-      isTraiDltFeature = this.checkDLTfeatureEnable();
+      isTraiDltFeature = commonUtil.hasTraiDltFeature();
     }
     const cardDataList = filteredTemplates && filteredTemplates.length ? map(filteredTemplates, (template) => {
       const templateData =
@@ -2058,7 +2054,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const isfilterContentVisisble = true;
     const isWechatEmbedded = !this.props.isFullMode && channel.toUpperCase() === WECHAT;
     const channelLowerCase = (channel || '').toLowerCase();
-    const isTraiDltFeature = this.checkDLTfeatureEnable();
+    const isTraiDltFeature = commonUtil.hasTraiDltFeature();
     const filterContent = (( isfilterContentVisisble || [WECHAT, MOBILE_PUSH].includes(this.state.channel.toUpperCase())) && <div className="action-container">
       {isfilterContentVisisble && <CapInput.Search
         className="search-text"
@@ -2275,7 +2271,6 @@ Templates.propTypes = {
   router: PropTypes.object,
   viberActions: PropTypes.object,
   facebookActions: PropTypes.object,
-  smsRegister: PropTypes.any,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/TemplatesV2/index.js

@@ -199,7 +199,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   getTemplatesComponent(channel) {
     // const templates = this.props.Templates[`${channel}Templates`];
     let query = {};
-    const {isFullMode, messageStrategy, smsRegister} = this.props;
+    const {isFullMode, messageStrategy} = this.props;
     if (!isFullMode) {
       query = {type: 'embedded', module: 'library'};
       switch (channel) {
@@ -232,7 +232,6 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
           renderNewCardGrid={this.getTemplateDataForGrid}
           handlePeviewTemplate={this.props.handlePeviewTemplate}
           messageStrategy={this.props.messageStrategy}
-          smsRegister={smsRegister}
     />);
     }
   }