@capillarytech/creatives-library 8.0.316-alpha.3 → 8.0.316-alpha.4

package/v2Containers/TemplatesV2/index.js

@@ -10,8 +10,8 @@ import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { bindActionCreators, compose } from 'redux';
-import { CapTab, CapCustomCard, CapButton, CapHeader, CapSpin, CapIcon, CapTooltip } from '@capillarytech/cap-ui-library';
-import { find, get } from 'lodash';
+import { CapTab, CapCustomCard, CapButton, CapHeader, CapIcon, CapSpin, CapTooltip } from '@capillarytech/cap-ui-library';
+import { find, get, pick } from 'lodash';
 import Helmet from 'react-helmet';
 
 import { UserIsAuthenticated } from '../../utils/authWrapper';
@@ -36,13 +36,14 @@ import { makeSelectAuthenticated, selectCurrentOrgDetails } from "../../v2Contai
 import {
   CALL_TASK,
   COMMON_CHANNELS,
+  LOCAL_TEMPLATE_CONFIG_KEYS_FOR_PICK,
   LOYALTY_SUPPORTED_ACTION,
   MOBILE_PUSH,
   NORMALIZED_CHANNEL_ALIASES,
   SMS,
 } from "../CreativesContainer/constants";
 
-const {CapCustomCardList} = CapCustomCard;
+const { CapCustomCardList } = CapCustomCard;
 
 const StyledCapTab = withStyles(CapTab, CapTabStyle);
 export class TemplatesV2 extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -119,9 +120,9 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       return !normalizedChannelsToHideSet.has(paneKey);
     });
 
-    if (isFullMode) {
-      filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.gallery), key: 'assets' });
-    } else {
+    if (isFullMode && !normalizedChannelsToHideSet.has(normalizeChannel(ASSETS))) {
+      filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.gallery), key: ASSETS });
+    } else if (!isFullMode) {
       // Add special-mode panes only when not hidden (use normalized checks)
       if (!normalizedChannelsToHideSet.has(CALL_TASK.toLowerCase())) {
         filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.callTask), key: CALL_TASK.toLowerCase() });
@@ -222,7 +223,8 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       this.setState({selectedChannel: nextProps.channel, panes });
     }
   }
-  getTemplateDataForGrid = ({templates, handlers, filterContent, channel, isLoading, loadingTip}) => {
+
+  getTemplateDataForGrid = ({ templates, handlers, filterContent, channel, isLoading, loadingTip }) => {
     const currentChannel = channel.toUpperCase();
     const cardDataList = templates.map((template) => {
       const templateData =
@@ -248,7 +250,8 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       </CapSpin>
 
     </div>);
-  }
+  };
+
   getGalleryComponent = (location) => <Gallery location={location} isFullMode={this.props.isFullMode}/>
   getCallTaskComponent = () => (
     <CallTask
@@ -312,6 +315,29 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
     if (messageStrategy !== "X_ENGAGE" && channel === 'facebook' && !isFullMode) {
       return this.getFacebookComponent();
     }
+    const localConfig = this.props.localTemplatesConfig || pick(this.props, LOCAL_TEMPLATE_CONFIG_KEYS_FOR_PICK);
+    const useLocalTemplates = localConfig.useLocalTemplates;
+    if (useLocalTemplates && channel === (this.props.channel || 'sms')) {
+      // Reuse full Templates component (same UI as Redux flow) with local data only
+      const location = { pathname: `/${channel}`, search: '', query: !this.props.isFullMode ? { type: 'embedded', module: 'library' } : {} };
+      return (
+        <Templates
+          key={`${channel}-local`}
+          location={location}
+          route={{ name: channel }}
+          router={this.props.router}
+          isFullMode={this.props.isFullMode}
+          createNew={this.props.createNew}
+          onSelectTemplate={this.props.onSelectTemplate}
+          handlePeviewTemplate={this.props.handlePeviewTemplate}
+          messageStrategy={this.props.messageStrategy}
+          smsRegister={this.props.smsRegister}
+          hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
+          localTemplatesConfig={localConfig}
+        />
+      );
+    }
+
     const location = {pathname: `/${channel}`, search: '', query};
     switch (channel) {
       case 'call_task':
@@ -361,29 +387,55 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   }
   render() {
     const { isFullMode, className, cap = {}, Global = {}} = this.props;
+    const useLocalTemplates = get(this.props, 'localTemplatesConfig.useLocalTemplates', false);
     const { accessiblePermissions = []} = cap.user || Global.user || {};
     let isCreativeAccessible = true;
     if (!accessiblePermissions.includes(CREATIVES_UI_VIEW)) {
       isCreativeAccessible = false;
     }
+    // Recompute active pane content every render so local-list mode updates
+    // (templates/loading/search UI) are not stuck with the initial cached pane.
+    const panes = this.setChannelContent(this.state.selectedChannel, this.state.panes);
+    const hideChannelTabsForLocalSms = useLocalTemplates && panes.length === 1;
+    const activeLocalPane = hideChannelTabsForLocalSms
+      ? (panes.find(
+        (p) => String(p.key).toLowerCase() === String(this.state.selectedChannel).toLowerCase(),
+      ) || panes[0])
+      : null;
     return (
       !isCreativeAccessible ? <AccessForbidden /> : (
-        <div className={`${className} creatives-templates-container ${isFullMode ? 'fullmode' : 'library-mode'}`} data-testid="cap-wrapper">
-          {isFullMode && <Helmet
-            title={this.props.intl.formatMessage(messages.creatives)}
-            meta={[
-              { name: 'description', content: this.props.intl.formatMessage(messages.creativesDesc) },
-            ]}
-          />}
-          <div className="component-wrapper">
-            {isFullMode && <CapHeader title={<FormattedMessage {...messages.creatives}/>} description={<FormattedMessage {...messages.creativesDesc}/>}/>}
-            <StyledCapTab
-              panes={this.state.panes}
-              onChange={this.channelChange}
-              activeKey={this.state.selectedChannel}
-              defaultActiveKey={this.state.selectedChannel}
-              isFullMode={isFullMode}
+        <div
+          className={`${className} creatives-templates-container ${isFullMode ? 'fullmode' : 'library-mode'}${useLocalTemplates ? ' creatives-templates-container--local-sms' : ''}`}
+          data-testid="cap-wrapper"
+        >
+          {isFullMode && !useLocalTemplates && (
+            <Helmet
+              title={this.props.intl.formatMessage(messages.creatives)}
+              meta={[
+                { name: 'description', content: this.props.intl.formatMessage(messages.creativesDesc) },
+              ]}
             />
+          )}
+          <div className="component-wrapper">
+            {isFullMode && (
+              <CapHeader
+                title={<FormattedMessage {...messages.creatives} />}
+                {...(!useLocalTemplates && {
+                  description: <FormattedMessage {...messages.creativesDesc} />,
+                })}
+              />
+            )}
+            {hideChannelTabsForLocalSms ? (
+              <div className="templates-v2-local-sms-pane">{activeLocalPane?.content}</div>
+            ) : (
+              <StyledCapTab
+                panes={panes}
+                onChange={this.channelChange}
+                activeKey={this.state.selectedChannel}
+                defaultActiveKey={this.state.selectedChannel}
+                isFullMode={isFullMode}
+              />
+            )}
           </div>
         </div>
       )
@@ -415,6 +467,17 @@ TemplatesV2.propTypes = {
   currentOrgDetails: PropTypes.object,
   restrictPersonalization: PropTypes.bool,
   isAnonymousType: PropTypes.bool,
+  // Optional: reuse grid UI with local template list (e.g. SMS fallback). Pass object or same keys as individual props.
+  localTemplatesConfig: PropTypes.shape({
+    useLocalTemplates: PropTypes.bool,
+    localTemplates: PropTypes.arrayOf(PropTypes.object),
+    localTemplatesLoading: PropTypes.bool,
+    localTemplatesLoadingTip: PropTypes.string,
+    localTemplatesFilterContent: PropTypes.node,
+    localTemplatesFooterContent: PropTypes.node,
+    localTemplatesOnPageChange: PropTypes.func,
+    localTemplatesUseSkeleton: PropTypes.bool,
+  }),
 };
 
 TemplatesV2.defaultProps = {

package/v2Containers/TemplatesV2/tests/TemplatesV2.localTemplates.test.js

@@ -0,0 +1,131 @@
+/**
+ * Embedded SMS template list: localTemplatesConfig + SMS-only channel visibility (RCS SMS fallback).
+ */
+import React from 'react';
+import { injectIntl } from 'react-intl';
+import '@testing-library/jest-dom';
+import cloneDeep from 'lodash/cloneDeep';
+import { Provider } from 'react-redux';
+import { configureStore } from '@capillarytech/vulcan-react-sdk/utils';
+import history from '../../../utils/history';
+import { initialReducer } from '../../../initialReducer';
+import { render, screen } from '../../../utils/test-utils';
+import { TemplatesV2 } from '../index';
+import { Templates, authData, currentOrgDetails as currentOrgDetailsMock } from './mockData';
+import { CHANNELS_TO_HIDE_FOR_SMS_ONLY } from '../../../v2Components/SmsFallback/constants';
+
+const mockTemplates = jest.fn(() => <div data-testid="templates-mock">Templates</div>);
+jest.mock('v2Containers/Templates', () => ({
+  __esModule: true,
+  default: (props) => mockTemplates(props),
+}));
+
+jest.mock('../../../utils/authWrapper', () => ({
+  UserIsAuthenticated: jest.fn((config) => config),
+}));
+
+const ComponentToRender = injectIntl(TemplatesV2);
+const renderComponent = (p) => {
+  const store = configureStore({}, initialReducer, history);
+  return render(
+    <Provider store={store}>
+      <ComponentToRender {...p} />
+    </Provider>,
+  );
+};
+
+describe('TemplatesV2 local SMS templates (embedded)', () => {
+  const templateActions = {
+    templateActions: jest.fn(),
+    deleteTemplate: jest.fn(),
+    getAccountsSettings: jest.fn(),
+    getAllTemplates: jest.fn(),
+    getCdnTransformationConfig: jest.fn(),
+    getDefaultBeeTemplates: jest.fn(),
+    getSenderDetails: jest.fn(),
+    getTemplateDetails: jest.fn(),
+    getUserList: jest.fn(),
+    getWeCrmAccounts: jest.fn(),
+    handleHtmlUpload: jest.fn(),
+    handleZipUpload: jest.fn(),
+    resetAccount: jest.fn(),
+    resetTemplate: jest.fn(),
+    resetTemplateData: jest.fn(),
+    resetTemplateStoreData: jest.fn(),
+    resetUploadData: jest.fn(),
+    setBEETemplate: jest.fn(),
+    setChannelAccount: jest.fn(),
+    setEdmTemplate: jest.fn(),
+    setFacebookAccount: jest.fn(),
+    setViberAccount: jest.fn(),
+    setWeChatAccount: jest.fn(),
+  };
+
+  const baseProps = {
+    cap: {
+      user: { accessiblePermissions: ['CREATIVES_UI_VIEW'] },
+    },
+    actions: { defaultAction: jest.fn(), getTemplates: jest.fn() },
+    Templates,
+    TemplatesList: Templates?.templates,
+    authData,
+    templateActions,
+    isFullMode: false,
+    className: 'embed-test',
+    channel: 'sms',
+    channelsToHide: CHANNELS_TO_HIDE_FOR_SMS_ONLY,
+    channelsToDisable: [],
+    onChannelChange: jest.fn(),
+    enableNewChannels: [],
+    /** Without JP_LOCALE_HIDE_FEATURE so SMS panes are not stripped to Email/Line/Gallery only */
+    currentOrgDetails: {
+      ...currentOrgDetailsMock,
+      accessibleFeatures: (currentOrgDetailsMock.accessibleFeatures || []).filter(
+        (f) => f !== 'JP_LOCALE_HIDE_FEATURE',
+      ),
+    },
+    location: {
+      pathname: 'v2',
+      basename: '/creatives/ui/',
+      query: {},
+    },
+    router: { push: jest.fn() },
+  };
+
+  beforeEach(() => {
+    mockTemplates.mockClear();
+  });
+
+  it('adds local-sms container class and single-pane layout when only SMS is visible', () => {
+    const p = cloneDeep(baseProps);
+    p.localTemplatesConfig = {
+      useLocalTemplates: true,
+      localTemplates: [],
+      localTemplatesLoading: false,
+    };
+    renderComponent(p);
+
+    const wrapper = screen.getByTestId('cap-wrapper');
+    expect(wrapper).toHaveClass('creatives-templates-container--local-sms');
+    expect(document.querySelector('.templates-v2-local-sms-pane')).toBeTruthy();
+    expect(mockTemplates).toHaveBeenCalled();
+  });
+
+  it('passes localTemplatesConfig into Templates for the SMS pane', () => {
+    const localConfig = {
+      useLocalTemplates: true,
+      localTemplates: [{ _id: '1', name: 'A' }],
+      localTemplatesLoading: false,
+    };
+    const p = cloneDeep(baseProps);
+    p.localTemplatesConfig = localConfig;
+    renderComponent(p);
+
+    expect(mockTemplates).toHaveBeenCalled();
+    const passed = mockTemplates.mock.calls.find(
+      (call) => call[0] && call[0].localTemplatesConfig && call[0].localTemplatesConfig.useLocalTemplates,
+    );
+    expect(passed).toBeTruthy();
+    expect(passed[0].localTemplatesConfig).toMatchObject(localConfig);
+  });
+});

package/v2Containers/WebPush/Create/components/MessageSection.js

@@ -12,6 +12,52 @@ import CapAskAira from '@capillarytech/cap-ui-library/CapAskAira';
 import { MESSAGE_MAX_LENGTH, SHOW_CHARACTER_COUNT } from '../../constants';
 import { useAiraTriggerPosition } from '../hooks/useAiraTriggerPosition';
 
+const InputWrapper = ({
+  children,
+  inputRef,
+  error,
+  value,
+  onChange,
+  isAiContentBotDisabled,
+}) => {
+  const wrapperRef = useRef(null);
+  const airaRootStyle = useAiraTriggerPosition({ wrapperRef, inputRef, error });
+
+  return (
+    <div className="webpush-message-input-wrapper" ref={wrapperRef}>
+      {children}
+      {!isAiContentBotDisabled && (
+        <CapAskAira.ContentGenerationBot
+          text={value || ''}
+          setText={(text) => onChange(text)}
+          iconPlacement="float-br"
+          iconSize="1.6rem"
+          rootStyle={airaRootStyle}
+        />
+      )}
+    </div>
+  );
+};
+
+InputWrapper.propTypes = {
+  children: PropTypes.node.isRequired,
+  inputRef: PropTypes.oneOfType([
+    PropTypes.shape({ current: PropTypes.any }),
+    PropTypes.func,
+  ]),
+  error: PropTypes.string,
+  value: PropTypes.string,
+  onChange: PropTypes.func.isRequired,
+  isAiContentBotDisabled: PropTypes.bool,
+};
+
+InputWrapper.defaultProps = {
+  inputRef: null,
+  error: '',
+  value: '',
+  isAiContentBotDisabled: false,
+};
+
 /**
  * MessageSection component - Message textarea with tags, emoji picker, and character count
  */
@@ -27,13 +73,6 @@ export const MessageSection = ({
   handleMessageTextAreaRef,
   isAiContentBotDisabled,
 }) => {
-  const messageInputWrapperRef = useRef(null);
-  const airaRootStyle = useAiraTriggerPosition({
-    wrapperRef: messageInputWrapperRef,
-    inputRef: messageTextAreaRef,
-    error,
-  });
-
   const renderCharacterCount = () => {
     if (!SHOW_CHARACTER_COUNT) return null;
 
@@ -60,7 +99,13 @@ export const MessageSection = ({
         <CapHeading type="h4" className="webpush-message">
           <FormattedMessage {...messages.message} />
         </CapHeading>
-        <div className="webpush-message-input-wrapper" ref={messageInputWrapperRef}>
+        <InputWrapper
+          inputRef={messageTextAreaRef}
+          error={error}
+          value={value}
+          onChange={onChange}
+          isAiContentBotDisabled={isAiContentBotDisabled}
+        >
           <CapEmojiPicker.Wrapper
             value={value}
             onChange={onChange}
@@ -84,16 +129,7 @@ export const MessageSection = ({
               }
             />
           </CapEmojiPicker.Wrapper>
-          {!isAiContentBotDisabled && (
-            <CapAskAira.ContentGenerationBot
-              text={value || ''}
-              setText={(text) => onChange(text)}
-              iconPlacement="float-br"
-              iconSize="1.6rem"
-              rootStyle={airaRootStyle}
-            />
-          )}
-        </div>
+        </InputWrapper>
         {renderCharacterCount()}
       </CapRow>
       <CapDivider className="webpush-message-divider" />

package/v2Containers/WebPush/Create/components/MessageSection.test.js

@@ -318,5 +318,33 @@ describe('MessageSection', () => {
       expect(textArea.prop('value')).toBe(longValue);
     });
   });
+
+  describe('InputWrapper', () => {
+    it('should render the wrapper div with correct class', () => {
+      const wrapper = mountWithIntl(<MessageSection {...defaultProps} />);
+      const inputWrapper = wrapper.find('.webpush-message-input-wrapper');
+      expect(inputWrapper.exists()).toBe(true);
+    });
+
+    it('should render children inside InputWrapper', () => {
+      const wrapper = mountWithIntl(<MessageSection {...defaultProps} />);
+      const inputWrapper = wrapper.find('.webpush-message-input-wrapper');
+      expect(inputWrapper.find(CapEmojiPicker.Wrapper).exists()).toBe(true);
+    });
+
+    it('should not render aiRA bot inside InputWrapper when disabled', () => {
+      const wrapper = mountWithIntl(<MessageSection {...defaultProps} isAiContentBotDisabled />);
+      const inputWrapper = wrapper.find('.webpush-message-input-wrapper');
+      expect(inputWrapper.find(CapAskAira.ContentGenerationBot).exists()).toBe(false);
+    });
+
+    it('should render aiRA bot inside InputWrapper when enabled', () => {
+      const wrapper = mountWithIntl(
+        <MessageSection {...defaultProps} isAiContentBotDisabled={false} />
+      );
+      const inputWrapper = wrapper.find('.webpush-message-input-wrapper');
+      expect(inputWrapper.find(CapAskAira.ContentGenerationBot).exists()).toBe(true);
+    });
+  });
 });
 

package/v2Containers/WebPush/Create/components/__snapshots__/MessageSection.test.js.snap

@@ -18,8 +18,12 @@ exports[`MessageSection Rendering should render correctly with default props 1`]
         values={Object {}}
       />
     </CapHeading>
-    <div
-      className="webpush-message-input-wrapper"
+    <InputWrapper
+      error=""
+      inputRef={null}
+      isAiContentBotDisabled={true}
+      onChange={[MockFunction]}
+      value="Test Message"
     >
       <InjectIntl(Wrapper)
         onChange={[MockFunction]}
@@ -43,7 +47,7 @@ exports[`MessageSection Rendering should render correctly with default props 1`]
           value="Test Message"
         />
       </InjectIntl(Wrapper)>
-    </div>
+    </InputWrapper>
     <CapLabel
       className="webpush-character-count"
       type="label2"

package/v2Containers/Whatsapp/index.js

@@ -118,6 +118,7 @@ import { ANDROID } from '../../v2Components/CommonTestAndPreview/constants';
 import CapImageUpload from '../../v2Components/CapImageUpload';
 import TagList from '../TagList';
 import { validateTags } from '../../utils/tagValidations';
+import { splitContentByOrderedVarTokens } from '../../utils/templateVarUtils';
 import { capitalizeString } from '../../utils/Formatter';
 import CapWhatsappCTA from '../../v2Components/CapWhatsappCTA';
 import {
@@ -482,28 +483,10 @@ export const Whatsapp = (props) => {
     );
   };
 
-  const converStringToVarArr = (validVarArr, content) => {
-    const templateVarArray = [];
-    while (content?.length !== 0) {
-      //converting content string to an array split at var
-      const index = content.indexOf(validVarArr?.[0]);
-      if (index !== -1) {
-        templateVarArray.push(content.substring(0, index)); //push string before var
-        templateVarArray.push(validVarArr?.[0]); //push var
-        content = content.substring(index + validVarArr?.[0]?.length, content?.length); //remaining str
-        validVarArr?.shift(); //remove considered var
-      } else {
-        templateVarArray.push(content); //remaining str
-        break;
-      }
-    }
-    return templateVarArray;
-  }
-
   const computeTextMessage = (msg, varMap, regex) => {
     const validVarArr = msg?.match(regex) || [];
     //conerting msg string to variable arr
-    const templateHeaderArray = converStringToVarArr(validVarArr, msg);
+    const templateHeaderArray = splitContentByOrderedVarTokens(validVarArr, msg);
     if (templateHeaderArray?.length !== 0) {
       let clonedVarMap = {};
       if (!isEmpty(varMap)) {
@@ -557,7 +540,7 @@ export const Whatsapp = (props) => {
       setUnsubscribeRequired(true);
     }
     //converting msg string to variable arr
-    const templateMessageArray = converStringToVarArr(validVarArr, msg);
+    const templateMessageArray = splitContentByOrderedVarTokens(validVarArr, msg);
     updateTempMsgArray(templateMessageArray.filter((i) => i === 0 || i));
   };
 
@@ -2957,12 +2940,13 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
   };
 
   const isEditDoneDisabled = () => {
+    const isBlankInput = (inputValue) => !String(inputValue ?? '').trim();
     let carouselDisableCheck = false;
     if (isMediaTypeCarousel) {
       carouselDisableCheck = carouselData.some((data) => {
 				return (
 					data.carouselTagValidationErr ||
-					Object.values(data.varMap).some((inputValue) => inputValue === "") ||
+					Object.values(data.varMap).some((inputValue) => isBlankInput(inputValue)) ||
           computeTextLength(CAROUSEL_TEXT, data) > TEMPLATE_MESSAGE_MAX_LENGTH ||
           (carouselMediaType === IMAGE.toLowerCase() && !data.imageSrc) ||
 					(carouselMediaType === VIDEO.toLowerCase() && !data.videoSrc) ||
@@ -2972,8 +2956,8 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
     }
     return (isTagValidationError ||
     isHeaderTagValidationError ||
-    Object.values(varMap).some((inputValue) => inputValue === "") ||
-    Object.values(headerVarMappedData).some((inputValue) => inputValue === "") ||
+    Object.values(varMap).some((inputValue) => isBlankInput(inputValue)) ||
+    Object.values(headerVarMappedData).some((inputValue) => isBlankInput(inputValue)) ||
     computeTextLength(MESSAGE_TEXT) > TEMPLATE_MESSAGE_MAX_LENGTH ||
     computeTextLength(HEADER_TEXT) > TEMPLATE_HEADER_MAX_LENGTH ||
     (isBtnTypeCta && ctaData.some((btn) => btn?.url?.includes("{{1}}"))) || isMediatypeValid()) || carouselDisableCheck;