@capillarytech/creatives-library 2.0.31 → 2.0.33

package/containers/Cap/selectors.js

@@ -1,6 +1,5 @@
 // makeSelectLocationState expects a plain JS object for the routing state
 import { createSelector } from 'reselect';
-import Immutable from 'immutable';
 const selectCapDomain = (state) => state.get('cap');
 
 const makeSelectAuthenticated = () => createSelector(
@@ -18,6 +17,10 @@ const makeSelectMetaEntities = () => createSelector(
   (globalState) => globalState.get('metaEntities')
 );
 
+const isLoadingMetaEntities = () => createSelector(
+  selectCapDomain,
+  (globalState) => globalState.get('fetchingSchema')
+);
 const makeSelectLocationState = () => {
   let prevRoutingState;
   let prevRoutingStateJS;
@@ -43,7 +46,10 @@ const makeSelectUser = () => createSelector(
   selectCapDomain,
   (globalState) => globalState.get('user')
 );
-
+const selectCurrentOrgDetails = () => createSelector(
+  selectCapDomain,
+  (globalState) => globalState.get('currentOrgDetails').toJS() || null
+);
 export {
   makeSelectLocationState,
   makeSelectAuthenticated,
@@ -51,4 +57,6 @@ export {
   makeSelectOrgId,
   makeSelectMetaEntities,
   makeSelectUser,
+  selectCurrentOrgDetails,
+  isLoadingMetaEntities,
 };

package/containers/CreativesContainer/SlideBoxContent.js

@@ -31,8 +31,10 @@ function SlideBoxContent(props) {
       onChannelChange,
       onEmailModeChange,
       emailCreateMode,
-      emailStep,
+      templateStep,
       onEmailNextStep,
+      cap,
+      onResetStep,
     } = props;
   const type = messageDetails.type.toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: 'embedded', module: 'library' };
@@ -69,6 +71,7 @@ function SlideBoxContent(props) {
         createNew={onCreateNew}
         channel={channel.toLowerCase()}
         onChannelChange={onChannelChange}
+        cap={cap}
         />
         )}
       {isPreview && (
@@ -112,9 +115,11 @@ function SlideBoxContent(props) {
         getFormdata={getFormData}
         templateData={templateData}
         type={type}
-        step={emailStep}
+        step={templateStep}
         showNextStep={onEmailNextStep}
         isFullMode={false}
+        cap={cap}
+        onResetStep={onResetStep}
       />
         )}
       {(isEditEmailWithId || isEmailEditWithContent) && (
@@ -130,6 +135,7 @@ function SlideBoxContent(props) {
         templateData={templateData}
         getFormSubscriptionData={getFormData}
         getDefaultTags={type}
+        cap={cap}
           />
         )}
     </CreativesWrapper>
@@ -149,7 +155,9 @@ SlideBoxContent.propTypes = {
   currentChannel: PropTypes.string,
   onEmailModeChange: PropTypes.func,
   emailCreateMode: PropTypes.string,
-  emailStep: PropTypes.string,
+  templateStep: PropTypes.string,
   onEmailNextStep: PropTypes.func,
+  cap: PropTypes.object,
+  onResetStep: PropTypes.func,
 };
 export default SlideBoxContent;

package/containers/CreativesContainer/SlideBoxFooter.js

@@ -4,8 +4,8 @@ import { CapButton } from '@capillarytech/cap-ui-library';
 import PropTypes from 'prop-types';
 import * as constants from './constants';
 function SlideBoxFooter(props) {
-  const { slidBoxContent, onSave, messages, onEditTemplate, currentChannel, onEmailNextStep, emailStep, emailCreateMode } = props;
-  const isEmailCreate = slidBoxContent === 'createTemplate' && currentChannel === constants.EMAIL && emailStep !== 'createTemplate';
+  const { slidBoxContent, onSave, messages, onEditTemplate, currentChannel, onEmailNextStep, templateStep, emailCreateMode } = props;
+  const isEmailCreate = slidBoxContent === 'createTemplate' && currentChannel === constants.EMAIL && templateStep !== 'createTemplate';
   const isCreate = (slidBoxContent === 'editTemplate' || slidBoxContent === 'createTemplate') && !isEmailCreate;
   return (
     <div>
@@ -36,7 +36,7 @@ SlideBoxFooter.propTypes = {
   onEditTemplate: PropTypes.func,
   currentChannel: PropTypes.string,
   onEmailNextStep: PropTypes.func,
-  emailStep: PropTypes.string,
+  templateStep: PropTypes.string,
   emailCreateMode: PropTypes.string,
 };
 export default SlideBoxFooter;

package/containers/CreativesContainer/index.js

@@ -21,15 +21,15 @@ class Creatives extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      emailStep: 1, //modeSelection: for selecting upload or editor, and createTemplate to create template create based on modeSelection
+      templateStep: 1, //modeSelection: for template name and (for email selecting upload or editor), and createTemplate to create template create based on modeSelection
       showSlideBox: true,
       slidBoxContent: this.getSlideBocContent({mode: props.creativesMode, templateData: props.templateData, isFullMode: props.isFullMode}),
       templateData: this.getTemplateData(props.templateData),
       currentChannel: this.props.channel || 'sms',
     };
-    this.creativesEmailSteps = {
+    this.creativesTemplateSteps = {
       1: 'modeSelection',
-      2: 'templateSelection',
+      2: 'templateSelection', // only for email in current flows wil be used for mpush, line and wechat as well.
       3: 'createTemplate',
     };
   }
@@ -61,9 +61,10 @@ class Creatives extends React.Component {
   }
   onEmailNextStep = () => {
     this.setState((prevState) => ({
-      emailStep: prevState.emailStep + 1,
+      templateStep: prevState.templateStep + 1,
     }));
   }
+
   onEmailModeChange = (mode) => {
     this.setState({ emailCreateMode: mode});
   }
@@ -140,6 +141,9 @@ class Creatives extends React.Component {
       );
     }
   };
+  resetStep = () => {
+    this.setState({templateStep: 1});
+  }
   toggleShowSlideBox = () => {
     this.setState((prevState) => ({
       ...prevState,
@@ -151,8 +155,8 @@ class Creatives extends React.Component {
   };
 
   render() {
-    const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, emailStep} = this.state;
-    const {isFullMode, creativesMode} = this.props;
+    const {slidBoxContent, isGetFormData, showSlideBox, templateData, currentChannel, emailCreateMode, templateStep} = this.state;
+    const {isFullMode, creativesMode, cap} = this.props;
     return (
       <div className={classnames(`${classPrefix}`)}>
         <CapSlideBox
@@ -183,8 +187,10 @@ class Creatives extends React.Component {
               onChannelChange={this.onChannelChange}
               onEmailModeChange={this.onEmailModeChange}//used when create is clicked in email
               emailCreateMode={emailCreateMode}// upload zip || use editor are values
-              emailStep={this.creativesEmailSteps[emailStep]}
+              templateStep={this.creativesTemplateSteps[templateStep]}
               onEmailNextStep={this.onEmailNextStep}
+              onResetStep={this.resetStep}
+              cap={cap}
             />
           }
           footer={
@@ -195,7 +201,7 @@ class Creatives extends React.Component {
               slidBoxContent={slidBoxContent}
               onEmailNextStep={this.onEmailNextStep}
               currentChannel={currentChannel.toUpperCase()}
-              emailStep={this.creativesEmailSteps[emailStep]}
+              templateStep={this.creativesTemplateSteps[templateStep]}
               emailCreateMode={emailCreateMode}
             />
           }
@@ -220,6 +226,7 @@ Creatives.propTypes = {
   channel: PropTypes.string,
   templateActions: PropTypes.object,
   globalActions: PropTypes.object,
+  cap: PropTypes.object,
 };
 function mapDispatchToProps(dispatch) {
   return {