@capillarytech/creatives-library 8.0.237 → 8.0.239-alpha.0

package/config/app.js

@@ -20,7 +20,7 @@ const config = {
     accountConfig: (strs, accountId) => `${window.location.origin}/org/config/AccountAdd?q=a&channelId=2&accountId=${accountId}&edit=1`,
   },
   development: {
-    api_endpoint: 'http://localhost:2022/arya/api/v1/creatives',
+    api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/creatives',
     campaigns_api_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/campaigns',
     campaigns_api_org_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/iris/v2/org/campaign',
     auth_endpoint: 'https://crm-nightly-new.cc.capillarytech.com/arya/api/v1/auth',

package/package.json

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

package/services/api.js

@@ -287,6 +287,11 @@ export const createMobilePushTemplateV2 = (template) => {
   return request(url, getAPICallObject('POST', template));
 };
 
+export const createWebPushTemplate = (template) => {
+  const url = `${API_ENDPOINT}/templates/WEBPUSH`;
+  return request(url, getAPICallObject('POST', template));
+};
+
 export const duplicateTemplate = ({id, channel}) => {
   const url = `${API_ENDPOINT}/templates/duplicate/${id}/${channel}`;
   return request(url, getAPICallObject('GET'));

package/translations/en.json

@@ -2022,6 +2022,7 @@
   "creatives.containersV2.Whatsapp.vietnamese": "Vietnamese",
   "creatives.containersV2.Whatsapp.whatsappCreateNotification": "{name} has been sent for approval",
   "creatives.containersV2.Whatsapp.zulu": "Zulu",
+  "creatives.containersV2.WebPush.addLabels": "Add labels",
   "creatives.containersV2.addLabels": "Add labels",
   "creatives.containersV2.appName": "App Name",
   "creatives.containersV2.applyNow": "Apply now",

package/utils/transformerUtils.js

@@ -10,6 +10,7 @@ import {
   RCS,
   LINE,
   VIBER,
+  WEBPUSH,
   EMF,
   VENENO,
   TEXT,
@@ -63,6 +64,8 @@ export const transformChannelPayload = (data, options = {}) => {
       return transformLinePayload(data, options);
     case VIBER:
       return transformViberPayload(data, options);
+    case WEBPUSH:
+      return transformWebpushPayload(data, options);
     default:
       return data; // Return unchanged for unsupported channels
   }
@@ -317,6 +320,45 @@ const transformViberPayload = (viberData, options = {}) => {
   return payload;
 };
 
+/**
+ * Transforms WebPush data to the required payload format
+ * @param {Object} webpushData - Current WebPush data
+ * @param {Object} options - Additional options (ouId, sourceEntityId, etc.)
+ * @returns {Object} - Transformed WebPush payload
+ */
+const transformWebpushPayload = (webpushData, options = {}) => {
+  const { loyaltyMetaData = {} } = options;
+  const { transformedMessageDetails = {} } = loyaltyMetaData;
+  const { webpushDeliverySettings = {} } = transformedMessageDetails || {};
+  
+  // Get base payload structure
+  const payload = createBasePayload(WEBPUSH, loyaltyMetaData);
+  
+  // Extract webpush content from messageContent.content.content structure
+  const webpushContent = webpushData?.messageContent?.content?.content || {};
+  const accountId = webpushData?.messageContent?.content?.accountId || 0;
+  
+  // Add WebPush-specific properties
+  payload.centralCommsPayload.webpushMessageContent = {
+    channel: WEBPUSH,
+    accountId,
+    isDefault: webpushData?.messageContent?.content?.isDefault || false,
+    storeType: webpushData?.messageContent?.content?.storeType || 'REGISTERED_STORE',
+    content: {
+      title: webpushContent?.title || '',
+      message: webpushContent?.message || '',
+      ...(webpushContent?.iconImageUrl && { iconImageUrl: webpushContent.iconImageUrl }),
+      ...(webpushContent?.cta && { cta: webpushContent.cta }),
+      ...(webpushContent?.expandableDetails && { expandableDetails: webpushContent.expandableDetails }),
+    },
+    messageSubject: webpushData?.messageSubject || "",
+    offers: webpushData?.messageContent?.content?.offers || [],
+  };
+  payload.centralCommsPayload.webpushDeliverySettings = webpushDeliverySettings;
+  
+  return payload;
+};
+
 // Checks if the template has changed
 export const getTemplateDiffState = (channel, oldData, newData) => {
   switch (channel.toUpperCase()) {

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,7 @@ function CapImageUpload(props) {
     channelSpecificStyle,
     showReUploadButton = true,
     disableAutoRestore = false, // New prop to disable automatic restoration
+    recommendedDimensions, // Array of {width, height} objects for recommended dimensions
   } = props;
   const {
     formatMessage,
@@ -72,7 +74,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 +93,7 @@ function CapImageUpload(props) {
 
   const WithLabel = LabelHOC(ImageComponent);
 
-  const uploadImages = useCallback((e, {files}) => {
+  const uploadImages = useCallback((e, { files }) => {
     if (e) {
       e.preventDefault();
     }
@@ -109,13 +111,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 +125,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 +148,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 +175,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 +196,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 (
       <>
@@ -262,7 +285,7 @@ function CapImageUpload(props) {
           className="dragger-button re-upload"
           type="flat"
           onClick={onReUpload}
-          style={channelSpecificStyle ? { marginTop: '-16px'} : {}}
+          style={channelSpecificStyle ? { marginTop: `-${CAP_SPACE_16}` } : {}}
         >
           <FormattedMessage {...messages.imageReUpload} />
         </CapButton>
@@ -305,7 +328,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 +362,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 +391,12 @@ CapImageUpload.propTypes = {
   channel: PropTypes.string,
   channelSpecificStyle: PropTypes.bool,
   disableAutoRestore: PropTypes.bool,
+  recommendedDimensions: PropTypes.arrayOf(
+    PropTypes.shape({
+      width: PropTypes.number.isRequired,
+      height: PropTypes.number.isRequired,
+    })
+  ),
 };
 
 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',

package/v2Components/CapImageUrlUpload/constants.js

@@ -0,0 +1,19 @@
+// 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';
+