@capillarytech/creatives-library 7.12.120 → 7.13.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.12.120",
+  "version": "7.13.05",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -24,7 +24,6 @@
     "jest-date-mock": "^1.0.8",
     "jquery": "^3.3.1",
     "load-script": "^1.0.0",
-    "node-html-parser": "^5.4.2-0",
     "normalizr": "^3.2.3",
     "papaparse": "^5.3.1",
     "pre-push": "^0.1.2",

package/routes.js

@@ -13,7 +13,6 @@ import * as emailSagas from 'containers/Email/sagas';
 import * as templateSagas from 'containers/Templates/sagas';
 import * as lineSagas from 'containers/Line/Create/sagas';
 import * as languageSaga from './v2Containers/LanguageProvider/sagas';
-
 import pathConfig from './config/path';
 
 import {updateCharCount} from './utils/smsCharCountV2';

package/services/api.js

@@ -484,9 +484,4 @@ export const createWhatsappTemplate = ({ payload }) => {
 export const getSenderDetails = (channel, orgUnitId) => {
   const url = `${CAMPAIGNS_API_ORG_ENDPOINT}/meta/domainProperties?channel=${channel}`;
   return request(url, getAPICallObject('GET', null, false, true, orgUnitId));
-};
-
-export const getCdnTransformationConfig = () => {
-  const url = `${API_ENDPOINT}/common/getCdnTransformationConfig`;
-  return request(url, getAPICallObject('GET'));
-}
+};

package/v2Components/FormBuilder/index.js

@@ -11,7 +11,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import _ from 'lodash';
 import { Tabs, Table, Modal} from 'antd';
-import { CapSpin, CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon, CapTooltip} from '@capillarytech/cap-ui-library';
+import { CapSpin, CapDrawer, CapButton, CapInput, CapPopover, CapImage, CapCheckbox, CapRadio, CapSelect, CapTable, CapRow, CapColumn, CapNotification, CapUploader, CapHeading, CapIcon} from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import LabelHOC from '@capillarytech/cap-ui-library/assets/HOCs/ComponentWithLabelHOC';
 import { CAP_SPACE_12, CAP_SPACE_08, FONT_COLOR_05, FONT_COLOR_04 } from '@capillarytech/cap-ui-library/styled/variables';
@@ -2800,28 +2800,22 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             break;
           case "checkbox":
             ifError = this.state.checkValidation && (isVersionEnable ? this.state.errorData[`${this.state.currentTab - 1}`][val.id] : this.state.errorData[val.id]);
-            const { disabled , hoverText } = val || {};
             if (styling === 'semantic') {
               columns.push(
                 <CapColumn key="input" span={val.width} offset={val.offset}>
-                  <CapTooltip
-                    title={ disabled && hoverText ? hoverText : '' }
-                    placement="topLeft"
+                  <CapCheckbox
+                    key={val.id}
+                    className={`${ifError ? 'error' : ''}`}
+                    errorMessage={val.errorMessage && ifError ? val.errorMessage : ''}
+                    onChange={(e) => this.updateFormData(e.target.checked, val, val.submitAction)}
+                    checked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
+                    defaultChecked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
+                    style={val.style ? val.style : {}}
+                    disabled={val.disabled}
+                    inductiveText={val.inductiveText}
                   >
-                    <CapCheckbox
-                      key={val.id}
-                      className={`${ifError ? 'error' : ''}`}
-                      errorMessage={val.errorMessage && ifError ? val.errorMessage : ''}
-                      onChange={(e) => this.updateFormData(e.target.checked, val, val.submitAction)}
-                      checked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
-                      defaultChecked={isVersionEnable ? this.state.formData[`${this.state.currentTab - 1}`][val.id] : this.state.formData[val.id]}
-                      style={val.style ? val.style : {}}
-                      disabled={val.disabled}
-                      inductiveText={val.inductiveText}
-                    >
                     {val.label}
-                    </CapCheckbox>
-                  </CapTooltip>
+                  </CapCheckbox>
                 </CapColumn>
               );
             }
@@ -3092,6 +3086,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   onTestContentClicked={this.props.onTestContentClicked}
                   templateDataRaw={this.props.templateData}
                   module={this.props.location.query.module}
+                  hideTestAndPreviewBtnJourney={this.props.hideTestAndPreviewBtnJourney}
                 >
                 </TemplatePreview>
               </CapColumn>

package/v2Components/NewCallTask/index.js

@@ -99,7 +99,7 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
   };
 
   render() {
-    const { intl, isLoading, metaEntities, selectedOfferDetails , injectedTags} = this.props;
+    const { intl, isLoading, metaEntities, selectedOfferDetails } = this.props;
     const { formatMessage } = intl;
     const { subject, messageBody, description, callTaskActionType } = this.state;
     const tags = metaEntities && metaEntities.tags ? metaEntities.tags.standard : [];
@@ -125,7 +125,6 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
                   tags={tags}
                   onTagSelect={this.onTagSelect}
                   selectedOfferDetails={selectedOfferDetails}
-                  injectedTags={injectedTags}
                 />
                 <CapInput.TextArea
                   setInputRef={this.setInputRef}
@@ -178,7 +177,6 @@ NewCallTask.propTypes = {
   selectedOfferDetails: PropTypes.array,
   messageDetails: PropTypes.object,
   mode: PropTypes.string,
-  injectedTags: PropTypes.object,
 };
 
 export default injectIntl(NewCallTask);

package/v2Components/TemplatePreview/index.js

@@ -160,6 +160,7 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
       intl,
       templateData,
       rcsIosPreview,
+      hideTestAndPreviewBtnJourney
     } = this.props;
     const { formatMessage } = intl;
     const { buttonText, imageURL, rcsPreviewContent, messageContent: viberMessageContent } = content || {};
@@ -193,7 +194,7 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
     const disablePreviewAndTest = this.props.channel === 'MOBILEPUSH' ? !this.props.content.header : (this.props.channel === 'SMS' ? !this.props.content : false);
     const showTestAndPreview = showTestAndPreviewIcon &&
         channel !== WECHAT &&
-        ['outbound', 'library'].includes(module);
+        ['outbound', 'library'].includes(module) && !hideTestAndPreviewBtnJourney;
 
     const renderLineMultiText = (content) => {
       let textCount = 0;

package/v2Containers/CallTask/index.js

@@ -16,7 +16,7 @@ import {
 } from '@capillarytech/cap-ui-library';
 import { injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
-import { makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags } from '../Cap/selectors';
+import { makeSelectMetaEntities, isLoadingMetaEntities } from '../Cap/selectors';
 import * as globalActions from '../Cap/actions';
 import * as actions from "./actions";
 import makeSelectCallTask from './selectors';
@@ -71,7 +71,7 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
     };
   }
   render() {
-    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities, selectedOfferDetails, messageDetails, injectedTags } = this.props;
+    const { intl, onCallTaskSubmit, templateData, loadingMetaEntities, metaEntities, selectedOfferDetails, messageDetails } = this.props;
     const { formatMessage } = intl;
     const { mode } = this.state;
     return (
@@ -85,7 +85,6 @@ export class CallTask extends React.Component { // eslint-disable-line react/pre
             onCallTaskSubmit={onCallTaskSubmit}
             selectedOfferDetails={selectedOfferDetails}
             messageDetails={messageDetails}
-            injectedTags={injectedTags || {}}
           />
           :
             <div>
@@ -145,7 +144,6 @@ const mapStateToProps = createStructuredSelector({
   CallTask: makeSelectCallTask(),
   metaEntities: makeSelectMetaEntities(),
   loadingMetaEntities: isLoadingMetaEntities(),
-  injectedTags: setInjectedTags(),
 });
 
 function mapDispatchToProps(dispatch) {

package/v2Containers/Cap/actions.js

@@ -73,3 +73,4 @@ export function clearTopbarMenuData() {
     type: types.CLEAR_TOPBAR_MENU_DATA,
   };
 }
+

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -147,6 +147,7 @@ export function SlideBoxContent(props) {
       orgUnitId,
       smsRegister,
       enableNewChannels,
+      hideTestAndPreviewBtnJourney
     } = props;
   const type = (messageDetails.type || '').toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'default' : 'library', isEditFromCampaigns: (templateData || {}).isEditFromCampaigns};
@@ -407,6 +408,7 @@ export function SlideBoxContent(props) {
         orgUnitId={orgUnitId}
         smsRegister={smsRegister}
         enableNewChannels={enableNewChannels}
+        hideTestAndPreviewBtnJourney={hideTestAndPreviewBtnJourney}
         />
       )}
       {isPreview && (
@@ -602,6 +604,7 @@ export function SlideBoxContent(props) {
           onPreviewContentClicked={onPreviewContentClicked}
           onTestContentClicked={onTestContentClicked}
           type={type}
+          hideTestAndPreviewBtnJourney={hideTestAndPreviewBtnJourney}
         />
         }
       {isCreateMPush &&
@@ -628,6 +631,7 @@ export function SlideBoxContent(props) {
         onValidationFail={onValidationFail}
         selectedOfferDetails={selectedOfferDetails}
         onPreviewContentClicked={onPreviewContentClicked}
+        hideTestAndPreviewBtnJourney={hideTestAndPreviewBtnJourney}
         onTestContentClicked={onTestContentClicked}/>
         }
       {

package/v2Containers/CreativesContainer/actions.js

@@ -24,4 +24,4 @@ export function hideCreativesContanerLoader() {
   return {
     type: HIDE_CONTAINER_LOADER,
   };
-}
+}

package/v2Containers/CreativesContainer/index.js

@@ -33,7 +33,6 @@ import { CREATIVE } from '../Facebook/constants';
 import { LOYALTY } from '../App/constants';
 import { WHATSAPP_STATUSES } from '../Whatsapp/constants';
 
-import { updateImagesInHtml } from '../../utils/cdnTransformation';
 
 const classPrefix = 'add-creatives-section';
 const CREATIVES_CONTAINER = 'creativesContainer';
@@ -77,9 +76,6 @@ export class Creatives extends React.Component {
 
   componentDidMount() {
     GA.timeTracker.startTimer(CREATIVES_CONTAINER);
-    if(!this.props?.isFullMode){
-      this.props?.templateActions.getCdnTransformationConfig();
-    }
   }
 
   onEnterTemplateName = () => {
@@ -499,8 +495,7 @@ export class Creatives extends React.Component {
           if (!html_content) {
             emailBase = templateRecords.base;
           }
-          const newHtmlContent = updateImagesInHtml(html_content);
-          templateData = {...templateData, ...emailBase, emailBody: newHtmlContent, emailSubject: (emailBase && emailBase.subject) ? emailBase.subject : ''};
+          templateData = {...templateData, ...emailBase, emailBody: html_content, emailSubject: (emailBase && emailBase.subject) ? emailBase.subject : ''};
           delete templateData.html_content;
           delete templateData.subject;
         }
@@ -1107,6 +1102,7 @@ export class Creatives extends React.Component {
               messageStrategy={this.props.strategy}
               orgUnitId={this.props.orgUnitId}
               enableNewChannels={enableNewChannels}
+              hideTestAndPreviewBtnJourney={this.props.hideTestAndPreviewBtnJourney}
           />
           }
           footer={this.shouldShowFooter() &&

package/v2Containers/CreativesContainer/tests/index.test.js

@@ -26,7 +26,6 @@ jest.mock('../../../v2Components/FormBuilder', () => ({
 describe('Test SlideBoxContent container', () => {
   const handleCloseCreatives = jest.fn();
   const getCreativesData = jest.fn();
-  const getCdnTransformationConfig = jest.fn();
   let renderedComponent;
 
   beforeEach(() => {
@@ -42,9 +41,6 @@ describe('Test SlideBoxContent container', () => {
         templateData={templateData}
         handleCloseCreatives={handleCloseCreatives}
         getCreativesData={getCreativesData}
-        templateActions={{
-          getCdnTransformationConfig
-        }}
       />,
     );
   };

package/v2Containers/Email/index.js

@@ -35,8 +35,6 @@ import { TRACK_CREATE_EMAIL, TRACK_EDIT_EMAIL, BEE_PLUGIN, CREATE, EDIT } from '
 import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
 import { gtmPush } from '../../utils/gtmTrackers';
 const {CapCustomCardList} = CapCustomCard;
-import {transformEmailTemplates} from '../../utils/cdnTransformation';
-
 export class Email extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -2440,8 +2438,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
     // if (saveCount === 0) {
 
-    const newEmail = transformEmailTemplates(obj);
-    this.props.actions.createTemplate(newEmail, this.onUpdateTemplateComplete);
+    this.props.actions.createTemplate(obj, this.onUpdateTemplateComplete);
     // } else {
     //   this.setState({saveObj: obj, targetSaveCount: saveCount, mode: "save", saveEdmDataMode: 'save'}, () => {
     //     _.forEach(data.selectedLanguages, (language, langIndex) => {

package/v2Containers/Facebook/Advertisement/index.js

@@ -7,7 +7,7 @@ import isEmpty from 'lodash/isEmpty';
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectCurrentOrgDetails } from "../../Cap/selectors";
-import { getCdnUrl } from '../../../utils/cdnTransformation';
+
 import {
   CapInput,
   CapRadioCard,
@@ -197,7 +197,7 @@ export const Advertisement = (props) => {
           };
           if (obj.subType === IMAGE) {
             data.imageData = {
-              imageSrc: getCdnUrl({url: obj.imgSrc, channelName: 'FACEBOOK', channelSubType: 'IMAGE'}),
+              imageSrc: obj.imgSrc,
             };
           }
           if (obj.subType === VIDEO) {
@@ -336,7 +336,7 @@ export const Advertisement = (props) => {
         };
       }
       if (obj.subType === IMAGE) {
-        data.imgSrc = getCdnUrl({url: obj.imageData.imageSrc, channelName: 'FACEBOOK', channelSubType: 'IMAGE'});
+        data.imgSrc = obj.imageData.imageSrc;
       } else {
         const {
           videoSrc,
@@ -1033,4 +1033,4 @@ const mapStateToProps = (state, props) =>
       : selectCurrentOrgDetails(),
   });
 
-export default connect(mapStateToProps, null)(injectIntl(Advertisement));
+export default connect(mapStateToProps, null)(injectIntl(Advertisement));

package/v2Containers/Line/Container/Image/index.js

@@ -15,7 +15,6 @@ import Gallery from '../../../Assets/Gallery';
 import style from './style';
 import { CAP_G06, CAP_G09 } from '@capillarytech/cap-ui-library/styled/variables';
 import withStyles from '../../../../hoc/withStyles';
-import { getCdnUrl } from '../../../../utils/cdnTransformation';
 
 import messages from './messages';
 import {
@@ -74,7 +73,7 @@ export const LineImage = ({
         if (imageSrc && (isFullMode ? messageTitle: true) && imagePreview) {
                 updateMessageState({
                     isError: !imageSrc || !(isFullMode ? messageTitle : true) || isImageError || errorMessageTitle,
-                    originalContentUrl: getCdnUrl({url: imageSrc, channelName: 'LINE', channelSubType: 'IMAGE'}),
+                    originalContentUrl: imageSrc,
                     previewImageUrl: imagePreview,
                     messageTitle,
                     index,
@@ -113,7 +112,7 @@ export const LineImage = ({
 
             updateMessageState({
                 isError: !imgSrc || !(isFullMode ? messageTitle : true) || errorMessageTitle,
-                originalContentUrl: getCdnUrl({url: imgSrc, channelName: 'LINE', channelSubType: 'IMAGE'}),
+                originalContentUrl: imgSrc,
                 previewImageUrl: imgPreview,
                 messageTitle,
                 index,
@@ -156,7 +155,7 @@ export const LineImage = ({
         }
         updateMessageState({
             isError: !imageSrc || !(isFullMode ? value : true) || isImageError || !value,
-            originalContentUrl: getCdnUrl({url: imageSrc, channelName: 'LINE', channelSubType: 'IMAGE'}),
+            originalContentUrl: imageSrc,
             previewImageUrl: imagePreview,
             messageTitle: value,
             index,
@@ -413,7 +412,7 @@ export const LineImage = ({
             updateImagePreview(imagePreview);
             updateMessageState({
                 isError: !image || !(isFullMode ? messageTitle : true) || isImageError || errorMessageTitle,
-                originalContentUrl: getCdnUrl({url: image, channelName: 'LINE', channelSubType: 'IMAGE'}),
+                originalContentUrl: image,
                 previewImageUrl: imagePreview,
                 messageTitle,
                 index,

package/v2Containers/Line/Container/ImageCarousel/index.js

@@ -15,7 +15,6 @@ import LineDrawer from '../Drawer';
 import style from './style';
 import { CAP_G06, FONT_COLOR_01, FONT_COLOR_02, CAP_SPACE_08, CAP_WHITE, CAP_SPACE_24, CAP_SPACE_04 } from '@capillarytech/cap-ui-library/styled/variables';
 import withStyles from '../../../../hoc/withStyles';
-import { getCdnUrl } from '../../../../utils/cdnTransformation';
 
 import LineImageCarouselContent from './Content';
 
@@ -104,7 +103,7 @@ export const LineImageCarousel = (props) => {
 							} = content || {};
 							validCarouselImages.push({
 								activeIndex: index,
-								originalContentUrl: getCdnUrl({url: url, channelName: 'LINE', channelSubType: 'CARD'}),
+								originalContentUrl: url,
 								aspectRatio,
 								selectedActionType: buttonType ? (buttonType === MESSAGE_ACTION_TYPE ? TEXT_ACTION_TYPE : URL_ACTION_TYPE) : '',
 								actionContent: text || uri,
@@ -128,7 +127,7 @@ export const LineImageCarousel = (props) => {
 
 							validCarouselImages.push({
 								activeIndex: index,
-								originalContentUrl: getCdnUrl({url: imageUrl, channelName: 'LINE', channelSubType: 'CARD'}),
+								originalContentUrl: imageUrl,
 								selectedActionType: type ? (type === MESSAGE_ACTION_TYPE ? TEXT_ACTION_TYPE : URL_ACTION_TYPE) : '',
 								actionContent: text || uri,
 								actionLabel: label,
@@ -161,7 +160,7 @@ export const LineImageCarousel = (props) => {
 				? isErrorIndex
 				: ((!originalContentUrl || !selectedActionType || actionContentErrorMessage || actionLabelErrorMessage || !actionContent) && activeIndex);
 			columns.push({
-				imageUrl: getCdnUrl({url: originalContentUrl, channelName: 'LINE', channelSubType: 'CARD'}),
+				imageUrl: originalContentUrl,
 				aspectRatio,
 				action: {
 					type: selectedActionType ? (selectedActionType === TEXT_ACTION_TYPE ? MESSAGE_ACTION_TYPE : URL_ACTION_TYPE) : '',
@@ -456,7 +455,7 @@ export const LineImageCarousel = (props) => {
 					} = content || {};
 					validCarouselImages.push({
 						activeIndex: index,
-						originalContentUrl: getCdnUrl({url: url, channelName: 'LINE', channelSubType: 'CARD'}),
+						originalContentUrl: url,
 						aspectRatio,
 						selectedActionType: buttonType ? (buttonType === MESSAGE_ACTION_TYPE ? TEXT_ACTION_TYPE : URL_ACTION_TYPE) : '',
 						actionContent: text || uri,
@@ -481,7 +480,7 @@ export const LineImageCarousel = (props) => {
 
 					validCarouselImages.push({
 						activeIndex: index,
-						originalContentUrl: getCdnUrl({url: imageUrl, channelName: 'LINE', channelSubType: 'CARD'}),
+						originalContentUrl: imageUrl,
 						selectedActionType: type ? (type === MESSAGE_ACTION_TYPE ? TEXT_ACTION_TYPE : URL_ACTION_TYPE) : '',
 						actionContent: text || uri,
 						actionLabel: label,

package/v2Containers/Line/Container/ImageMap/index.js

@@ -39,7 +39,6 @@ import {
 } from '../constants';
 
 const { CapIconAvatar } = CapIcon;
-import { getCdnUrl } from '../../../../utils/cdnTransformation';
 
 export const LineImageMap = ({
     className,
@@ -115,7 +114,7 @@ export const LineImageMap = ({
         if (imageSrc && (isFullMode ? messageTitle: true) && imageMapTemplate && actionLinks) {
                 updateMessageState({
                     isError: !imageSrc || !(isFullMode ? messageTitle : true)  || !imageMapTemplate || (isImageError && errorMessageTitle) || errorTitle || !altText,
-                    baseUrl: getCdnUrl({url: imageSrc, channelName: 'LINE', channelSubType: 'RICH_MESSAGE'}),
+                    baseUrl: imageSrc,
                     messageTitle,
                     index,
                     type: IMAGE_MAP,

package/v2Containers/MobilePush/Create/index.js

@@ -31,7 +31,6 @@ 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'
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -465,7 +464,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       const secondaryCta2 = !!android['cta-deeplink-secondary-cta-1-select'] || !!android['secondary-cta-1-label'];
       const imageLink = android.image;
       if (imageLink) {
-        obj.versions.base.ANDROID.expandableDetails.image = getCdnUrl({url: imageLink, channelName: 'MOBILE_PUSH'});
+        obj.versions.base.ANDROID.expandableDetails.image = imageLink;
         obj.versions.base.ANDROID.expandableDetails.style = "BIG_PICTURE";
       }
       if (secondaryCta1 || secondaryCta2 ) {
@@ -539,7 +538,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       const imageLinkIos = ios.image;
       const secondaryCtaIos = !!ios['cta-deeplink-secondary-cta-1-select'] || !!ios['secondary-cta-1-label'];
       if (imageLinkIos) {
-        obj.versions.base.IOS.expandableDetails.image = getCdnUrl({url: imageLinkIos, channelName: 'MOBILE_PUSH'});
+        obj.versions.base.IOS.expandableDetails.image = imageLinkIos;
         obj.versions.base.IOS.expandableDetails.style = "BIG_PICTURE";
       }
       if (secondaryCtaIos) {
@@ -1321,7 +1320,10 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         duration: 2,
       });
     } else {
-      this.props.actions.uploadAsset(data.file, data.type, data.fileParams);
+      const name = data.file.name.split('.');
+      const blob = data.file.slice(0, -1, 'image');
+      const newFile = new File([blob], `${name[0]}${Date.now()}.${name[1]}`, {type: 'image'});
+      this.props.actions.uploadAsset(newFile, data.type, data.fileParams);
     }
   };
   selectCtaIos = (selectedConfig) => {
@@ -1737,6 +1739,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 onTestContentClicked={this.props.onTestContentClicked}
                 templateData={this.props.templateData}
+                hideTestAndPreviewBtnJourney={this.props.hideTestAndPreviewBtnJourney}
               />
             </CapColumn>
             {this.props.iosCtasData && this.state.showIosCtaTable &&
@@ -1850,4 +1853,4 @@ export default withCreatives({
   mapStateToProps,
   mapDispatchToProps,
   userAuth: false,
-});
+});

package/v2Containers/MobilePush/Edit/index.js

@@ -33,7 +33,6 @@ import {getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields, getConten
 import { GA } from '@capillarytech/cap-ui-utils';
 import { EDIT, TRACK_EDIT_MPUSH } from '../../App/constants';
 import { MOBILE_PUSH } from '../../CreativesContainer/constants';
-import { getCdnUrl } from '../../../utils/cdnTransformation';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -422,7 +421,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     const imageLink = android.image;
     if (imageLink) {
-      obj.versions.base.ANDROID.expandableDetails.image = getCdnUrl({url: imageLink, channelName: 'MOBILE_PUSH'});
+      obj.versions.base.ANDROID.expandableDetails.image = imageLink;
       obj.versions.base.ANDROID.expandableDetails.style = "BIG_PICTURE";
     }
     if (obj.versions.base.ANDROID && obj.versions.base.ANDROID.cta) {
@@ -493,7 +492,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     const imageLinkIos = ios.image;
     if (imageLinkIos) {
-      obj.versions.base.IOS.expandableDetails.image = getCdnUrl({url: imageLinkIos, channelName: 'MOBILE_PUSH'});
+      obj.versions.base.IOS.expandableDetails.image = imageLinkIos;
       obj.versions.base.IOS.expandableDetails.style = "BIG_PICTURE";
     }
     if (obj.versions.base.IOS && obj.versions.base.IOS.cta) {
@@ -1821,6 +1820,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 onTestContentClicked={this.props.onTestContentClicked}
                 templateData={this.props.templateData}
+                hideTestAndPreviewBtnJourney={this.props.hideTestAndPreviewBtnJourney}
               />}
             </CapColumn>
             {this.props.iosCtasData && this.state.showIosCtaTable &&
@@ -1941,4 +1941,4 @@ export default withCreatives({
   mapStateToProps,
   mapDispatchToProps,
   userAuth: false,
-});
+});

package/v2Containers/MobilePush/initialSchema.js

@@ -782,8 +782,6 @@ export const response = {
                                       supportedEvents: [
                                         "addSecondaryCtaIos",
                                       ],
-                                      disabled: true,
-                                      hoverText: "This section is being revamped. Till then it will remain disabled.",
                                     },
                                   ],
                                 },
@@ -1692,8 +1690,6 @@ export const response = {
                                       supportedEvents: [
                                         "addSecondaryCtaIos",
                                       ],
-                                      disabled: true,
-                                      hoverText: "This section is being revamped. Till then it will remain disabled.",
                                     },
                                   ],
                                 },

package/v2Containers/MobilepushWrapper/index.js

@@ -115,6 +115,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
               onPreviewContentClicked={onPreviewContentClicked}
               onTestContentClicked={onTestContentClicked}
               templateData={templateData}
+              hideTestAndPreviewBtnJourney={this.props.hideTestAndPreviewBtnJourney}
           />
 
 

package/v2Containers/Rcs/index.js

@@ -81,7 +81,6 @@ import Templates from '../Templates';
 import SmsTraiEdit from '../SmsTrai/Edit';
 import TagList from '../TagList';
 import { validateTags } from '../../utils/tagValidations';
-import { getCdnUrl } from '../../utils/cdnTransformation';
 const { Group: CapCheckboxGroup } = CapCheckbox;
 export const Rcs = (props) => {
   const {
@@ -901,7 +900,7 @@ export const Rcs = (props) => {
                   ...(suggestions.length > 0 && { suggestions }),
                   ...(!isMediaTypeNone && {
                     media: {
-                      mediaUrl: getCdnUrl({url: rcsImageSrc, channelName: 'RCS'}),
+                      mediaUrl: rcsImageSrc,
                       height: MEDIUM,
                     },
                   }),

package/v2Containers/Templates/actions.js

@@ -150,9 +150,3 @@ export function getSenderDetails(data = {}) {
     ...data,
   };
 }
-
-export function getCdnTransformationConfig() {
-  return {
-    type: types.GET_CDN_TRANSFORMATION_CONFIG_REQUEST,
-  }
-}

package/v2Containers/Templates/constants.js

@@ -68,7 +68,3 @@ export const GET_SENDER_DETAILS_SUCCESS =
   'app/v2Containers/Templates/GET_SENDER_DETAILS_SUCCESS';
 export const GET_SENDER_DETAILS_FAILURE =
   'app/v2Containers/Templates/GET_SENDER_DETAILS_FAILURE';
-
-export const GET_CDN_TRANSFORMATION_CONFIG_REQUEST = 'app/v2Containers/Templates/GET_CDN_TRANSFORMATION_CONFIG_REQUEST';
-export const GET_CDN_TRANSFORMATION_CONFIG_SUCCESS = 'app/v2Containers/Templates/GET_CDN_TRANSFORMATION_CONFIG_SUCCESS';
-export const GET_CDN_TRANSFORMATION_CONFIG_FAILURE = 'app/v2Containers/Templates/GET_CDN_TRANSFORMATION_CONFIG_FAILURE';

package/v2Containers/Templates/sagas.js

@@ -3,7 +3,6 @@ import { LOCATION_CHANGE } from 'react-router-redux';
 // import { schema, normalize } from 'normalizr';
 import * as Api from '../../services/api';
 import * as types from './constants';
-import { saveCdnConfigs, removeAllCdnLocalStorageItems } from '../../utils/cdnTransformation';
 
 // Individual exports for testing
 export function* getAllTemplates(channel, queryParams) {
@@ -86,22 +85,6 @@ export function* getOrgLevelCampaignSettings() {
   }
 }
 
-function* getCdnTransformationConfig() {
-  try {
-    const res = yield call(Api.getCdnTransformationConfig);
-
-    if (res?.success && res?.status?.code === 200) {
-      const cdnConfigs = res?.response;
-      saveCdnConfigs(cdnConfigs);
-    } else {
-      removeAllCdnLocalStorageItems();
-    }
-  } catch (error) {
-    console.log("some error occured during getCdnTransformationConfig call");
-    removeAllCdnLocalStorageItems();
-  }
-}
-
 export function* watchGetOrgLevelCampaignSettings() {
   const watcher = yield takeLatest(
     types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_REQUEST,
@@ -239,13 +222,6 @@ function* watchGetSenderDetails() {
   yield cancel(watcher);
 }
 
-function* watchGetCdnTransformationConfig() {
-  yield takeLatest(
-    types.GET_CDN_TRANSFORMATION_CONFIG_REQUEST,
-    getCdnTransformationConfig
-  );
-}
-
 // All sagas to be loaded
 export default [
   watchGetAllTemplates,
@@ -257,5 +233,4 @@ export default [
   watchGetTemplateDetails,
   watchGetOrgLevelCampaignSettings,
   watchGetSenderDetails,
-  watchGetCdnTransformationConfig
 ];