@capillarytech/creatives-library 8.0.242-alpha.10 → 8.0.242-alpha.11

package/v2Components/CapDeviceContent/index.js

@@ -69,7 +69,7 @@ const CapDeviceContent = (props) => {
     templateDescErrorHandler,
     templateTitleError,
     setTemplateTitleError,
-    isAiContentBotDisabled,
+    isAiContentBotDisabled
   } = props || {};
   const { TextArea } = CapInput;
   const { formatMessage } = intl;
@@ -167,22 +167,21 @@ const CapDeviceContent = (props) => {
   return (
     <>
       <CapRow className="creatives-device-content">
-        <CapLink
+       <CapLink
           title={isAndroid
-            ? formatMessage(messages.copyContentFromIOS)
-            : formatMessage(messages.copyCotentFromAndroid)}
+              ? formatMessage(messages.copyContentFromIOS)
+              : formatMessage(messages.copyCotentFromAndroid)}
           className="inapp-copy-content"
           onClick={onCopyTitleAndContent}
-        />
+          />
         <CapRow className="creatives-inapp-title">
           <CapColumn
-            className="inapp-content-main"
+           className="inapp-content-main"
           >
             <CapHeading type="h5" className="inapp-title">
               {formatMessage(messages.title)}
             </CapHeading>
-            {getTagList(0)}
-            {/* here 0 signifies the tags for template title */}
+            {getTagList(0)} {/* here 0 signifies the tags for template title */}
           </CapColumn>
           <CapInput
             id="inapp-title-name-input"
@@ -214,7 +213,7 @@ const CapDeviceContent = (props) => {
         </CapRow>
         <CapRow className={`creatives-inapp-message ${!isMediaTypeImage && "message-bottom-margin"}`}>
           <CapColumn
-            className="inapp-message-header"
+           className="inapp-message-header"
           >
             <CapHeading type="h5" className="inapp-message-header-style">
               {formatMessage(messages.message)}
@@ -223,37 +222,37 @@ const CapDeviceContent = (props) => {
             {/* here 1 signifies the tags for template message */}
           </CapColumn>
           <div className="inapp-create-template-message-input-wrapper">
-            <TextArea
-              id="inapp-create-template-message-input"
-              className="inapp-create-template-message-input"
-              placeholder={formatMessage(messages.textAreaInputPlaceholder)}
-              onChange={onTemplateMessageChange}
-              value={templateMessage || ""}
-              autosize={{ minRows: 5, maxRows: 5 }}
-              errorMessage={
-                templateMessageError && (
-                  <CapError className="inapp-template-message-error">
-                    {templateMessageError}
-                  </CapError>
-                )
-              }
+          <TextArea
+            id="inapp-create-template-message-input"
+            className="inapp-create-template-message-input"
+            placeholder={formatMessage(messages.textAreaInputPlaceholder)}
+            onChange={onTemplateMessageChange}
+            value={templateMessage || ""}
+            autosize={{ minRows: 5, maxRows: 5 }}
+            errorMessage={
+              templateMessageError && (
+                <CapError className="inapp-template-message-error">
+                  {templateMessageError}
+                </CapError>
+              )
+            }
+          />
+          {!isAiContentBotDisabled && (
+            <CapAskAira.ContentGenerationBot
+              text={templateMessage || ""}
+              setText={(text) => {
+                onTemplateMessageChange({ target: { value: text } }); 
+              }}
+              iconPlacement="float-br"
+              iconSize="1.6rem"
+              rootStyle={{
+                bottom: "0.2rem",
+                right: "0.2rem",
+                left: "auto",
+                position: "absolute",
+              }}
             />
-            {!isAiContentBotDisabled && (
-              <CapAskAira.ContentGenerationBot
-                text={templateMessage || ""}
-                setText={(text) => {
-                  onTemplateMessageChange({ target: { value: text } });
-                }}
-                iconPlacement="float-br"
-                iconSize="1.6rem"
-                rootStyle={{
-                  bottom: "0.2rem",
-                  right: "0.2rem",
-                  left: "auto",
-                  position: "absolute",
-                }}
-              />
-            )}
+          )}
           </div>
           {isMediaTypeImage && (
             <>
@@ -280,16 +279,14 @@ const CapDeviceContent = (props) => {
         </CapRow>
       </CapRow>
       <CapRow className="inapp-action-link">
-        <CapCheckbox onChange={onActionLinkCheckBoxChange} checked={addActionLink} />
+        <CapCheckbox onChange={onActionLinkCheckBoxChange} checked={addActionLink}/>
         <CapRow className="inapp-render-heading">
           <CapHeader
-            title={(
-              <CapRow type="flex">
-                <CapHeading type="h4">
-                  {formatMessage(messages.addActionLink)}
-                </CapHeading>
-              </CapRow>
-            )}
+            title={<CapRow type="flex">
+              <CapHeading type="h4">
+                {formatMessage(messages.addActionLink)}
+              </CapHeading>
+            </CapRow>}
             description={<CapLabel type="label3">{formatMessage(messages.addActionLinkDesc)}</CapLabel>}
           />
           {addActionLink && (
@@ -313,21 +310,19 @@ const CapDeviceContent = (props) => {
       <CapRow className="inapp-cta-button">
         <CapHeader
           className="inapp-render-heading-cta-button"
-          title={(
-            <CapRow type="flex">
-              <CapHeading type="h4">
-                {formatMessage(messages.btnLabel)}
-              </CapHeading>
-              <CapHeading
-                type="h6"
-                className="inapp-optional-label"
-              >
-                {formatMessage(messages.optional)}
-              </CapHeading>
-            </CapRow>
-          )}
+          title={<CapRow type="flex">
+            <CapHeading type="h4">
+              {formatMessage(messages.btnLabel)}
+            </CapHeading>
+            <CapHeading
+              type="h6"
+              className="inapp-optional-label"
+            >
+              {formatMessage(messages.optional)}
+            </CapHeading>
+          </CapRow>}
           description={<CapLabel type="label3">{formatMessage(messages.btnDesc)}</CapLabel>}
-        />
+          />
         <CapRadioGroup
           options={BUTTON_RADIO_OPTIONS}
           value={buttonType}

package/v2Components/CapImageUpload/constants.js

@@ -4,4 +4,6 @@ export const MAX_SUPPORTED_IMAGE_SIZE = {
   INAPP: 5,
   WHATSAPP: 5,
   MOBILEPUSH: 2,
+  WEBPUSH: 5,
+  WEBPUSH_BRAND_ICON: 1
 };

package/v2Components/CapImageUpload/index.js

@@ -17,17 +17,18 @@ 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,
+  FACEBOOK, INAPP, RCS, WHATSAPP, VIBER, WEBPUSH, WEBPUSH_BRAND_ICON
 } 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,
@@ -50,6 +51,8 @@ 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,
@@ -72,7 +75,7 @@ function CapImageUpload(props) {
   const [isImageError, updateImageErrorMessage] = useState(false);
   const [isDrawerRequired, updateDrawerRequirement] = useState(false);
 
-  const {CapHeadingSpan} = CapHeading;
+  const { CapHeadingSpan } = CapHeading;
   const ImageComponent = useCallback(
     () => (
       <>
@@ -91,7 +94,7 @@ function CapImageUpload(props) {
 
   const WithLabel = LabelHOC(ImageComponent);
 
-  const uploadImages = useCallback((e, {files}) => {
+  const uploadImages = useCallback((e, { files }) => {
     if (e) {
       e.preventDefault();
     }
@@ -109,13 +112,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;
@@ -123,7 +126,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 {
@@ -146,6 +149,19 @@ 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 {
@@ -160,7 +176,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]);
@@ -181,19 +197,27 @@ function CapImageUpload(props) {
       secure_file_path: image, width, height, file_size: size,
     } = get(imageTemplate, 'metaInfo', {});
     updateDrawerRequirement(false);
-    if (!allowedExtensionsRegex.test(image) || height > imgHeight || width > imgWidth || size > imgSize ) {
+    // 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) {
       updateImageErrorMessage(formatMessage(messages.imageErrorDesc));
     } else {
       updateImageErrorMessage('');
       updateImageSrc(image);
     }
-  }, [isImageError, isDrawerRequired]);
+  }, [isImageError, isDrawerRequired, channel, allowedExtensionsRegex, imgSize, formatMessage]);
 
   const getGalleryDrawerContent = useCallback(() => {
     const locationGallery = {
       pathname: `/assets`,
       search: '',
-      query: !isFullMode ? {type: 'embedded', module: 'library'} : {},
+      query: !isFullMode ? { type: 'embedded', module: 'library' } : {},
     };
     return (
       <>
@@ -230,6 +254,7 @@ function CapImageUpload(props) {
             customRequest={capUploaderCustomRequest}
             className="form-builder-dragger grey-background"
             showUploadList={!isImageError}
+            disabled={disabled}
           >
             <CapHeading className="dragger-title" type="h7">
               <FormattedMessage {...messages.dragAndDrop} />
@@ -237,7 +262,7 @@ function CapImageUpload(props) {
             <CapHeading className="dragger-or" type="label6">
               <FormattedMessage {...messages.or} />
             </CapHeading>
-            <CapButton className="dragger-button upload-image" type="secondary">
+            <CapButton className="dragger-button upload-image" type="secondary" disabled={disabled} tabIndex={disabled ? -1 : undefined}>
               <FormattedMessage {...messages.uploadComputer} />
             </CapButton>
             {channel !== WHATSAPP && (
@@ -245,6 +270,8 @@ function CapImageUpload(props) {
                 className="dragger-button gallery-select"
                 type="secondary"
                 onClick={onGalleryClick}
+                disabled={disabled}
+                tabIndex={disabled ? -1 : undefined}
               >
                 <FormattedMessage {...messages.uploadGallery} />
               </CapButton>
@@ -262,13 +289,15 @@ function CapImageUpload(props) {
           className="dragger-button re-upload"
           type="flat"
           onClick={onReUpload}
-          style={channelSpecificStyle ? { marginTop: '-16px'} : {}}
+          style={channelSpecificStyle ? { marginTop: `-${CAP_SPACE_16}` } : {}}
+          disabled={disabled}
+          tabIndex={disabled ? -1 : undefined}
         >
           <FormattedMessage {...messages.imageReUpload} />
         </CapButton>
       );
     }
-  }, [isImageError, imageSrc]);
+  }, [isImageError, imageSrc, disabled, showReUploadButton, channel, channelSpecificStyle, capUploaderCustomRequest, onGalleryClick, onReUpload]);
 
   return (
     <div style={style} className="cap-custom-image-upload">
@@ -285,6 +314,8 @@ function CapImageUpload(props) {
           type="file"
           onChange={(e) => uploadImages(e, { files: e.target.files })}
           accept={supportedExtensions || "image/*"}
+          disabled={disabled}
+          tabIndex={disabled ? -1 : undefined}
         />
         {getImageSection()}
         <CapDrawer
@@ -305,7 +336,18 @@ function CapImageUpload(props) {
         )}
         {![WHATSAPP, INAPP].includes(channel) && (
           <CapHeadingSpan type="label2" className="image-dimension">
-            <FormattedMessage {...messages.imageDimenstionDescription} values={{ width: imgWidth, height: imgHeight }} />
+            {[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 }} />
+            )}
           </CapHeadingSpan>
         )}
         {channel === FACEBOOK && (
@@ -328,7 +370,7 @@ function CapImageUpload(props) {
             getImageSizeLabel()
           )
         )}
-        {[VIBER, INAPP, MOBILEPUSH].includes(channel) && getImageSizeLabel()}
+        {[VIBER, INAPP, MOBILEPUSH, WEBPUSH, WEBPUSH_BRAND_ICON].includes(channel) && getImageSizeLabel()}
         <CapHeadingSpan type="label2" className="image-format">
           {channel === INAPP ? <FormattedMessage {...messages.format2} /> : <FormattedMessage {...messages.format} />}
         </CapHeadingSpan>
@@ -357,6 +399,13 @@ 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,5 +19,8 @@ $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,6 +34,10 @@ 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',
@@ -57,7 +61,7 @@ export default defineMessages({
   },
   channelImageSize: {
     id: `${scope}.channelImageSize`,
-    defaultMessage: 'Size upto: {size}MB',
+    defaultMessage: 'Size up to: {size}MB',
   },
   RcschannelImageSize: {
     id: `${scope}.RcschannelImageSize`,

package/v2Components/CapImageUrlUpload/constants.js

@@ -0,0 +1,26 @@
+// Default allowed content types for image URL validation
+export const DEFAULT_ALLOWED_CONTENT_TYPES = ['image/jpeg', 'image/jpg', 'image/png'];
+
+// Default maximum file size (5MB)
+export const DEFAULT_MAX_SIZE = 5000000;
+
+// Default allowed extensions regex
+export const DEFAULT_ALLOWED_EXTENSIONS_REGEX = /\.(jpe?g|png)$/i;
+
+// MIME type to file extension mapping
+export const MIME_TYPE_TO_EXTENSION = {
+  'image/jpeg': 'jpg',
+  'image/jpg': 'jpg',
+  'image/png': 'png',
+};
+
+// Default image extension fallback
+export const DEFAULT_IMAGE_EXTENSION = 'png';
+
+// Upload status state machine states
+export const UPLOAD_STATUS = {
+  IDLE: 'idle',
+  UPLOADING: 'uploading',
+  WAITING: 'waiting',
+};
+