@capillarytech/creatives-library 2.0.29 → 2.0.30

package/containers/Email/index.js

@@ -1234,7 +1234,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     const isEdmSupport = (this.props.location.query.isEdmSupport !== "false") || false;
     const formData = _.cloneDeep(this.state.formData);
 
-    const schema = (this.props.location.query.type === 'embedded') ? this.removeStandAlone() : _.cloneDeep(this.state.schema);
+    const schema = (this.props.location.query.type === 'embedded') ? this.removeStandAlone(this.state.schema) : _.cloneDeep(this.state.schema);
     const containers = _.cloneDeep(schema.containers.slice());
     let tabKey = "";
     let currentTab = _.cloneDeep(this.state.currentTab);
@@ -2398,7 +2398,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   injectEvents = (schema) => {
     const type = this.props.location.query.type;
 
-    const temp = schema;
+    let temp = _.cloneDeep(schema);
     temp.standalone.sections = this.injectSections(temp.standalone.sections);
     _.forEach(temp.containers, (container) => {
       let tempContainer = container;
@@ -2468,11 +2468,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       }
     });
     //}
-
-    this.setState({schema, isSchemaChanged: true}, () => {
-      if (type === 'embedded') {
-        this.removeStandAlone();
-      }
+    temp = type === 'embedded' ? this.removeStandAlone(temp) : temp;
+    this.setState({schema: temp, isSchemaChanged: true}, () => {
       if (type === 'embedded' && (this.props.route.name === 'EmailView' || (this.props.location.query.module && (this.props.location.query.module.toLowerCase() === 'loyalty' || this.props.location.query.module.toLowerCase() === 'dvs' || this.props.location.query.module.toLowerCase() === 'coupon_expiry' || this.props.location.query.module.toLowerCase() === 'timeline')))) {
         if ((this.props.route.name === "EmailEdit" || this.props.route.name === "EmailCreate") && (this.props.location.query.module === "dvs" || this.props.location.query.module.toLowerCase() === 'coupon_expiry')) {
           return;
@@ -2496,17 +2493,17 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     this.props.globalActions.fetchSchemaForEntity(query);
   }
 
-  removeStandAlone() {
-    const schema = _.cloneDeep(this.state.schema);
-    delete schema.standalone;
-    schema.standalone = {};
-    schema.standalone.sections = [];
+  removeStandAlone(schema) {
+    const newSchema = _.cloneDeep(schema);
+    delete newSchema.standalone;
+    newSchema.standalone = {};
+    newSchema.standalone.sections = [];
     if (this.props.location.query.type === 'embedded' && (this.props.location.query.module === "loyalty" || this.props.location.query.module === "dvs" || this.props.location.query.module === "coupon_expiry" || this.props.location.query.module === "timeline" ||
       this.props.location.query.module === "library")) {
-      schema.standalone.sections.push(_.cloneDeep(this.state.schema.standalone.sections[0]));
+      newSchema.standalone.sections.push(_.cloneDeep(schema.standalone.sections[0]));
     }
 
-    _.forEach(schema.containers, (container) => {
+    _.forEach(newSchema.containers, (container) => {
       const temp = container;
       if (temp.type === 'tabs') {
         // temp.tabBarExtraContent = {};
@@ -2542,8 +2539,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         temp.panes.push(basePane);
       }
     });
-    this.setState({ schema, isSchemaChanged: true });
-    return schema;
+    return newSchema;
   }
 
   startTemplateCreation(data) {
@@ -2832,6 +2828,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         postAction: this.state.getFormDataValue || 'next',
         value: this.transformFormData(passedData),
         validity: this.state.isFormValid,
+        type: 'EMAIL',
       };
 
       this.setState({checkValidation: true});

package/containers/EmailWrapper/index.js

@@ -6,11 +6,11 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { connect } from 'react-redux';
-import { FormattedMessage, injectIntl } from 'react-intl';
+import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { bindActionCreators } from 'redux';
 import _ from 'lodash';
-import { CapRadioCard, CapHeader} from '@capillarytech/cap-ui-library';
+import { CapRadioCard, CapHeader, CapNotification} from '@capillarytech/cap-ui-library';
 import { UserIsAuthenticated } from '../../utils/authWrapper';
 import {selectEmailLayout, selectCmsTemplates, selectEdmEditor} from '../Templates/selectors';
 import * as templatesActionsCreators from '../Templates/actions';
@@ -49,12 +49,12 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
   componentDidUpdate() {
     const {modeContent} = this.state;
    // const isValid = this.isValid();
-    const {emailCreateMode, EmailLayout, CmsTemplates, step, SelectedEdmDefaultTemplate} = this.props;
+    const {emailCreateMode, EmailLayout, CmsTemplates, step, SelectedEdmDefaultTemplate, templatesActions} = this.props;
     if (step === "modeSelection" && !this.state.selectedCreateMode && emailCreateMode === 'upload' && !EmailLayout) {
       document.getElementById('upload-email-template').click();
     } else if (step === "templateSelection" && !this.state.selectedCreateMode) {
       if (emailCreateMode === "editor" && !CmsTemplates) {
-        this.props.templatesActions.getEdmDefaultTemplates();
+        templatesActions.getEdmDefaultTemplates();
       }
     } else if (step === "createTemplate" && !this.state.selectedCreateMode) {
       if (emailCreateMode === 'upload' && !EmailLayout) {
@@ -75,7 +75,7 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
     this.setState({selectedCreateMode: emailCreateMode});
   }
   handleFileUpload = (e, files) => {
-    const { templatesActions } = this.props;
+    const { templatesActions, intl } = this.props;
     if (files.length === 0) {
       return;
     }
@@ -97,8 +97,11 @@ export class EmailWrapper extends React.Component { // eslint-disable-line react
       };
       reader.readAsText(files[0]);
     } else {
-      // const message = getMessageObject('error', this.props.intl.formatMessage(messages.invalidUploadFileError), true);
-      // this.props.globalActions.addMessageToQueue(message);
+      const message = {
+        message: intl.formatMessage(messages.invalidUploadFileError),
+        description: intl.formatMessage(messages.invalidUploadFileErrorDesc),
+      };
+      CapNotification.error(message);
     }
   };
 
@@ -175,6 +178,7 @@ EmailWrapper.propTypes = {
   step: PropTypes.string,
   showNextStep: PropTypes.func,
   getFormdata: PropTypes.func,
+  intl: intlShape,
 };
 
 const mapStateToProps = createStructuredSelector({

package/containers/EmailWrapper/messages.js

@@ -34,4 +34,12 @@ export default defineMessages({
     id: 'app.containers.EmailWrapper.createMode',
     defaultMessage: 'How do you want to create ?',
   },
+  invalidUploadFileError: {
+    id: `app.containers.EmailWrapper.invalidUploadFileError`,
+    defaultMessage: `File cannot be uploaded.`,
+  },
+  invalidUploadFileErrorDesc: {
+    id: `app.containers.EmailWrapper.invalidUploadFileDesc`,
+    defaultMessage: `Please select another file with valid file format.`,
+  },
 });

package/containers/Sms/Edit/index.js

@@ -297,6 +297,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       value: result,
       postAction: value || 'next',
       validity: this.state.isFormValid,
+      type: 'SMS',
     };
     this.setState({checkValidation: true});
     console.log('posting final result internal', response);

package/package.json

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