@capillarytech/creatives-library 7.6.2 → 7.6.4

package/v2Containers/CreativesContainer/index.js

@@ -51,7 +51,6 @@ class Creatives extends React.Component {
       currentChannel: this.props.channel || 'sms',
       weChatTemplateType: '',
       weChatMaptemplateStep: 0,
-
     };
     this.creativesTemplateSteps = {
       1: 'modeSelection',
@@ -87,8 +86,12 @@ class Creatives extends React.Component {
   onEditTemplate = () => {
     this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true });
   };
-  onCreateNew = () => {
-    this.setState({ slidBoxContent: 'createTemplate', showSlideBox: true });
+  onCreateNew = (fbAdManger) => {
+    if (fbAdManger) {
+      this.setState({ slidBoxContent: 'createTemplate', showSlideBox: true, fbAdManger });
+    } else {
+      this.setState({ slidBoxContent: 'createTemplate', showSlideBox: true });
+    }
   };
 
   onShowTemplates = () => {
@@ -637,6 +640,7 @@ class Creatives extends React.Component {
               onEnterTemplateName={this.onEnterTemplateName}
               onRemoveTemplateName={this.onRemoveTemplateName}
               onResetStep={this.resetStep}
+              fbAdManger={this.state.fbAdManger}
               cap={cap}
               setIsLoadingContent={this.setIsLoadingContent}
               onMobilepushModeChange={this.onMobilepushModeChange}
@@ -661,6 +665,7 @@ class Creatives extends React.Component {
               handleClose={this.handleCloseSlideBox}
               onFTPSubmit={getCreativesData}
               editor={editor}
+              messageStrategy={this.props.strategy}
           />
           }
           footer={this.shouldShowFooter() &&
@@ -713,6 +718,8 @@ Creatives.propTypes = {
   selectedWeChatAccount: PropTypes.object,
   Templates: PropTypes.object,
   selectedAccount: PropTypes.object,
+  strategy: PropTypes.string,
+
 };
 const mapStatesToProps = () => createStructuredSelector({
   isLoading: isLoadingSelector(),

package/v2Containers/Ebill/actions.js

@@ -14,7 +14,7 @@ export function createTemplate(template) {
 }
 
 export function getTemplateDetails(id, channel) {
-  
+  console.log('getting template', id, channel);
   return {
     type: types.GET_TEMPLATE_DETAILS_REQUEST,
     id,

package/v2Containers/Ebill/index.js

@@ -585,13 +585,13 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       type: 'LAYOUT',
     };
     this.props.globalActions.fetchSchemaForEntity(query);
-    
+    console.log('Form Data After 2', this.state.formData, this.props.Ebill.cmsData);
   }
 
   componentWillReceiveProps(nextProps) {
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.schema)) {
       this.injectEvents(nextProps.metaEntities.layouts[0].definition);
-      
+      console.log('isTagLoaded', this.isTagLoaded);
       const query = {
         layout: 'EBILL',
         type: 'TAG',
@@ -627,18 +627,18 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       this.props.globalActions.addMessageToQueue(message);
     }
 
-    
+    console.log('Form Data After ', nextProps.Ebill.cmsData, this.props.Ebill.cmsData);
     if (nextProps.Ebill.cmsData !== '' && !_.isEqual(nextProps.Ebill.cmsData, this.props.Ebill.cmsData)) {
       const formData = _.cloneDeep(this.state.formData);
       formData[this.state.currentTab - 1][`ebill-editor${this.state.currentTab > 1 ? this.state.currentTab : ''}`] = nextProps.Ebill.cmsData.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/\\&quot;/g, "\"");
-      
+      console.log('Manoj Form Data After 21', formData);
       this.setState({formData});
     }
 
     if (nextProps.Templates.selectedEmailLayout && nextProps.Templates.selectedEmailLayout !== '' && this.state.formData[this.state.currentTab - 1] && this.state.formData[this.state.currentTab - 1][`ebill-editor${this.state.currentTab > 1 ? this.state.currentTab : ''}`] !== '') {
       const formData = _.cloneDeep(this.state.formData);
       formData[this.state.currentTab - 1][`ebill-editor${this.state.currentTab > 1 ? this.state.currentTab : ''}`] = nextProps.Templates.selectedEmailLayout;
-      
+      console.log('Manoj Form Data After 01', formData);
       this.setState({formData});
     }
 
@@ -654,7 +654,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   }
 
   onTagSelect = (data, currentTab, value) => {
-    
+    console.log('On Tag selection ', data, currentTab, value);
     if (this.state.isDragDrop) {
       const msg = {
         action: "InsertToCursor",
@@ -669,12 +669,12 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   };
 
   onTabChange = (data, formData) => {
-    
+    console.log('inside parent ontabchange', data, this.state);
     this.setState({currentTab: data, formData});
   };
 
   onFormDataChange = (formData, tabCount, currentTab) => {
-    
+    console.log('Form data changed is ', formData, tabCount, currentTab);
     const tmpFormData = _.cloneDeep(formData);
     if (this.props.Templates.selectedEmailLayout !== '' && tmpFormData['0']['ebill-editor'] === '') {
       tmpFormData['0']['ebill-editor'] = this.props.Templates.selectedEmailLayout;
@@ -687,18 +687,18 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   };
 
   onTagSelect = (data, currentTab) => {
-    
+    console.log('parent data tag', data, currentTab);
     const editorId = currentTab > 1 ? `ebill-editor${currentTab}` : 'ebill-editor';
     this.insertAtCursor(document.getElementById(editorId), `{{${data}}}`, currentTab);
     document.getElementById(editorId).focus();
   };
 
   onTemplateNameChange = (name) => {
-    
+    console.log('Template name changed to ', name);
   };
 
   onTemplateContentChange = (content) => {
-    
+    console.log('Template content changed to ', content);
   };
 
   setEditState = (data) => {
@@ -719,7 +719,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       }
       if (type === 'embedded' || count > 0) {
         setTimeout( () => {
-          
+          console.log('removing standalone');
           if (type === 'embedded') {
             that.removeStandAlone();
           } else {
@@ -735,13 +735,13 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       formData[0].base = true;
     }
     formData.base = data.versions.base;
-    
+    console.log('form data after discarding ', formData);
     this.setState({tabCount, formData, editData: data, currentTab: 1}, () => {
     });
   };
 
   getMappedEvent = (id, event) => {
-    
+    console.log('Map ', this.map, id, event);
     return this.map[id][event];
   };
 
@@ -769,11 +769,11 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   saveFormData = (formData) => {
     //Logic to save in db etc
     // const isValidated = this.validateFormData(formData);
-    // 
+    // console.log('whyyyy');
     // if (!isValidated) {
     //   return;
     // }
-    
+    console.log('Saving form data', formData, this.state.tabCount);
     const obj = {};
     obj.versions = {
       base: {},
@@ -790,11 +790,11 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
     });
     obj.name = formData['template-name'];
     obj.versions.base = formData.base;
-    
+    console.log('HTML file ', obj.versions.history);
     _.forEach(obj.versions.history, (index, version) => {
-      
+      console.log('Encoding ', index, version);
     });
-    
+    console.log('obj', obj);
     this.props.actions.createTemplate(obj);
   };
 
@@ -811,17 +811,17 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       }
     }
     if (isValid) {
-      
+      console.log('isValid');
       return true;
     }
     const message = getMessageObject('error', this.props.intl.formatMessage(messages.templateDataNotValid), true);
     this.props.globalActions.addMessageToQueue(message);
-    
+    console.log('not valid');
     return false;
   };
 
   handleOnTagsContextChange = (data) => {
-    
+    console.log('parent tags context', data);
     const query = {
       layout: 'EBILL',
       type: 'TAG',
@@ -905,7 +905,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
 
 
   injectEvents(schema) {
-    
+    console.log('now injecting events', schema);
     const temp = schema;
     temp.standalone.sections = this.injectSections(temp.standalone.sections);
     _.forEach(temp.containers, (container) => {
@@ -913,7 +913,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       tempContainer = this.injectContainer(tempContainer);
       return tempContainer;
     });
-    
+    console.log('final injected schema', schema);
     this.setState({schema}, () => {
       const type = this.props.location.query.type;
       if (type === 'embedded') {
@@ -955,7 +955,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
           console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
-        
+        console.log('should translate multicol', temp);
         if (temp.type === 'icon') {
           return true;
         }
@@ -986,7 +986,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
         _.forEach(col.supportedEvents, (event) => {
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
-        
+        console.log('should translate multicol action', temp);
         if (temp.type === 'icon') {
           return true;
         }
@@ -1020,7 +1020,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       _.forEach(inputField.supportedEvents, (event) => {
         temp.injectedEvents[event] = this.getMappedEvent(inputField.id, event);
       });
-      
+      console.log('should translate collabel', temp);
       if (temp.type === 'icon') {
         return true;
       }
@@ -1049,7 +1049,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       _.forEach(actionField.supportedEvents, (event) => {
         temp.injectedEvents[event] = this.getMappedEvent(actionField.id, event);
       });
-      
+      console.log('should translate collabel action', temp);
       if (temp.type === 'icon') {
         return true;
       }
@@ -1099,7 +1099,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
   }
 
   cloneColLabel(sectionObj, tabIndex) {
-    
+    console.log('cloning cloneColLabel', sectionObj, tabIndex);
     const section = _.cloneDeep(sectionObj);
     const inputFields = _.forEach(section.inputFields, (inputField) => {
       const inputF = inputField;
@@ -1108,12 +1108,12 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       return inputF;
     });
     section.inputFields = inputFields;
-    
+    console.log('cloned ifs are', section);
     return section;
   }
 
   cloneMultiCol(sectionObj, tabIndex) {
-    
+    console.log('cloning multicol ', sectionObj, tabIndex);
     const section = _.cloneDeep(sectionObj);
     const inputFields = _.forEach(section.inputFields, (inputField) => {
       const inputF = inputField;
@@ -1127,7 +1127,7 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       return inputF;
     });
     section.inputFields = inputFields;
-    
+    console.log('cloned cols are', section);
     return section;
   }
 
@@ -1145,13 +1145,13 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
       } else if (childSection.type === 'parent') {
         sect = this.cloneParent(childSection, tabIndex);
       }
-      
+      console.log('returning cloned parent section', sect);
       childSections.push(sect);
       return true;
     });
     console.log('returning cloned parent section final 1', JSON.stringify(childSections));
     parentsect.childSections = childSections;
-    
+    console.log('returning cloned parent section final', parentsect);
     return _.cloneDeep(parentsect);
   }
 

package/v2Containers/Ebill/sagas.js

@@ -7,7 +7,7 @@ import * as types from './constants';
 export function* createTemplate(template) {
   let errorMsg = "";
   try {
-    
+    console.log('Template data ', template);
     const result = yield call(Api.createEbillTemplate, template);
     if ((result.message && typeof result.message === 'string') || result.status.code === 500) {
       errorMsg = result.message;
@@ -20,7 +20,7 @@ export function* createTemplate(template) {
 
 export function* getTemplateDetails(id, channel) {
   try {
-    
+    console.log('saga get Template details', id);
     const result = yield call(Api.getTemplateDetails, id, channel);
     // const sidebar = result.response.sidebar;
     yield put({ type: types.GET_TEMPLATE_DETAILS_SUCCESS, data: result.response });
@@ -32,7 +32,7 @@ export function* getTemplateDetails(id, channel) {
 export function* getCmsData({cmsType, projectId}) {
   try {
     const result = yield call(Api.getCmsData, cmsType, projectId);
-    
+    console.log('CMS Data ', result);
     yield put({ type: types.GET_CMS_EDITOR_DATA_SUCCESS, data: decodeURIComponent(result.data.response.cmsData.htmlContent) });
   } catch (error) {
     yield put({ type: types.GET_CMS_EDITOR_DATA_FAILURE, error });

package/v2Containers/Email/reducer.js

@@ -14,7 +14,7 @@ const initialState = fromJS({
 });
 
 function emailReducer(state = initialState, action) {
-  //
+  //console.log('email reducer', action);
   switch (action.type) {
     case types.CREATE_TEMPLATE_REQUEST:
       return state

package/v2Containers/EmailWrapper/index.js

@@ -132,9 +132,9 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
 
 
       if (supportedZipFormats.indexOf(fileExtension.toLowerCase()) !== -1) {
-        templatesActions.handleZipUpload(file.originFileObj, () => { //handle upload success
+        templatesActions.handleZipUpload(file, () => { //handle upload success
           this.setState({ modeContent: { file } }, showNextStep);
-          stopTimerGA();
+          this.stopTimerGA();
         }, this.handleZipUploadError);
       } else if (fileExtension === 'html' || fileExtension === 'htm') {
         const reader = new FileReader();
@@ -145,7 +145,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
           });
           // showNextStep();
         };
-        reader.readAsText(file.originFileObj);
+        reader.readAsText(file);
       } else {
         const message = {
           key: "email-upload-error",
@@ -229,7 +229,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
               <div>
                 {emailCreateMode === "upload" &&
                   <div style={{ marginLeft: '8px' }}>
-                    <CapUploader onChange={this.useFileUpload} accept=".zip, .html, .htm" showUploadList={false}>
+                    <CapUploader customRequest={this.useFileUpload} accept=".zip, .html, .htm" showUploadList={false}>
                       <CapButton>{this.props.intl.formatMessage(messages.upload)}</CapButton>
                     </CapUploader>
                     {!_.isEmpty(EmailLayout) &&

package/v2Containers/Facebook/Advertisement/index.js

@@ -978,4 +978,3 @@ Advertisement.propTypes = {
 };
 
 export default injectIntl(Advertisement);
-

package/v2Containers/Facebook/Facebook.style.js

@@ -50,7 +50,7 @@ export default css`
 
     .parameter-list-item {
       list-style: none;
-      margin-bottom: ${CAP_SPACE_28};
+      margin-bottom: 60px;
   
       .parameter-index {
         float: left;

package/v2Containers/Facebook/constants.js

@@ -47,3 +47,7 @@ export const VALUE_REACH = 'VALUE_REACH';
 export const VALUE_VIDEO_VIEWS = 'VALUE_VIDEO_VIEWS';
 export const VALUE_LINK_CLICKS = 'VALUE_LINK_CLICKS';
 export const VALUE_POST_ENGAGEMENT = 'VALUE_POST_ENGAGEMENT';
+
+
+export const AD_MANAGER = "AD_MANAGER";
+export const CREATIVE = "CREATIVE";