@capillarytech/creatives-library 8.0.128 → 8.0.129

package/v2Components/TemplatePreview/messages.js

@@ -90,4 +90,8 @@ export default defineMessages({
     id: `creatives.componentsV2.TemplatePreview.addToCart`,
     defaultMessage: 'Add to cart',
   },
+  videoNotSupported: {
+    id: 'creatives.componentsV2.TemplatePreview.videoNotSupported',
+    defaultMessage: 'Your browser does not support the video tag.',
+  },
 });

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -7,7 +7,6 @@ import cloneDeep from 'lodash/cloneDeep';
 import TemplatesV2 from '../TemplatesV2';
 import TemplatePreview from '../../v2Components/TemplatePreview';
 import SmsWrapper from '../SmsWrapper';
-// import SmsEdit from '../Sms/Edit';
 import Email from '../Email';
 import EmailWrapper from '../EmailWrapper';
 import MobilepushWrapper from '../MobilepushWrapper';
@@ -28,6 +27,7 @@ import Rcs from '../Rcs';
 import { getWhatsappContent } from '../Whatsapp/utils';
 import * as commonUtil from '../../utils/common';
 import Zalo from '../Zalo';
+import MobilePushNew from '../MobilePushNew';
 const CreativesWrapper = styled.div`
   .ant-popover,
   .ant-notification,
@@ -424,7 +424,6 @@ export function SlideBoxContent(props) {
         channelsToDisable={channelsToDisable}
         messageDetails={messageDetails}
         onFacebookSubmit={onFacebookSubmit}
-        location={creativesLocationProps}
         onCreateComplete={onCreateComplete}
         getFormSubscriptionData={getFormData}
         handleClose={handleClose}
@@ -479,9 +478,7 @@ export function SlideBoxContent(props) {
           forwardedTags={forwardedTags}
         />
       )}
-      {isMpushPreview &&
-        <MobilePushPreview templateData={templateData} channel={channel}/>
-      }
+
       {
         (currentChannel === constants.WECHAT && !!slidBoxContent) && <WechatWrapper
           mode={slidBoxContent}
@@ -665,63 +662,131 @@ export function SlideBoxContent(props) {
         handleCloseTestAndPreview={handleCloseTestAndPreview}
       />
         )}
-      {isEditMPush &&
-        <MobliPushEdit
-          getFormLibraryData={getFormData}
-          setIsLoadingContent={setIsLoadingContent}
-          location={{
-            pathname: `/mobilepush/edit/`,
-            query,
-          }}
-          params={{id: templateData._id}}
-          isFullMode={isFullMode}
-          isGetFormData={isGetFormData}
-          route={{ name: 'mobilepush' }}
-          templateData={templateData}
-          showTemplateName={showTemplateName}
-          getDefaultTags={type}
-          onValidationFail={onValidationFail}
-          forwardedTags={forwardedTags}
-          selectedOfferDetails={selectedOfferDetails}
-          onPreviewContentClicked={onPreviewContentClicked}
-          onTestContentClicked={onTestContentClicked}
-          type={type}
-          hideTestAndPreviewBtn={hideTestAndPreviewBtn}
-          creativesMode={creativesMode}
-          eventContextTags={eventContextTags}
-          showLiquidErrorInFooter={showLiquidErrorInFooter}
-        />
-        }
-      {isCreateMPush &&
-        <MobilepushWrapper
-          key="creatives-mobilepush-wrapper"
-          date={new Date().getMilliseconds()}
-          setIsLoadingContent={setIsLoadingContent}
-          onMobilepushModeChange={onMobilepushModeChange}
-          mobilePushCreateMode={mobilePushCreateMode}
-          isGetFormData={isGetFormData}
-          getFormData={getFormData}
-          templateData={templateData}
-          type={type}
-          step={templateStep}
-          showNextStep={onCreateNextStep}
-          isFullMode={isFullMode}
-          onEnterTemplateName={onEnterTemplateName}
-          onRemoveTemplateName={onRemoveTemplateName}
-          cap={cap}
-          onResetStep={onResetStep}
-          showTemplateName={showTemplateName}
-          query={query}
-          forwardedTags={forwardedTags}
-          onValidationFail={onValidationFail}
-          selectedOfferDetails={selectedOfferDetails}
-          onPreviewContentClicked={onPreviewContentClicked}
-          hideTestAndPreviewBtn={hideTestAndPreviewBtn}
-          onTestContentClicked={onTestContentClicked}
-          eventContextTags={eventContextTags}
-          showLiquidErrorInFooter={showLiquidErrorInFooter}
-        />
-      }
+      {isEditMPush && (
+        (isFullMode && !commonUtil.hasNewMobilePushFeatureEnabled()) || 
+        (!isFullMode && isLoyaltyModule) || 
+        (!isFullMode && !isLoyaltyModule && !commonUtil.hasNewMobilePushFeatureEnabled()) ? (
+          <MobliPushEdit
+            getFormLibraryData={getFormData}
+            setIsLoadingContent={setIsLoadingContent}
+            location={{
+              pathname: `/mobilepush/edit/`,
+              query,
+            }}
+            params={{ id: templateData._id }}
+            isFullMode={isFullMode}
+            isGetFormData={isGetFormData}
+            route={{ name: 'mobilepush' }}
+            templateData={templateData}
+            showTemplateName={showTemplateName}
+            getDefaultTags={type}
+            onValidationFail={onValidationFail}
+            forwardedTags={forwardedTags}
+            selectedOfferDetails={selectedOfferDetails}
+            onPreviewContentClicked={onPreviewContentClicked}
+            onTestContentClicked={onTestContentClicked}
+            type={type}
+            hideTestAndPreviewBtn={hideTestAndPreviewBtn}
+            creativesMode={creativesMode}
+            eventContextTags={eventContextTags}
+            showLiquidErrorInFooter={showLiquidErrorInFooter}
+          />
+        ) : (
+          <MobilePushNew
+            getFormLibraryData={getFormData}
+            setIsLoadingContent={setIsLoadingContent}
+            location={{
+              pathname: `/mobilepush/edit/`,
+              query,
+            }}
+            params={{ id: templateData._id }}
+            isFullMode={isFullMode}
+            isGetFormData={isGetFormData}
+            route={{ name: 'mobilepush' }}
+            templateData={templateData}
+            showTemplateName={showTemplateName}
+            getDefaultTags={type}
+            onValidationFail={onValidationFail}
+            forwardedTags={forwardedTags}
+            selectedOfferDetails={selectedOfferDetails}
+            onPreviewContentClicked={onPreviewContentClicked}
+            onTestContentClicked={onTestContentClicked}
+            type={type}
+            hideTestAndPreviewBtn={hideTestAndPreviewBtn}
+            creativesMode={creativesMode}
+            eventContextTags={eventContextTags}
+            showLiquidErrorInFooter={showLiquidErrorInFooter}
+          />
+        )
+      )}
+      {isCreateMPush && (
+        (isFullMode && !commonUtil.hasNewMobilePushFeatureEnabled()) || 
+        (!isFullMode && isLoyaltyModule) || 
+        (!isFullMode && !isLoyaltyModule && !commonUtil.hasNewMobilePushFeatureEnabled()) ? (
+          <MobilepushWrapper
+            key="creatives-mobilepush-wrapper"
+            date={new Date().getMilliseconds()}
+            setIsLoadingContent={setIsLoadingContent}
+            onMobilepushModeChange={onMobilepushModeChange}
+            mobilePushCreateMode={mobilePushCreateMode}
+            isGetFormData={isGetFormData}
+            getFormData={getFormData}
+            templateData={templateData}
+            type={type}
+            step={templateStep}
+            showNextStep={onCreateNextStep}
+            isFullMode={isFullMode}
+            onEnterTemplateName={onEnterTemplateName}
+            onRemoveTemplateName={onRemoveTemplateName}
+            cap={cap}
+            onResetStep={onResetStep}
+            showTemplateName={showTemplateName}
+            query={query}
+            forwardedTags={forwardedTags}
+            onValidationFail={onValidationFail}
+            selectedOfferDetails={selectedOfferDetails}
+            onPreviewContentClicked={onPreviewContentClicked}
+            hideTestAndPreviewBtn={hideTestAndPreviewBtn}
+            onTestContentClicked={onTestContentClicked}
+            eventContextTags={eventContextTags}
+            showLiquidErrorInFooter={showLiquidErrorInFooter}
+          />
+        ) : (
+          <MobilePushNew
+            key="creatives-mobilepush-wrapper"
+            date={new Date().getMilliseconds()}
+            setIsLoadingContent={setIsLoadingContent}
+            onMobilepushModeChange={onMobilepushModeChange}
+            mobilePushCreateMode={mobilePushCreateMode}
+            isGetFormData={isGetFormData}
+            getFormLibraryData={getFormData}
+            location={location}
+            getDefaultTags={type}
+            templateData={templateData}
+            type={type}
+            handleClose={handleClose}
+            step={templateStep}
+            showNextStep={onCreateNextStep}
+            isFullMode={isFullMode}
+            onEnterTemplateName={onEnterTemplateName}
+            onRemoveTemplateName={onRemoveTemplateName}
+            cap={cap}
+            onResetStep={onResetStep}
+            showTemplateName={showTemplateName}
+            query={query}
+            forwardedTags={forwardedTags}
+            onValidationFail={onValidationFail}
+            selectedOfferDetails={selectedOfferDetails}
+            onPreviewContentClicked={onPreviewContentClicked}
+            hideTestAndPreviewBtn={hideTestAndPreviewBtn}
+            onTestContentClicked={onTestContentClicked}
+            eventContextTags={eventContextTags}
+            showLiquidErrorInFooter={showLiquidErrorInFooter}
+            onCreateComplete={onCreateComplete}
+            creativesMode={creativesMode}
+          />
+        )
+      )}
       {
         isCreateFacebook && (
           <Facebook