@capillarytech/creatives-library 1.0.1-alpha.0 → 1.0.2

package/components/organisms/ExpiryStrategy/messages.js

@@ -21,20 +21,8 @@ export default defineMessages({
     id: `${scope}.expiryTitle`,
     defaultMessage: 'Expiry Conditions',
   },
-  expS_trackerAllocate100_name: {
-    id: `${scope}.expS_trackerAllocate100_name`,
-    defaultMessage: 'Default_Points_Transfer_LatestExpiry',
-  },
-  expS_never100_name: {
-    id: `${scope}.expS_never100_name`,
-    defaultMessage: 'NEVER100',
-  },
-  expS_numMonthEnd_name: {
-    id: `${scope}.expS_numMonthEnd_name`,
-    defaultMessage: 'NUM_MONTHS_END12',
-  },
-  expS_RedeemedPointsReversal_name: {
-    id: `${scope}.expS_RedeemedPointsReversal_name`,
-    defaultMessage: 'Redeemed_Points_Reversal_Default_Expiry',
+  module: {
+    id: `${scope}.module`,
+    defaultMessage: 'Module',
   },
 });

package/components/organisms/ExpiryStrategy/tests/ExpiryStrategy.test.js

@@ -1,68 +1,3 @@
-import { injectIntl } from 'react-intl';
-import { screen, waitFor } from '@testing-library/dom';
-import '@testing-library/jest-dom';
-import userEvent from '@testing-library/user-event';
-import { render } from '../../../../tests/test-utils';
-import { ExpiryStrategy } from '../ExpiryStrategy';
-import { currentProgram } from '../../AllocationStrategy/tests/mockData';
-import globalMessages from '../../../pages/Cap/messages';
-import { expiryStrategyDetails } from './mockData';
-
-const initializeExpiryStrategy = (isEditable = false) => {
-  const Component = injectIntl(ExpiryStrategy);
-  const propsObj = {
-    expiryStrategyDetails,
-    currentProgram,
-    isEditable,
-    buttonAction: jest.fn(() => {}),
-    buttonDescription: '',
-    onOptionClick: undefined,
-    currentOrgDetails: {accessibleFeatures : [], basic_details : {name: ''}},
-  };
-
-  render(Component, undefined, propsObj);
-};
-
-describe('Expiry Stratergy', () => {
-  const spyWindowOpen = jest.spyOn(window, 'open');
-  spyWindowOpen.mockImplementation(jest.fn());
-
-  it('Expect Expiry Strategry to have Link and toolTip', async () => {
-    initializeExpiryStrategy(true);
-    const linkvar = screen.getByTestId('cap-growth-icon');
-    const text = screen.queryByText(globalMessages.viewReports.defaultMessage);
-    const divider = screen.getByTestId('cap-report-link-divider');
-    expect(divider).toBeInTheDocument();
-    expect(text).toEqual(null);
-    expect(linkvar).toBeInTheDocument();
-    userEvent.hover(linkvar);
-    expect(
-      await screen.findByText(
-        globalMessages.pointsConditionPointsStandardReportToolTip
-          .defaultMessage, 
-      ),
-    ).toBeInTheDocument();
-    await waitFor(() => userEvent.click(linkvar));
-    expect(spyWindowOpen).toHaveBeenCalledTimes(1);
-  });
-  it('Expect Expiry Strategry not to have Link and toolTip when Editable is true', async () => {
-    initializeExpiryStrategy(false);
-    const linkvar = screen.queryByTestId('cap-growth-icon');
-    expect(linkvar).toBe(null);
-  });
-
-  it('Expect Expiry Strategy to have show formatted text', async () => {
-    initializeExpiryStrategy(true);
-    const dateText=screen.getAllByText(/Aug 16, 2023/i);
-    const neverText=screen.getAllByText(/never/i);
-    expect(dateText[0]).toBeInTheDocument();
-    expect(neverText[0]).toBeInTheDocument();
-  });
-  
-
-});
-
-
 describe('<ProgramPerformance />', () => {
   it('Expect to have unit tests specified', () => {
     expect(true).toEqual(true);

package/components/organisms/ExpiryStrategy/tests/mockData.js

@@ -1,125 +0,0 @@
-export const expiryStrategyDetails = [
-  {
-    id: 7527,
-    programId: 35,
-    name: 'hi there',
-    description: 'hi there',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_type: 'SLAB_INDEPENDENT',
-      expiry_from: 'ACTIVITY_BASED_EXTENSION',
-      expiry_time_units:
-        'NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END',
-      expiry_time_values: '4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-  {
-    id: 184,
-    programId: 35,
-    name: 'NUM_MONTHS_END100',
-    description: 'NUM_MONTHS_END100 for Capillary TechnologiesDefaultProgram',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_time_units:
-        'NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END',
-      expiry_type: 'SLAB_INDEPENDENT',
-      expiry_from: 'CURRENT_DATE',
-      expiry_time_values:
-        '100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100,100',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-  {
-    id: 184,
-    programId: 35,
-    name: 'NUM_MONTHS_END12',
-    description: 'NUM_MONTHS_END12 for Capillary TechnologiesDefaultProgram',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_time_units: 'NUM_MONTHS_END,NUM_MONTHS_END,NUM_MONTHS_END',
-      expiry_type: 'SLAB_INDEPENDENT',
-      expiry_from: 'CURRENT_DATE',
-      expiry_time_values: '12,12,12',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-  {
-    id: 111820,
-    programId: 2711,
-    name: 'TestExp',
-    description: 'desc',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_type: 'SLAB_BASED',
-      expiry_from: 'CURRENT_DATE',
-      expiry_time_units: 'FIXED_DATE,NUM_DAYS,NEVER,NUM_DAYS',
-      expiry_time_values: '2023-08-16,1,100,1',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-  {
-    id: 184,
-    programId: 35,
-    name: 'FixedDate',
-    description: 'Fixed',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_time_units: 'FIXED_DATE,FIXED_DATE,FIXED_DATE,FIXED_DATE',
-      expiry_type: 'SLAB_INDEPENDENT',
-      expiry_from: 'CURRENT_DATE',
-      expiry_time_values: '2023-08-16,2023-08-16,2023-08-16,2023-08-16',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-  {
-    id: 184,
-    programId: 35,
-    name: 'Never',
-    description: 'Fixed',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_time_units: 'NEVER,NEVER,NEVER,NEVER',
-      expiry_type: 'SLAB_INDEPENDENT',
-      expiry_from: 'CURRENT_DATE',
-      expiry_time_values: '100,100,100,100',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-  {
-    id: 1784,
-    programId: 375,
-    name: 'Never',
-    description: 'Fixed',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_time_units: 'ENROLLMENT_DATE,ENROLLMENT_DATE,ENROLLMENT_DATE,ENROLLMENT_DATE',
-      expiry_type: 'SLAB_INDEPENDENT',
-      expiry_from: 'CURRENT_DATE',
-      expiry_time_values: '-1,-1,-1,-1',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-  {
-    id: 1784,
-    programId: 375,
-    name: 'Never',
-    description: 'Fixed',
-    strategyTypeId: 3,
-    propertyValues: {
-      expiry_time_units: 'FIXED_DATE_WITHOUT_YEAR,FIXED_DATE_WITHOUT_YEAR,FIXED_DATE_WITHOUT_YEAR,FIXED_DATE_WITHOUT_YEAR',
-      expiry_type: 'SLAB_INDEPENDENT',
-      expiry_from: 'CURRENT_DATE',
-      expiry_time_values: '10-10, 10-10, 10-10, 10-10',
-    },
-    owner: 'LOYALTY',
-    updatedViaNewUI: null,
-  },
-];

package/components/organisms/ForwardToSetWorkflowAction/ForwardToSetWorkflowAction.js

@@ -1,28 +1,17 @@
-import React, { useState } from 'react';
+import React, { useState, useLayoutEffect } from 'react';
 import { injectIntl, intlShape } from 'react-intl';
 import PropTypes from 'prop-types';
 import withStyles from 'utils/withStyles';
-import moment from 'moment';
+
 import { compose, bindActionCreators } from 'redux';
 import { createStructuredSelector } from 'reselect';
 import { connect } from 'react-redux';
-import { v4 as uuidv4 } from 'uuid';
-import useDeepCompareEffect from 'use-deep-compare-effect';
-import classnames from 'classnames';
-import lodashGet from 'lodash/get';
 
 import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
 import CapRow from '@capillarytech/cap-ui-library/CapRow';
 import CapSlideBox from '@capillarytech/cap-ui-library/CapSlideBox';
 import CapAlert from '@capillarytech/cap-ui-library/CapAlert';
 
-import {
-  getCommSaveData,
-  isRulesetInIdentifier,
-  findRulesetObjectById,
-} from 'utils/workflow';
-import { isTrue } from 'utils/commonUtils';
-import withErrorBoundary from 'utils/withErrorBoundary';
 import * as style from './style';
 import messages from './messages';
 import {
@@ -32,30 +21,23 @@ import {
   ENABLE_TENDER_UNROLLER,
   INTIAL_FORWARD_TO_SET,
   FORWARD_EVENTS,
-  createUpdateForward,
 } from './constants';
 
 import TriggerAction from '../../atoms/TriggerAction';
 import SwitchWithDivider from '../../molecules/SwitchWithDivider';
 import globalMessages from '../../pages/Cap/messages';
 import * as globalActions from '../../pages/Cap/actions';
-import {
-  makeSelectUpsertAction,
-  makeSelectCap,
-} from '../../pages/Cap/selectors';
+import { makeSelectUpsertAction } from '../../pages/Cap/selectors';
+import { getCommSaveData, isRulesetInIdentifier } from 'utils/workflow';
 import {
   REQUEST,
   TRACKER_RS_START,
   POINTS_TRACKER_RS_START,
-  SOURCE_PROMOTION,
-  SOURCE_LOYALTY,
-  DATE_FORMAT_DB,
 } from '../../pages/App/constants';
+import { isTrue } from 'utils/commonUtils';
 import ActionTitle from '../../molecules/ActionTitle';
 import AddTierBanner from '../../molecules/AddTierBanner';
-import { getNewRuleSetInfo } from '../ConfigureWorkflows/utils';
-import { getWorkflowMode } from '../ConfigureWorkflows/context';
-import { NonEditableContainer } from '../../../global-styles';
+import withErrorBoundary from 'utils/withErrorBoundary';
 
 const { styles, SwitchWithSpacing } = style;
 
@@ -66,32 +48,18 @@ const ForwardToSetWorkflowAction = ({
   updateRuleSet,
   actionData = {},
   actionDetailsData: { upsertActionStatus } = {},
-  source,
-  eventType = '',
-  makeSelectCapData: { currentOrgDetails = {} } = {},
 }) => {
-  const {
-    ruleset = {},
-    isEditMode = false,
-    event_type,
-    groups = [],
-    ruleset_id,
-  } = actionData;
-  const {
-    name = '',
-    internalShouldUnroll,
-    internalShouldTenderUnroll,
-  } = ruleset;
+  const { ruleset = {}, isEditMode = false } = actionData;
+  const { name = '' } = ruleset;
 
   const [dataSource, setDataSource] = useState(INTIAL_FORWARD_TO_SET);
   const [visibility, setVisibility] = useState(false);
   const [showTenderUnroller, setShowTenderUnroller] = useState(true);
   const [isSaveDisabled, setIsSaveDisabled] = useState(isEditMode);
-  const { isPreviewMode } = getWorkflowMode() ?? { isPreviewMode: false };
 
   const showSpin = upsertActionStatus === REQUEST;
 
-  useDeepCompareEffect(
+  useLayoutEffect(
     () => {
       const {
         groups = [],
@@ -127,7 +95,7 @@ const ForwardToSetWorkflowAction = ({
         );
       }
     },
-    [actionData],
+    [JSON.stringify(actionData)],
   );
 
   const changeDataSource = param => {
@@ -162,7 +130,6 @@ const ForwardToSetWorkflowAction = ({
   };
 
   const saveSlidebox = () => {
-    const { basic_details: { name: orgName = '' } = {} } = currentOrgDetails;
     const { programId, actionType } = actionData;
     if (programId && actionType) {
       const commonData = getCommSaveData({ dataSource: actionData });
@@ -172,70 +139,17 @@ const ForwardToSetWorkflowAction = ({
         [MAXIMIZE_POINT_ALLOCATION]: maximize_points = false,
         [ENABLE_TENDER_UNROLLER]: tender_unroller = false,
       } = dataSource;
-
-      const propertyValues = {};
-      let actionInfo = {};
-
-      if (`${commonData.action_id}` === `-1`) {
-        actionInfo = {
-          id: `temp_${uuidv4()}`,
-          actionClass: createUpdateForward.actionClass,
-          actionName: createUpdateForward.actionName,
-          description: `ruleset_${moment().format(DATE_FORMAT_DB)}`,
-        };
-
-        const newRulesetId = `temp_${uuidv4()}`;
-        let newRulesetName = `ruleset_${moment().format(DATE_FORMAT_DB)}`;
-        const { id: userId } = JSON.parse(window.localStorage.getItem('user'));
-
-        if (source !== SOURCE_PROMOTION) {
-          const selectedRulesetData = findRulesetObjectById(ruleset_id, groups);
-          if (lodashGet(selectedRulesetData, 'name') === 'Tracker_RS_Start') {
-            newRulesetName = `Tracker_${newRulesetName}`;
-          } else if (
-            lodashGet(selectedRulesetData, 'name') === 'Points_Tracker_RS_Start'
-          ) {
-            newRulesetName = `Points_Tracker_${newRulesetName}`;
-          }
-        }
-
-        const newRulesetInfo = getNewRuleSetInfo({
-          userId,
-          newRulesetId,
-          newRulesetName,
-          contextId: programId,
-          isRoot: false,
-          eventType,
-          orgName,
-        });
-        delete newRulesetInfo.eventType;
-        propertyValues.ruleset = newRulesetName;
-        actionInfo.newRuleset = newRulesetInfo;
-      } else {
-        //TODO: take this into account when doing edit case.
-        // actionInfo = actions.find((action) => `${action.id}` === `${actionId}`) || {};
-        // propertyValues.ruleset = lodashGet(actionInfo, 'mandatoryPropertiesValues.ruleset');
-      }
-
-      if (unroller) {
-        propertyValues.shouldUnroll = 'true';
-        propertyValues.useProportions = proportions ? 'true' : 'false';
-        propertyValues.maximizePoints = maximize_points ? 'true' : 'false';
-      } else {
-        propertyValues.shouldUnroll = 'false';
-        propertyValues.useProportions = 'false';
-        propertyValues.maximizePoints = 'false';
-      }
-      propertyValues.shouldTenderUnroll = tender_unroller ? 'true' : 'false';
-
-      actionInfo.mandatoryPropertiesValues = propertyValues;
-      actionInfo.mandatoryComplexPropertiesValues = {};
-      const response = {
-        success: true,
-        result: actionInfo,
+      const payload = {
+        ...commonData,
+        unroller,
+        proportions,
+        maximize_points,
+        tender_unroller,
+        ruleset_name: name,
       };
-      updateRuleSet(actionData, response);
-      closeSlidebox();
+      globalActions.upsertAction(programId, actionType, payload, responseData =>
+        updateRuleSet(actionData, responseData),
+      );
     }
   };
 
@@ -248,16 +162,13 @@ const ForwardToSetWorkflowAction = ({
       param: ENABLE_TRANSACTION_ITEM,
       onSwitchChange: changeEnabledTransaction,
       isDivider: false,
-      disabled: internalShouldUnroll,
     },
     ...(dataSource[ENABLE_TRANSACTION_ITEM]
       ? [
           {
             label: formatMessage(messages.useProportions),
-            inductiveText: formatMessage(globalMessages.useProportionsDesc),
-            tooltipInfoText: formatMessage(
-              globalMessages.useProportionsTooltipText,
-            ),
+            inductiveText: formatMessage(messages.useProportionsInductiveText),
+            tooltipInfoText: formatMessage(messages.useProportionsTooltipText),
             isSwitchChecked: dataSource[USE_PROPORTIONS],
             onSwitchChange: changeUseProportions,
             isDivider: false,
@@ -289,7 +200,6 @@ const ForwardToSetWorkflowAction = ({
             isSwitchChecked: dataSource[ENABLE_TENDER_UNROLLER],
             onSwitchChange: changeEnableTenderUnroller,
             isDivider: true,
-            disabled: internalShouldTenderUnroll,
           },
         ]
       : []),
@@ -308,7 +218,6 @@ const ForwardToSetWorkflowAction = ({
                 isSwitchChecked,
                 onSwitchChange,
                 isDivider,
-                disabled,
               }) => {
                 const sliderProps = {
                   label,
@@ -317,9 +226,6 @@ const ForwardToSetWorkflowAction = ({
                   isSwitchChecked,
                   onSwitchChange,
                   isDivider,
-                  disabled,
-                  hoverToolTipText:
-                    disabled && formatMessage(messages.unrollValidationMsg),
                 };
                 return isDivider ? (
                   <SwitchWithDivider {...sliderProps} />
@@ -349,7 +255,7 @@ const ForwardToSetWorkflowAction = ({
     <TriggerAction
       title={formatMessage(globalMessages.save)}
       triggerAction={saveSlidebox}
-      isDisabled={isSaveDisabled || showSpin || isPreviewMode}
+      isDisabled={isSaveDisabled || showSpin}
     />
   );
 
@@ -358,13 +264,7 @@ const ForwardToSetWorkflowAction = ({
       showShadow
       show
       header={<ActionTitle actionData={actionData} />}
-      content={
-        <NonEditableContainer
-          className={classnames({ 'disable-cursor': isPreviewMode })}
-        >
-          {sliderContent}
-        </NonEditableContainer>
-      }
+      content={sliderContent}
       footer={slideBoxFooter}
       handleClose={closeSlidebox}
       size="size-s"
@@ -379,9 +279,6 @@ ForwardToSetWorkflowAction.propTypes = {
   globalActions: PropTypes.object,
   actionDetailsData: PropTypes.object,
   updateRuleSet: PropTypes.func,
-  source: PropTypes.string,
-  eventType: PropTypes.string,
-  makeSelectCapData: PropTypes.object,
 };
 
 ForwardToSetWorkflowAction.defaultProps = {
@@ -392,7 +289,6 @@ ForwardToSetWorkflowAction.defaultProps = {
 
 const mapStateToProps = createStructuredSelector({
   actionDetailsData: makeSelectUpsertAction(),
-  makeSelectCapData: makeSelectCap(),
 });
 
 function mapDispatchToProps(dispatch) {

package/components/organisms/ForwardToSetWorkflowAction/constants.js

@@ -15,8 +15,3 @@ export const FORWARD_EVENTS = [
   'TransactionAdd',
   'GroupTransactionAdd',
 ];
-
-export const createUpdateForward = {
-  actionClass: 'com.capillary.shopbook.nrules.impl.action.ForwardAction',
-  actionName: 'FORWARD',
-};

package/components/organisms/ForwardToSetWorkflowAction/messages.js

@@ -27,6 +27,16 @@ export default defineMessages({
     id: `${scope}.useProportions`,
     defaultMessage: 'Use lineitem proportions?',
   },
+  useProportionsInductiveText: {
+    id: `${scope}.useProportionsInductiveText`,
+    defaultMessage:
+      'Use this if line item amounts may not add up to transaction amount',
+  },
+  useProportionsTooltipText: {
+    id: `${scope}.useProportionsTooltipText`,
+    defaultMessage:
+      'This option can be used if there might be bill level discounts over and above the line items and if we need to redistribute that to the line items. Refer to support documentation for more details',
+  },
   maximizePointAllocation: {
     id: `${scope}.maximizePointAllocation`,
     defaultMessage: 'Maximise points allocation?',
@@ -62,9 +72,4 @@ export default defineMessages({
     defaultMessage:
       'Forward Action config is not editable once saved. Please delete action and add again',
   },
-  unrollValidationMsg: {
-    id: `${scope}.unrollValidationMsg`,
-    defaultMessage:
-      'This ruleset or a parent is already unrolled, you cannot unroll again',
-  },
 });