@capillarytech/creatives-library 2.0.65 → 2.0.68

package/containers/MobilePush/Create/index.js

@@ -10,13 +10,13 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { Row, Col, Spin, Breadcrumb, notification } from 'antd';
-import {get, set, filter, isEmpty, map, forEach, uniqueId, cloneDeep, isEqual, merge, has, findIndex} from 'lodash';
+import {get, set, filter, isEmpty, map, forEach, uniqueId, cloneDeep, isEqual, findIndex} from 'lodash';
 import { createStructuredSelector } from 'reselect';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import styled from 'styled-components';
 import { CapSlideBox, CapHeader, CapTable, CapLink, CapRow, CapColumn, CapIcons} from '@capillarytech/cap-ui-library';
 import { makeSelectCreate, makeSelectCreateResponse, makeSelectIosCta } from './selectors';
-import { makeSelectMetaEntities } from '../../Cap/selectors';
+import { makeSelectMetaEntities, setInjectedTags } from '../../Cap/selectors';
 import * as globalActions from '../../../containers/Cap/actions';
 import FormBuilder from '../../../components/FormBuilder';
 import './_mobilePushCreate.scss';
@@ -146,25 +146,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         this.showNext();
       }
     }
-
-    if (nextProps.metaEntities && nextProps.metaEntities.tags && nextProps.metaEntities.tags.custom && !isEqual(this.props.metaEntities.tags, nextProps.metaEntities.tags)) {
-      let injectedTags = cloneDeep(this.state.injectedTags);
-      delete injectedTags["Registration custom fields"];
-      delete injectedTags["Store custom fields"];
-      delete injectedTags["Transaction custom fields"];
-      injectedTags = merge({}, injectedTags, nextProps.metaEntities.tags.custom);
-
-      if (!has(nextProps.metaEntities.tags.custom, "Registration custom fields")) {
-        delete injectedTags["Registration custom fields"];
-      }
-      if (!has(nextProps.metaEntities.tags.custom, "Store custom fields")) {
-        delete injectedTags["Store custom fields"];
-      }
-      if (!has(nextProps.metaEntities.tags.custom, "Transaction custom fields")) {
-        delete injectedTags["Transaction custom fields"];
-      }
-      this.setState({injectedTags});
-    }
   };
   componentWillUnmount = () => {
     this.props.actions.resetStore();
@@ -1655,7 +1636,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 formData={cloneDeep(this.state.formData)}
                 location={this.props.location}
                 tags={tags}
-                injectedTags={this.state.injectedTags ? this.state.injectedTags : {}}
+                injectedTags={this.props.injectedTags ? this.props.injectedTags : {}}
                 onFormValidityChange={this.setFormValidity}
                 usingTabContainer
                 checkValidation={this.state.checkValidation}
@@ -1752,6 +1733,7 @@ Create.propTypes = {
   supportedTags: PropTypes.array,
   getDefaultTags: PropTypes.string,
   iosCtasData: PropTypes.array,
+  injectedTags: PropTypes.object,
 };
 
 const mapStateToProps = createStructuredSelector({
@@ -1760,6 +1742,7 @@ const mapStateToProps = createStructuredSelector({
   metaEntities: makeSelectMetaEntities(),
   Templates: makeSelectTemplates(),
   iosCtasData: makeSelectIosCta(),
+  injectedTags: setInjectedTags(),
 });
 
 function mapDispatchToProps(dispatch) {

package/containers/MobilePush/Create/selectors.js

@@ -3,7 +3,7 @@ import { createSelector } from 'reselect';
 /**
  * Direct selector to the create state domain
  */
-const selectPushMessageCreateDomain = () => (state, props) => props.isFullMode === false ? state.get('mobileCreate') : state.get('create');
+const selectPushMessageCreateDomain = () => (state) => state.get('mobileCreate');
 /**
  * Other specific selectors
  */

package/containers/MobilePush/Edit/index.js

@@ -17,7 +17,7 @@ import _, {get, findIndex, set, forEach, cloneDeep} from 'lodash';
 import { CapSlideBox, CapHeader, CapTable, CapLink, CapRow, CapColumn, CapIcons} from '@capillarytech/cap-ui-library';
 import styled from 'styled-components';
 import {makeSelectEdit, makeSelectEditResponse, makeSelectTemplateDetailsResponse, makeSelectIosCta} from "./selectors";
-import {makeSelectMetaEntities} from "../../Cap/selectors";
+import {makeSelectMetaEntities, setInjectedTags, isLoadingMetaEntities} from "../../Cap/selectors";
 import {getMessageObject} from "../../../utils/messageUtils";
 import FormBuilder from '../../../components/FormBuilder';
 import * as globalActions from "../../Cap/actions";
@@ -186,29 +186,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       const message = getMessageObject('error', (nextProps.Edit.editTemplateErrorMessage && nextProps.Edit.editTemplateErrorMessage !== '') ? nextProps.Edit.editTemplateErrorMessage : this.props.intl.formatMessage(messages.somethingWentWrong), true);
       this.props.globalActions.addMessageToQueue(message);
     }
-    // if (nextProps.metaEntities && nextProps.metaEntities.tags && nextProps.metaEntities.tags.custom && this.props.metaEntities.tags !== nextProps.metaEntities.tags) {
-    //   let injectedTags = _.cloneDeep(this.state.injectedTags);
-    //   injectedTags = _.merge({}, injectedTags, nextProps.metaEntities.tags.custom);
-    //   this.setState({injectedTags});
-    // }
-    if (nextProps.metaEntities && nextProps.metaEntities.tags && nextProps.metaEntities.tags.custom && !_.isEqual(this.props.metaEntities.tags, nextProps.metaEntities.tags)) {
-      let injectedTags = _.cloneDeep(this.state.injectedTags);
-      delete injectedTags["Registration custom fields"];
-      delete injectedTags["Store custom fields"];
-      delete injectedTags["Transaction custom fields"];
-      injectedTags = _.merge({}, injectedTags, nextProps.metaEntities.tags.custom);
-      console.log('new injected tags', nextProps.metaEntities.tags.custom);
-      if (!_.has(nextProps.metaEntities.tags.custom, "Registration custom fields")) {
-        delete injectedTags["Registration custom fields"];
-      }
-      if (!_.has(nextProps.metaEntities.tags.custom, "Store custom fields")) {
-        delete injectedTags["Store custom fields"];
-      }
-      if (!_.has(nextProps.metaEntities.tags.custom, "Transaction custom fields")) {
-        delete injectedTags["Transaction custom fields"];
-      }
-      this.setState({injectedTags});
-    }
   }
   componentWillUnmount() {
     this.props.actions.clearData();
@@ -1691,7 +1668,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     let tipText = this.props.Edit && ("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) ? 'Getting template details...' : '';
     tipText = this.props.Edit && ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress) ? 'Saving Template...' : '';
     const loadingContentEdit = this.state.loadingContentEdit || (this.props.location.query.module === 'dvs' && _.isEmpty(this.state.schema));
-    const spinning = loadingContentEdit || this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
+    const spinning = this.props.isLoadingMetaEntities || loadingContentEdit || this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
     if (this.props.supportedTags) {
       tags = this.props.supportedTags;
@@ -1712,7 +1689,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           </Row>}
           <Row>
             <Col>
-              <FormBuilder
+              {!this.props.isLoadingMetaEntities && <FormBuilder
                 schema={schema}
                 onSubmit={this.saveFormData}
                 onChange={this.onFormDataChange}
@@ -1724,7 +1701,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 tabCount={2}
                 iosCtasData={this.state.iosCtasData}
                 tags={tags}
-                injectedTags={this.state.injectedTags ? this.state.injectedTags : {}}
+                injectedTags={this.props.injectedTags ? this.props.injectedTags : {}}
                 onFormValidityChange={this.setFormValidity}
                 usingTabContainer
                 checkValidation={this.state.checkValidation}
@@ -1736,7 +1713,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 handleCancelModal={this.handleCancelModal}
                 modal={this.state.modalContent}
                 setModalContent={this.setModalContent}
-              />
+              />}
             </Col>
             {this.props.iosCtasData && this.state.showIosCtaTable &&
               <CapSlideBox
@@ -1820,7 +1797,8 @@ Edit.propTypes = {
   templateData: PropTypes.object,
   isFullMode: PropTypes.bool,
   iosCtasData: PropTypes.array,
-
+  isLoadingMetaEntities: PropTypes.bool,
+  injectedTags: PropTypes.object,
 };
 
 const mapStateToProps = createStructuredSelector({
@@ -1831,7 +1809,8 @@ const mapStateToProps = createStructuredSelector({
   metaEntities: makeSelectMetaEntities(),
   Templates: makeSelectTemplates(),
   iosCtasData: makeSelectIosCta(),
-
+  isLoadingMetaEntities: isLoadingMetaEntities(),
+  injectedTags: setInjectedTags(),
 });
 
 function mapDispatchToProps(dispatch) {

package/containers/MobilePush/Edit/selectors.js

@@ -3,7 +3,7 @@ import { createSelector } from 'reselect';
 /**
  * Direct selector to the create state domain
  */
-const selectMobilePushEditDomain = () => (state, props) => props.isFullMode === false ? state.get('mobileEdit') : state.get('edit'); // reducer injected as mobileEdit in library mode.
+const selectMobilePushEditDomain = () => (state) => state.get('mobileEdit'); // reducer injected as mobileEdit in library mode.
 
 
 /**
@@ -23,7 +23,7 @@ const makeSelectEditResponse = () => createSelector(
   selectMobilePushEditDomain(), (dimensionState) => dimensionState.get('editResponse')
 );
 const makeSelectTemplateDetailsResponse = () => createSelector(
-  selectMobilePushEditDomain(), (dimensionState) => dimensionState.get('templateDetails')
+  makeSelectEdit(), (dimensionState) => dimensionState.templateDetails
 );
 const makeSelectIosCta = () => createSelector(makeSelectEdit(), (create) => create.getIosCtasSucccess && create.iosCtasData );
 

package/containers/MobilePush/initialSchema.js

@@ -1216,12 +1216,12 @@ export const response = {
                                       showPreview: true,
                                       previewProps: {
                                         label: "Cover Image",
-                                        inductiveText: "Maximum file size acceptable is 5 mb",
+                                        inductiveText: "Maximum file size acceptable is 5 MB",
                                             // placeholder: "Max file size acceptable is 5mb",
                                         errorMessage: "Please upload Image",
 
                                       },
-                                      width: 20,
+                                      width: 22,
                                       metaType: "text",
                                       datatype: "string",
                                       required: true,
@@ -1594,13 +1594,13 @@ export const response = {
                                       showPreview: true,
                                       previewProps: {
                                         label: "Cover Image",
-                                        inductiveText: "Maximum file size acceptable is 5 mb",
+                                        inductiveText: "Maximum file size acceptable is 5 MB",
                                             // placeholder: "Max file size acceptable is 5mb",
                                         errorMessage: "Please upload Image",
 
                                       },
                                       type: "upload",
-                                      width: 20,
+                                      width: 22,
                                       metaType: "text",
                                       datatype: "string",
                                       required: true,

package/containers/MobilepushWrapper/index.js

@@ -18,6 +18,12 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
   constructor(props) {
     super(props);
     this.modes = [
+
+      {
+        title: <FormattedMessage {...messages.image}/>,
+        content: <WithImage height="248px" width={"248px"}/>,
+        value: 'image',
+      },
       {
         title: <FormattedMessage {...messages.text}/>,
         content: <WithNoImage height="124px" width={"248px"}/>,
@@ -26,18 +32,13 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
         //   this.emailUploader.current.click();
         // },
       },
-      {
-        title: <FormattedMessage {...messages.image}/>,
-        content: <WithImage height="248px" width={"248px"}/>,
-        value: 'image',
-      },
     ];
   }
   onChange = (e) => {
     this.props.onMobilepushModeChange( e.target.value );
   };
   render() {
-    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query} = this.props;
+    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode} = this.props;
     const isShowMobilepushCreate = !isEmpty(mobilePushCreateMode);
     return (
       <div className="mobilepush-wrapper">
@@ -61,7 +62,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
                 query,
               }}
               params={{mode: mobilePushCreateMode}}
-              isFullMode={false}
+              isFullMode={isFullMode}
               isGetFormData={isGetFormData}
               route={{ name: 'mobilepush' }}
           />
@@ -83,6 +84,7 @@ MobilepushWrapper.propTypes = {
   setIsLoadingContent: PropTypes.func,
   isGetFormData: PropTypes.bool,
   query: PropTypes.object,
+  isFullMode: PropTypes.bool,
 };
 
 

package/containers/Sms/Create/index.js

@@ -14,13 +14,14 @@ import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
 import { bindActionCreators } from 'redux';
 import { makeSelectCreate, makeSelectCreateResponse } from './selectors';
-import { makeSelectMetaEntities, isLoadingMetaEntities } from '../../Cap/selectors';
+import { makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags } from '../../Cap/selectors';
 import { UserIsAuthenticated } from '../../../utils/authWrapper';
 import './_smsCreate.scss';
 import FormBuilder from '../../../components/FormBuilder';
 import * as actions from './actions';
 import messages from './messages';
 import * as charCount from '../../../utils/smsCharCount';
+import {checkUnicode} from '../../../utils/smsCharCountV2';
 import * as globalActions from '../../../containers/Cap/actions';
 import {getMessageObject} from '../../../utils/messageUtils';
 import * as creativesContainerActions from '../../CreativesContainer/actions';
@@ -150,28 +151,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         }
       }
     }
-    if (nextProps.metaEntities && nextProps.metaEntities.tags && nextProps.metaEntities.tags.custom && this.props.metaEntities.tags && this.props.metaEntities.tags.standard && (this.props.metaEntities.tags !== nextProps.metaEntities.tags)) {
-      let injectedTags = _.cloneDeep(this.state.injectedTags);
-      delete injectedTags["Registration custom fields"];
-      delete injectedTags["Store custom fields"];
-      delete injectedTags["Transaction custom fields"];
-      injectedTags = _.merge({}, injectedTags, nextProps.metaEntities.tags.custom);
-
-      if (!_.has(nextProps.metaEntities.tags.custom, "Registration custom fields")) {
-        delete injectedTags["Registration custom fields"];
-      }
-      if (!_.has(nextProps.metaEntities.tags.custom, "Store custom fields")) {
-        delete injectedTags["Store custom fields"];
-      }
-      if (!_.has(nextProps.metaEntities.tags.custom, "Transaction custom fields")) {
-        delete injectedTags["Transaction custom fields"];
-      }
-      this.setState({injectedTags, loadingStatus: this.state.loadingStatus + 1});
-    }
-    // if (nextProps.metaEntities && nextProps.metaEntities.tags && nextProps.metaEntities.tags.length > 0 && _.isEmpty(this.state.schema)) {
-    //
-    //   this.injectEvents(nextProps.metaEntities.layouts[0].definition);
-    // }
   }
 
   componentWillUnmount() {
@@ -757,9 +736,11 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   startTemplateCreation(data) {
+    console.log("reached here", data);
     if (data.edit) {
-      // const ifUnicode = checkUnicode(data.content ? data.content : '');
-
+      console.log('in if startTemplateCreation', data.tags);
+      const ifUnicode = checkUnicode(data.content ? data.content : '');
+      console.log('smsDetails', ifUnicode, data.content);
       const content = data.content;
       const id = _.uniqueId();
       const tempData = {
@@ -775,8 +756,10 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         this.setState({tabKey: ''});
       });
     } else {
+      console.log("in else startTemplateCreation: ", data.tags);
       this.setState({injectedTags: data.tags});
     }
+    this.props.globalActions.setInjectedTags(data.tags);
   }
 
   startLoading(ifEdit) {
@@ -932,9 +915,11 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     return isLoading;
   }
   render() {
+    console.log("this.props sms create: ", this.props);
     const schema = this.state.schema;
     const spinning = this.isSmsLoading();
-    let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
+    let tags = this.props.metaEntities && this.props.metaEntities.tags && this.props.metaEntities.tags.standard ? this.props.metaEntities.tags.standard : [];
+
     if (this.props.location.query.type === 'embedded' && this.props.location.query.module === 'library' && !this.props.getDefaultTags) {
       tags = this.props.supportedTags; // if get default tags is not present and supported tags is present use that inlbrary mode
     }
@@ -967,7 +952,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 tabKey={this.state.tabKey}
                 tags={tags}
                 tagModule={this.props.getDefaultTags}
-                injectedTags={this.state.injectedTags ? this.state.injectedTags : {}}
+                injectedTags={this.props.injectedTags ? this.props.injectedTags : {}}
                 onFormValidityChange={this.setFormValidity}
                 usingTabContainer
                 checkValidation={this.state.checkValidation}
@@ -994,11 +979,11 @@ Create.propTypes = {
   intl: intlShape.isRequired,
   supportedTags: PropTypes.array,
   getDefaultTags: PropTypes.string,
-  isLoadingMetaEntities: PropTypes.bool,
-  // creativesContainerActions: PropTypes.object,
-  getFormSubscriptionData: PropTypes.func,
+  injectedTags: PropTypes.object,
+  setIsLoadingContent: PropTypes.bool,
   isFullMode: PropTypes.bool,
-  setIsLoadingContent: PropTypes.func,
+  getFormSubscriptionData: PropTypes.func,
+  isLoadingMetaEntities: PropTypes.bool,
 };
 
 const mapStateToProps = createStructuredSelector({
@@ -1006,6 +991,7 @@ const mapStateToProps = createStructuredSelector({
   createResponse: makeSelectCreateResponse(),
   metaEntities: makeSelectMetaEntities(),
   isLoadingMetaEntities: isLoadingMetaEntities(),
+  injectedTags: setInjectedTags(),
 });
 
 function mapDispatchToProps(dispatch) {

package/containers/Sms/Edit/index.js

@@ -15,7 +15,7 @@ import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
 import { bindActionCreators } from 'redux';
 import { makeSelectEdit, makeSelectEditResponse, makeSelectTemplateDetailsResponse } from './selectors';
-import { makeSelectMetaEntities, isLoadingMetaEntities } from '../../Cap/selectors';
+import { makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags } from '../../Cap/selectors';
 import { UserIsAuthenticated } from '../../../utils/authWrapper';
 import FormBuilder from '../../../components/FormBuilder';
 import * as actions from './actions';
@@ -170,24 +170,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       const message = getMessageObject('error', (nextProps.Edit.editTemplateErrorMessage && nextProps.Edit.editTemplateErrorMessage !== '') ? nextProps.Edit.editTemplateErrorMessage : this.props.intl.formatMessage(messages.somethingWentWrong), true);
       this.props.globalActions.addMessageToQueue(message);
     }
-    if (nextProps.metaEntities && nextProps.metaEntities.tags && nextProps.metaEntities.tags.custom && this.props.metaEntities.tags && this.props.metaEntities.tags.standard && (this.props.metaEntities.tags !== nextProps.metaEntities.tags)) {
-      let injectedTags = _.cloneDeep(this.state.injectedTags);
-      delete injectedTags["Registration custom fields"];
-      delete injectedTags["Store custom fields"];
-      delete injectedTags["Transaction custom fields"];
-      injectedTags = _.merge({}, injectedTags, nextProps.metaEntities.tags.custom);
-
-      if (!_.has(nextProps.metaEntities.tags.custom, "Registration custom fields")) {
-        delete injectedTags["Registration custom fields"];
-      }
-      if (!_.has(nextProps.metaEntities.tags.custom, "Store custom fields")) {
-        delete injectedTags["Store custom fields"];
-      }
-      if (!_.has(nextProps.metaEntities.tags.custom, "Transaction custom fields")) {
-        delete injectedTags["Transaction custom fields"];
-      }
-      this.setState({injectedTags});
-    }
   }
 
   componentWillUnmount() {
@@ -425,6 +407,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     } else {
       this.setState({injectedTags: data.tags});
     }
+    this.props.globalActions.setInjectedTags(data.tags);
   }
 
   startLoading(ifEdit) {
@@ -972,7 +955,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 modal={this.state.modalContent}
                 tags={tags}
                 tagModule={this.props.getDefaultTags}
-                injectedTags={this.state.injectedTags ? this.state.injectedTags : {}}
+                injectedTags={this.props.injectedTags ? this.props.injectedTags : {}}
                 onFormValidityChange={this.setFormValidity}
                 usingTabContainer
                 checkValidation={this.state.checkValidation}
@@ -1005,6 +988,8 @@ Edit.propTypes = {
   isFullMode: PropTypes.bool,
   getFormSubscriptionData: PropTypes.func,
   setIsLoadingContent: PropTypes.func,
+  // route: PropTypes.object,
+  injectedTags: PropTypes.object,
 };
 
 const mapStateToProps = createStructuredSelector({
@@ -1012,6 +997,7 @@ const mapStateToProps = createStructuredSelector({
   editResponse: makeSelectEditResponse(),
   templateDetails: makeSelectTemplateDetailsResponse(),
   metaEntities: makeSelectMetaEntities(),
+  injectedTags: setInjectedTags(),
   isLoadingMetaEntities: isLoadingMetaEntities(),
 });