@capillarytech/creatives-library 7.18.0-beta.0 → 8.0.0

package/v2Containers/MobilePush/Create/index.js

@@ -31,7 +31,7 @@ import { GA } from '@capillarytech/cap-ui-utils';
 import { CREATE, TRACK_CREATE_MPUSH } from '../../App/constants';
 import { MOBILE_PUSH } from '../../CreativesContainer/constants';
 import { getContent } from '../commonMethods';
-import { getCdnUrl } from '../../../utils/cdnTransformation'
+import { getCdnUrl } from '../../../utils/cdnTransformation';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -101,6 +101,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     if (nextProps.Create.createTemplateError && !isEqual(nextProps.Create.createTemplateError, this.props.Create.createTemplateError)) {
       const message = getMessageObject('error', (nextProps.Create.createTemplateErrorMessage && nextProps.Create.createTemplateErrorMessage !== '') ? nextProps.Create.createTemplateErrorMessage : this.props.intl.formatMessage(messages.somethingWentWrong), true);
+      this.props.onValidationFail();
+      this.setState({showModal: false, startValidation: false});
       this.props.globalActions.addMessageToQueue(message);
     }
     if (nextProps.iosCtasData && isEmpty(this.state.templateCta)) {
@@ -147,6 +149,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   onFormDataChange = (formData, tabCount, currentTab, inputField) => {
     const newFormData = cloneDeep(formData);
     const {templateCta} = this.state;
+    const { defaultData = {}, isFullMode, showTemplateName} = this.props;
+
     if (!isEmpty(templateCta)) {
       newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-label`] = get(templateCta, 'name');
       newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-action`] = get(templateCta, 'ctaTemplateDetails[0].buttonText');
@@ -156,6 +160,11 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       }
     }
 
+
+    const templateName = formData['template-name'];
+    const defaultTemplateName = get(defaultData, 'template-name', '');
+
+
     // copy content code
     // if (newFormData[0]['copy-iphone-content'] === "") {
     //
@@ -177,17 +186,19 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     //     newFormData[1]['copy-android-content'] = "";
     //   }
     // }
-    if (this.props.isFullMode && this.props.defaultData && isEmpty(formData['template-name'])) {
-      newFormData['template-name'] = get(this.props, "defaultData['template-name']");
+     //assign newFormData['template-name'] to default name only once in inital render, if edited use latest form data
+    if (isFullMode && defaultData && isEmpty(templateName) && !formData?.isTemplateNameEdited) {
+      newFormData['template-name'] = defaultTemplateName;
     }
+
     if (inputField && inputField.id === "add-sec-cta") {
       if (!newFormData[0]["add-sec-cta"]) {
         newFormData[0]["add-sec-cta-2"] = false;
       }
     }
     this.setState({formData: newFormData, tabCount, isSchemaChanged: !this.state.isSchemaChanged}, () => {
-      if (this.props.isFullMode) {
-        this.props.showTemplateName({formData: this.state.formData, onFormDataChange: this.onFormDataChange});
+      if (isFullMode && showTemplateName) {
+        showTemplateName({formData: this.state.formData, onFormDataChange: this.onFormDataChange});
       }
     });
   };
@@ -202,7 +213,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.setState({currentTab: data});
   };
   onTemplateNameChange = () => {
-    // 
+    //
   };
 
 
@@ -366,11 +377,23 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     };
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
-    obj.definition = {
-      accountId: this.props.Templates.selectedWeChatAccount.id,
-      licenseCode: this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier,
-      mode: this.props.params.mode,
-    };
+    if (this.props?.Templates?.selectedWeChatAccount?.sourceTypeName === 'MAPP_SDK') {
+      obj.definition = {
+        accountId: this.props.Templates.selectedWeChatAccount.id,
+        licenseCode: this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier,
+        gatewayId: this.props.Templates.selectedWeChatAccount.configs.gatewayId,
+        gatewayAccountId: this.props.Templates.selectedWeChatAccount.configs.gatewayAccountId,
+        mode: this.props.params.mode,
+        sourceType: this.props.Templates.selectedWeChatAccount.sourceTypeName,
+      };
+    } else {
+      obj.definition = {
+        accountId: this.props.Templates.selectedWeChatAccount.id,
+        licenseCode: this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier,
+        mode: this.props.params.mode,
+        sourceType: this.props.Templates.selectedWeChatAccount.sourceTypeName,
+      };
+    }
     const android = {};
     Object.keys(formData[0]).forEach((data) => {
       if (!!formData[0][data] && data !== "tabKey") {
@@ -1436,10 +1459,10 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     //this function gets called from form bulder only when the form data is valid
     const obj = this.getTransformedData(formData);
     const content = getContent(obj);
-    const  { 
+    const {
       definition: {
-        mode: definitionMode
-      } 
+        mode: definitionMode,
+      },
     } = obj || {};
     const label = this.props.location.pathname.indexOf('image') >= 0 ? 'image' : 'text';
     this.props.actions.createTemplate(obj, (response) => {
@@ -1455,9 +1478,9 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         timeTaken,
         content,
         mode: CREATE,
-        imageAdded: definitionMode === 'image'
+        imageAdded: definitionMode === 'image',
       });
-      
+
       this.discardValues();
       const message = this.props.intl.formatMessage(messages.messageCreateSuccess);
       CapNotification.success({message, key: 'createMpushSuccess'});
@@ -1879,4 +1902,4 @@ export default withCreatives({
   mapStateToProps,
   mapDispatchToProps,
   userAuth: false,
-});
+});

package/v2Containers/MobilePush/Create/sagas.js

@@ -1,6 +1,4 @@
-import { take, cancel, call, put, takeLatest } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
-// import { LOCATION_CHANGE } from 'react-router-redux';
+import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';
@@ -44,19 +42,19 @@ export function* getIosCtas(licenseCode) {
 
 function* watchCreateTemplate() {
   
-  const watcher = yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.CREATE_TEMPLATE_REQUEST, createTemplate);
+  
+  
 }
 function* watchUploadAsset() {
-  const watcher = yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
+  
+  
 }
 function* watchGetIosCtas() {
-  const watcher = yield takeLatest(types.GET_IOS_CTAS, getIosCtas);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_IOS_CTAS, getIosCtas);
+  
+  
 }
 // All sagas to be loaded
 export default [
@@ -64,3 +62,11 @@ export default [
   watchUploadAsset,
   watchGetIosCtas,
 ];
+
+export function* v2MobilePushCreateSagas() {
+  yield all([
+    watchCreateTemplate(),
+    watchUploadAsset(),
+    watchGetIosCtas(),
+  ]);
+}

package/v2Containers/MobilePush/Edit/index.js

@@ -338,10 +338,21 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     };
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
-    obj.definition = {
-      accountId: selectedWeChatAccount?.id,
-      licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
-    };
+    if(this.props?.Templates?.selectedWeChatAccount?.sourceTypeName === 'MAPP_SDK') {
+      obj.definition = {
+        accountId: selectedWeChatAccount.id,
+        licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
+        gatewayId: selectedWeChatAccount.configs.gatewayId,
+        gatewayAccountId: selectedWeChatAccount.configs.gatewayAccountId,
+        sourceType: selectedWeChatAccount.sourceTypeName,
+      };
+    } else {
+      obj.definition = {
+        accountId: selectedWeChatAccount?.id,
+        licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
+        sourceType: selectedWeChatAccount.sourceTypeName,
+      };
+    }
     if (this.props.location.query && this.props.location.query.module !== 'dvs') {
       obj.definition.mode = get(this, 'props.Edit.templateDetails.mode', '') || get(this, 'props.Edit.templateDetails.definition.mode', '');
     }
@@ -768,10 +779,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     formData[0].base = true;
     // formData[0].tabKey = '1';
     // formData[1].tabKey = '2';
-
     this.setState({templateCta}, () => {
       this.getSchemaForFormData(formData, schema);
-      this.setState({tabCount, formData, editData: data, currentTab: 1}, () => {
+      this.setState({tabCount, formData, editData: data}, () => {
         this.props.showTemplateName({formData, onFormDataChange: this.onFormDataChange});
       });
     });
@@ -1469,7 +1479,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           temp.content.appName = this.props.Templates.selectedWeChatAccount.name;
         }
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         return true;

package/v2Containers/MobilePush/Edit/sagas.js

@@ -1,5 +1,4 @@
-import { call, put, takeLatest, take, cancel } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
+import { call, put, takeLatest, take, cancel, all } from 'redux-saga/effects';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../../services/api';
 import * as types from './constants';
@@ -79,36 +78,36 @@ export function* fetchWeCrmAccounts(action) {
 }
 
 function* watchFetchWeCrmAccounts() {
-  const watcher = yield takeLatest(types.GET_WECRM_ACCOUNTS_REQUEST, fetchWeCrmAccounts);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_WECRM_ACCOUNTS_REQUEST, fetchWeCrmAccounts);
+  
+  
 }
 
 function* watchEditTemplate() {
-  const watcher = yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.EDIT_TEMPLATE_REQUEST, editTemplate);
+  
+  
 }
 
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_TEMPLATE_DETAILS_REQUEST, getTemplateDetails);
+  
+  
 }
 function* watchUploadAsset() {
-  const watcher = yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
+  
+  
 }
 function* watchGetIosCtas() {
-  const watcher = yield takeLatest(types.GET_IOS_CTAS, getIosCtas);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_IOS_CTAS, getIosCtas);
+  
+  
 }
 function* watchMobilepushTemplatesList() {
-  const watcher = yield takeLatest(types.GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST, getMobilepushTemplatesList);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(types.GET_MOBILEPUSH_TEMPLATES_LIST_REQUEST, getMobilepushTemplatesList);
+  
+  
 }
 
 // All sagas to be loaded
@@ -117,3 +116,14 @@ export default [
   watchUploadAsset,
   watchGetIosCtas,
 ];
+
+export function* v2MobilePushEditSagas() {
+  yield all([
+    watchEditTemplate(),
+    watchGetTemplateDetails(),
+    watchFetchWeCrmAccounts(),
+    watchMobilepushTemplatesList(),
+    watchUploadAsset(),
+    watchGetIosCtas(),
+  ]);
+}

package/v2Containers/MobilepushWrapper/index.js

@@ -56,6 +56,8 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
       templateName: "",
     };
   }
+
+
   onChange = (e) => {
     this.props.onMobilepushModeChange( e.target.value );
   };
@@ -68,6 +70,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
       onRemoveTemplateName();
     }
   }
+
   render() {
     const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData} = this.props;
     const {templateName} = this.state;

package/v2Containers/Rcs/sagas.js

@@ -1,5 +1,4 @@
-import { take, cancel, call, put, takeLatest } from 'redux-saga/effects';
-import { LOCATION_CHANGE } from 'react-router-redux';
+import { take, cancel, call, put, takeLatest, all } from 'redux-saga/effects';
 import * as Api from '../../services/api';
 import {
   RCS,
@@ -31,9 +30,7 @@ export function* uploadRcsAsset(file, assetType, fileParams) {
   }
 }
 function* watchUploadRcsAsset() {
-  const watcher = yield takeLatest(UPLOAD_RCS_ASSET_REQUEST, uploadRcsAsset);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(UPLOAD_RCS_ASSET_REQUEST, uploadRcsAsset);
 }
 
 export function* createRCSTemplate({ template, callback }) {
@@ -64,12 +61,10 @@ export function* createRCSTemplate({ template, callback }) {
   }
 }
 function* watchCreateTemplate() {
-  const watcher = yield takeLatest(
+  yield takeLatest(
     CREATE_RCS_TEMPLATE_REQUEST,
     createRCSTemplate,
   );
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
 }
 
 // FOR EDIT
@@ -101,9 +96,7 @@ export function* editTemplate({ template, callback }) {
   }
 }
 function* watchEditTemplate() {
-  const watcher = yield takeLatest(EDIT_RCS_TEMPLATE_REQUEST, editTemplate);
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
+  yield takeLatest(EDIT_RCS_TEMPLATE_REQUEST, editTemplate);
 }
 
 export function* getTemplateDetails({ id, callback }) {
@@ -124,12 +117,10 @@ export function* getTemplateDetails({ id, callback }) {
   }
 }
 function* watchGetTemplateDetails() {
-  const watcher = yield takeLatest(
+  yield takeLatest(
     GET_RCS_TEMPLATE_DETAILS_REQUEST,
     getTemplateDetails,
   );
-  yield take(LOCATION_CHANGE);
-  yield cancel(watcher);
 }
 
 // All sagas to be loaded
@@ -139,3 +130,12 @@ export default [
   watchGetTemplateDetails,
   watchEditTemplate,
 ];
+
+export function* v2RcsSagas() {
+  yield all([
+    watchUploadRcsAsset(),
+    watchCreateTemplate(),
+    watchGetTemplateDetails(),
+    watchEditTemplate(),
+  ]);
+}