@capillarytech/creatives-library 8.0.250 → 8.0.252

package/v2Components/CapImageUpload/index.js

@@ -17,18 +17,17 @@ import {
   CapImage,
   CapError,
 } from '@capillarytech/cap-ui-library';
-import { injectIntl, FormattedMessage, intlShape } from 'react-intl';
+import { injectIntl, FormattedMessage, intlShape} from 'react-intl';
 import { isEmpty, get } from 'lodash';
 import './index.scss';
 import Gallery from '../../v2Containers/Assets/Gallery';
 import { MAX_SUPPORTED_IMAGE_SIZE } from './constants';
 import {
-  FACEBOOK, INAPP, RCS, WHATSAPP, VIBER, WEBPUSH, WEBPUSH_BRAND_ICON
+  FACEBOOK, INAPP, RCS, WHATSAPP, VIBER,
 } from "../../v2Containers/CreativesContainer/constants";
 
 import messages from './messages';
 import { MOBILEPUSH } from '../CapVideoUpload/constants';
-import { CAP_SPACE_16 } from '@capillarytech/cap-ui-library/styled/variables';
 function CapImageUpload(props) {
   const {
     intl,
@@ -51,8 +50,6 @@ function CapImageUpload(props) {
     channelSpecificStyle,
     showReUploadButton = true,
     disableAutoRestore = false, // New prop to disable automatic restoration
-    recommendedDimensions, // Array of {width, height} objects for recommended dimensions
-    disabled = false,
   } = props;
   const {
     formatMessage,
@@ -75,7 +72,7 @@ function CapImageUpload(props) {
   const [isImageError, updateImageErrorMessage] = useState(false);
   const [isDrawerRequired, updateDrawerRequirement] = useState(false);
 
-  const { CapHeadingSpan } = CapHeading;
+  const {CapHeadingSpan} = CapHeading;
   const ImageComponent = useCallback(
     () => (
       <>
@@ -94,7 +91,7 @@ function CapImageUpload(props) {
 
   const WithLabel = LabelHOC(ImageComponent);
 
-  const uploadImages = useCallback((e, { files }) => {
+  const uploadImages = useCallback((e, {files}) => {
     if (e) {
       e.preventDefault();
     }
@@ -112,13 +109,13 @@ function CapImageUpload(props) {
         height: img.height,
         error: file && (file.size / (1e+6) > 5), // Checking if file exists and its size is greater than 5MB (5 * 10^6 bytes)
       };
-      submitAction({ file, type: 'image', fileParams }, incorrectFile);
+      submitAction({file, type: 'image', fileParams}, incorrectFile);
     };
     img.onerror = () => {
       const fileParams = {
         error: true,
       };
-      submitAction({ fileParams }, incorrectFile);
+      submitAction({fileParams}, incorrectFile);
     };
     if (e) {
       const event = e;
@@ -126,7 +123,7 @@ function CapImageUpload(props) {
     }
   }, []);
 
-  const rcsValidation = useCallback((incorrectFile, data, size, height, width, error) => {
+  const rcsValidation = useCallback((incorrectFile, data, size, height, width, error) => { 
     if (incorrectFile || size < minImgSize || size > imgSize || height !== imgHeight || width !== imgWidth || error) {
       updateImageErrorMessage(formatMessage(messages.imageErrorDesc));
     } else {
@@ -149,19 +146,6 @@ function CapImageUpload(props) {
     const { height, width, error } = fileParams || {};
     if (channel === RCS) {
       rcsValidation(incorrectFile, data, size, height, width, error);
-    } else if ([WEBPUSH, WEBPUSH_BRAND_ICON].includes(channel)) {
-      // For WEBPUSH, only validate file extension, size, and format - no dimension validation
-      if (incorrectFile || size > imgSize || error) {
-        updateImageErrorMessage(formatMessage(messages.imageErrorDesc));
-      } else {
-        updateImageErrorMessage('');
-        uploadAsset(
-          data.file,
-          data.type,
-          data.fileParams,
-          index,
-        );
-      }
     } else if (incorrectFile || size > imgSize || height > imgHeight || width > imgWidth || error) {
       updateImageErrorMessage(formatMessage(messages.imageErrorDesc));
     } else {
@@ -176,7 +160,7 @@ function CapImageUpload(props) {
   }, [isImageError]);
 
   const capUploaderCustomRequest = useCallback((uploadData) => {
-    uploadImages(undefined, { files: [uploadData.file] });
+    uploadImages(undefined, {files: [uploadData.file]});
   }, [uploadImages]);
 
   const setDrawerVisibility = useCallback((drawervisibleFlag) => updateDrawerRequirement(drawervisibleFlag), [isDrawerRequired]);
@@ -197,27 +181,19 @@ function CapImageUpload(props) {
       secure_file_path: image, width, height, file_size: size,
     } = get(imageTemplate, 'metaInfo', {});
     updateDrawerRequirement(false);
-    // For WEBPUSH, skip dimension validation - only check extension, size
-    if ([WEBPUSH, WEBPUSH_BRAND_ICON].includes(channel)) {
-      if (!allowedExtensionsRegex.test(image) || size > imgSize) {
-        updateImageErrorMessage(formatMessage(messages.imageErrorDesc));
-      } else {
-        updateImageErrorMessage('');
-        updateImageSrc(image);
-      }
-    } else if (!allowedExtensionsRegex.test(image) || height > imgHeight || width > imgWidth || size > imgSize) {
+    if (!allowedExtensionsRegex.test(image) || height > imgHeight || width > imgWidth || size > imgSize ) {
       updateImageErrorMessage(formatMessage(messages.imageErrorDesc));
     } else {
       updateImageErrorMessage('');
       updateImageSrc(image);
     }
-  }, [isImageError, isDrawerRequired, channel, allowedExtensionsRegex, imgSize, formatMessage]);
+  }, [isImageError, isDrawerRequired]);
 
   const getGalleryDrawerContent = useCallback(() => {
     const locationGallery = {
       pathname: `/assets`,
       search: '',
-      query: !isFullMode ? { type: 'embedded', module: 'library' } : {},
+      query: !isFullMode ? {type: 'embedded', module: 'library'} : {},
     };
     return (
       <>
@@ -254,7 +230,6 @@ function CapImageUpload(props) {
             customRequest={capUploaderCustomRequest}
             className="form-builder-dragger grey-background"
             showUploadList={!isImageError}
-            disabled={disabled}
           >
             <CapHeading className="dragger-title" type="h7">
               <FormattedMessage {...messages.dragAndDrop} />
@@ -262,7 +237,7 @@ function CapImageUpload(props) {
             <CapHeading className="dragger-or" type="label6">
               <FormattedMessage {...messages.or} />
             </CapHeading>
-            <CapButton className="dragger-button upload-image" type="secondary" disabled={disabled} tabIndex={disabled ? -1 : undefined}>
+            <CapButton className="dragger-button upload-image" type="secondary">
               <FormattedMessage {...messages.uploadComputer} />
             </CapButton>
             {channel !== WHATSAPP && (
@@ -270,8 +245,6 @@ function CapImageUpload(props) {
                 className="dragger-button gallery-select"
                 type="secondary"
                 onClick={onGalleryClick}
-                disabled={disabled}
-                tabIndex={disabled ? -1 : undefined}
               >
                 <FormattedMessage {...messages.uploadGallery} />
               </CapButton>
@@ -289,15 +262,13 @@ function CapImageUpload(props) {
           className="dragger-button re-upload"
           type="flat"
           onClick={onReUpload}
-          style={channelSpecificStyle ? { marginTop: `-${CAP_SPACE_16}` } : {}}
-          disabled={disabled}
-          tabIndex={disabled ? -1 : undefined}
+          style={channelSpecificStyle ? { marginTop: '-16px'} : {}}
         >
           <FormattedMessage {...messages.imageReUpload} />
         </CapButton>
       );
     }
-  }, [isImageError, imageSrc, disabled, showReUploadButton, channel, channelSpecificStyle, capUploaderCustomRequest, onGalleryClick, onReUpload]);
+  }, [isImageError, imageSrc]);
 
   return (
     <div style={style} className="cap-custom-image-upload">
@@ -314,8 +285,6 @@ function CapImageUpload(props) {
           type="file"
           onChange={(e) => uploadImages(e, { files: e.target.files })}
           accept={supportedExtensions || "image/*"}
-          disabled={disabled}
-          tabIndex={disabled ? -1 : undefined}
         />
         {getImageSection()}
         <CapDrawer
@@ -336,18 +305,7 @@ function CapImageUpload(props) {
         )}
         {![WHATSAPP, INAPP].includes(channel) && (
           <CapHeadingSpan type="label2" className="image-dimension">
-            {[WEBPUSH, WEBPUSH_BRAND_ICON].includes(channel) && recommendedDimensions?.length ? (
-              <FormattedMessage
-                {...messages.recommendedDimensions}
-                values={{
-                  dimensions: recommendedDimensions
-                    .map((dim) => `${dim.width} x ${dim.height}px`)
-                    .join(', '),
-                }}
-              />
-            ) : (
-              <FormattedMessage {...messages.imageDimenstionDescription} values={{ width: imgWidth, height: imgHeight }} />
-            )}
+            <FormattedMessage {...messages.imageDimenstionDescription} values={{ width: imgWidth, height: imgHeight }} />
           </CapHeadingSpan>
         )}
         {channel === FACEBOOK && (
@@ -370,7 +328,7 @@ function CapImageUpload(props) {
             getImageSizeLabel()
           )
         )}
-        {[VIBER, INAPP, MOBILEPUSH, WEBPUSH, WEBPUSH_BRAND_ICON].includes(channel) && getImageSizeLabel()}
+        {[VIBER, INAPP, MOBILEPUSH].includes(channel) && getImageSizeLabel()}
         <CapHeadingSpan type="label2" className="image-format">
           {channel === INAPP ? <FormattedMessage {...messages.format2} /> : <FormattedMessage {...messages.format} />}
         </CapHeadingSpan>
@@ -399,13 +357,6 @@ CapImageUpload.propTypes = {
   channel: PropTypes.string,
   channelSpecificStyle: PropTypes.bool,
   disableAutoRestore: PropTypes.bool,
-  recommendedDimensions: PropTypes.arrayOf(
-    PropTypes.shape({
-      width: PropTypes.number.isRequired,
-      height: PropTypes.number.isRequired,
-    })
-  ),
-  disabled: PropTypes.bool,
 };
 
 export default injectIntl(CapImageUpload);

package/v2Components/CapImageUpload/index.scss

@@ -19,8 +19,5 @@ $classPrefix: cap-custom-image-upload;
   }
   .upload-image-error{
     margin-top: $CAP_SPACE_04;
-  }
-  .ant-upload-list-item{
-    height: 1.65rem;
-  }
+}
 }

package/v2Components/CapImageUpload/messages.js

@@ -34,10 +34,6 @@ export default defineMessages({
     id: `${scope}.imageDimenstionDescription`,
     defaultMessage: 'Dimensions upto: {width}px x {height}px',
   },
-  recommendedDimensions: {
-    id: `${scope}.recommendedDimensions`,
-    defaultMessage: 'Recommended dimensions: {dimensions}',
-  },
   format: {
     id: `${scope}.format`,
     defaultMessage: 'Format: JPEG, JPG, PNG',
@@ -61,7 +57,7 @@ export default defineMessages({
   },
   channelImageSize: {
     id: `${scope}.channelImageSize`,
-    defaultMessage: 'Size up to: {size}MB',
+    defaultMessage: 'Size upto: {size}MB',
   },
   RcschannelImageSize: {
     id: `${scope}.RcschannelImageSize`,

package/v2Components/CapTagList/index.js

@@ -227,6 +227,10 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
 
   togglePopoverVisibility = (visible) => {
     this.setState({visible});
+    // Call onVisibleChange callback if provided (for triggering API calls when popover opens)
+    if (this.props.onVisibleChange) {
+      this.props.onVisibleChange(visible);
+    }
   };
 
   renderDynamicTagFlow = () => {
@@ -468,7 +472,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             onVisibleChange={this.togglePopoverVisibility}
             content={contentSection}
             trigger="click"
-            placement={channel === EMAIL.toUpperCase() ? "leftTop" : "rightTop"}
+            placement={this.props.popoverPlacement || (channel === EMAIL.toUpperCase() ? "leftTop" : "rightTop")}
           >
             <CapTooltip
               title={
@@ -535,6 +539,7 @@ CapTagList.propTypes = {
   channel: PropTypes.string,
   disabled: PropTypes.bool,
   fetchingSchemaError: PropTypes.bool,
+  popoverPlacement: PropTypes.string,
 };
 
 CapTagList.defaultValue = {

package/v2Components/CapTagListWithInput/index.js

@@ -48,13 +48,14 @@ export const CapTagListWithInput = (props) => {
     showTagList = true,
     showInput = true,
     inputProps = {},
+    popoverPlacement,
   } = props;
 
   const { formatMessage } = intl;
 
   return (
     <CapColumn style={containerStyle}>
-      <CapRow style={{display: 'flex', flexDirection: 'row'}}>
+      <CapRow align="middle" type="flex">
         {showHeading && headingText && (
           <CapHeading type={headingType} style={headingStyle}>
             {headingText}
@@ -76,6 +77,7 @@ export const CapTagListWithInput = (props) => {
             selectedOfferDetails={selectedOfferDetails}
             eventContextTags={eventContextTags}
             style={tagListStyle}
+            popoverPlacement={popoverPlacement}
           />
         )}
       </CapRow>
@@ -136,6 +138,7 @@ CapTagListWithInput.propTypes = {
   showHeading: PropTypes.bool,
   showTagList: PropTypes.bool,
   showInput: PropTypes.bool,
+  popoverPlacement: PropTypes.string,
 };
 
 CapTagListWithInput.defaultProps = {
@@ -164,6 +167,7 @@ CapTagListWithInput.defaultProps = {
   showTagList: true,
   showInput: true,
   inputProps: {},
+  popoverPlacement: undefined,
 };
 
 export default injectIntl(CapTagListWithInput);

package/v2Components/CapTagListWithInput/messages.js

@@ -5,6 +5,6 @@ const prefix = 'creatives.componentsV2.CapTagListWithInput';
 export default defineMessages({
   addLabels: {
     id: `${prefix}.addLabels`,
-    defaultMessage: 'Add labels',
+    defaultMessage: 'Add label',
   },
 });

package/v2Components/CapWhatsappCTA/tests/index.test.js

@@ -4,6 +4,11 @@ import '@testing-library/jest-dom';
 import { render, screen, fireEvent } from '../../../utils/test-utils';
 import { CapWhatsappCTA } from '../index';
 
+// Mock the missing reducer
+jest.mock('@capillarytech/cap-ui-library/CapCollapsibleLeftNavigation/reducer', () => {
+  return (state = {}) => state;
+}, { virtual: true });
+
 const updateHandler = jest.fn();
 const deleteHandler = jest.fn();
 const initializeComponent = (