@capillarytech/creatives-library 8.0.340-beta.0.4 → 8.0.340-beta.0.6

package/constants/unified.js

@@ -52,6 +52,7 @@ export const EXTENDED_TAG = 'ExtendedTagMessage';
 export const BADGES_UI_ENABLED = 'BADGES_UI_ENABLED';
 export const JP_LOCALE_HIDE_FEATURE = 'JP_LOCALE_HIDE_FEATURE';
 export const ENABLE_WECHAT = 'ENABLE_WECHAT';
+export const ENABLE_CREATIVES_ARCHIVAL = 'ENABLE_CREATIVES_ARCHIVAL';
 export const ENABLE_WEBPUSH = 'ENABLE_WEBPUSH';
 export const ENABLE_CUSTOMER_BARCODE_TAG = 'ENABLE_CUSTOMER_BARCODE_TAG';
 export const EMAIL_UNSUBSCRIBE_TAG_MANDATORY = 'EMAIL_UNSUBSCRIBE_TAG_MANDATORY';

package/package.json

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

package/services/api.js

@@ -361,6 +361,26 @@ export const deleteTemplate = ({channel, id}) => {
   //return API.deleteResource(url);
 };
 
+export const archiveTemplate = ({ channel, id }) => {
+  const url = `${API_ENDPOINT}/templates/archive/${id}/${channel}`;
+  return request(url, getAPICallObject('PUT'));
+};
+
+export const unarchiveTemplate = ({ channel, id }) => {
+  const url = `${API_ENDPOINT}/templates/unarchive/${id}/${channel}`;
+  return request(url, getAPICallObject('PUT'));
+};
+
+export const bulkArchiveTemplates = ({ channel, ids }) => {
+  const url = `${API_ENDPOINT}/templates/archive/bulk/${channel}`;
+  return request(url, getAPICallObject('PUT', { ids }));
+};
+
+export const bulkUnarchiveTemplates = ({ channel, ids }) => {
+  const url = `${API_ENDPOINT}/templates/unarchive/bulk/${channel}`;
+  return request(url, getAPICallObject('PUT', { ids }));
+};
+
 export const deleteRcsTemplate = ({ templateName }) => {
   const url = `${API_ENDPOINT}/templates/${templateName}/RCS`;
   return request(url, getAPICallObject('DELETE'))

package/services/tests/api.test.js

@@ -1086,3 +1086,62 @@ describe('createTestCustomer', () => {
     expect(lastCall[1].body).toBe(JSON.stringify(payload));
   });
 });
+
+import {
+  archiveTemplate,
+  unarchiveTemplate,
+  bulkArchiveTemplates,
+  bulkUnarchiveTemplates,
+} from '../api';
+
+describe('archiveTemplate', () => {
+  beforeEach(() => {
+    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
+  });
+
+  it('should call PUT on archive endpoint', () => {
+    archiveTemplate({ channel: 'EMAIL', id: 'id123' });
+    expect(global.fetch).toHaveBeenCalled();
+    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
+    expect(lastCall[1].method).toBe('PUT');
+  });
+});
+
+describe('unarchiveTemplate', () => {
+  beforeEach(() => {
+    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
+  });
+
+  it('should call PUT on unarchive endpoint', () => {
+    unarchiveTemplate({ channel: 'EMAIL', id: 'id123' });
+    expect(global.fetch).toHaveBeenCalled();
+    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
+    expect(lastCall[1].method).toBe('PUT');
+  });
+});
+
+describe('bulkArchiveTemplates', () => {
+  beforeEach(() => {
+    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
+  });
+
+  it('should call PUT on bulk archive endpoint with ids', () => {
+    bulkArchiveTemplates({ channel: 'EMAIL', ids: ['id1', 'id2'] });
+    expect(global.fetch).toHaveBeenCalled();
+    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
+    expect(lastCall[1].method).toBe('PUT');
+  });
+});
+
+describe('bulkUnarchiveTemplates', () => {
+  beforeEach(() => {
+    global.fetch = jest.fn().mockReturnValue(Promise.resolve({ json: () => Promise.resolve({}) }));
+  });
+
+  it('should call PUT on bulk unarchive endpoint with ids', () => {
+    bulkUnarchiveTemplates({ channel: 'EMAIL', ids: ['id1', 'id2'] });
+    expect(global.fetch).toHaveBeenCalled();
+    const lastCall = global.fetch.mock.calls[global.fetch.mock.calls.length - 1];
+    expect(lastCall[1].method).toBe('PUT');
+  });
+});

package/utils/common.js

@@ -27,6 +27,7 @@ import {
   ENABLE_NEW_MPUSH,
   ENABLE_NEW_EDITOR_FLOW_INAPP,
   SUPPORT_ENGAGEMENT_MODULE,
+  ENABLE_CREATIVES_ARCHIVAL,
 } from '../constants/unified';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -122,6 +123,11 @@ export const hasWechatFeatureEnabled = Auth.hasFeatureAccess.bind(
   ENABLE_WECHAT,
 );
 
+export const hasCreativesArchivalEnabled = Auth.hasFeatureAccess.bind(
+  null,
+  ENABLE_CREATIVES_ARCHIVAL,
+);
+
 export const hasWebPushFeatureEnabled = Auth.hasFeatureAccess.bind(
   null,
   ENABLE_WEBPUSH,

package/utils/test-utils.js

@@ -57,7 +57,7 @@ function getVisibleDropdown() {
   return dropdowns[0];
 }
 
-async function findVisibleSelectOption(optionText) {
+async function findVisibleSelectOption(optionText, { timeout = 1000 } = {}) {
   return waitFor(() => {
     const dropdowns = Array.from(document.querySelectorAll('.ant-select-dropdown'))
       .filter((el) => !el.classList.contains('ant-select-dropdown-hidden'));
@@ -67,7 +67,7 @@ async function findVisibleSelectOption(optionText) {
       if (match) return match;
     }
     throw new Error(`Visible select option with text "${optionText}" not found`);
-  });
+  }, { timeout });
 }
 
 // re-export everything

package/utils/tests/v2Common.test.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import { getObjFromQueryParams } from '../v2common';
+import { shallow } from 'enzyme';
+import { getObjFromQueryParams, buildTemplateNameDescription } from '../v2common';
 
 describe('Test v2common container', () => {
   it('test getObjFromQueryParams', () => {
@@ -9,3 +10,47 @@ describe('Test v2common container', () => {
     });
   });
 });
+
+describe('buildTemplateNameDescription', () => {
+  it('returns undefined when templateName is empty string', () => {
+    expect(buildTemplateNameDescription('Template name', '')).toBeUndefined();
+  });
+
+  it('returns undefined when templateName is null', () => {
+    expect(buildTemplateNameDescription('Template name', null)).toBeUndefined();
+  });
+
+  it('returns undefined when templateName is undefined', () => {
+    expect(buildTemplateNameDescription('Template name', undefined)).toBeUndefined();
+  });
+
+  it('renders a span wrapper when templateName is provided', () => {
+    const result = buildTemplateNameDescription('Template name', 'Welcome 01');
+    const wrapper = shallow(result);
+    expect(wrapper.type()).toBe('span');
+  });
+
+  it('renders label text in the first CapLabelInline with correct class', () => {
+    const result = buildTemplateNameDescription('Template name', 'Welcome 01');
+    const wrapper = shallow(result);
+    const firstLabel = wrapper.childAt(0);
+    expect(firstLabel.prop('className')).toBe('notification-template-label');
+    expect(firstLabel.prop('children')).toBe('Template name');
+  });
+
+  it('renders template name in the second CapLabelInline with correct class', () => {
+    const result = buildTemplateNameDescription('Template name', 'Welcome 01');
+    const wrapper = shallow(result);
+    const secondLabel = wrapper.childAt(1);
+    expect(secondLabel.prop('className')).toBe('notification-template-name');
+    expect(secondLabel.prop('children')).toBe('Welcome 01');
+  });
+
+  it('both CapLabelInline elements have type="label1"', () => {
+    const result = buildTemplateNameDescription('Template name', 'Welcome 01');
+    const wrapper = shallow(result);
+    wrapper.children().forEach((node) => {
+      expect(node.prop('type')).toBe('label1');
+    });
+  });
+});

package/utils/v2common.js

@@ -1,3 +1,21 @@
+import React from 'react';
+import CapLabel from '@capillarytech/cap-ui-library/CapLabel';
+
+/**
+ * Builds a JSX description for template archive/unarchive notifications.
+ * @param {string} labelText - Localised label (e.g. "Template name ")
+ * @param {string} templateName - The template name to display
+ */
+export const buildTemplateNameDescription = (labelText, templateName) => (
+  templateName
+    ? (
+      <span>
+        <CapLabel.CapLabelInline type="label1" className="notification-template-label">{labelText}</CapLabel.CapLabelInline>
+        <CapLabel.CapLabelInline type="label1" className="notification-template-name">{templateName}</CapLabel.CapLabelInline>
+      </span>
+    )
+    : undefined
+);
 
 // returns query items as obj when query string is passed
 /**

package/v2Components/CapTagList/index.js

@@ -79,7 +79,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
 
   componentDidUpdate(prevProps, prevState) {
     if (this.props.tags !== prevProps.tags || this.state.searchValue !== prevState.searchValue) {
-      const temp = this.renderTags(this.props.tags, this.state.searchValue);
+      const temp = this.renderTags(this.props.tags);
       this.setState({
         tagsList: temp,
       });
@@ -136,14 +136,13 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       const tagNameWithoutUnderscore = tagName.replace(/_/g, " ");
       const searchStringLower = _.toLower(value);
       if (_.has(val, "subtags")) {
-        if (
-          val?.name
+        const temp = this.getSearchedExpandedKeys(val?.subtags, value, nodeKey);
+        const nodeMatches = val?.name
           && (tagName.includes(searchStringLower)
-            || tagNameWithoutUnderscore.includes(searchStringLower))
-        ) {
+            || tagNameWithoutUnderscore.includes(searchStringLower));
+        if (nodeMatches || temp.length > 0) {
           list.push(nodeKey);
         }
-        const temp = this.getSearchedExpandedKeys(val?.subtags, value, nodeKey);
         list = list.concat(temp);
       } else if (
         val?.name

package/v2Components/CapTagListWithInput/index.js

@@ -57,7 +57,7 @@ export const CapTagListWithInput = (props) => {
 
   return (
     <CapColumn style={containerStyle}>
-      <CapRow align="middle" type="flex">
+      <CapRow align="middle" type="flex" noWrap>
         {showHeading && headingText && (
           <CapHeading type={headingType} style={headingStyle}>
             {headingText}

package/v2Components/CommonTestAndPreview/UnifiedPreview/WhatsAppPreviewContent.js

@@ -18,7 +18,7 @@ import CapRow from '@capillarytech/cap-ui-library/CapRow';
 import { ANDROID, IOS } from '../constants';
 import messages from '../messages';
 import { getWhatsappQuickReply, getWhatsappCarouselButtonView } from '../../../v2Containers/Whatsapp/utils';
-import { QUICK_REPLY, PHONE_NUMBER, WHATSAPP_CATEGORIES } from '../../../v2Containers/Whatsapp/constants';
+import { QUICK_REPLY, PHONE_NUMBER, WHATSAPP_CATEGORIES, TEMPLATE_VARIABLE_REGEX } from '../../../v2Containers/Whatsapp/constants';
 import videoPlay from '../../../assets/videoPlay.svg';
 import whatsappImageEmptyPreview from '../../TemplatePreview/assets/images/empty_image_preview.svg';
 import whatsappVideoEmptyPreview from '../../TemplatePreview/assets/images/empty_video_preview.svg';
@@ -27,6 +27,8 @@ import whatsappVideoEmptyPreview from '../../TemplatePreview/assets/images/empty
 const whatsappMobileAndroid = require('../../../assets/whatsapp_android.png');
 const whatsappMobileIos = require('../../../assets/whatsapp_ios.png');
 
+const { CapLabelInline } = CapLabel;
+
 const WhatsAppPreviewContent = ({
   content,
   device,
@@ -215,11 +217,21 @@ const WhatsAppPreviewContent = ({
 
         {/* Image Preview */}
         {content?.whatsappImageSrc && (
-          <CapImage
-            src={content.whatsappImageSrc}
-            className="whatsapp-image"
-            alt={formatMessage(messages.previewGenerated)}
-          />
+          TEMPLATE_VARIABLE_REGEX.test(content.whatsappImageSrc) ? (
+            <CapRow className="whatsapp-image-url-placeholder">
+              <CapIcon type="picture" size="s" className="whatsapp-image-url-placeholder-icon" />
+              <CapLabelInline type="label2" className="whatsapp-image-url-placeholder-text">
+                {content.whatsappImageSrc}
+              </CapLabelInline>
+            </CapRow>
+          ) : (
+            <CapImage
+              src={content.whatsappImageSrc}
+              className="whatsapp-image"
+              alt={formatMessage(messages.previewGenerated)}
+              onError={(e) => { e.target.src = whatsappImageEmptyPreview; }}
+            />
+          )
         )}
 
         {/* Video Preview */}

package/v2Components/CommonTestAndPreview/UnifiedPreview/_unifiedPreview.scss

@@ -941,6 +941,33 @@
       }
     }
 
+    .whatsapp-image-url-placeholder {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      gap: $CAP_SPACE_08;
+      width: 100%;
+      min-height: 5rem;
+      max-height: 8.786rem;
+      margin-bottom: $CAP_SPACE_04;
+      background-color: $CAP_G09;
+      border-radius: $CAP_SPACE_04;
+      padding: $CAP_SPACE_08;
+
+      .whatsapp-image-url-placeholder-icon {
+        color: $CAP_G05;
+        font-size: 1.5rem;
+      }
+
+      .whatsapp-image-url-placeholder-text {
+        font-size: $FONT_SIZE_S;
+        color: $CAP_G04;
+        text-align: center;
+        word-break: break-all;
+      }
+    }
+
     .whatsapp-image {
       width: 100%;
       max-height: 8.786rem;

package/v2Components/CommonTestAndPreview/tests/UnifiedPreview/WhatsAppPreviewContent.test.js

@@ -26,6 +26,7 @@ jest.mock('../../../../v2Containers/Whatsapp/constants', () => ({
   WHATSAPP_CATEGORIES: {
     authentication: 'authentication',
   },
+  TEMPLATE_VARIABLE_REGEX: /\{\{.*?\}\}/,
 }));
 
 // Convert messages object to format expected by IntlProvider
@@ -238,6 +239,53 @@ describe('WhatsAppPreviewContent', () => {
       expect(image.getAttribute('src')).toBe('https://image.url');
     });
 
+    it('should render placeholder when whatsappImageSrc is a template variable', () => {
+      const props = {
+        ...defaultProps,
+        content: {
+          templateMsg: 'Message',
+          whatsappImageSrc: '{{imageUrl}}',
+        },
+      };
+
+      const { container } = render(
+        <TestWrapper>
+          <ComponentToRender {...props} />
+        </TestWrapper>
+      );
+
+      expect(container.querySelector('.whatsapp-image-url-placeholder')).toBeTruthy();
+      expect(container.querySelector('.whatsapp-image-url-placeholder-icon')).toBeTruthy();
+      expect(container.querySelector('.whatsapp-image-url-placeholder-text').textContent).toBe('{{imageUrl}}');
+      expect(container.querySelector('img.whatsapp-image')).toBeFalsy();
+    });
+
+    it('should fall back to empty preview image when image fails to load', () => {
+      const props = {
+        ...defaultProps,
+        content: {
+          templateMsg: 'Message',
+          whatsappImageSrc: 'https://broken.url/image.jpg',
+        },
+      };
+
+      const { container } = render(
+        <TestWrapper>
+          <ComponentToRender {...props} />
+        </TestWrapper>
+      );
+
+      const image = container.querySelector('img.whatsapp-image');
+      expect(image).toBeTruthy();
+      expect(image.getAttribute('src')).toBe('https://broken.url/image.jpg');
+
+      // Trigger onError to swap src to fallback
+      const errorEvent = new Event('error');
+      image.dispatchEvent(errorEvent);
+
+      expect(image.getAttribute('src')).not.toBe('https://broken.url/image.jpg');
+    });
+
     it('should render video preview when whatsappVideoPreviewImg is present', () => {
       const props = {
         ...defaultProps,

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -816,6 +816,27 @@
     }
   }
 
+  .whatsapp-image-url-placeholder {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    background-color: $CAP_G09; 
+    border-radius: $CAP_SPACE_04;
+    width: 100%;
+    min-height: 5rem;
+    max-height: 8.786rem;
+    margin-bottom: $CAP_SPACE_04;
+    .whatsapp-image-url-placeholder-text {
+      font-size: 0.786rem;
+      color: $CAP_G04;
+      margin-top: $CAP_SPACE_04;
+      text-align: center;
+      word-break: break-all;
+      padding: 0 $CAP_SPACE_04;
+    }
+  }
+
   .msg-container-carousel {
     display: flex;
     .scroll-container {
@@ -972,7 +993,7 @@
 }
 
 .character-count-col{
-  margin-top: 8px;
+  margin: $CAP_SPACE_12 0;
   text-align: center;
   width: 100%;
   .optout-tag-heading{

package/v2Components/TemplatePreview/index.js

@@ -48,7 +48,7 @@ import { TEMPLATE, IMAGE_CAROUSEL, IMAGE, STICKER, TEXT, IMAGE_MAP, VIDEO } from
 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 { QUICK_REPLY, WHATSAPP_CATEGORIES, PHONE_NUMBER, TEMPLATE_VARIABLE_REGEX } from '../../v2Containers/Whatsapp/constants';
 import { RCS_BUTTON_TYPES, LEFT, HORIZONTAL, VERTICAL, RIGHT} from '../../v2Containers/Rcs/constants';
 import { ANDROID, INAPP_MESSAGE_LAYOUT_TYPES } from '../../v2Containers/InApp/constants';
 import { CAROUSEL } from '../../v2Containers/MobilePushNew/constants';
@@ -66,6 +66,8 @@ const lineVideoPlaceholder = require('../../assets/rich-video-placeholder.svg');
 const androidPushMessagePhone = require('./assets/images/Android_With_date_and_time.svg');
 const iPhonePushMessagePhone = require('./assets/images/iOS_With_date_and_time.svg');
 
+const { CapLabelInline } = CapLabel;
+
 export class TemplatePreview extends React.Component { // eslint-disable-line react/prefer-stateless-function
   onPreviewContentClicked = (channel) => {
     const IOSContent = (this.props.templateDataRaw && this.props.templateDataRaw.versions.base.IOS) ||
@@ -659,8 +661,8 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                   </CapRow>
                 </CapRow>
                 {!this.props.showCount && (
-                  <CapRow>
-                    <CapColumn className="character-count-col" span={22}>
+                  <CapRow type='flex' justify='center'>
+                    <CapRow type='flex' align='middle' justify='center' className="character-count-col">
                       {(channel || "").toLowerCase() === "sms" && (
                         <CapHeading type="h3">
                           <FormattedMessage
@@ -685,7 +687,7 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                           />
                         </CapHeading>
                       )}
-                    </CapColumn>
+                    </CapRow>
                   </CapRow>
                 )}
               </CapRow>
@@ -1195,11 +1197,21 @@ export class TemplatePreview extends React.Component { // eslint-disable-line re
                         {content?.showUrlPreview
                           && renderUrlPreview(content?.metaTagsDetails)}
                         {content?.whatsappImageSrc && (
-                          <CapImage
-                            src={content.whatsappImageSrc}
-                            className="whatsapp-image"
-                            alt={formatMessage(messages.previewGenerated)}
-                          />
+                          TEMPLATE_VARIABLE_REGEX.test(content.whatsappImageSrc) ? (
+                            <CapRow className="whatsapp-image-url-placeholder">
+                              <CapIcon type="picture" size="s" className="whatsapp-image-url-placeholder-icon" />
+                              <CapLabelInline type="label2" className="whatsapp-image-url-placeholder-text">
+                                {content.whatsappImageSrc}
+                              </CapLabelInline>
+                            </CapRow>
+                          ) : (
+                            <CapImage
+                              src={content.whatsappImageSrc}
+                              className="whatsapp-image"
+                              alt={formatMessage(messages.previewGenerated)}
+                              onError={(e) => { e.target.src = whatsappImageEmptyPreview; }}
+                            />
+                          )
                         )}
                         {content?.whatsappVideoPreviewImg && (
                           <CapTooltip

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

@@ -42,6 +42,7 @@ exports[`Test Templates container Should render correct preview component for wh
               <CapImage
                 alt="Preview is being generated"
                 className="whatsapp-image"
+                onError={[Function]}
                 src="https://crm-nightly-new-fileservice.s3.amazonaws.com/intouch_creative_assets/c9edc114-923b-4ac7-82d0-d6682213.jpg"
               />
               You have received {{1}} points