@capillarytech/creatives-library 8.0.88-alpha.7 → 8.0.88

package/package.json

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

package/services/api.js

@@ -524,13 +524,7 @@ export const checkBulkDuplicates = (data) => {
 export const createWhatsappTemplate = ({payload, gupshupMediaFile }) => {
   const data = new FormData();
   data.append('payload', JSON.stringify(payload));
-  if (Array.isArray(gupshupMediaFile) && gupshupMediaFile?.length) {
-    gupshupMediaFile.forEach((file, index) => {
-      data.append(`gupshupMediaFile_${index}`, file);
-    });
-  } else {
-    data.append('gupshupMediaFile', gupshupMediaFile);
-  }
+  data.append('gupshupMediaFile', gupshupMediaFile);
   const url = `${API_ENDPOINT}/templates/WHATSAPP`;
   return request(url, getAPICallObject('POST', data, true));
 };

package/services/tests/api.test.js

@@ -86,11 +86,7 @@ describe('uploadFile -- whatsapp image upload', () => {
 describe('createWhatsappTemplate -- Test with valid responses', () => {
   it('Should return correct response', () =>
     expect(
-      createWhatsappTemplate({gupshupMediaFile: [sampleFile], payload: mockData.createWhatsappPayload}),
-    ).toEqual(Promise.resolve()));
-  it('Should return correct response when single file is present', () =>
-    expect(
-      createWhatsappTemplate({gupshupMediaFile: sampleFile, payload: mockData.createWhatsappPayload}),
+      createWhatsappTemplate(sampleFile, mockData.createWhatsappPayload),
     ).toEqual(Promise.resolve()));
 });
 

package/v2Components/CapImageUpload/index.js

@@ -44,7 +44,6 @@ function CapImageUpload(props) {
     imageData,
     channel,
     channelSpecificStyle,
-    showReUploadButton = true,
   } = props;
   const {
     formatMessage,
@@ -225,18 +224,16 @@ function CapImageUpload(props) {
         </>
       );
     }
-    if (showReUploadButton) {
-      return (
-        <CapButton
-          className="dragger-button re-upload"
-          type="flat"
-          onClick={onReUpload}
-          style={channelSpecificStyle ? { marginTop: '-16px'} : {}}
-        >
-          <FormattedMessage {...messages.imageReUpload} />
-        </CapButton>
-      );
-    }
+    return (
+      <CapButton
+        className="dragger-button re-upload"
+        type="flat"
+        onClick={onReUpload}
+        style={channelSpecificStyle ? { marginTop: '-16px'} : {}}
+       >
+        <FormattedMessage {...messages.imageReUpload} />
+      </CapButton>
+    );
   }, [isImageError, imageSrc]);
 
   return (

package/v2Components/CapVideoUpload/index.js

@@ -39,7 +39,6 @@ function CapVideoUpload(props) {
     errorMessage,
     showVideoNameAndDuration = true,
     formClassName = 'video-form',
-    showReUploadButton = true,
   } = props;
   const [isVideoError, updateVideoErrorMessage] = useState(false);
   const [isVideo, updateVideoStatus] = useState(false);
@@ -247,17 +246,15 @@ function CapVideoUpload(props) {
     const videoDurationValue = moment('1900-01-01 00:00:00').add(videoDuration, 'seconds').format("HH.mm.ss"); // to get the duration of video
     return (
       <Fragment key={videoSrc}>
-        {showReUploadButton && (
-          <div style={{ overflow: 'hidden' }}>
-            <CapButton
-              className="dragger-button video-reupload"
-              type="flat"
-              onClick={onReUpload}
-            >
-              <FormattedMessage {...messages.imageReUpload} />
-            </CapButton>
-          </div>
-        )}
+        <div style={{ overflow: 'hidden' }}>
+          <CapButton
+            className="dragger-button video-reupload"
+            type="flat"
+            onClick={onReUpload}
+          >
+            <FormattedMessage {...messages.imageReUpload} />
+          </CapButton>
+        </div>
         <div className={showVideoNameAndDuration ? 'video-panel' : 'video-panel-wp'}>
           <video
             width="230"

package/v2Components/CapWhatsappCTA/messages.js

@@ -104,8 +104,4 @@ export default defineMessages({
     id: `${prefix}.whatsappCtaTagListRevert`,
     defaultMessage: 'Reset website URL label to default value',
   },
-  url: {
-    id: `${prefix}.url`,
-    defaultMessage: 'URL',
-  },
 });

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -567,10 +567,6 @@
         font-size: 10px;
         font-family: 'open-sans';
       }
-      &.message-pop-carousel {
-        position: relative; 
-        margin-right: $CAP_SPACE_04;
-      }
     }
   }
   .android-push-message-Container, .iphone-push-message-Container{
@@ -751,11 +747,6 @@
       width: 153px;
     }
   }
-
-  .msg-container-carousel {
-    display: flex;
-    flex-direction: column;
-  }
 }
 
 .align-center {

package/v2Components/TemplatePreview/index.js

@@ -20,7 +20,6 @@ import {
   CAP_PURPLE01,
   CAP_G16,
   CAP_SPACE_08,
-  CAP_SPACE_04,
 } from '@capillarytech/cap-ui-library/styled/variables';
 import isEmpty from 'lodash/isEmpty';
 import './_templatePreview.scss';
@@ -44,16 +43,14 @@ import inAppMobileIOSModal from './assets/images/inapp_mobile_ios_modal.svg';
 import inAppMobileIOSTop from './assets/images/inapp_mobile_ios_top.svg';
 import inAppMobileIOSBottom from './assets/images/inapp_mobile_ios_bottom.svg';
 import inAppMobileIOSFull from './assets/images/inapp_mobile_ios_full.svg';
-import whatsappImageEmptyPreview from './assets/images/empty_image_preview.svg';
-import whatsappVideoEmptyPreview from './assets/images/empty_video_preview.svg';
 import videoPlay from '../../assets/videoPlay.svg';
 import zaloMessage from '../../v2Containers/Zalo/messages';
 import { handlePreviewInNewTab } from '../../utils/common';
 import { TEMPLATE, IMAGE_CAROUSEL, IMAGE, STICKER, TEXT, IMAGE_MAP, VIDEO } from '../../v2Containers/Line/Container/constants';
 import CapFacebookPreview from '../../v2Containers/CapFacebookPreview';
 import WhatsappStatusContainer from '../WhatsappStatusContainer';
-import { getWhatsappQuickReply, getWhatsappCarouselButtonView } from '../../v2Containers/Whatsapp/utils';
-import { QUICK_REPLY, WHATSAPP_CATEGORIES, PHONE_NUMBER } from '../../v2Containers/Whatsapp/constants';
+import { getWhatsappQuickReply } from '../../v2Containers/Whatsapp/utils';
+import { QUICK_REPLY, WHATSAPP_CATEGORIES } from '../../v2Containers/Whatsapp/constants';
 import { ANDROID, INAPP_MESSAGE_LAYOUT_TYPES } from '../../v2Containers/InApp/constants';
 
 const wechatBodyNew = require('./assets/images/wechat_mobile_android.svg');
@@ -216,7 +213,7 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
       iosActions = _.map(content.actions, (action) => {
         if (action.label) {
           return (<div className="actions" key={`action-${action.label}`}>
-              <span className="action">{action.label.toUpperCase()}</span>
+            <span className="action">{action.label.toUpperCase()}</span>
           </div>);
         }
         return undefined;
@@ -256,15 +253,6 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
       'width': '88%',
       'left': 0,
     };
-    const carouselWhatsappSectionStyle = {
-      'padding': `${CAP_SPACE_04} 0 ${CAP_SPACE_08}`,
-      'border-radius': '0.428rem',
-      'background-color': CAP_WHITE,
-      'width': '11.857rem',
-      'cursor': 'pointer',
-      'flex-shrink': 0,
-      'left': 0,
-    };
     const getVideoContent = ({
       video,
       actionUrl,
@@ -286,53 +274,53 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
       >
         {
           video
-            ? (
-              <>
-                <video style={{ opacity: 0.5, width: '100%' }}>
-                  <source src={video} type="video/mp4" />
-                </video>
-                <div
-                  style={{
-                    position: 'absolute',
-                    display: 'flex',
-                    flexDirection: 'column',
-                  }}
+          ? (
+            <>
+              <video style={{ opacity: 0.5, width: '100%' }}>
+                <source src={video} type="video/mp4" />
+              </video>
+              <div
+                style={{
+                  position: 'absolute',
+                  display: 'flex',
+                  flexDirection: 'column',
+                }}
+              >
+                <CapButton
+                  className="preview-video-btn"
+                  type="flat"
                 >
-                  <CapButton
-                    className="preview-video-btn"
-                    type="flat"
-                  >
                   <CapIcon type="play"/>
-                    <FormattedMessage {...messages.playVideo} />
-                  </CapButton>
-                  {
-                    actionUrl
-                      ? (
-                        <CapButton
-                          className="preview-video-btn"
-                          type="flat"
-                        >
+                  <FormattedMessage {...messages.playVideo} />
+                </CapButton>
+                {
+                  actionUrl
+                  ? (
+                    <CapButton
+                      className="preview-video-btn"
+                      type="flat"
+                    >
                       <CapIcon type="reply" style={{ fontSize: 18 }}/>
-                          <FormattedMessage {...messages.showDetails} />
-                        </CapButton>
-                      )
-                      : null
-                  }
-                </div>
-              </>
-            )
-            : (
-              <CapImage
-                src={lineVideoPlaceholder}
-                alt="brand-name"
-                rest={{
-                  style: {
-                    width: 126,
-                    marginBottom: 5,
-                  },
-                }}
-              />
-            )
+                      <FormattedMessage {...messages.showDetails} />
+                    </CapButton>
+                  )
+                  : null
+                }
+              </div>
+            </>
+          )
+          : (
+            <CapImage
+              src={lineVideoPlaceholder}
+              alt="brand-name"
+              rest={{
+                style: {
+                  width: 126,
+                  marginBottom: 5,
+                },
+              }}
+            />
+          )
         }
       </div>
     );
@@ -348,10 +336,10 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
             renderArray.push(
               <CapLabel type="label21" className="whatsapp-cta-preview">
                 {type !== WHATSAPP_CATEGORIES.authentication && <CapIcon
-                    type={
-                      (ctaType || type) === PHONE_NUMBER ? 'call' : 'launch'
-                    }
-                    size="xs"
+                  type={
+                    (ctaType || type) === 'PHONE_NUMBER' ? 'call' : 'launch'
+                  }
+                  size="xs"
                 />}
                 {text}
               </CapLabel>,
@@ -442,42 +430,42 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
         {this.props.showCount &&
           channel &&
           channel.toLowerCase() !== FACEBOOK && (
-          <CapColumn span={16}>
-            {channel && channel.toLowerCase() === "sms" && (
-              <CapHeading type="h3">
-                <FormattedMessage
-                  {...messages.charactersTotal}
-                  values={{
-                    smsCount: smsDetails.parts,
-                    charCount: smsDetails.chars_used,
-                  }}
-                />
-                {smsDetails.unicode && (
-                  <FormattedMessage {...messages.smsFormatType} />
-                )}
-              </CapHeading>
-            )}
-            {smsDetails.optoutUrlPresent && (
-              <CapHeading type="h6">
-                <FormattedMessage
-                  {...messages.optoutCharactersTotal}
-                  values={{ optoutUrlLength: smsDetails.optouturlLength }}
-                />
-              </CapHeading>
-            )}
-            {channel?.toLowerCase() === WHATSAPP.toLowerCase() ? (
-              <>
-                <WhatsappStatusContainer template={templateData} />
-                <CapHeading type="h3" className="margin-t-12">
+            <CapColumn span={16}>
+              {channel && channel.toLowerCase() === "sms" && (
+                <CapHeading type="h3">
                   <FormattedMessage
-                    {...messages.whatsappMessageLength}
-                    values={{ length: whatsappUpdatedLen }}
+                    {...messages.charactersTotal}
+                    values={{
+                      smsCount: smsDetails.parts,
+                      charCount: smsDetails.chars_used,
+                    }}
                   />
+                  {smsDetails.unicode && (
+                    <FormattedMessage {...messages.smsFormatType} />
+                  )}
                 </CapHeading>
-              </>
-            ) : null}
-          </CapColumn>
-        )}
+              )}
+              {smsDetails.optoutUrlPresent && (
+                <CapHeading type="h6">
+                  <FormattedMessage
+                    {...messages.optoutCharactersTotal}
+                    values={{ optoutUrlLength: smsDetails.optouturlLength }}
+                  />
+                </CapHeading>
+              )}
+              {channel?.toLowerCase() === WHATSAPP.toLowerCase() ? (
+                <>
+                  <WhatsappStatusContainer template={templateData} />
+                  <CapHeading type="h3" className="margin-t-12">
+                    <FormattedMessage
+                      {...messages.whatsappMessageLength}
+                      values={{ length: whatsappUpdatedLen }}
+                    />
+                  </CapHeading>
+                </>
+              ) : null}
+            </CapColumn>
+          )}
         <CapColumn span={this.props.showCount ? 8 : 24}>
           {showTestAndPreview && (
             <div className="test-and-preview-container">
@@ -640,9 +628,9 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                         )}
                         {content.actions.filter((action) => action.label)
                           .length ? (
-                            <div className="actions">
-                              {_.map(
-                                content.actions,
+                          <div className="actions">
+                            {_.map(
+                              content.actions,
                               (action) =>
                                 !!action.label && (
                                   <span
@@ -652,11 +640,11 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                                     {action.label && action.label.toUpperCase()}
                                   </span>
                                 )
-                              )}
-                            </div>
-                          ) : (
-                            ""
-                          )}
+                            )}
+                          </div>
+                        ) : (
+                          ""
+                        )}
                       </div>
                     ) : (
                       <div className="message-pop align-left">
@@ -992,14 +980,14 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                   <CapLabel className="whatsapp-brand-name">
                     {whatsappUpdatedAccountName || ""}
                   </CapLabel>
-                  <div className={`msg-container whatsapp-message-container ${content?.carouselData && 'msg-container-carousel'}`}>
+                  <div className="msg-container whatsapp-message-container">
                     <div
-                      className={`message-pop align-left ${content?.carouselData && 'message-pop-carousel'}`}
+                      className="message-pop align-left"
                       style={whatsappSectionStyle}
                     >
                       <div className="whatsapp-content">
-                        {content?.showUrlPreview
-                          && renderUrlPreview(content?.metaTagsDetails)}
+                        {content?.showUrlPreview &&
+                          renderUrlPreview(content?.metaTagsDetails)}
                         {content?.whatsappImageSrc && (
                           <CapImage
                             src={content.whatsappImageSrc}
@@ -1038,60 +1026,6 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                         {renderQuickReplyPreview()}
                       </div>
                     </div>
-                    {content?.carouselData && (
-                      <div
-                        style={{
-                          overflowX: "auto",
-                          display: "flex",
-                          paddingTop: "5px",
-                          paddingRight: "5px",
-                          whiteSpace: "nowrap",
-                          scrollbarWidth: "none", // Hide scrollbar in Firefox
-                          msOverflowStyle: "none", // Hide scrollbar in IE/Edge
-                        }}
-                        className="scroll-container"
-                      >
-                        {content?.carouselData?.map((data, index) => (
-                          <div
-                            key={`carousel-${index}`}
-                            className="message-pop align-left message-pop-carousel"
-                            style={carouselWhatsappSectionStyle}>
-                            <div className="whatsapp-content">
-                              {content?.carouselMediaType === "image" && (
-                                <CapImage
-                                  src={data?.imageSrc ? data?.imageSrc : whatsappImageEmptyPreview}
-                                  className="whatsapp-image"
-                                  alt={formatMessage(messages.previewGenerated)}
-                                />
-                              )}
-                              {content?.carouselMediaType === "video" && (
-                                <CapTooltip
-                                  title={formatMessage(messages.videoPreviewTooltip)}
-                                >
-                                  <div className="video-preview">
-                                    <CapImage
-                                      src={data?.videoPreviewImg ? data?.videoPreviewImg : whatsappVideoEmptyPreview}
-                                      className="whatsapp-image"
-                                      alt={formatMessage(messages.previewGenerated)}
-                                    />
-                                    <div className="icon-position">
-                                      <CapImage
-                                        className="video-icon"
-                                        src={videoPlay}
-                                      />
-                                    </div>
-                                  </div>
-                                </CapTooltip>
-                              )}
-                              <CapLabel type="label5">
-                                {content?.isEditFlow ? data?.updatedBodyText?.join("") : data?.bodyText}
-                              </CapLabel>
-                              {getWhatsappCarouselButtonView(data?.buttons, true)}
-                            </div>
-                          </div>
-                        ))}
-                      </div>
-                    )}
                   </div>
                 </div>
                 <CapHeading
@@ -1271,21 +1205,21 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                       {ctaData &&
                         !isEmpty(ctaData) &&
                         ctaData[0]?.text !== "" && (
-                        <CapButton
-                          type="primary"
-                          className={`inapp-button-${templateLayoutType}-${device} ${
+                          <CapButton
+                            type="primary"
+                            className={`inapp-button-${templateLayoutType}-${device} ${
                               mediaPreview?.inAppImageSrcAndroid
                                 ? ""
                                 : `without-image-button-${templateLayoutType}-android`
-                          } ${
+                            } ${
                               mediaPreview?.inAppImageSrcIos
                                 ? ""
                                 : `without-image-button-${templateLayoutType}-ios`
-                          }`}
-                        >
-                          {ctaData[0]?.text}
-                        </CapButton>
-                      )}
+                            }`}
+                          >
+                            {ctaData[0]?.text}
+                          </CapButton>
+                        )}
                     </div>
                   </div>
                 </div>

package/v2Components/TemplatePreview/tests/__snapshots__/index.test.js.snap

@@ -66,10 +66,10 @@ exports[`Test Templates container Should render correct preview component for wh
           test
         </CapLabel>
         <div
-          className="msg-container whatsapp-message-container undefined"
+          className="msg-container whatsapp-message-container"
         >
           <div
-            className="message-pop align-left undefined"
+            className="message-pop align-left"
             style={
               Object {
                 "background-color": "#ffffff",
@@ -163,10 +163,10 @@ exports[`Test Templates container Should render correct preview component for wh
           test
         </CapLabel>
         <div
-          className="msg-container whatsapp-message-container undefined"
+          className="msg-container whatsapp-message-container"
         >
           <div
-            className="message-pop align-left undefined"
+            className="message-pop align-left"
             style={
               Object {
                 "background-color": "#ffffff",
@@ -235,10 +235,10 @@ exports[`Test Templates container Should render correct preview component for wh
           test
         </CapLabel>
         <div
-          className="msg-container whatsapp-message-container undefined"
+          className="msg-container whatsapp-message-container"
         >
           <div
-            className="message-pop align-left undefined"
+            className="message-pop align-left"
             style={
               Object {
                 "background-color": "#ffffff",