@capillarytech/creatives-library 6.10.0 → 6.10.2

package/v2Components/FormBuilder/index.js

@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import _ from 'lodash';
 import { Tabs, Table, Modal} from 'antd';
-import { CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon} from '@capillarytech/cap-ui-library';
+import { CapSpin, CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon} from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import LabelHOC from '@capillarytech/cap-ui-library/assets/HOCs/ComponentWithLabelHOC';
 import { CAP_SPACE_12, CAP_SPACE_08, FONT_COLOR_05, FONT_COLOR_04 } from '@capillarytech/cap-ui-library/styled/variables';
@@ -21,6 +21,7 @@ import SlideBox from '../SlideBox';
 import CardGrid from '../CardGrid';
 import CKEditor from "../Ckeditor/";
 import EDMEditor from "../Edmeditor";
+import BeeEditor from '../BeeEditor';
 import CustomPopOver from '../CustomPopOver';
 import messages from './messages';
 import './_formBuilder.scss';
@@ -275,7 +276,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
   onEdit() {
 
   }
-
   getModal = () => {
     let modal;
     if (this.state.modal) {
@@ -925,7 +925,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           for (var i = 0; i < data.selectedLanguages.length; i+= 1) {
             const currentLang = data.selectedLanguages[i];
             const content = data[currentLang]['template-content'];
-            const tagValidationResponse = this.validateTags(content, tags, injectedTags);
+            if (!content) {
+              return false;
+            }
+            const tagValidationResponse = this.validateTags(content, tags, injectedTags);;
             if (errorData[index][currentLang] === undefined) {
               errorData[index][currentLang] = {};
             }
@@ -2953,24 +2956,28 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             if (channel === 'EMAIL') {
               moduleFilterEnabled = this.props.isFullMode;
             }
-            columns.push(
-              <CapColumn key={`input-${val.id}`} offset={val.offset} span={val.width ? val.width : ''} style={val.style ? val.style : {marginBottom: '16px'}}>
-                <TagList
-                  key={`input-${val.id}`}
-                  moduleFilterEnabled={moduleFilterEnabled}
-                  label={val.label ? val.label : ''}
-                  onTagSelect={(data) => this.callChildEvent(data, val, 'onTagSelect')}
-                  onContextChange={this.props.onContextChange}
-                  location={this.props.location}
-                  tags={this.props.tags ? this.props.tags : []}
-                  injectedTags={this.props.injectedTags ? this.props.injectedTags : {}}
-                  className={val.className ? val.className : ''}
-                  id={val.id}
-                  userLocale={this.props.userLocale}
-                  selectedOfferDetails={this.props.selectedOfferDetails}
-                />
-              </CapColumn>
-            );
+            const langIndex = 0;
+            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;
+            if (!(_.get(this.state, `formData[${this.state.currentTab - 1}][${currentLang}].is_drag_drop`, false)) || channel !== 'EMAIL') {
+              columns.push(
+                <CapColumn key={`input-${val.id}`} offset={val.offset} span={val.width ? val.width : ''} style={val.style ? val.style : {marginBottom: '16px'}}>
+                  <TagList
+                    key={`input-${val.id}`}
+                    moduleFilterEnabled={moduleFilterEnabled}
+                    label={val.label ? val.label : ''}
+                    onTagSelect={(data) => this.callChildEvent(data, val, 'onTagSelect')}
+                    onContextChange={this.props.onContextChange}
+                    location={this.props.location}
+                    tags={this.props.tags ? this.props.tags : []}
+                    injectedTags={this.props.injectedTags ? this.props.injectedTags : {}}
+                    className={val.className ? val.className : ''}
+                    id={val.id}
+                    userLocale={this.props.userLocale}
+                    selectedOfferDetails={this.props.selectedOfferDetails}
+                  />
+                </CapColumn>
+              );
+            }
             break;
           case "button":
             if (styling === 'semantic' && val.metaType === 'submit-button') {
@@ -3191,38 +3198,53 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             }
           }
             break;
-          case "edmeditor": {
-            // if (!this.state.formData[`${this.state.currentTab - 1}`]) {
-            //   return true;
-            // }
+          case "BEEeditor": {
             let langTab = 1;
-            if (val.id.match(/edmeditor/g)) {
+            if (val.id.match(/BEEeditor/g)) {
               if (val.id.length > 9 && val.id.charAt(9)) {
                 langTab = val.id.charAt(9);
               }
             }
-            const supportedLanguages = this.state.formData[this.state.currentTab - 1].selectedLanguages;
-            // let langIndex = 0;
-            // if (val.id.indexOf('edmeditor') > -1 && val.id !== 'edmeditorsrc') {
-            //   const test = val.id.replace('src', '');
-            //   langIndex = parseInt(test.replace('edmeditor', ''), 10) - 1;
-            // }
-            // 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;
+            const { currentTab, formData } = this.state;
+            const supportedLanguages = formData[currentTab - 1].selectedLanguages;
             const currentLang = supportedLanguages[langTab - 1];
-            const edmSrc = this.state.formData[`${this.state.currentTab - 1}`][currentLang] && this.state.formData[`${this.state.currentTab - 1}`][currentLang][`edmeditor${this.state.currentTab > 1 ? this.state.currentTab : ''}src`];
-
 
-            if (!edmSrc) {
+            let beeJson = '',
+              beeToken = '',
+              uuid = '';
+            const data = formData[`${currentTab - 1}`][currentLang];
+            if (data) {
+              beeJson = data[`BEEeditor${currentTab > 1 ? currentTab : ''}json`];
+              beeToken = data[`BEEeditor${currentTab > 1 ? currentTab : ''}token`];
+              uuid = this.props.uuid;
+            }
+            if (!beeJson || !beeToken) {
               return false;
             }
-
-
+            let isModuleFilterEnabled = _.get(this.props.location, 'query.type', '') !== 'embedded';
+            const schemaChannel = _.get(this.props.schema, 'channel', "");
+            if (schemaChannel === 'EMAIL') {
+              isModuleFilterEnabled = this.props.isFullMode;
+            }
             columns.push(
               <CapColumn style={val.colStyle ? val.colStyle : {}} span={val.width}>
-                <EDMEditor
+                <BeeEditor
+                  uid={uuid}
+                  tokenData={beeToken}
                   id={val.id}
-                  getEditorInstanse={this.getEditorInstanse}
-                  edmSrc={edmSrc}
+                  beeJson={beeJson}
+                  showTagsPopover={this.showTagsPopover}
+                  location={this.props.location}
+                  label={val.label || ''}
+                  className={val.className || ''}
+                  userLocale={this.props.userLocale}
+                  selectedOfferDetails={this.props.selectedOfferDetails}
+                  tags={this.props.tags || []}
+                  injectedTags={this.props.injectedTags ? this.props.injectedTags : {}}
+                  saveBeeInstance={this.props.saveBeeInstance}
+                  saveBeeData={this.props.saveBeeData}
+                  onContextChange={this.props.onContextChange}
+                  moduleFilterEnabled={isModuleFilterEnabled}
                 />
               </CapColumn>
             );
@@ -3263,7 +3285,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           }
         </CapRow>
       );
-      fields.push(row);
+      if (columns.length) {
+        fields.push(row);
+      }
     });
 
     _.forEach(section.actionFields, (field) => {
@@ -3303,8 +3327,18 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           }
         </CapRow>
       );
-      fields.push(row);
+      if (columns.length) {
+        fields.push(row);
+      }
+
     });
+    if(!this.props.isEmailLoading && this.props.schema.channel.toUpperCase() === 'EMAIL' && !fields.length) {
+      return (
+        <div style={{ textAlign: 'center' }}>
+          <CapSpin spinning />
+        </div>
+      );
+    }
     return fields;
   }
 
@@ -3538,6 +3572,7 @@ FormBuilder.propTypes = {
   setDrawerVisibility: PropTypes.bool,
   capDrawerContent: PropTypes.array,
   isFullMode: PropTypes.bool,
+
 };
 
 export default injectIntl(FormBuilder);

package/v2Containers/App/constants.js

@@ -46,3 +46,4 @@ export const CHANNEL_EDIT_TRACK_MAPPING = {
   line: TRACK_EDIT_LINE,
 };
 export const GTM_TRACKING_ID = 'UA-110024621-2';
+export const BEE_PLUGIN = 'BEE_PLUGIN';

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -10,13 +10,13 @@ function getFullModeSaveBtn(slidBoxContent) {
     <FormattedMessage {...messages.creativesTemplatesSaveFullMode}/>;
 }
 function SlideBoxFooter(props) {
-  const { slidBoxContent, onSave, onEditTemplate, onCreateNextStep, isFullMode} = props;
+  const { slidBoxContent, onSave, onEditTemplate, onCreateNextStep, isFullMode, fetchingCmsData} = props;
   return (
     <div>
       <div>
         {props.shouldShowDoneFooter() && (
           <div>
-            <CapButton onClick={onSave}>
+            <CapButton onClick={onSave} disabled={fetchingCmsData || false}>
               {isFullMode ?
                 getFullModeSaveBtn(slidBoxContent)
               :

package/v2Containers/CreativesContainer/index.js

@@ -25,6 +25,7 @@ import * as globalActions from '../Cap/actions';
 import {isLoading as isLoadingSelector} from './selectors';
 import messages from './messages';
 import { MAP_TEMPLATE } from '../WeChat/Wrapper/constants';
+import { makeSelectFetchingCmsData } from '../Email/selectors';
 
 const classPrefix = 'add-creatives-section';
 
@@ -165,6 +166,8 @@ class Creatives extends React.Component {
             iso_code: templateData.iso_code,
             language: templateData.language,
             drag_drop_id: templateData.drag_drop_id,
+            json_content: templateData.json_content,
+            id: templateData.id,
           };
           creativesTemplateData = {
             base: formData,
@@ -528,7 +531,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} = this.props;
+    const {isFullMode, creativesMode, cap, isUploading, channelsToHide, selectedWeChatAccount, forwardedTags, channelsToDisable, selectedOfferDetails, onTestContentClicked, onPreviewContentClicked, getCreativesData, fetchingCmsData} = 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 (
@@ -617,11 +620,12 @@ class Creatives extends React.Component {
               emailCreateMode={emailCreateMode}
               shouldShowContinueFooter={this.shouldShowContinueFooter}
               shouldShowDoneFooter={this.shouldShowDoneFooter}
+              fetchingCmsData={fetchingCmsData}
             />
           }
           handleClose={this.handleCloseSlideBox}
           show={showSlideBox}
-          size="size-l"
+          size="size-xl"
         />
       </SlideBoxWrapper>
     );
@@ -659,6 +663,7 @@ const mapStatesToProps = () => createStructuredSelector({
   EmailLayout: selectEmailLayout(),
   isUploading: uploadSelector(),
   Templates: makeSelectTemplates(),
+  fetchingCmsData: makeSelectFetchingCmsData(),
 });
 function mapDispatchToProps(dispatch) {
   return {

package/v2Containers/Email/constants.js

@@ -35,3 +35,4 @@ export const CLEAR_ALL_VALUES = "app/v2Containers/Email/CLEAR_ALL_VALUES";
 export const DUPLICATE_TEMPLATE_REQUEST = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_REQUEST';
 export const DUPLICATE_TEMPLATE_SUCCESS = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_SUCCESS';
 export const DUPLICATE_TEMPLATE_FAILURE = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_FAILURE';
+