@capillarytech/creatives-library 7.17.92 → 7.17.93

package/containers/Ebill/index.js

@@ -956,7 +956,6 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
         }
         temp.injectedEvents = {};
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         

package/containers/MobilePush/Edit/index.js

@@ -1779,7 +1779,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/index.js

@@ -95,10 +95,6 @@ import Zalo from './v2Containers/Zalo';
 import zaloReducer from './v2Containers/Zalo/reducer';
 import zaloSaga from './v2Containers/Zalo/saga';
 
-import InApp from './v2Containers/InApp';
-import inAppReducer from './v2Containers/InApp/reducer';
-import inAppSaga from './v2Containers/InApp/sagas';
-
 import Rcs from './v2Containers/Rcs';
 import rcsReducer from './v2Containers/Rcs/reducer';
 import rcsSaga from './v2Containers/Rcs/sagas';
@@ -130,7 +126,6 @@ const SmsTraiContainer = {SmsTraiCreate, SmsTraiCreateReducer, SmsTraiCreateSaga
 const WhatsappContainer = { Whatsapp, whatsappReducer, whatsappSaga };
 const RcsContainer = { Rcs, rcsReducer, rcsSaga };
 const ZaloContainer = { Zalo, zaloReducer, zaloSaga };
-const InAppContainer = { InApp, inAppReducer, inAppSaga };
 
 const GalleryContainer = {Gallery, galleryReducer, gallerySagas};
 const FTPContainer = {FTP, FTPReducer, FTPSagas};
@@ -180,5 +175,4 @@ export { CapContainer,
   WhatsappContainer,
   RcsContainer,
   ZaloContainer,
-  InAppContainer,
 };

package/package.json

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

package/routes.js

@@ -665,8 +665,6 @@ export default function createRoutes(store) {
           import('v2Containers/Whatsapp/reducer'),
           import('v2Containers/Zalo/saga'),
           import('v2Containers/Zalo/reducer'),
-          import('v2Containers/InApp/sagas'),
-          import('v2Containers/InApp/reducer'),
           import('v2Containers/Rcs/sagas'),
           import('v2Containers/Rcs/reducer'),
         ]);
@@ -694,7 +692,6 @@ export default function createRoutes(store) {
           smsTraiSagas, smsTraiReducer,
           whatsappSagas, whatsappReducer,
           zaloSagas, zaloReducer,
-          inAppSagas, inAppReducer,
           rcsSagas, rcsReducer,
         ]) => {
           injectReducer('templates', reducer.default);
@@ -717,7 +714,6 @@ export default function createRoutes(store) {
           injectReducer('smsTrai', smsTraiReducer.default);
           injectReducer('whatsapp', whatsappReducer.default);
           injectReducer('zalo', zaloReducer.default);
-          injectReducer('inapp', inAppReducer.default);
           injectReducer('rcs', rcsReducer.default);
           injectSagas(gallerySagas.default);
           injectSagas(sagas.default);
@@ -739,7 +735,6 @@ export default function createRoutes(store) {
           injectSagas(smsTraiSagas.default);
           injectSagas(whatsappSagas.default);
           injectSagas(zaloSagas.default);
-          injectSagas(inAppSagas.default);
           injectSagas(rcsSagas.default);
           renderRoute(component);
         });

package/services/api.js

@@ -237,11 +237,6 @@ export const createMobilePushTemplate = ({template}) => {
   return request(url, getAPICallObject('POST', template));
 };
 
-export const createInAppTemplate = ({payload}) => {
-  const url = `${API_ENDPOINT}/templates/INAPP`;
-  return request(url, getAPICallObject('POST', payload));
-};
-
 export const duplicateTemplate = ({id, channel}) => {
   const url = `${API_ENDPOINT}/templates/duplicate/${id}/${channel}`;
   return request(url, getAPICallObject('GET'));

package/v2Components/CapImageUpload/index.js

@@ -20,7 +20,7 @@ import { injectIntl, FormattedMessage, intlShape} from 'react-intl';
 import { isEmpty, get } from 'lodash';
 import './index.scss';
 import Gallery from '../../v2Containers/Assets/Gallery';
-import { FACEBOOK, INAPP, RCS, WHATSAPP } from "../../v2Containers/CreativesContainer/constants";
+import { FACEBOOK, RCS, WHATSAPP } from "../../v2Containers/CreativesContainer/constants";
 
 import messages from './messages';
 function CapImageUpload(props) {
@@ -252,7 +252,7 @@ function CapImageUpload(props) {
             </CapHeadingSpan>
           </>
         )}
-        {![WHATSAPP, INAPP].includes(channel) && (
+        {channel !== WHATSAPP && (
           <CapHeadingSpan type="label2" className="image-dimension">
             <FormattedMessage {...messages.imageDimenstionDescription} values={{ width: imgWidth, height: imgHeight }} />
           </CapHeadingSpan>
@@ -267,15 +267,8 @@ function CapImageUpload(props) {
             <FormattedMessage {...messages.imageSize} />
           </CapHeadingSpan>
         )}
-        {
-          channel === INAPP && (
-            <CapHeadingSpan type="label2" className="image-size">
-              <FormattedMessage {...messages.whatsappImageSize} />
-            </CapHeadingSpan>
-          )
-        }
         <CapHeadingSpan type="label2" className="image-format">
-          {channel === INAPP ? <FormattedMessage {...messages.format2} /> : <FormattedMessage {...messages.format} />}
+          <FormattedMessage {...messages.format} />
         </CapHeadingSpan>
       </div>
     </div>

package/v2Components/CapImageUpload/messages.js

@@ -42,10 +42,6 @@ export default defineMessages({
     id: `${scope}.format`,
     defaultMessage: 'Format: JPEG, JPG, PNG',
   },
-  format2: {
-    id: `${scope}.format2`,
-    defaultMessage: 'Format: png, jpg, jpeg',
-  },
   imageErrorDesc: {
     id: `${scope}.imageErrorDesc`,
     defaultMessage:

package/v2Components/FormBuilder/index.js

@@ -214,9 +214,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           this.setState({usingTabContainer: true});
         }
       }
-      // if (nextProps.currentTab) {
-      //   this.setState({currentTab: nextProps.currentTab});
-      // }
+      //In Context of MPUSH currentTab represents whether its Android or IOS tab , 1 for Android and 2 for IOS
+      if (nextProps.currentTab && _.get(this.props, 'schema.channel') === MOBILE_PUSH) {
+        this.setState({currentTab: nextProps.currentTab});
+      }
     } else if (!_.isEmpty(nextProps.formData) &&
       ( !this.state.usingTabContainer || (this.state.usingTabContainer && nextProps.tabKey !== ''))
       && !_.isEqual(nextProps.formData, this.state.formData) &&

package/v2Components/MobilePushPreviewV2/index.js

@@ -11,9 +11,6 @@ import { CapTab, CapIcon } from '@capillarytech/cap-ui-library';
 import { get, map, isEmpty} from 'lodash';
 import TemplatePreview from '../TemplatePreview';
 import '../PreviewSideBar/_previewsidebar.scss';
-import { MOBILE_PUSH } from '../../v2Containers/CreativesContainer/constants';
-import { INAPP } from '../../v2Containers/App/constants';
-import { ANDROID, IOS } from '../../v2Containers/InApp/constants';
 
 class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -34,85 +31,39 @@ class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react
     }
     this.state = {
       device,
-      content: this.setContent(props.templateData, device, this.props.channel),
+      content: this.setContent(props.templateData, device),
     };
   }
 
-  setContent(templateData, device, channel) {
-    let content;
-    if (channel === INAPP.toUpperCase()) {
-      const androidContent = get(templateData, 'versions.base.content.ANDROID') || get(templateData, 'androidContent');
-      const iosContent = get(templateData, 'versions.base.content.IOS') || get(templateData, 'iosContent');
-      const androidPreviewContent = {
-        templateTitle: androidContent?.title,
-        templateMsg: androidContent?.message,
-        mediaPreview: { inAppImageSrcAndroid: androidContent?.expandableDetails?.imageUrl },
-        ctaData: androidContent?.expandableDetails?.buttons?.map((cta) => {
-          const { index, type, text, url = "", label } = cta;
-          const ctaObject = {
-            index,
-            text,
-            url,
-            urlType: type,
-            isSaved: true,
-            label,
-          };
-          return ctaObject;
-        }),
-      };
-      const iosPreviewContent = {
-        templateTitle: iosContent?.title,
-        templateMsg: iosContent?.message,
-        mediaPreview: { inAppImageSrcIos: iosContent?.expandableDetails?.imageUrl },
-        ctaData: iosContent?.expandableDetails?.buttons?.map((cta) => {
-          const { index, type, text, url = "", label } = cta;
-          const ctaObject = {
-            index,
-            text,
-            url,
-            urlType: type,
-            isSaved: true,
-            label,
-          };
-          return ctaObject;
-        }),
-      };
-      content = {
-        inAppPreviewContent: device === ANDROID.toLowerCase() ? androidPreviewContent : iosPreviewContent,
-        templateLayoutType: device === ANDROID.toLowerCase() ? androidContent?.bodyType : iosContent?.bodyType,
-      };
-    } else if (channel === MOBILE_PUSH) {
-      const androidContent = get(templateData, 'versions.base.ANDROID') || get(templateData, 'androidContent');
-      const iosContent = get(templateData, 'versions.base.IOS') || get(templateData, 'iosContent');
+  setContent(templateData, device) {
+    const androidContent = get(templateData, 'versions.base.ANDROID') || get(templateData, 'androidContent');
+    const iosContent = get(templateData, 'versions.base.IOS') || get(templateData, 'iosContent');
 
-      const data = device === "android" ? androidContent : iosContent;
-      const { title = '', message = '', expandableDetails: { ctas = [], image = '' } = {}} = data || {};
-      content = {
-        header: title,
-        bodyText: message,
-        bodyImage: image,
-        actions: [],
-        appName: templateData?.appName,
-      };
-      if (ctas && ctas?.length) {
-        if (device === "android" ) {
-          content.actions = map(ctas, (cta) => ({label: cta?.actionText}));
-        } else {
-          content.actions = [{label: ctas[0]?.actionLabel}, {label: ctas[0]?.actionLabel2}];
-        }
+    const data = device === "android" ? androidContent : iosContent;
+    const { title = '', message = '', expandableDetails: { ctas = [], image = '' } = {}} = data || {};
+    const content = {
+      header: title,
+      bodyText: message,
+      bodyImage: image,
+      actions: [],
+      appName: templateData?.appName,
+    };
+    if (ctas && ctas?.length) {
+      if (device === "android" ) {
+        content.actions = map(ctas, (cta) => ({label: cta?.actionText}));
+      } else {
+        content.actions = [{label: ctas[0]?.actionLabel}, {label: ctas[0]?.actionLabel2}];
       }
     }
     return content;
   }
   getPreview(device) {
-    const deviceParam = device === ANDROID.toLowerCase() ? ANDROID : IOS;
     return (
       <TemplatePreview
-        device={this.props.channel === INAPP.toUpperCase() ? deviceParam : device}
+        device={device}
         channel={this.props.channel}
         content={this.state.content || ''}
         templateData={this.props.templateData}
-        templateLayoutType={this.state.content.templateLayoutType || ''}
       />
     );
   }
@@ -121,7 +72,7 @@ class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react
     this.props.handleClose();
   }
   changeDevice(device) {
-    const content = this.setContent(this.props.templateData, device, this.props.channel);
+    const content = this.setContent(this.props.templateData, device);
     this.setState({device, content });
   }
   goToEdit(e, path) {
@@ -129,18 +80,9 @@ class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react
   }
   render() {
     const {templateData} = this.props;
-    let hasAndroid;
-    let hasIos;
-    let hasBothAndroidAndIos;
-    if (this.props.channel === MOBILE_PUSH) {
-      hasAndroid = get(templateData, 'versions.base.ANDROID') || get(templateData, 'androidContent.title');
-      hasIos = get(templateData, 'versions.base.IOS') || get(templateData, 'iosContent.title');
-      hasBothAndroidAndIos = hasAndroid && hasIos;
-    } else if (this.props.channel === INAPP.toUpperCase()) {
-      hasAndroid = get(templateData, 'versions.base.content.ANDROID') || get(templateData, 'androidContent.title');
-      hasIos = get(templateData, 'versions.base.content.IOS') || get(templateData, 'iosContent.title');
-      hasBothAndroidAndIos = hasAndroid && hasIos;
-    }
+    const hasAndroid = get(templateData, 'versions.base.ANDROID') || get(templateData, 'androidContent.title');
+    const hasIos = get(templateData, 'versions.base.IOS') || get(templateData, 'iosContent.title');
+    const hasBothAndroidAndIos = hasAndroid && hasIos;
 
     return (
       <div>