@capillarytech/creatives-library 8.0.345-alpha.12 → 8.0.345-alpha.13

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

@@ -1,5 +1,6 @@
 import { fromJS } from "immutable";
 import { makeSelectTemplatesResponse } from "../selectors";
+import { selectArchiveFilter, selectSelectedTemplateIds } from "../selectors";
 
 describe("Template selectors", () => {
   const mockState = fromJS({
@@ -15,3 +16,34 @@ describe("Template selectors", () => {
     });
   });
 });
+
+describe("selectArchiveFilter selector", () => {
+  it("should return archiveFilter from state", () => {
+    const state = fromJS({
+      templates: { archiveFilter: 'archived' },
+    });
+    const result = selectArchiveFilter().resultFunc(state.get('templates').toJS());
+    expect(result).toBe('archived');
+  });
+
+  it("should default to 'active' when archiveFilter is not set", () => {
+    const result = selectArchiveFilter().resultFunc({});
+    expect(result).toBe('active');
+  });
+});
+
+describe("selectSelectedTemplateIds selector", () => {
+  it("should return selectedTemplateIds from state", () => {
+    const ids = ['id1', 'id2'];
+    const state = fromJS({
+      templates: { selectedTemplateIds: ids },
+    });
+    const result = selectSelectedTemplateIds().resultFunc(state.get('templates').toJS());
+    expect(result).toEqual(ids);
+  });
+
+  it("should default to [] when selectedTemplateIds is not set", () => {
+    const result = selectSelectedTemplateIds().resultFunc({});
+    expect(result).toEqual([]);
+  });
+});

package/v2Containers/TemplatesV2/TemplatesV2.style.js

@@ -10,7 +10,7 @@ export default css`
 
   .component-wrapper {
     ${(props) => props.isFullMode ? `
-      max-width: 71.25rem;
+      max-width: 1140px;
       margin: 0 auto;
       width: 100%;
       padding: ${CAP_SPACE_24} 0;
@@ -23,77 +23,6 @@ export default css`
       height: calc(100vh - 11.25rem);
     } `}
   }
-
-  /* SMS fallback / local list: single pane skips .cap-tab-v2, so flex-fill the grid instead of viewport-fixed pagination height */
-  .creatives-templates-container--local-sms.library-mode {
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    min-height: 0;
-    height: 100%;
-
-    .component-wrapper {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-height: 0;
-      height: 100%;
-    }
-
-    .templates-v2-local-sms-pane {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-height: 0;
-      overflow: hidden;
-      height: 100%;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode {
-      display: flex;
-      flex-direction: column;
-      flex: 1;
-      min-height: 0;
-      overflow: hidden;
-      height: 100%;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode > .cap-row:first-of-type {
-      flex: 1;
-      min-height: 0;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode > .cap-row:first-of-type > div {
-      flex: 1;
-      min-height: 0;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-    }
-
-    .templates-v2-local-sms-pane .creatives-templates-list.library-mode > .cap-row:first-of-type > div > div:first-child {
-      flex: 1;
-      min-height: 0;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-    }
-
-    .templates-v2-local-sms-pane .v2-pagination-container,
-    .templates-v2-local-sms-pane .v2-pagination-container-half {
-      /* Match _templates local-SMS: bounded height so overflow-y scroll works (flex+100% alone often doesn’t) */
-      flex: 0 1 auto;
-      min-height: 0;
-      height: calc(100vh - 12rem);
-      max-height: calc(100vh - 12rem);
-      overflow-y: auto;
-      overflow-x: hidden;
-      -webkit-overflow-scrolling: touch;
-    }
-  }
 `;
 
 export const CapTabStyle = css`

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, CapIcon, CapSpin, CapTooltip } from '@capillarytech/cap-ui-library';
-import { find, get, pick } from 'lodash';
+import { CapTab, CapCustomCard, CapButton, CapHeader, CapSpin, CapIcon, CapTooltip } from '@capillarytech/cap-ui-library';
+import { find, get } from 'lodash';
 import Helmet from 'react-helmet';
 
 import { UserIsAuthenticated } from '../../utils/authWrapper';
@@ -36,14 +36,13 @@ 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
@@ -120,9 +119,9 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       return !normalizedChannelsToHideSet.has(paneKey);
     });
 
-    if (isFullMode && !normalizedChannelsToHideSet.has(normalizeChannel(ASSETS))) {
-      filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.gallery), key: ASSETS });
-    } else if (!isFullMode) {
+    if (isFullMode) {
+      filteredPanes.push({ content: <div></div>, tab: intl.formatMessage(messages.gallery), key: 'assets' });
+    } else {
       // 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() });
@@ -223,8 +222,7 @@ 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 =
@@ -250,8 +248,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       </CapSpin>
 
     </div>);
-  };
-
+  }
   getGalleryComponent = (location) => <Gallery location={location} isFullMode={this.props.isFullMode}/>
   getCallTaskComponent = () => (
     <CallTask
@@ -315,29 +312,6 @@ 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':
@@ -387,55 +361,29 @@ 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'}${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={`${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} />}
-                {...(!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}
-              />
-            )}
+            {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>
         </div>
       )
@@ -467,17 +415,6 @@ 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/Whatsapp/index.js

@@ -118,7 +118,6 @@ 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 {
@@ -484,10 +483,28 @@ 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 = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateHeaderArray = converStringToVarArr(validVarArr, msg);
     if (templateHeaderArray?.length !== 0) {
       let clonedVarMap = {};
       if (!isEmpty(varMap)) {
@@ -541,7 +558,7 @@ export const Whatsapp = (props) => {
       setUnsubscribeRequired(true);
     }
     //converting msg string to variable arr
-    const templateMessageArray = splitContentByOrderedVarTokens(validVarArr, msg);
+    const templateMessageArray = converStringToVarArr(validVarArr, msg);
     updateTempMsgArray(templateMessageArray.filter((i) => i === 0 || i));
   };