@capillarytech/creatives-library 2.0.65 → 2.0.68

package/containers/WeChat/RichmediaTemplates/Create/sagas.js

@@ -7,21 +7,25 @@ import * as types from './constants';
 export function* defaultSaga() {
   // See example in containers/HomePage/sagas.js
 }
-export function* uploadAsset({file, assetType, fileParams, mode, wechatParams, contentId}) {
+export function* uploadAsset({file, assetType, fileParams, mode, wechatParams, contentId, uploadId}) {
   try {
     const params = {
       file, assetType, fileParams, mode, wechatParams,
     };
     const result = yield call(Api.uploadFile, params);
-    yield put({ type: types.UPLOAD_ASSET_SUCCESS, data: result.response.asset, statusCode: result.status ? result.status.code : '', contentId});
+    yield put({ type: types.UPLOAD_ASSET_SUCCESS, data: result.response.asset, statusCode: result.status ? result.status.code : '', contentId, uploadId});
   } catch (error) {
     yield put({ type: types.UPLOAD_ASSET_FAILURE, error });
   }
 }
 export function* saveTemplate(template) {
   try {
+    let errorMsg;
     const result = yield call(Api.createWeChatTemplate, template);
-    yield put({ type: types.SAVE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : ''});
+    if (!result.success || result.status.code === 500) {
+      errorMsg = result.message;
+    }
+    yield put({ type: types.SAVE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg});
   } catch (error) {
     yield put({ type: types.SAVE_TEMPLATE_FAILURE, error });
   }

package/containers/WeChat/RichmediaTemplates/Create/selectors.js

@@ -16,6 +16,10 @@ const getAssetDetails = () => createSelector(
   makeSelectCreate(),
   (substate) => substate.uploadedAssetData || null,
 );
+const getContentAssetDetails = () => createSelector(
+  makeSelectCreate(),
+  (substate) => substate.uploadedContentAssetData || null,
+);
 /**
  * Default selector used by Create
  */
@@ -29,4 +33,5 @@ export default makeSelectCreate;
 export {
   makeSelectTemplates,
   getAssetDetails,
+  getContentAssetDetails,
 };

package/containers/WeChat/RichmediaTemplates/Edit/index.js

@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import _ from 'lodash';
 import { createStructuredSelector } from 'reselect';
-import makeSelectEdit from './selectors';
+import makeSelectEdit, { makeSelectTemplates } from './selectors';
 import * as actions from './actions';
 import Create from '../Create';
 
@@ -18,12 +18,29 @@ export class Edit extends React.PureComponent { // eslint-disable-line react/pre
     super(props);
     this.state = {
       totalContentBlocks: 0,
+      templateData: {},
     };
     this.setTemplateData = this.setTemplateData.bind(this);
   }
+  componentWillMount = () => {
+    if (_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
+      const module = this.props.location.query.module ? this.props.location.query.module : 'default';
+      const type = this.props.location.query.type;
+      this.props.router.push({
+        pathname: `/wechat`,
+        query: type === 'embedded' ? {type: 'embedded', module} : {module},
+      });
+    }
+  }
   componentDidMount = () => {
     this.props.actions.getTemplateDetails(this.props.params.id, "wechat");
   }
+  componentWillReceiveProps = (nextProps) => {
+    if (nextProps.Edit.templateDetails && !_.isEmpty(nextProps.Edit.templateDetails) && !_.isEqual(this.props.Edit.templateDetails, nextProps.Edit.templateDetails)) {
+      const templateData = this.setTemplateData(nextProps.Edit.templateDetails);
+      this.setState({templateData});
+    }
+  }
   setTemplateData = (templateDetails) => {
     const templateData = {};
     let contentId = 0;
@@ -36,6 +53,7 @@ export class Edit extends React.PureComponent { // eslint-disable-line react/pre
         formData['content-value'] = content.content;
         formData['source-link-value'] = content.content_source_url;
         formData['post-comments-value'] = content.post_comments_scope;
+        formData['show-cover-pic-value'] = content.show_cover_pic;
         templateData[contentId] = {
           formData,
           imageUrl: content.image_url,
@@ -51,15 +69,11 @@ export class Edit extends React.PureComponent { // eslint-disable-line react/pre
     return templateData;
   }
   render() {
-    let templateData = {};
-    if (!_.isEmpty(this.props.Edit.templateDetails)) {
-      templateData = this.setTemplateData(this.props.Edit.templateDetails);
-    }
-    if (templateData && !_.isEmpty(templateData) && this.state.totalContentBlocks > 0) {
+    if (this.state.templateData && !_.isEmpty(this.state.templateData) && this.state.totalContentBlocks > 0) {
       return (
-        <div>
+        <div className="richmedia-container">
           <Create
-            templateData={templateData}
+            templateData={this.state.templateData}
             mode="EDIT"
             totalContentBlocks={this.state.totalContentBlocks}
             templateName={this.props.Edit && this.props.Edit.templateDetails && this.props.Edit.templateDetails.name ? this.props.Edit.templateDetails.name : ""}
@@ -83,10 +97,12 @@ Edit.propTypes = {
   actions: PropTypes.object,
   params: PropTypes.object,
   Edit: PropTypes.object,
+  Templates: PropTypes.object,
 };
 
 const mapStateToProps = createStructuredSelector({
   Edit: makeSelectEdit(),
+  Templates: makeSelectTemplates(),
 });
 
 function mapDispatchToProps(dispatch) {

package/containers/WeChat/RichmediaTemplates/Edit/selectors.js

@@ -4,11 +4,15 @@ import { createSelector } from 'reselect';
  * Direct selector to the edit state domain
  */
 const selectEditDomain = () => (state) => state.get('edit');
+const selectTemplatesDomain = (state) => state.get('templates');
 
 /**
  * Other specific selectors
  */
-
+const makeSelectTemplates = () => createSelector(
+  selectTemplatesDomain,
+  (globalState) => globalState.toJS()
+);
 
 /**
  * Default selector used by Edit
@@ -22,4 +26,5 @@ const makeSelectEdit = () => createSelector(
 export default makeSelectEdit;
 export {
   selectEditDomain,
+  makeSelectTemplates,
 };

package/initialState.js

@@ -15,6 +15,7 @@ export default {
       tags: [],
       layouts: [],
     },
+    fetchingSchema: true,
     // isLoggedIn,
   },
   app: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "2.0.65",
+  "version": "2.0.68",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -12,7 +12,7 @@
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
-    "@capillarytech/cap-ui-library": "^1.0.100",
+    "@capillarytech/cap-ui-library": "^1.0.106",
     "antd": "3.15.0",
     "axios": "^0.16.2",
     "babel-polyfill": "6.20.0",

package/routes.js

@@ -412,7 +412,7 @@ export default function createRoutes(store) {
         const renderRoute = loadModule(cb);
 
         importModules.then(([reducer, sagas, component]) => {
-          injectReducer('create', reducer.default);
+          injectReducer('mobilepushCreate', reducer.default);
           injectSagas(sagas.default);
           injectSagas(rootSaga.default);
           renderRoute(component);
@@ -433,7 +433,7 @@ export default function createRoutes(store) {
         const renderRoute = loadModule(cb);
 
         importModules.then(([reducer, sagas, component]) => {
-          injectReducer('edit', reducer.default);
+          injectReducer('mobilepushEdit', reducer.default);
           injectSagas(sagas.default);
           injectSagas(rootSaga.default);
           injectSagas(templateSagas.default);
@@ -578,15 +578,17 @@ export default function createRoutes(store) {
           import('containers/WeChat/RichmediaTemplates/Edit/reducer'),
           import('containers/WeChat/RichmediaTemplates/Edit/sagas'),
           import('containers/WeChat/RichmediaTemplates/Create/sagas'),
+          import('containers/WeChat/RichmediaTemplates/Create/reducer'),
           import('containers/WeChat/RichmediaTemplates/Edit'),
         ]);
 
         const renderRoute = loadModule(cb);
 
-        importModules.then(([reducer, sagas, createSagas, component]) => {
+        importModules.then(([reducer, sagas, createSagas, createReducer, component]) => {
           injectReducer('edit', reducer.default);
           injectSagas(sagas.default);
           injectSagas(createSagas.default);
+          injectReducer('create', createReducer.default);
           renderRoute(component);
         });
 
@@ -610,23 +612,39 @@ export default function createRoutes(store) {
           import('containers/Email/sagas'),
           import('containers/CallTask/reducer'),
           import('containers/CallTask/sagas'),
+          import('containers/Mobilepush/Create/sagas'),
+          import('containers/Mobilepush/Create/reducer'),
+          import('containers/Mobilepush/Edit/sagas'),
+          import('containers/Mobilepush/Edit/reducer'),
         ]);
 
         const renderRoute = loadModule(cb);
 
-        importModules.then(([reducer, sagas, component, emailContainerSagas, creativesContainerReducer, smsCreateReducer, smsCreateSaga, smsEditReducer, smsEditSaga, emailReducer, emailSaga, callTaskReducer, callTaskSagas]) => {
+        importModules.then(([reducer,
+          sagas, component,
+          emailContainerSagas, creativesContainerReducer,
+          smsCreateReducer, smsCreateSaga, smsEditReducer, smsEditSaga,
+          emailReducer, emailSaga,
+          callTaskReducer, callTaskSagas,
+          mpushCreateSagas, mpushCreateReducer,
+          mpushEditSagas, mpushEditReducer,
+        ]) => {
           injectReducer('templates', reducer.default);
           injectReducer('create', smsCreateReducer.default);
           injectReducer('creativesContainer', creativesContainerReducer.default);
           injectReducer('edit', smsEditReducer.default);
           injectReducer('email', emailReducer.default);
           injectReducer('callTask', callTaskReducer.default);
+          injectReducer('mobileCreate', mpushCreateReducer.default);
+          injectReducer('mobileEdit', mpushEditReducer.default);
           injectSagas(sagas.default);
           injectSagas(emailContainerSagas.default);
           injectSagas(smsCreateSaga.default);
           injectSagas(smsEditSaga.default);
           injectSagas(emailSaga.default);
           injectSagas(callTaskSagas.default);
+          injectSagas(mpushCreateSagas.default);
+          injectSagas(mpushEditSagas.default);
           renderRoute(component);
         });
         importModules.catch(errorLoading);