@capillarytech/creatives-library 8.0.144 → 8.0.146

package/initialReducer.js

@@ -15,7 +15,6 @@ import galleryReducer from './v2Containers/Assets/Gallery/reducer';
 import CapCollapsibleLeftNavigationReducer from '@capillarytech/cap-ui-library/CapCollapsibleLeftNavigation/reducer';
 import { AIRA_REDUCER_DOMAIN, askAiraReducer } from '@capillarytech/cap-ui-library/CapAskAira';
 import previewAndTestReducer from './v2Components/TestAndPreviewSlidebox/reducer';
-import inAppReducer from './v2Containers/InApp/reducer';
 
 export const initialReducer = {
   language: languageProviderReducer,
@@ -34,5 +33,4 @@ export const initialReducer = {
   gallery: galleryReducer,
   navigationConfig: CapCollapsibleLeftNavigationReducer,
   previewAndTest: previewAndTestReducer,
-  inapp: inAppReducer,
 };

package/package.json

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

package/services/api.js

@@ -684,9 +684,4 @@ export const updateTestMessageMeta = (payload) => {
   return request(url, getAPICallObject('POST', payload?.data, false, true));
 };
 
-export const getBeePopupBuilderToken = () => {
-  const url = `${API_ENDPOINT}/common/getInappTokenData`;
-  return request(url, getAPICallObject('GET'));
-};
-
 export {request, getAPICallObject};

package/services/tests/api.test.js

@@ -23,7 +23,6 @@ import {
   getBulkCustomerDetails,
   createTestMessageMeta,
   updateTestMessageMeta,
-  getBeePopupBuilderToken,
 } from '../api';
 import { mockData } from './mockData';
 import getSchema from '../getSchema';
@@ -805,19 +804,3 @@ describe('updateTestMessageMeta', () => {
     });
   });
 });
-describe('getBeePopupBuilderToken', () => {
-  it('should return correct response', async () => {
-    global.fetch.mockReturnValue(Promise.resolve({
-      status: 200,
-      json: () => Promise.resolve({
-        status: 200,
-        response: 'test',
-      }),
-    }));
-    const result = await getBeePopupBuilderToken();
-    expect(result).toEqual({
-      status: 200,
-      response: 'test',
-    });
-  });
-});

package/v2Components/MobilePushPreviewV2/index.js

@@ -45,14 +45,6 @@ class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react
     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 isBeeFreeTemplate = get(androidContent, 'isBEEeditor') || get(iosContent, 'isBEEeditor');
-      if (isBeeFreeTemplate) {
-        content = {
-          inAppPreviewContent: device === ANDROID.toLowerCase() ? androidContent?.beeHtml : iosContent?.beeHtml,
-          isBeeFreeTemplate: true,
-        };
-        return content;
-      }
       const androidPreviewContent = {
         templateTitle: androidContent?.title,
         templateMsg: androidContent?.message,
@@ -87,8 +79,8 @@ class MobilePushPreviewV2 extends React.Component { // eslint-disable-line react
 
       if (media?.length > 0) {
         const mediaItem = media[0];
-        const { type, url } = mediaItem;
-        if (type === VIDEO) {
+        const { type: mediaType, url } = mediaItem;
+        if (mediaType === VIDEO) {
           // Distinguish between actual video and GIF based on URL extension
           if (url && url?.toLowerCase()?.includes('.gif')) {
             bodyGif = url;

package/v2Components/NavigationBar/saga.js

@@ -12,7 +12,7 @@ export default [
   {
     key: 'analyticsBotSaga',
     saga: function* analyticsBotSagaFn() {
-      yield all(analyticsBotSaga?.map(saga => saga.call()));
+      yield all(analyticsBotSaga.map(saga => saga.call()));
     },
   },
 ];

package/v2Components/NavigationBar/tests/saga.test.js

@@ -11,8 +11,8 @@ describe("analyticsBotSagaFn", () => {
     );
     return expectSaga(analyticsBotSagaFn)
       .provide([
-        [matchers.call.fn(analyticsBotSaga?.[0]), undefined],
-        [matchers.call.fn(analyticsBotSaga?.[1]), undefined]
+        [matchers.call.fn(analyticsBotSaga[0]), undefined],
+        [matchers.call.fn(analyticsBotSaga[1]), undefined]
       ])
       .run();
   });

package/v2Components/TemplatePreview/index.js

@@ -182,17 +182,17 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
               key={`carousel-card-${idx}`}
               className="mobile-push-carousel-card message-pop align-left message-pop-carousel"
             >
-              {item?.mediaType === IMAGE.toLowerCase() && item?.imageUrl && (
+              {item?.mediaType?.toLowerCase() === IMAGE && (item?.imageUrl || item?.url) && (
                 <CapImage
-                  src={item?.imageUrl}
+                  src={item?.imageUrl || item?.url}
                   alt="carousel-img"
                   className="carousel-image"
                 />
               )}
-              {item?.mediaType === VIDEO.toLowerCase() && item?.videoPreviewImg && (
+              {item?.mediaType?.toLowerCase() === VIDEO && item?.videoPreviewImg && (
                 <CapRow className="video-preview">
                   <CapImage
-                    src={item?.videoPreviewImg}
+                    src={item?.videoPreviewImg || item?.url}
                     alt="carousel-video-preview"
                     className="carousel-video-preview"
                   />
@@ -236,7 +236,7 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
     } = this.props;
     let content = channel && channel.toLowerCase() === 'sms' ? [this.props.content] : this.props.content;
     const { formatMessage } = intl;
-    const { rcsPreviewContent, inAppPreviewContent, viberPreviewContent, isBeeFreeTemplate } = content || {};
+    const { rcsPreviewContent, inAppPreviewContent, viberPreviewContent } = content || {};
     const { rcsImageSrc, rcsTitle, rcsDesc, buttonText: rcsButtonText } = rcsPreviewContent || {};
     const {
       videoParams,
@@ -1326,31 +1326,6 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
               </div>
             )}
             {channel?.toUpperCase() === INAPP && (
-              isBeeFreeTemplate ? (
-                <div className="shell-v2 align-center">
-                  <div style={{ position: 'relative', display: 'inline-block', width: '100%', height: '100%' }}>
-                    <CapImage
-                      className="preview-image"
-                      src={this.props.device === ANDROID ? inAppMobileAndroidFull : inAppMobileIOSFull}
-                      alt={formatMessage(messages.previewGenerated)}
-                    />
-                    <iframe 
-                      srcDoc={inAppPreviewContent?.value} 
-                      title={formatMessage(messages.inappPreview)}
-                      style={{
-                        position: 'absolute',
-                        top: '3rem',
-                        left: '5rem',
-                        width: '60%',
-                        height: '100%',
-                        zIndex: 1,
-                        pointerEvents: 'none'
-                      }}
-                      frameBorder="0" 
-                    />
-                  </div>
-                </div>
-              ) : (
               <div className="shell-v2 align-center">
                 <CapImage
                   className="preview-image"
@@ -1427,9 +1402,8 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                       )}
                     </div>
                   </div>
-                  </div>
                 </div>
-              )
+              </div>
             )}
           </CapRow>
         </CapColumn>

package/v2Components/TemplatePreview/messages.js

@@ -94,8 +94,4 @@ export default defineMessages({
     id: 'creatives.componentsV2.TemplatePreview.videoNotSupported',
     defaultMessage: 'Your browser does not support the video tag.',
   },
-  inappPreview: {
-    id: 'creatives.componentsV2.TemplatePreview.inappPreview',
-    defaultMessage: 'Inapp Preview',
-  },
 });

package/v2Components/TestAndPreviewSlidebox/PreviewSection.js

@@ -15,7 +15,7 @@ const PreviewSection = ({
   formatMessage,
   PreviewChrome,
 }) => (
-  <CapRow className="preview-section-test panel-section">
+  <CapRow className="preview-section panel-section">
     <PreviewChrome
       device={previewDevice}
       onDeviceChange={setPreviewDevice}

package/v2Components/TestAndPreviewSlidebox/_testAndPreviewSlidebox.scss

@@ -329,7 +329,7 @@
     }
   }
 
-  .preview-section-test {
+  .preview-section {
     .section-title {
       margin-bottom: $CAP_SPACE_16;
       color: #333;

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -27,7 +27,6 @@ import Rcs from '../Rcs';
 import { getWhatsappContent } from '../Whatsapp/utils';
 import * as commonUtil from '../../utils/common';
 import Zalo from '../Zalo';
-import InappWrapper from '../InappWrapper';
 import MobilePushNew from '../MobilePushNew';
 const CreativesWrapper = styled.div`
   .ant-popover,
@@ -116,8 +115,6 @@ export function SlideBoxContent(props) {
       emailCreateMode,
       onMobilepushModeChange,
       mobilePushCreateMode,
-      inAppCreateMode,
-      onInAppModeChange,
       templateStep,
       onEnterTemplateName,
       onRemoveTemplateName,
@@ -938,32 +935,25 @@ export function SlideBoxContent(props) {
         />
       )}
 
-      {isCreateInApp && (<InappWrapper
-        key="creatives-inapp-wrapper"
-        date={new Date().getMilliseconds()}
+      {isCreateInApp && (<InApp
         isFullMode={isFullMode}
         onCreateComplete={onCreateComplete}
         handleClose={handleClose}
+        location={{
+          pathname: `/inapp/create`,
+          query,
+          search: '',
+        }}
         getFormData={getFormData}
         isGetFormData={isGetFormData}
         templateData={templateData}
         getDefaultTags={type}
-        step={templateStep}
-        onResetStep={onResetStep}
-        onInAppModeChange={onInAppModeChange}
-        onEnterTemplateName={onEnterTemplateName}
-        onRemoveTemplateName={onRemoveTemplateName}
-        inAppCreateMode={inAppCreateMode}
-        forwardedTags={forwardedTags}
-        type={type}
-        query={query}
-        selectedOfferDetails={selectedOfferDetails}
-        onValidationFail={onValidationFail}
+        eventContextTags={eventContextTags}
+        showLiquidErrorInFooter={showLiquidErrorInFooter}
       />
       )}
 
       {isEditInApp && (<InApp
-        isEditInApp={true}
         isFullMode={isFullMode}
         templateData={templateData}
         getFormData={getFormData}
@@ -981,14 +971,6 @@ export function SlideBoxContent(props) {
           search: '',
         }}
         showLiquidErrorInFooter={showLiquidErrorInFooter}
-        setIsLoadingContent={setIsLoadingContent}
-        onInAppModeChange={onInAppModeChange}
-        inAppCreateMode={inAppCreateMode}
-        isGetFormData={isGetFormData}
-        showTemplateName={showTemplateName}
-        onValidationFail={onValidationFail}
-        type={type}
-        query={query}
         />
       )}
 

package/v2Containers/CreativesContainer/index.js

@@ -363,16 +363,16 @@ export class Creatives extends React.Component {
           const iosContent = { ...(templateData?.iosContent || {}) };
           if (androidCarouselMedia?.length) {
             androidContent.expandableDetails.carouselData = androidCarouselMedia.map((media) => ({
-              mediaType: media.type,
-              imageUrl: media.url,
+              mediaType: media?.type,
+              imageUrl: media?.url,
               buttons: [],
               videoSrc: '',
             }));
           }
           if (iosCarouselMedia?.length) {
             iosContent.expandableDetails.carouselData = iosCarouselMedia.map((media) => ({
-              mediaType: media.type,
-              imageUrl: media.url,
+              mediaType: media?.type,
+              imageUrl: media?.url,
               buttons: [],
               videoSrc: '',
             }));
@@ -398,22 +398,8 @@ export class Creatives extends React.Component {
             versions: {
               base: {
                 content: {
-                  ANDROID: templateData?.androidContent?.type === 'HTML' ? {
-                    type: templateData?.androidContent?.type,
-                    bodyType: templateData?.androidContent?.bodyType,
-                    deviceType: constants.ANDROID,
-                    beeHtml: { value: templateData?.androidContent?.message },
-                    beeJson: templateData?.androidContent?.expandableDetails?.message,
-                    isBEEeditor: true,
-                  } : templateData?.androidContent,
-                  IOS: templateData?.iosContent?.type === 'HTML' ? {
-                    type: templateData?.iosContent?.type,
-                    bodyType: templateData?.iosContent?.bodyType,
-                    deviceType: constants.IOS,
-                    beeHtml: { value: templateData?.iosContent?.message },
-                    beeJson: templateData?.iosContent?.expandableDetails?.message,
-                    isBEEeditor: true,
-                  } : templateData?.iosContent,
+                  ANDROID: templateData?.androidContent,
+                  IOS: templateData?.iosContent,
                 },
               },
             },
@@ -815,24 +801,9 @@ export class Creatives extends React.Component {
             if (channel === constants.MOBILE_PUSH && androidContent?.expandableDetails?.carouselData?.length) {
               androidContent.expandableDetails = this.getMobilePushCarouselData({...androidContent?.expandableDetails});
             }
-            if (androidContent?.isBEEeditor && androidContent?.beeHtml?.value) {
-              templateData.androidContent = {};
-              templateData.androidContent.type = 'TEXT';
-              // replace the TEXT in above line when backend supports HTML
-              templateData.androidContent.message = androidContent?.beeHtml?.value || '';
-              templateData.androidContent.title = 'bee free template';
-              templateData.androidContent.bodyType = androidContent?.bodyType;
-              templateData.androidContent.deviceType = constants.ANDROID;
-              templateData.androidContent.expandableDetails = {
-                style: 'BIG_TEXT',
-                // replace the BIG_TEXT in above line when backend supports HTML
-                message: androidContent?.beeJson || '',
-              };
-            } else if (!androidContent?.isBEEeditor) {
-              templateData.androidContent = androidContent;
-              templateData.androidContent.type = androidContent?.type || get(channelTemplate, 'definition.mode', '')?.toUpperCase() || constants.TEXT;
-              templateData.androidContent.deviceType = constants.ANDROID;
-            }
+            templateData.androidContent = androidContent;
+            templateData.androidContent.type = androidContent?.type || get(channelTemplate, 'definition.mode', '')?.toUpperCase() || constants.TEXT;
+            templateData.androidContent.deviceType = constants.ANDROID;
           }
           const iosContent = channel === constants.INAPP ? get(channelTemplate, 'versions.base.content.IOS') : get(channelTemplate, 'versions.base.IOS');
           if (!isEmpty(iosContent)) {
@@ -852,24 +823,9 @@ export class Creatives extends React.Component {
             if (channel === constants.MOBILE_PUSH && iosContent?.expandableDetails?.carouselData?.length) {
               iosContent.expandableDetails = this.getMobilePushCarouselData({...iosContent?.expandableDetails});
             }
-            if (iosContent?.isBEEeditor && iosContent?.beeHtml?.value) {
-              templateData.iosContent = {};
-              templateData.iosContent.type = 'TEXT';
-              // replace the TEXT in above line when backend supports HTML
-              templateData.iosContent.message = iosContent?.beeHtml?.value || '';
-              templateData.iosContent.title = 'bee free template';
-              templateData.iosContent.bodyType = iosContent?.bodyType;
-              templateData.iosContent.deviceType = constants.IOS;
-              templateData.iosContent.expandableDetails = {
-                style: 'BIG_TEXT',
-                // replace the BIG_TEXT in above line when backend supports HTML
-                message: iosContent?.beeJson || '',
-              };
-            } else if (!iosContent?.isBEEeditor) {
-              templateData.iosContent = iosContent;
-              templateData.iosContent.type = iosContent?.type || get(channelTemplate, 'definition.mode', '')?.toUpperCase() || 'TEXT';
-              templateData.iosContent.deviceType = constants.IOS;
-            }
+            templateData.iosContent = iosContent;
+            templateData.iosContent.type = iosContent?.type || get(channelTemplate, 'definition.mode', '')?.toUpperCase() || 'TEXT';
+            templateData.iosContent.deviceType = constants.IOS;
           }
           templateData.messageSubject = channelTemplate?.name ? channelTemplate?.name : "messageSubject";
         }
@@ -1311,7 +1267,7 @@ export class Creatives extends React.Component {
   shouldShowFooter = () => {
     const { isFullMode } = this.props;
     const {
-      slidBoxContent, currentChannel, emailCreateMode, templateNameExists, templateStep, mobilePushCreateMode, weChatTemplateType, templateData, inAppCreateMode,
+      slidBoxContent, currentChannel, emailCreateMode, templateNameExists, templateStep, mobilePushCreateMode, weChatTemplateType, templateData,
     } = this.state;
     const channel = currentChannel.toUpperCase();
     const currentStep = this.creativesTemplateSteps[templateStep];
@@ -1354,13 +1310,6 @@ export class Creatives extends React.Component {
       showFooter = true;
     }
 
-    if (channel === constants.INAPP &&
-      ((slidBoxContent === 'createTemplate' && !isEmpty(inAppCreateMode))
-      || (slidBoxContent === 'editTemplate' && currentStep === 'modeSelection')) &&
-      templateNameExists) {
-      showFooter = true;
-    }
-
     if (showFooter) {
       if (slidBoxContent === "createTemplate" && ((channel === constants.EMAIL && currentStep === 'createTemplateContent') ||
         ([constants.SMS, constants.WECHAT].includes(channel) && currentStep === 'modeSelection'))) {
@@ -1481,7 +1430,7 @@ export class Creatives extends React.Component {
     } else if (currentChannel.toUpperCase() === constants.WECHAT) {
       isShowContinueFooter = !isEmpty(weChatTemplateType) && currentStep === "modeSelection";
     } else if (currentChannel.toUpperCase() === constants.INAPP) {
-      isShowContinueFooter = !isEmpty(inAppCreateMode) && currentStep === "modeSelection";
+      isShowContinueFooter = !isEmpty(inAppCreateMode) && currentChannel === "modeSelection";
     }
 
     return isShowContinueFooter;
@@ -1518,7 +1467,6 @@ export class Creatives extends React.Component {
       templateStep,
       isLoadingContent,
       mobilePushCreateMode,
-      inAppCreateMode,
       isDiscardMessage,
       weChatTemplateType,
       weChatMaptemplateStep,
@@ -1621,8 +1569,6 @@ export class Creatives extends React.Component {
               setIsLoadingContent={this.setIsLoadingContent}
               onMobilepushModeChange={this.onMobilepushModeChange}
               mobilePushCreateMode={mobilePushCreateMode}
-              inAppCreateMode={inAppCreateMode}
-              onInAppModeChange={this.onInAppModeChange}
               showTemplateName={this.showTemplateName}
               onValidationFail={this.onValidationFail}
               channelsToHide={channelsToHide}

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

@@ -31,7 +31,6 @@ exports[`Test SlideBoxContent container campaign message, add creative click rcs
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
-        onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
@@ -117,7 +116,6 @@ exports[`Test SlideBoxContent container campaign message, add creative click wha
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
-        onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
@@ -203,7 +201,6 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit all data
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
-        onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
@@ -301,7 +298,6 @@ exports[`Test SlideBoxContent container campaign message, whatsapp edit min data
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
-        onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}
@@ -399,7 +395,6 @@ exports[`Test SlideBoxContent container it should clear the url, on channel chan
         onEnterTemplateName={[Function]}
         onFTPSubmit={[MockFunction]}
         onFacebookSubmit={[MockFunction]}
-        onInAppModeChange={[Function]}
         onMobilepushModeChange={[Function]}
         onPreviewTemplate={[Function]}
         onRemoveTemplateName={[Function]}

package/v2Containers/Email/index.js

@@ -2709,7 +2709,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     return (
       <div className="email-container">
         <CapSpin spinning={isLoading}>
-          { !showTestAndPreviewSlidebox && showTestAndPreview &&
+          { showTestAndPreview &&
             <div className="test-and-preview-container">
               {this.showTestAndPreviewIcons('PREVIEW')}
               {this.showTestAndPreviewIcons('TEST')}

package/v2Containers/InApp/actions.js

@@ -7,7 +7,6 @@ import {
   UPLOAD_INAPP_ASSET_REQUEST,
   CLEAR_INAPP_ASSET,
   INAPP_EDIT_TEMPLATE_REQUEST,
-  GET_BEE_POPUP_BUILDER_TOKEN_REQUEST,
 } from "./constants";
 
 export function createInAppTemplate(payload, callback) {
@@ -63,9 +62,3 @@ export const clearInAppAsset = (templateType) => ({
   type: CLEAR_INAPP_ASSET,
   templateType,
 });
-
-export function getBeePopupBuilderToken() {
-  return {
-    type: GET_BEE_POPUP_BUILDER_TOKEN_REQUEST,
-  };
-}

package/v2Containers/InApp/constants.js

@@ -34,10 +34,6 @@ export const UPLOAD_INAPP_ASSET_SUCCESS = `${prefix}/UPLOAD_INAPP_ASSET_SUCCESS`
 export const UPLOAD_INAPP_ASSET_FAILURE = `${prefix}/UPLOAD_INAPP_ASSET_FAILURE`;
 export const CLEAR_INAPP_ASSET = `${prefix}/CLEAR_INAPP_ASSET`;
 
-export const GET_BEE_POPUP_BUILDER_TOKEN_REQUEST = `${prefix}/GET_BEE_POPUP_BUILDER_TOKEN_REQUEST`;
-export const GET_BEE_POPUP_BUILDER_TOKEN_SUCCESS = `${prefix}/GET_BEE_POPUP_BUILDER_TOKEN_SUCCESS`;
-export const GET_BEE_POPUP_BUILDER_TOKEN_FAILURE = `${prefix}/GET_BEE_POPUP_BUILDER_TOKEN_FAILURE`;
-
 export const INAPP_MEDIA_TYPES = {
   TEXT: "TEXT",
   IMAGE: "IMAGE",
@@ -163,7 +159,4 @@ export const INAPP_LAYOUT_DETAILS = {
 };
 
 export const DEVICE_SUPPORTED = '1';
-export const AI_CONTENT_BOT_DISABLED = "AI_CONTENT_BOT_DISABLED";
-export const MODE_SELECTION = "modeSelection";
-export const BASIC_EDITOR = "basicEditor";
-export const BEE_EDITOR = "beeEditor";
+export const AI_CONTENT_BOT_DISABLED = "AI_CONTENT_BOT_DISABLED";