@capillarytech/creatives-library 8.0.7 → 8.0.9

package/containers/Email/sagas.js

@@ -45,7 +45,7 @@ export function* getTemplateDetails(id) {
 export function* getAllAssets(assetType, queryParams) {
   try {
     const result = yield call(Api.getAllAssets, assetType, queryParams);
-    yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result.data.response, isReset: assetType.queryParams.page === 1 });
+    yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result?.response, isReset: assetType.queryParams.page === 1 });
   } catch (error) {
     yield put({ type: types.GET_ALL_ASSETS_FAILURE, error });
   }

package/containers/MobilePush/Create/sagas.js

@@ -63,4 +63,10 @@ export function* createMPushSaga() {
     watchUploadAsset(),
     watchGetIosCtas(),
   ]);
+}
+
+export function* duplicateMPushSaga() {
+  yield all([
+    watchCreateTemplate(),
+  ]);
 }

package/containers/Templates/index.js

@@ -56,6 +56,7 @@ import mobilePushCreateReducer from '../MobilePush/Create/reducer';
 import lineCreateReducer from '../Line/Create/reducer';
 import { ebillSaga } from '../Ebill/sagas';
 import { lineCreateSaga } from '../Line/Create/sagas';
+import { duplicateMPushSaga } from '../MobilePush/Create/sagas';
 
 const MenuItem = Menu.Item;
 const Option = Select.Option;
@@ -1709,6 +1710,7 @@ const withCreateSmsSaga = injectSaga({ key: 'create', saga: createSmsSaga });
 const withEditSmsSaga = injectSaga({ key: 'edit', saga: editSmsSaga });
 const withEmailSaga = injectSaga({ key: 'email', saga: emailSaga });
 const withEbillSaga = injectSaga({ key: 'ebill', saga: ebillSaga });
+const withMpushSaga = injectSaga({ key: 'mobileCreate', saga: duplicateMPushSaga });
 const withLineCreateSaga = injectSaga({ key: 'line', saga: lineCreateSaga });
 const withReducer = injectReducer({ key: 'templates', reducer });
 const withMPushCreateReducer = injectReducer({ key: 'mobileCreate', reducer: mobilePushCreateReducer });
@@ -1721,6 +1723,7 @@ export default compose(
   withCreateSmsSaga,
   withEditSmsSaga,
   withEmailSaga,
+  withMpushSaga,
   withEbillSaga,
   withLineCreateSaga,
   withReducer,

package/package.json

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

package/v2Containers/Assets/Gallery/sagas.js

@@ -5,7 +5,7 @@ import * as types from './constants';
 export function* getAllAssets(assetType, queryParams) {
   try {
     const result = yield call(Api.getAllAssets, assetType, queryParams);
-    yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result.data.response, isReset: assetType.queryParams.page === 1 });
+    yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result?.response, isReset: assetType.queryParams.page === 1 });
   } catch (error) {
     yield put({ type: types.GET_ALL_ASSETS_FAILURE, error });
   }

package/v2Containers/Cap/index.js

@@ -40,11 +40,13 @@ import RenderRoute from '../../v2Components/RenderRoute';
 import injectReducer from '../../utils/injectReducer';
 import injectSaga from '../../utils/injectSaga';
 import reducer from './reducer';
+import zaloReducer from '../Zalo/reducer';
 import { v2CapSagas } from './sagas';
 import { v2SmsCreateSagas } from '../Sms/Create/sagas';
 import { v2EbillSagas } from '../Ebill/sagas';
 import { v2EmailDuplicateTemplateSaga } from '../Email/sagas';
 import { v2LineContainerSagas } from '../Line/Container/sagas'
+import { v2ZaloSagas } from '../Zalo/saga'; 
 import { v2MobilePushCreateSagas } from '../MobilePush/Create/sagas';
 import { v2WechatMapTemplatesSagas } from '../WeChat/MapTemplates/sagas';
 import { v2RcsSagas } from '../Rcs/sagas';
@@ -606,6 +608,7 @@ function mapDispatchToProps(dispatch) {
 
 const withConnect = connect(mapStateToProps, mapDispatchToProps);
 const withReducer = injectReducer({ key: 'cap', reducer });
+const withZaloReducer = injectReducer({ key: 'zalo', reducer: zaloReducer });
 const withSaga = injectSaga({ key: 'cap', saga: v2CapSagas });
 const withSmsCreateSaga = injectSaga({ key: 'create', saga: v2SmsCreateSagas });
 const withEbillSaga = injectSaga({ key: 'ebill', saga: v2EbillSagas });
@@ -613,6 +616,7 @@ const withEmailSaga = injectSaga({ key: 'email', saga: v2EmailDuplicateTemplateS
 const withLineContainerSaga = injectSaga({ key: 'lineCreate', saga: v2LineContainerSagas });
 const withMobilePushCreateSaga = injectSaga({ key: 'mobileCreate', saga: v2MobilePushCreateSagas });
 const withWechatMapTemplatesSaga = injectSaga({ key: 'weChatMapTemplate', saga: v2WechatMapTemplatesSagas });
+const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 const withRcsSaga = injectSaga({ key: 'rcs', saga: v2RcsSagas });
 const withInAppSaga = injectSaga({ key: 'inapp', saga: v2InAppSagas });
 const withViberSaga = injectSaga({ key: 'viber', saga: v2ViberSagas });
@@ -626,9 +630,11 @@ export default compose(
   withMobilePushCreateSaga,
   withWechatMapTemplatesSaga,
   withRcsSaga,
+  withZaloSaga,
   withInAppSaga,
   withViberSaga,
   withFacebookSaga,
   withReducer,
+  withZaloReducer,
   withConnect,
 )(injectIntl(Cap));

package/v2Containers/Email/index.js

@@ -431,7 +431,10 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
         this.setState({ formData }, () => {
           const isDragDrop = this.checkBeeEditorAllowedForLibrary() && nextProps.Email.CmsSettings.isDragDrop;
-          this.hideEdmOptions(isDragDrop);
+          //hiding this after entire dom is rendered
+          setTimeout(() => {
+            this.hideEdmOptions(isDragDrop);
+          },0);
         });
       }
       if (nextProps.Email.createTemplateError && !_.isEqual(nextProps.Email.createTemplateError, this.props.Email.createTemplateError)) {

package/v2Containers/Email/sagas.js

@@ -59,7 +59,7 @@ export function* getTemplateDetails(id) {
 export function* getAllAssets(assetType, queryParams) {
   try {
     const result = yield call(Api.getAllAssets, assetType, queryParams);
-    yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result.data.response, isReset: assetType.queryParams.page === 1 });
+    yield put({ type: types.GET_ALL_ASSETS_SUCCESS, data: result?.response, isReset: assetType.queryParams.page === 1 });
   } catch (error) {
     yield put({ type: types.GET_ALL_ASSETS_FAILURE, error });
   }

package/v2Containers/Line/Container/sagas.js

@@ -7,7 +7,7 @@ import * as types from './constants';
 export function* createTemplate({ template, callback }) {
   let errorMsg;
   try {
-    const result = yield call(Api.createLineTemplate, { template });
+    const result = yield call(Api.createLineTemplate, template);
     if (result.status.code >= 400) {
       errorMsg = result.message;
       throw errorMsg;

package/v2Containers/MobilePush/Create/index.js

@@ -33,7 +33,9 @@ import { MOBILE_PUSH } from '../../CreativesContainer/constants';
 import { getContent } from '../commonMethods';
 import { getCdnUrl } from '../../../utils/cdnTransformation';
 import injectReducer from '../../../utils/injectReducer';
+import injectSaga from '../../../utils/injectSaga';
 import v2MobilePushCreateReducer from './reducer';
+import { v2MobilePushWatchDuplicateTemplateSaga } from './sagas';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -1901,11 +1903,13 @@ function mapDispatchToProps(dispatch) {
 }
 
 const withReducer = injectReducer({ key: 'mobileCreate', reducer: v2MobilePushCreateReducer });
+const withSaga = injectSaga({ key: 'mobileCreate', saga: v2MobilePushWatchDuplicateTemplateSaga});
 
 export default withCreatives({
   WrappedComponent: Create,
   mapStateToProps,
   mapDispatchToProps,
   userAuth: false,
+  sagas: [withSaga],
   reducers: [withReducer],
 });

package/v2Containers/MobilePush/Create/sagas.js

@@ -66,7 +66,12 @@ export default [
 export function* v2MobilePushCreateSagas() {
   yield all([
     watchCreateTemplate(),
-    watchUploadAsset(),
+  ]);
+}
+
+export function* v2MobilePushWatchDuplicateTemplateSaga() {
+  yield all([
     watchGetIosCtas(),
+    watchUploadAsset(),
   ]);
 }

package/v2Containers/SmsTrai/Edit/index.js

@@ -19,6 +19,8 @@ import CapError from '@capillarytech/cap-ui-library/CapError';
 import CapCheckbox from '@capillarytech/cap-ui-library/CapCheckbox';
 import CapInfoNote from '@capillarytech/cap-ui-library/CapInfoNote';
 import * as globalActions from '../../Cap/actions';
+import injectSaga from '../../../utils/injectSaga';
+import injectReducer from '../../../utils/injectReducer';
 import {
   CAP_SPACE_16,
   CAP_SPACE_12,
@@ -47,7 +49,8 @@ import {
   ALL,
   LIBRARY,
 } from './constants';
-
+import v2EditSmsReducer from '../../Sms/Edit/reducer';
+import { v2SmsEditSagas } from '../../Sms/Edit/sagas';
 let varMap = {};
 let traiData = {};
 let tagValidationResponse = {};
@@ -632,9 +635,14 @@ const mapDispatchToProps = (dispatch) => ({
   globalActions: bindActionCreators(globalActions, dispatch),
 });
 
+const withSaga = injectSaga({ key: 'edit', saga: v2SmsEditSagas });
+const withReducer = injectReducer({ key: 'edit', reducer: v2EditSmsReducer });
+
 export default withCreatives({
   WrappedComponent: SmsTraiEdit,
   mapStateToProps,
   mapDispatchToProps,
   userAuth: true,
+  sagas: [withSaga],
+  reducers: [withReducer],
 });

package/v2Containers/Zalo/index.js

@@ -51,7 +51,6 @@ import TemplatePreview from '../../v2Components/TemplatePreview';
 import injectSaga from '../../utils/injectSaga';
 import injectReducer from '../../utils/injectReducer';
 import * as globalActions from '../Cap/actions';
-import { v2ZaloSagas } from './saga';
 import v2ZaloReducer from './reducer';
 
 export const Zalo = (props) => {
@@ -501,7 +500,6 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 
-const withSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 const withReducer = injectReducer({ key: 'zalo', reducer: v2ZaloReducer });
 
 export default withCreatives({
@@ -509,6 +507,5 @@ export default withCreatives({
   mapStateToProps,
   mapDispatchToProps,
   userAuth: true,
-  sagas: [withSaga],
   reducers: [withReducer],
 });