@capillarytech/creatives-library 6.13.0 → 6.13.1

package/package.json

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

package/services/api.js

@@ -319,12 +319,11 @@ export const getCmsTemplateSettings = (cmsType, projectId, cmsMode, langId, isEd
   return API.get(url);
 };
 
-export const getCmsTemplateSettingsV2 = (cmsType, projectId, cmsMode, langId, isEdmSupport) => {
-  const url = `${API_ENDPOINT}/cms/v2/getDetails/?type=${cmsType}&projectId=${projectId}&cmsMode=${cmsMode}&langId=${langId}&isEdmSupport=${isEdmSupport ? 1 : 0}`;
+export const getCmsTemplateSettingsV2 = (cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable) => {
+  const url = `${API_ENDPOINT}/cms/v2/getDetails/?type=${cmsType}&projectId=${projectId}&cmsMode=${cmsMode}&langId=${langId}&isEdmSupport=${isEdmSupport ? 1 : 0}&isBEEAppEnable=${isBEEAppEnable}`;
   return API.get(url);
 };
 
-
 export const getCmsTemplateData = (cmsType, projectId, langId) => {
   const url = `${API_ENDPOINT}/cms/getContent?type=${cmsType}&projectId=${projectId}&langId=${langId}`;
   return API.get(url);

package/v2Components/FormBuilder/index.js

@@ -1470,10 +1470,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           } else if (key === this.props.baseLanguage) {
             formData[newTabIndex][key] = {};
             _.forEach(val, (subVal, index) => {
-                // if (subVal === 'is_drag_drop' || subVal === 'lang_id' || subVal === 'iso_code' === 'language') {
-                //
-                //   formData[newTabIndex][key][index] = formData[0][this.props.baseLanguage][subVal];
-                // } else {
               if (index === 'tabKey') {
                 formData[newTabIndex][key][index] = _.uniqueId();
               } else if (index === 'template-content') {
@@ -3180,10 +3176,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
               console.log('CKEditor Data 2', this.state.formData, this.state.formData[`${this.state.currentTab - 1}`], val, this.state.currentTab, this.state.currentLangTab, langIndex);
               const currentLang = ((!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage) || 'en';
               const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] ? this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] : '');
-              console.log('ckeditor current lang', currentLang, content);
-              if (this.state.formData[`${this.state.currentTab - 1}`][currentLang].is_drag_drop) {
-                // content = "";
-              }
               columns.push(
                 <CapColumn style={val.colStyle ? val.colStyle : {}} span={val.width}>
                   <CKEditor

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -69,7 +69,7 @@ const getLineType = ({
     }
   }
   return {};
-}
+};
 
 function SlideBoxContent(props) {
   const {
@@ -96,6 +96,7 @@ function SlideBoxContent(props) {
       cap,
       onResetStep,
       isFullMode,
+      editor,
       onCallTaskSubmit,
       setIsLoadingContent,
       showTemplateName,
@@ -184,7 +185,7 @@ function SlideBoxContent(props) {
           } = {},
           template,
         }) => {
-          let previewContent = {};
+          const previewContent = {};
           previewContent.messageContent = text;
           previewContent.previewImageUrl = previewImageUrl;
           previewContent.selectedSticker = selectedSticker || {
@@ -366,6 +367,7 @@ function SlideBoxContent(props) {
         step={templateStep}
         showNextStep={onCreateNextStep}
         isFullMode={isFullMode}
+        editor={editor}
         cap={cap}
         onResetStep={onResetStep}
         showTemplateName={showTemplateName}
@@ -392,6 +394,7 @@ function SlideBoxContent(props) {
         getFormSubscriptionData={getFormData}
         getDefaultTags={type}
         isFullMode={isFullMode}
+        editor={editor}
         cap={cap}
         showTemplateName={showTemplateName}
         onValidationFail={onValidationFail}
@@ -456,6 +459,7 @@ function SlideBoxContent(props) {
             messageDetails={messageDetails}
             cap={cap}
             onFacebookSubmit={onFacebookSubmit}
+            isFullMode={isFullMode}
           />
         )
       }

package/v2Containers/CreativesContainer/index.js

@@ -533,7 +533,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} = 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 (
@@ -606,6 +606,7 @@ class Creatives extends React.Component {
               selectedAccount={this.props.selectedAccount}
               onShowTemplates={this.onShowTemplates}
               handleClose={this.handleCloseSlideBox}
+              editor={editor}
           />
           }
           footer={this.shouldShowFooter() &&

package/v2Containers/Email/actions.js

@@ -38,7 +38,7 @@ export function getAllAssets(assetType, queryParams) {
   };
 }
 
-export function getCmsSetting(cmsType, projectId, cmsMode, langId, isEdmSupport) {
+export function getCmsSetting(cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable) {
   return {
     type: types.GET_CMS_EDITOR_DETAILS_REQUEST,
     cmsType,
@@ -46,6 +46,7 @@ export function getCmsSetting(cmsType, projectId, cmsMode, langId, isEdmSupport)
     cmsMode,
     langId,
     isEdmSupport,
+    isBEEAppEnable,
   };
 }
 

package/v2Containers/Email/index.js

@@ -183,15 +183,15 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       this.props.templatesActions.resetTemplateData();
     }
     const isBEESupport = (this.props.location.query.isBEESupport !== "false") || false;
-
-    if (!_.isEmpty(this.props.Templates.BEETemplate) ) {
-      if (this.props.Templates.BEETemplate.versions.base.is_drag_drop) {
+    const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
+    if (!_.isEmpty(this.props.Templates.BEETemplate)) {
+      if (this.props.Templates.BEETemplate.versions.base.is_drag_drop && isBEEAppEnable ) {
         this.setState({isDragDrop: true});
       }
       if (this.props.params.id) {
-        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'open', undefined, isBEESupport);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'open', undefined, isBEESupport, isBEEAppEnable);
       } else if (this.props.location.query.module !== "library" || (this.props.location.query.module === "library" && !this.props.templateData)) {
-        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'create', undefined, isBEESupport);
+        this.props.actions.getCmsSetting(BEE_PLUGIN, this.props.Templates.BEETemplate._id, 'create', undefined, isBEESupport, isBEEAppEnable);
       }
     }
     this.setState({ content: (this.props.Templates.selectedEmailLayout ? this.props.Templates.selectedEmailLayout : ''), formData});
@@ -214,6 +214,15 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       this.showNext();
     }
   }
+
+  checkBeeEditorAllowedForLibrary = () => {
+    const { isFullMode = false, editor } = this.props || {};
+    if (editor === "BEE" && !isFullMode) {
+      return true;
+    }
+    return false;
+  }
+
   componentWillReceiveProps(nextProps) {
     // if (this.props.location.query.type === 'embedded') {
     //   this.showNext();
@@ -315,8 +324,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       if (nextProps.location.query.module === 'library' && nextProps.isGetFormData) {
         const formData = this.state.formData;
         let isBeeEditor = false;
+        const isBEEEnable = this.checkBeeEditorAllowedForLibrary();
         _.forEach(formData[0].selectedLanguages, (language) => {
-          if (formData[0][language].is_drag_drop) {
+          if (formData[0][language].is_drag_drop && isBEEEnable) {
             isBeeEditor = true;
           }
         });
@@ -349,7 +359,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         const temp = (schema.containers || {})[this.state.currentTab - 1];
 
         const { currentTab } = this.state;
-        if (nextProps.Email.CmsSettings.isDragDrop) {
+        if (nextProps.Email.CmsSettings.isDragDrop && this.checkBeeEditorAllowedForLibrary()) {
           const beeJson = `BEEeditor${currentTab > 1 ? currentTab : ''}json`;
           const beeToken = `BEEeditor${currentTab > 1 ? currentTab : ''}token`;
           let beeJsonValue = _.get(nextProps, 'Templates.BEETemplate.versions.base.json-content', '');
@@ -409,7 +419,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         }
 
         this.setState({ formData }, () => {
-          this.hideEdmOptions(nextProps.Email.CmsSettings.isDragDrop);
+          const isDragDrop = this.checkBeeEditorAllowedForLibrary() && nextProps.Email.CmsSettings.isDragDrop;
+          this.hideEdmOptions(isDragDrop);
         });
       }
       if (nextProps.Email.createTemplateError && !_.isEqual(nextProps.Email.createTemplateError, this.props.Email.createTemplateError)) {
@@ -469,7 +480,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       if ( !_.isEqual(nextProps.Email.uploadAssetSuccess, this.props.Email.uploadAssetSuccess) && nextProps.Email.uploadAssetSuccess) {
         const isDragDrop = this.state.formData[`${this.state.currentTab - 1}`][this.state.formData[`${this.state.currentTab - 1}`].activeTab].is_drag_drop;
         const isBEESupport = (this.props.location.query.isBEESupport !== "false") || false;
-        if (isDragDrop && isBEESupport) {
+        if (isDragDrop && isBEESupport && this.checkBeeEditorAllowedForLibrary()) {
           const evtData = JSON.parse(this.edmEvent.data);
           if (evtData.action === 'editBackground') {
             this.edmEvent.source.postMessage(JSON.stringify({
@@ -516,7 +527,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     if (!_.isEmpty(nextProps.Email.templateDetails) && _.isEmpty(this.props.Email.templateDetails) ) {
       const base = nextProps.Email.templateDetails.versions.base;
       const activeBase = nextProps.Email.templateDetails.versions.base[base.activeTab];
-      if (activeBase && activeBase.is_drag_drop) {
+      if (activeBase && activeBase.is_drag_drop && this.checkBeeEditorAllowedForLibrary()) {
         this.setState({isDragDrop: true});
       }
     }
@@ -581,7 +592,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     //this.resetCkEditorInstance(data, formData);
     const schema = _.cloneDeep(this.state.schema);
     const container = schema.containers[`${data - 1}`];
-    if (formData[`${data - 1}`][formData[`${data - 1}`].activeTab].is_drag_drop) {
+    if (formData[`${data - 1}`][formData[`${data - 1}`].activeTab].is_drag_drop && this.checkBeeEditorAllowedForLibrary()) {
       container.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[3].cols[0].style = {display: ""};
       container.tabBarExtraContent.sections[0].inputFields[0].cols[2].style.display = "none";
     } else {
@@ -606,7 +617,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     const formData = _.cloneDeep(this.state.formData);
     const isBEESupport = (this.props.location.query.isBEESupport !== "false") || false;
 
-    if (isDragDrop && isBEESupport) {
+    if (isDragDrop && isBEESupport && this.checkBeeEditorAllowedForLibrary()) {
       let msg = {};
       if (data === "unsubscribe") {
         const anchor = `<a href='{{${data}}}'>${data}</a>`;
@@ -649,9 +660,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     const base = formData.base || {};
     const isDragDrop = _.get(base[base.activeTab], 'is_drag_drop');
     let editorType = '';
-    if ( isDragDrop === true) {
+    if ( isDragDrop === true && this.checkBeeEditorAllowedForLibrary()) {
       editorType = 'edmEditor';
-    } else if (isDragDrop === false) {
+    } else if (isDragDrop === false && !this.checkBeeEditorAllowedForLibrary()) {
       editorType = 'ckEditor';
     }
     GA.timeTracker.stopTimer(isEdit ? TRACK_EDIT_EMAIL : TRACK_CREATE_EMAIL, {
@@ -706,7 +717,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       _.forEach(formData, (val, index) => {
         if (!isNaN(index)) {
           _.forEach(val.selectedLanguages, (language) => {
-            if (val[language].is_drag_drop) {
+            if (val[language].is_drag_drop && this.checkBeeEditorAllowedForLibrary()) {
               that.props.actions.getCmsData(BEE_PLUGIN, id, language);
             }
           });
@@ -907,6 +918,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       if (this.props.isFullMode) {
         this.props.showTemplateName({formData, onFormDataChange: this.onFormDataChange});
       }
+      const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
       _.forEach((editData.versions.base.selectedLanguages), (language) => {
         // if (formData[this.state.currentTab - 1].tabKey === formData[this.state.currentTab - 1][language].tabKey) {
         //   formData[this.state.currentTab - 1].activeTab = language;
@@ -914,8 +926,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         // if (formData.base.tabKey === formData.base[language].tabKey) {
         //   formData.base.activeTab = language;
         // }
-        if (language && editData.versions.base[language].is_drag_drop) {
-          this.props.actions.getCmsSetting(BEE_PLUGIN, editData._id, 'open', language, isBEESupport);
+        if (language && editData.versions.base[language].is_drag_drop && isBEEAppEnable) {
+          this.props.actions.getCmsSetting(BEE_PLUGIN, editData._id, 'open', language, isBEESupport, isBEEAppEnable);
         }
       });
 
@@ -998,11 +1010,12 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   }
   saveValidationData = () => {
     let saveCount = 0;
+    const isBeeEnable = this.checkBeeEditorAllowedForLibrary();
     this.setState({saveEdmDataMode: 'validation', saveCount: 0, cmsDataCount: 0}, () => {
       _.forEach(this.state.formData, (newdata, index) => {
         if (!isNaN(index)) {
           _.forEach(newdata.selectedLanguages, (language) => {
-            if (newdata[language].is_drag_drop && ((parseInt(index, 10) + 1) === this.state.currentTab)) {
+            if (newdata[language].is_drag_drop && isBeeEnable && ((parseInt(index, 10) + 1) === this.state.currentTab)) {
               saveCount += 1;
             }
           });
@@ -1119,14 +1132,14 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
   copyPrimaryLanguage = () => {
     const isEdmSupport = (this.props.location.query.isEdmSupport !== "false") || false;
-
+    const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
     this.setState({addLanguageType: "copyPrimaryLanguage"}, () => {
       this.setState({showModal: false});
       const formData = _.cloneDeep(this.state.formData);
       const currentTab = this.state.currentTab - 1;
       const baseLanguage = this.props.currentOrgDetails.basic_details.base_language ? this.props.currentOrgDetails.basic_details.base_language : 'en';
-      if (formData[currentTab][baseLanguage].is_drag_drop) {
-        this.props.actions.getCmsSetting(BEE_PLUGIN, formData[currentTab][baseLanguage].drag_drop_id, 'duplicate', baseLanguage, isEdmSupport);
+      if (formData[currentTab][baseLanguage].is_drag_drop && isBEEAppEnable) {
+        this.props.actions.getCmsSetting(BEE_PLUGIN, formData[currentTab][baseLanguage].drag_drop_id, 'duplicate', baseLanguage, isEdmSupport, isBEEAppEnable);
       }
     });
   }
@@ -1504,7 +1517,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const data = _.find(this.props.Email.assetList, {_id: id});
 
       if (data) {
-        if (isDragDrop && isEdmSupport) {
+        if (isDragDrop && isEdmSupport && this.checkBeeEditorAllowedForLibrary()) {
           const evtData = JSON.parse(this.edmEvent.data);
           if (evtData.action === 'editBackground') {
             this.edmEvent.source.postMessage(JSON.stringify({
@@ -1539,7 +1552,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
   toggleEmailPreview = () => {
     const isDragDrop = this.state.formData[`${this.state.currentTab - 1}`][this.state.formData[`${this.state.currentTab - 1}`].activeTab].is_drag_drop;
-    if (isDragDrop && !this.state.showEmailPreview) {
+    if (isDragDrop && !this.state.showEmailPreview && this.checkBeeEditorAllowedForLibrary()) {
       this.handleEdmSave();
       this.setState({mode: "preview", gettingPreviewData: true});
     } else if (this.state.showEmailPreview) {
@@ -2118,9 +2131,10 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
             "language": this.supportedLanguages[languageIndex].language,
             "template-content": templates.html_content,
           };
-          if (templates.drag_drop_id) {
+          const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
+          if (templates.drag_drop_id && isBEEAppEnable) {
             tempData.drag_drop_id = templates.drag_drop_id;
-            this.props.actions.getCmsSetting(BEE_PLUGIN, tempData._id, 'open', tempData.iso_code, isEdmSupport);
+            this.props.actions.getCmsSetting(BEE_PLUGIN, tempData._id, 'open', tempData.iso_code, isEdmSupport, isBEEAppEnable);
           }
           // formData.usingTabContainer = true;
           // formData.tabCount = 1;
@@ -2144,9 +2158,10 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
       this.setState({formData, loading: false, injectedTags: data.tags, tabKey, isDragDrop: (data.base.is_drag_drop !== 0 )}, () => {
         // this.setState({tabKey: ''});
+        const isBEEEnable = this.checkBeeEditorAllowedForLibrary();
         _.forEach(formData[0].selectedLanguages, (language) => {
-          if (formData[0][language].is_drag_drop) {
-            this.props.actions.getCmsSetting(BEE_PLUGIN, formData[0][language].drag_drop_id, 'open', language, isEdmSupport);
+          if (formData[0][language].is_drag_drop && isBEEEnable) {
+            this.props.actions.getCmsSetting(BEE_PLUGIN, formData[0][language].drag_drop_id, 'open', language, isEdmSupport, isBEEEnable);
           }
         });
       });
@@ -2483,8 +2498,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       // const isEdmSupport = (this.props.location.query.isEdmSupport) ? this.props.location.query.isEdmSupport : true;
       // let getQuery = '';
       const isEdmSupport = (this.props.location.query.isEdmSupport !== "false") || false;
-
-      this.props.actions.getCmsSetting(BEE_PLUGIN, data._id, 'create', this.state.formData[this.state.currentTab - 1].activeTab, isEdmSupport);
+      const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
+      this.props.actions.getCmsSetting(BEE_PLUGIN, data._id, 'create', this.state.formData[this.state.currentTab - 1].activeTab, isEdmSupport, isBEEAppEnable);
       // this.props.templatesActions.setEdmTemplate(data);
       this.toggleEdmEmailTemplateSelection();
       // if (type && type.toLowerCase() === 'email') {

package/v2Containers/Email/sagas.js

@@ -51,9 +51,9 @@ export function* getAllAssets(assetType, queryParams) {
   }
 }
 
-export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSupport}) {
+export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable}) {
   try {
-    const result = yield call(Api.getCmsTemplateSettingsV2, cmsType, projectId, cmsMode, langId, isEdmSupport);
+    const result = yield call(Api.getCmsTemplateSettingsV2, cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable);
 
     yield put({ type: types.GET_CMS_EDITOR_DETAILS_SUCCESS, settings: result.data.response.cmsDetails });
   } catch (error) {

package/v2Containers/EmailWrapper/index.js

@@ -196,6 +196,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       onPreviewContentClicked,
       onTestContentClicked,
       cmsTemplatesLoader,
+      editor,
     } = this.props;
     const {
       templateName,
@@ -259,6 +260,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
                 selectedOfferDetails={selectedOfferDetails}
                 onPreviewContentClicked={onPreviewContentClicked}
                 onTestContentClicked={onTestContentClicked}
+                editor={editor}
               />}
               {!isShowEmailCreate && (
                 <CmsTemplatesComponent

package/v2Containers/TemplatesV2/index.js

@@ -52,6 +52,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       //'wechat': {content: this.getTemplatesComponent('wechat'), tab: 'Wechat', key: 'wechat'},
       mPush: {content: <></>, tab: intl.formatMessage(messages.pushNotification), key: 'mobilepush'},
       line: {content: <></>, tab: intl.formatMessage(messages.line), key: 'line'},
+
     };
     let filteredPanes = Object.keys(defaultPanes)
       .filter((key) => !channelsToHide.includes(key)).reduce((obj = [], key) => {
@@ -152,14 +153,12 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
     );
   }
 
-  getLineComponent = () => {
-    return (
-      <Line
-        {...this.props}
-        isCreateFlow
+  getLineComponent = () => (
+    <Line
+      {...this.props}
+      isCreateFlow
       />
     )
-  }
 
   getTemplatesComponent(channel) {
     // const templates = this.props.Templates[`${channel}Templates`];