@capillarytech/creatives-library 8.0.263 → 8.0.265

package/v2Containers/Templates/messages.js

@@ -46,10 +46,6 @@ export default defineMessages({
     id: `${scope}.mobilepushHeader`,
     defaultMessage: `Mobile Push`,
   },
-  "webpushHeader": {
-    id: `${scope}.webpushHeader`,
-    defaultMessage: `Web Push`,
-  },
   "ebillHeader": {
     id: `${scope}.ebillHeader`,
     defaultMessage: `Ebill`,
@@ -346,10 +342,6 @@ export default defineMessages({
     id: `${scope}.newWhatsappTemplate`,
     defaultMessage: 'Add new Whatsapp {template}',
   },
-  "newWebPushTemplate": {
-    id: `${scope}.newWebPushTemplate`,
-    defaultMessage: 'Add new Web push {template}',
-  },
   "newInAppMessageTemplate": {
     id: `${scope}.newInAppMessageTemplate`,
     defaultMessage: 'Add new In app message {template}',
@@ -386,14 +378,6 @@ export default defineMessages({
     id: `${scope}.whatsappDescIllustration`,
     defaultMessage: 'These templates can be reused when creating a\nnew message content.',
   },
-  "webPushTitleIllustration": {
-    id: `${scope}.webPushTitleIllustration`,
-    defaultMessage: 'Add a new Web push creative {template}',
-  },
-  "webPushDescIllustration": {
-    id: `${scope}.webPushDescIllustration`,
-    defaultMessage: 'These templates can be reused when creating a new message content.',
-  },
   "whatsappAccountNotConfiguredTitle": {
     id: `${scope}.whatsappAccountNotConfiguredTitle`,
     defaultMessage: 'Whatsapp account is not configured',
@@ -478,10 +462,6 @@ export default defineMessages({
     id: `${scope}.zaloAccount`,
     defaultMessage: 'Zalo account',
   },
-  "webpushAccount": {
-    id: `${scope}.webpushAccount`,
-    defaultMessage: 'Web push account',
-  },
   "rcsAccount": {
     id: `${scope}.rcsAccount`,
     defaultMessage: 'RCS account',
@@ -518,10 +498,6 @@ export default defineMessages({
     id: `${scope}.noAccountsPresentZalo`,
     defaultMessage: "Zalo accounts are not setup for your brand",
   },
-  "noAccountsPresentWebpush": {
-    id: `${scope}.noAccountsPresentWebpush`,
-    defaultMessage: "Web push accounts are not setup for your brand",
-  },
   "noAccountsPresentRcs": {
     id: `${scope}.noAccountsPresentRcs`,
     defaultMessage: "RCS accounts are not setup for your brand",
@@ -558,10 +534,6 @@ export default defineMessages({
     id: `${scope}.rcsOnlyApprovedTemplates`,
     defaultMessage: 'Only "Approved" templates are available here, as you can use those templates to create a message.',
   },
-  "layout": {
-    id: `${scope}.layout`,
-    defaultMessage: `Layout`,
-  },
   "status": {
     id: `${scope}.status`,
     defaultMessage: 'Status',

package/v2Containers/Templates/reducer.js

@@ -124,8 +124,6 @@ function templatesReducer(state = initialState, action) {
       return state
         .set('selectedFacebookAccount', fromJS(action.faceBookAccount))
         .set('templates', []);
-    case types.SET_WEBPUSH_ACCOUNT:
-      return state.set('selectedWebPushAccount', fromJS(action.account));
     case types.RESET_ACCOUNT:
       return state
         .remove('selectedWeChatAccount')

package/v2Containers/Templates/tests/index.test.js

@@ -22,7 +22,6 @@ describe('Test Templates container', () => {
   const getAllTemplates = jest.fn();
   const getUserList = jest.fn();
   const getSenderDetails = jest.fn();
-  const resetTemplate = jest.fn();
   let renderedComponent;
 
   beforeEach(() => {
@@ -55,7 +54,6 @@ describe('Test Templates container', () => {
           getAllTemplates,
           getUserList,
           getSenderDetails,
-          resetTemplate,
         }}
         location={{
           pathname: `/${channel}`,
@@ -81,8 +79,6 @@ describe('Test Templates container', () => {
       channel: 'WHATSAPP',
       orgUnitId: -1,
     });
-    // resetTemplate should be called when entering account selection mode
-    expect(resetTemplate).toHaveBeenCalled();
   });
 
   it('Should render temlates when whatsapp templates are passed', () => {
@@ -107,8 +103,6 @@ describe('Test Templates container', () => {
       Templates: {},
     });
     expect(renderedComponent).toMatchSnapshot();
-    // SMS doesn't enter account selection mode, so resetTemplate shouldn't be called on mount
-    expect(resetTemplate).not.toHaveBeenCalled();
   });
 
   it('Should render temlates when whatsapp templates are passed in full mode', () => {
@@ -129,8 +123,6 @@ describe('Test Templates container', () => {
   it('Should render correct component for zalo channel', () => {
     RenderFunctionFor('zalo');
     expect(renderedComponent).toMatchSnapshot();
-    // resetTemplate should be called when entering account selection mode
-    expect(resetTemplate).toHaveBeenCalled();
   });
   it('Should render temlates when zalo templates are passed', () => {
     RenderFunctionFor('zalo');
@@ -209,8 +201,6 @@ describe('Test Templates container', () => {
       channel: 'RCS',
       orgUnitId: -1,
     });
-    // resetTemplate should be called when entering account selection mode
-    expect(resetTemplate).toHaveBeenCalled();
   });
 
   it('Should render templates when RCS templates are passed', () => {

package/v2Containers/TemplatesV2/TemplatesV2.style.js

@@ -14,10 +14,8 @@ export default css`
       margin: 0 auto;
       width: 100%;
       padding: ${CAP_SPACE_24} 0;
-      /* Only main channel tabs content, not HTML Editor validation panel tabs */
-      > .cap-tab-v2 > .ant-tabs-content-holder > .ant-tabs-content,
-      > .cap-tab-v2 > .ant-tabs-content {
-        margin-top: ${CAP_SPACE_16};
+      .ant-tabs-content{
+        margin-top: ${CAP_SPACE_16}
       }
     ` : `.cap-tab-v2 {
       height: calc(100vh - 11.25rem);

package/v2Containers/TemplatesV2/index.js

@@ -30,11 +30,11 @@ import FTP from '../FTP';
 import Gallery from '../Assets/Gallery';
 import withStyles from '../../hoc/withStyles';
 import styles, { CapTabStyle } from './TemplatesV2.style';
-import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, JP_LOCALE_HIDE_FEATURE, ZALO, INAPP, WEBPUSH } from '../App/constants';
+import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, JP_LOCALE_HIDE_FEATURE, ZALO, INAPP } from '../App/constants';
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import { getObjFromQueryParams } from '../../utils/v2common';
 import { makeSelectAuthenticated, selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
-import { LOYALTY_SUPPORTED_ACTION, COMMON_CHANNELS } from "../CreativesContainer/constants";
+import { LOYALTY_SUPPORTED_ACTION } from "../CreativesContainer/constants";
 
 const {CapCustomCardList} = CapCustomCard;
 
@@ -65,13 +65,6 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       email: {content: <></>, tab: intl.formatMessage(messages.email), key: 'email'},
       //'wechat': {content: this.getTemplatesComponent('wechat'), tab: 'Wechat', key: 'wechat'},
       mPush: {content: <></>, tab: intl.formatMessage(messages.pushNotification), key: 'mobilepush'},
-      ...(commonUtil.hasWebPushFeatureEnabled() ? {
-        webpush: {
-          content: <div></div>,
-          tab: intl.formatMessage(messages.webPush),
-          key: WEBPUSH,
-        }
-      } : {}),
       viber: {content: <></>, tab: intl.formatMessage(messages.viber), key: 'viber'},
       whatsapp: { content: <></>, tab: intl.formatMessage(messages.whatsapp), key: WHATSAPP },
       zalo: { content: <div></div>, tab: intl.formatMessage(messages.zalo), key: ZALO },
@@ -95,7 +88,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         return obj;
       }, []);
 
-      if (isFullMode ) {
+    if (isFullMode ) {
       filteredPanes.push({content: <div></div>, tab: intl.formatMessage(messages.gallery), key: 'assets'});
     } else {
       if (!channelsToHide.includes('callTask')) {
@@ -105,19 +98,18 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         filteredPanes.push({content: <></>, tab: intl.formatMessage(messages.FTP), key: 'ftp'});
         defaultChannel = 'FTP';
       }
+      const commonChannels = ['sms', 'email', 'wechat', 'mobilepush', 'line', 'viber', 'facebook', 'call_task', 'ftp', 'assets'];
 
-      // Create a local copy of COMMON_CHANNELS to avoid mutating the imported array
-      const channels = [...COMMON_CHANNELS];
       const { actionName = ''} = loyaltyMetaData;
       if (isLoyaltyModule && actionName === LOYALTY_SUPPORTED_ACTION) {
-        channels.push(WHATSAPP, ZALO);
+        commonChannels.push(WHATSAPP, ZALO);
       }
 
-      // we only show channels which other than COMMON_CHANNELS
+      // we only show channels which other than commonChannels
       // if it is coming in enableNewChannels array
       filteredPanes = filteredPanes.filter((item) => {
         const channel = item.key;
-        if (!channels.includes(channel)) {
+        if (!commonChannels.includes(channel)) {
           return enableNewChannels.includes(channel.toUpperCase());
         }
         return true;

package/v2Containers/TemplatesV2/messages.js

@@ -86,8 +86,4 @@ export default defineMessages({
     id: `creatives.containersV2.TemplatesV2.inapp`,
     defaultMessage: 'In app message',
   },
-  webPush: {
-    id: `creatives.containersV2.TemplatesV2.webPush`,
-    defaultMessage: 'Web Push',
-  },
 });

package/v2Containers/Whatsapp/tests/__snapshots__/index.test.js.snap

@@ -2281,7 +2281,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -23690,7 +23689,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -47215,7 +47213,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -71728,7 +71725,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -98538,7 +98534,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -119977,7 +119972,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -141386,7 +141380,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -166807,7 +166800,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -193216,7 +193208,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -221922,7 +221913,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -251610,7 +251600,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -267364,7 +267353,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -281969,7 +281957,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -298681,7 +298668,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -322730,7 +322716,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -350369,7 +350354,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -366694,7 +366678,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -388103,7 +388086,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -413524,7 +413506,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -434933,7 +434914,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -457162,7 +457142,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -480214,7 +480193,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -504086,7 +504064,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -528801,7 +528778,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -554356,7 +554332,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -580742,7 +580717,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -607959,7 +607933,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -635988,7 +635961,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -658258,7 +658230,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -681355,7 +681326,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -705343,7 +705313,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -726752,7 +726721,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -751488,7 +751456,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],
@@ -776332,7 +776299,6 @@ new message content.",
         "email": [Function],
         "facebookPreview": [Function],
         "gallery": [Function],
-        "inApp": [Function],
         "language": [Function],
         "navigationConfig": [Function],
         "previewAndTest": [Function],

package/utils/imageUrlUpload.js

@@ -1,141 +0,0 @@
-/**
- * Utility functions for uploading images from URLs
- * 
- * NOTE: CORS-limited; will be replaced with backend implementation.
- * Flow currently hidden (not removed) from frontend.
- */
-
-import {
-  DEFAULT_ALLOWED_CONTENT_TYPES,
-  MIME_TYPE_TO_EXTENSION,
-  DEFAULT_IMAGE_EXTENSION,
-} from '../v2Components/CapImageUrlUpload/constants';
-
-/**
- * Fetches an image from a URL
- * 
- * @param {string} url - The image URL to fetch
- * @returns {Promise<Response>} - The fetch response object
- * @throws {Error} - If the fetch fails (network/CORS error)
- */
-export const fetchImageFromUrl = async (url) => {
-  const trimmedUrl = url?.trim() || '';
-  
-  if (!trimmedUrl) {
-    throw new Error('URL is required');
-  }
-
-  // CORS-limited: fails for images without proper CORS headers
-  const response = await fetch(trimmedUrl, {
-    method: 'GET',
-    redirect: 'follow',
-    mode: 'cors',
-  });
-
-  if (!response.ok) {
-    throw new Error(`Failed to fetch image: ${response.status} ${response.statusText}`);
-  }
-
-  return response;
-};
-
-/**
- * Helper function to upload image from URL
- * Fetches image, validates content type and size, converts to File, and uploads via uploadAsset
- * 
- * @param {string} url - The image URL to upload
- * @param {Function} formatMessage - React Intl formatMessage function
- * @param {Object} messages - React Intl messages object
- * @param {Function} uploadAssetFn - Function to upload the asset (file, type, fileParams)
- * @param {string} fileNamePrefix - Prefix for the generated file name
- * @param {number} maxSize - Maximum file size in bytes
- * @param {string[]} allowedContentTypes - Array of allowed MIME types (defaults to DEFAULT_ALLOWED_CONTENT_TYPES)
- * @returns {Promise<{success: boolean, error: string}>} - Result object with success status and error message
- * 
- * @example
- * const result = await uploadImageFromUrlHelper(
- *   'https://example.com/image.jpg',
- *   formatMessage,
- *   messages,
- *   uploadAsset,
- *   'my-image',
- *   5000000,
- *   ['image/jpeg', 'image/png']
- * );
- */
-export const uploadImageFromUrlHelper = async (
-  url,
-  formatMessage,
-  messages,
-  uploadAssetFn,
-  fileNamePrefix,
-  maxSize,
-  allowedContentTypes = DEFAULT_ALLOWED_CONTENT_TYPES,
-) => {
-  const trimmedUrl = url?.trim() || '';
-  
-  try {
-    const response = await fetchImageFromUrl(trimmedUrl);
-
-    // Validate Content-Type
-    const contentType = response.headers?.get('Content-Type') || '';
-    const normalizedContentType = contentType.split(';')[0].toLowerCase().trim();
-    
-    if (!allowedContentTypes.includes(normalizedContentType)) {
-      return {
-        success: false,
-        error: formatMessage(messages.imageTypeInvalid),
-      };
-    }
-
-    const blob = await response.blob();
-    
-    if (blob.size > maxSize) {
-      return {
-        success: false,
-        error: formatMessage(messages.imageSizeInvalid),
-      };
-    }
-
-    // Load image to get dimensions and verify validity
-    return new Promise((resolve) => {
-      const img = new Image();
-      const objectUrl = URL.createObjectURL(blob);
-      
-      img.onload = () => {
-        const extension = MIME_TYPE_TO_EXTENSION[normalizedContentType] || DEFAULT_IMAGE_EXTENSION;
-        const fileName = `${fileNamePrefix}.${extension}`;
-        const file = new File([blob], fileName, { type: blob.type });
-        const fileParams = {
-          width: img.width,
-          height: img.height,
-          error: false,
-        };
-        
-        uploadAssetFn(file, 'image', fileParams);
-        URL.revokeObjectURL(objectUrl);
-        
-        resolve({
-          success: true,
-          error: '',
-        });
-      };
-      
-      img.onerror = () => {
-        URL.revokeObjectURL(objectUrl);
-        resolve({
-          success: false,
-          error: formatMessage(messages.imageLoadError),
-        });
-      };
-      
-      img.src = objectUrl;
-    });
-  } catch (error) {
-    return {
-      success: false,
-      error: formatMessage(messages.imageLoadError),
-    };
-  }
-};
-

package/v2Components/CapImageUrlUpload/constants.js

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