@capillarytech/creatives-library 8.0.316-alpha.4 → 8.0.317-alpha.0

package/v2Components/HtmlEditor/components/CodeEditorPane/index.js

@@ -59,6 +59,7 @@ const CodeEditorPaneComponent = ({
   injectedTags = {},
   location,
   eventContextTags = [],
+  waitEventContextTags = {},
   selectedOfferDetails = [],
   channel,
   userLocale = 'en',
@@ -289,6 +290,7 @@ const CodeEditorPaneComponent = ({
               location={location}
               selectedOfferDetails={selectedOfferDetails}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               popoverPlacement="rightTop"
             />
           </CapRow>
@@ -327,6 +329,7 @@ CodeEditorPane.propTypes = {
   injectedTags: PropTypes.object,
   location: PropTypes.object,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   channel: PropTypes.string,
   userLocale: PropTypes.string,

package/v2Components/SmsFallback/tests/useLocalTemplateList.test.js

@@ -284,6 +284,101 @@ describe('useLocalTemplateList', () => {
     expect(fetchTemplates.mock.calls.length).toBe(callsAfterFirst);
   });
 
+  it('passes explicit search term from reset() through to fetchTemplates', async () => {
+    const fetchTemplates = jest.fn().mockResolvedValue({
+      templates: [{ _id: 'r1' }],
+      totalCount: 5,
+    });
+
+    const { result } = renderHook(() =>
+      useLocalTemplateList({ fetchTemplates, perPage: 25 }),
+    );
+
+    act(() => {
+      result.current.reset('explicit-search');
+    });
+
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+    });
+
+    expect(fetchTemplates).toHaveBeenCalledWith(
+      expect.objectContaining({ search: 'explicit-search', page: 1, reset: true }),
+    );
+    expect(result.current.search).toBe('explicit-search');
+  });
+
+  it('stores a positive totalCount returned by the API', async () => {
+    const fetchTemplates = jest.fn().mockResolvedValue({
+      templates: [{ _id: 'a' }, { _id: 'b' }],
+      totalCount: 42,
+    });
+
+    const { result } = renderHook(() =>
+      useLocalTemplateList({ fetchTemplates, perPage: 25 }),
+    );
+
+    act(() => {
+      result.current.reset('');
+    });
+
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+    });
+
+    expect(result.current.totalCount).toBe(42);
+    expect(result.current.templates).toHaveLength(2);
+  });
+
+  it('canLoadMore is false while a fetch is in progress even when more items exist', async () => {
+    let resolveFirst;
+    const fetchTemplates = jest.fn(
+      () => new Promise((res) => { resolveFirst = res; }),
+    );
+
+    const { result } = renderHook(() =>
+      useLocalTemplateList({ fetchTemplates, perPage: 2 }),
+    );
+
+    act(() => {
+      result.current.reset('');
+    });
+
+    // Loading is true → canLoadMore must be false regardless of hasMoreByTotal
+    expect(result.current.loading).toBe(true);
+    expect(result.current.canLoadMore).toBe(false);
+
+    await act(async () => {
+      resolveFirst({ templates: [{ _id: 'x' }, { _id: 'y' }], totalCount: 10 });
+      await Promise.resolve();
+    });
+
+    expect(result.current.loading).toBe(false);
+    expect(result.current.canLoadMore).toBe(true);
+  });
+
+  it('canLoadMore is false when templates is empty (hasMoreByFullPage requires length > 0)', async () => {
+    const fetchTemplates = jest.fn().mockResolvedValue({
+      templates: [],
+      totalCount: 0,
+    });
+
+    const { result } = renderHook(() =>
+      useLocalTemplateList({ fetchTemplates, perPage: 0 }),
+    );
+
+    act(() => {
+      result.current.reset('');
+    });
+
+    await waitFor(() => {
+      expect(result.current.loading).toBe(false);
+    });
+
+    // templates.length === 0 means hasMoreByFullPage is false even if lastFetchFullPage would be true
+    expect(result.current.canLoadMore).toBe(false);
+  });
+
   it('allows loadMore when totalCount is unknown but first page is full (hasMoreByFullPage)', async () => {
     const fetchTemplates = jest.fn(({ page }) => {
       if (page === 1) {

package/v2Containers/BeeEditor/index.js

@@ -53,6 +53,7 @@ function BeeEditor(props) {
     BEESelect,
     currentOrgDetails,
     eventContextTags,
+    waitEventContextTags,
   } = props;
   const { saveRowRequest } = BEESelect;
   const {formatMessage} = intl;
@@ -368,6 +369,7 @@ function BeeEditor(props) {
         }}
         onContextChange={onContextChange}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
       />
       <CapModal
         className="custom-row-modal"
@@ -414,6 +416,7 @@ BeeEditor.propTypes = {
   onContextChange: PropTypes.func,
   userLocale: PropTypes.string,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
 };
 
 const mapStateToProps = () => createStructuredSelector({

package/v2Containers/CommunicationFlow/CommunicationFlow.js

@@ -0,0 +1,291 @@
+/**
+ * CommunicationFlow - Orchestrator Component
+ *
+ * Manages the step flow, validation, and data aggregation.
+ * Renders steps based on config and calls callbacks with aggregated data.
+ */
+
+import React, {
+  useState, useCallback, useMemo, useEffect,
+} from 'react';
+import PropTypes from 'prop-types';
+import { injectIntl } from 'react-intl';
+import { compose } from 'redux';
+import { connect } from 'react-redux';
+import { createStructuredSelector } from 'reselect';
+// import { CouponsCapContainer } from '@capillarytech/cap-coupons'; // Commented - cap-coupons flows disabled
+import CapRow from '@capillarytech/cap-ui-library/CapRow';
+import CapDivider from '@capillarytech/cap-ui-library/CapDivider';
+import CapButton from '@capillarytech/cap-ui-library/CapButton';
+// import injectSaga from '../../utils/injectSaga';   // cap-coupons flows disabled
+// import injectReducer from '../../utils/injectReducer';
+import { makeSelectAuthenticated } from '../Cap/selectors';
+import DynamicControlsStep from './steps/DynamicControlsStep';
+import MessageTypeStep from './steps/MessageTypeStep';
+import CommunicationStrategyStep from './steps/CommunicationStrategyStep';
+import ChannelSelectionStep from './steps/ChannelSelectionStep';
+import {
+  STEPS,
+  CHANNEL_PRIORITY,
+  AB_TEST,
+} from './constants';
+import { getEnabledSteps } from './utils/getEnabledSteps';
+import messages from './messages';
+import './CommunicationFlow.scss';
+
+// Inject couponsCap reducer and saga - commented out (cap-coupons flows disabled)
+// const withCouponsReducer = injectReducer({
+//   key: 'couponsCap',
+//   reducer: CouponsCapContainer.couponsCapReducer,
+// });
+// const withCouponsSaga = injectSaga({
+//   key: 'couponsCapSaga',
+//   saga: CouponsCapContainer.couponsCapSaga,
+// });
+
+const CommunicationFlow = ({
+  config,
+  initialData,
+  onSave,
+  onCancel, // eslint-disable-line
+  onChange,
+  intl,
+  capData, // From Redux - contains user/org info needed by CouponsWrapper
+}) => {
+  const { formatMessage } = intl || {};
+  const { messageTypeData = {}, communicationStrategyData = {}, contentTemplateData = {} } = config?.features || {};
+  // Initialize step data from initialData or defaults
+  const [stepData, setStepData] = useState(() => {
+    const defaultMessageType = messageTypeData.defaultOption?.value || null;
+    return {
+      messageType: initialData?.messageType || defaultMessageType,
+      communicationStrategy: initialData?.communicationStrategy || null,
+      channel: initialData?.channel || config.channel || null,
+      channels: initialData?.channels || [],
+      selectedOfferDetails: initialData?.selectedOfferDetails || [],
+      contentItems: initialData?.contentItems || [],
+      deliverySetting: initialData?.deliverySetting || {},
+      dynamicControls: initialData?.dynamicControls || {},
+    };
+  });
+  const [validationErrors, setValidationErrors] = useState({});
+
+  // Memoize enabled steps
+  const enabledSteps = useMemo(() => getEnabledSteps(config), [config]);
+
+  /**
+   * Get aggregated data from all steps
+   */
+  const getAggregatedData = useCallback(() => {
+    const { communicationStrategy } = stepData;
+    const isMultiChannel = [CHANNEL_PRIORITY, AB_TEST].includes(communicationStrategy);
+
+    return {
+      messageType: stepData.messageType,
+      communicationStrategy: stepData.communicationStrategy,
+      channel: isMultiChannel ? null : stepData.channel,
+      channels: isMultiChannel ? stepData.channels : [],
+      selectedOfferDetails: stepData.selectedOfferDetails,
+      contentItems: stepData.contentItems || [],
+      deliverySetting: stepData.deliverySetting,
+      dynamicControls: stepData.dynamicControls,
+    };
+  }, [stepData]);
+
+  /**
+   * Handle step data change
+   */
+  const handleStepChange = useCallback((step, data) => {
+    setStepData((prevStepData) => ({
+      ...prevStepData,
+      ...data,
+    }));
+    setValidationErrors((prevErrors) => ({
+      ...prevErrors,
+      [step]: null, // Clear validation error for this step
+    }));
+  }, []);
+
+  // Call onChange callback when stepData changes
+  useEffect(() => {
+    if (onChange) {
+      onChange(getAggregatedData());
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [stepData]);
+
+  /**
+   * Render all enabled steps
+   */
+  const renderSteps = useCallback(() => enabledSteps.map((step) => {
+    const commonProps = {
+      value: stepData,
+      onChange: (data) => handleStepChange(step, data),
+      error: validationErrors[step],
+    };
+
+    switch (step) {
+      case STEPS.MESSAGE_TYPE:
+        return (
+          <CapRow key={step}>
+            <MessageTypeStep
+              {...commonProps}
+              value={stepData.messageType}
+              options={messageTypeData.options}
+              defaultOption={messageTypeData.defaultOption}
+              onChange={(messageType) => handleStepChange(step, { messageType })}
+            />
+            <CapDivider />
+          </CapRow>
+        );
+      case STEPS.COMMUNICATION_STRATEGY:
+        return (
+          <CapRow key={step}>
+            <CommunicationStrategyStep
+              {...commonProps}
+              value={stepData.communicationStrategy}
+              // messageType={stepData.messageType}
+              options={communicationStrategyData.options}
+              disabled={communicationStrategyData.disabled}
+              onChange={(communicationStrategy) => handleStepChange(step, { communicationStrategy })}
+            />
+            <CapDivider />
+          </CapRow>
+        );
+      case STEPS.CHANNEL_SELECTION:
+        // Only show ChannelSelectionStep if communication strategy is selected
+        if (!stepData.communicationStrategy) {
+          return null;
+        }
+        return (
+          <CapRow key={step}>
+            <ChannelSelectionStep
+              {...commonProps}
+              value={stepData}
+              channels={contentTemplateData.channels}
+              onChange={(data) => handleStepChange(step, data)}
+              channelsToHide={contentTemplateData.channelsToHide}
+              channelsToDisable={contentTemplateData.channelsToDisable}
+              creativesMode={config.mode || 'create'}
+              selectedOfferDetails={stepData.selectedOfferDetails}
+              incentivesData={config.features?.incentivesData}
+              deliverySettingsData={config.features?.deliverySettingsData}
+              config={config}
+              capData={capData}
+            />
+            <CapDivider />
+          </CapRow>
+        );
+      // This will be added back in when coupons/points are integrated so keeping it commented out for now
+      // case STEPS.INCENTIVES:
+      //   return (
+      //     <IncentivesStep
+      //       key={step}
+      //       {...commonProps}
+      //       value={stepData.selectedOfferDetails}
+      //       onChange={(selectedOfferDetails) => handleStepChange(step, { selectedOfferDetails })}
+      //     />
+      //   );
+      case STEPS.DYNAMIC_CONTROLS:
+        // Only show DynamicControlsStep if communication strategy is selected
+        if (!stepData.communicationStrategy) {
+          return null;
+        }
+        return (
+          <DynamicControlsStep
+            key={step}
+            {...commonProps}
+            value={{ dynamicControls: stepData.dynamicControls }}
+            controls={config.features?.dynamicControlsData?.controls || []}
+            onChange={(data) => handleStepChange(step, { dynamicControls: data.dynamicControls })}
+          />
+        );
+      default:
+        return null;
+    }
+  }), [enabledSteps, stepData, validationErrors, config, handleStepChange, messageTypeData, communicationStrategyData, contentTemplateData]);
+
+  return (
+    <CapRow className="communication-flow-container">
+      {renderSteps()}
+      {onSave && (
+        <CapRow className="communication-flow-container__footer">
+          <CapButton type="primary" onClick={() => onSave(getAggregatedData())}>
+            {formatMessage(messages.save)}
+          </CapButton>
+        </CapRow>
+      )}
+    </CapRow>
+  );
+};
+
+CommunicationFlow.propTypes = {
+  config: PropTypes.shape({
+    consumer: PropTypes.oneOf(['campaigns', 'loyalty', 'adiona']).isRequired,
+    channel: PropTypes.string,
+    mode: PropTypes.oneOf(['create', 'edit', 'preview']).isRequired,
+    channelsToHide: PropTypes.arrayOf(PropTypes.string),
+    channelsToDisable: PropTypes.arrayOf(PropTypes.string),
+    features: PropTypes.shape({
+      enableMessageType: PropTypes.bool,
+      enableCommunicationStrategy: PropTypes.bool,
+      messageTypeData: PropTypes.shape({
+        options: PropTypes.arrayOf(PropTypes.shape({
+          value: PropTypes.string.isRequired,
+          label: PropTypes.node.isRequired,
+        })),
+        defaultOption: PropTypes.shape({
+          value: PropTypes.string.isRequired,
+          label: PropTypes.node.isRequired,
+        }),
+        required: PropTypes.bool,
+      }),
+      communicationStrategyData: PropTypes.shape({
+        options: PropTypes.arrayOf(PropTypes.shape({
+          value: PropTypes.string.isRequired,
+          label: PropTypes.node.isRequired,
+        })),
+        defaultOption: PropTypes.shape({
+          value: PropTypes.string.isRequired,
+          label: PropTypes.node.isRequired,
+        }),
+        required: PropTypes.bool,
+        disabled: PropTypes.bool,
+      }),
+      contentTemplateData: PropTypes.shape({
+        required: PropTypes.bool,
+        channels: PropTypes.object,
+      }),
+      enableIncentives: PropTypes.bool,
+      enableDeliverySettings: PropTypes.bool,
+      enableOtherSettings: PropTypes.bool,
+      incentivesTypes: PropTypes.arrayOf(PropTypes.oneOf(['coupons', 'points', 'promotions', 'giftVouchers', 'badges'])),
+    }),
+    context: PropTypes.object,
+  }).isRequired,
+  initialData: PropTypes.object,
+  onSave: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  onChange: PropTypes.func,
+  intl: PropTypes.object.isRequired,
+  capData: PropTypes.object,
+};
+
+CommunicationFlow.defaultProps = {
+  initialData: null,
+  onChange: null,
+  capData: {},
+};
+
+const mapStateToProps = createStructuredSelector({
+  capData: makeSelectAuthenticated(),
+});
+
+const withConnect = connect(mapStateToProps);
+
+export default compose(
+  // withCouponsReducer, // cap-coupons flows disabled
+  // withCouponsSaga,   // cap-coupons flows disabled
+  withConnect,
+  injectIntl,
+)(CommunicationFlow);

package/v2Containers/CommunicationFlow/CommunicationFlow.scss

@@ -0,0 +1,25 @@
+@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
+
+// .slidebox-content-container is a DOM ancestor of .communication-flow-container
+// (the outer CapSlideBox wraps this component), so it cannot be scoped as a
+// descendant selector — it must remain at root level to match correctly.
+.slidebox-content-container {
+  padding: 0 $CAP_SPACE_48 !important; // 48px left and right, 0 top and bottom
+  .slidebox-footer {
+    padding: 0 $CAP_SPACE_48 !important;
+  }
+}
+
+.communication-flow-container {
+  .step-divider {
+    margin: $CAP_SPACE_32 0;
+  }
+
+  .heading-style {
+    margin-bottom: $CAP_SPACE_08;
+  }
+
+  &__footer {
+    padding: $CAP_SPACE_16 0 $CAP_SPACE_08;
+  }
+}