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

package/components/organisms/AllocationStrategy/AllocationStrategy.js

@@ -12,7 +12,6 @@ import CapIcon from '@capillarytech/cap-ui-library/CapIcon';
 import CapDivider from '@capillarytech/cap-ui-library/CapDivider';
 import CapColumn from '@capillarytech/cap-ui-library/CapColumn';
 import CapMultiSelect from '@capillarytech/cap-ui-library/CapMultiSelect';
-import CapTooltip from '@capillarytech/cap-ui-library/CapTooltip';
 
 import classnames from 'classnames';
 import withStyles from 'utils/withStyles';
@@ -31,16 +30,11 @@ import {
   getAllocationOn,
   getAllocationStrategyDetails,
   getSlabType,
-  getStepFunctionSlabType,
 } from '../../../utils/commonUtils';
 import TableOption from '../../molecules/TableOption';
 import StrategiesTag from '../../molecules/StrategiesTag';
 import EllipsisText from '../../atoms/EllipsisText';
 import { sorterHandler } from '../LoyaltyDetail/utils';
-import CapReportLink from '../../molecules/CapReportLink';
-import { STEP_FUNCTION } from '../../../../../api/src/constants';
-import { checkDefaultConfiguration } from '../PointStrategies/utils';
-import DisabledMoreIcon from '../../atoms/DisabledMoreIcon';
 
 const { FlexApart } = globalStyle;
 const { styles } = style;
@@ -52,7 +46,6 @@ const {
   TIME_UNIT_MAP,
   ROUND_UP,
   CUSTOM_FIELD,
-  ALLOCATION_STRATEGY_NAME_MAP,
 } = constants;
 
 const { DESCEND, ASCEND } = globalConstants;
@@ -65,7 +58,6 @@ const {
   ALLOCATION_BASED_ON_MAP,
   ALLOCATION_TYPE_MAP,
   SLAB_DEPENDENT,
-  DISABLE_EI_STATS,
 } = appConstants;
 
 export const AllocationStrategy = ({
@@ -77,15 +69,10 @@ export const AllocationStrategy = ({
   buttonAction,
   buttonDescription,
   onOptionClick,
-  currentOrgDetails,
 }) => {
-  const { accessibleFeatures = [], basic_details = {} } = currentOrgDetails;
-
-  const hasInsightsChartDisabled = accessibleFeatures.includes(
-    DISABLE_EI_STATS,
-  );
   const [searchValue, setSearchValue] = useState('');
   const [filterValue, setFilterValue] = useState([]);
+
   const handleSearchValueChange = event => {
     setSearchValue(event.target.value);
   };
@@ -105,7 +92,7 @@ export const AllocationStrategy = ({
       sortColumnType: SORT_STR,
     },
     {
-      title: formatMessage(globalMessage.type),
+      title: formatMessage(messages.allocationType),
       description: formatMessage(messages.delayInAccrual),
       width: '20%',
       dataKey: 'allocationType',
@@ -121,13 +108,13 @@ export const AllocationStrategy = ({
       columnType: SINGLE_TAG_VAL,
     },
     {
-      title: formatMessage(globalMessage.details),
+      title: formatMessage(messages.details),
       width: '25%',
       dataKey: 'details',
       columnType: DETAILS,
     },
     {
-      title: formatMessage(globalMessage.module),
+      title: formatMessage(messages.module),
       width: '13%',
       dataKey: 'module',
       columnType: SINGLE_TEXT_VAL,
@@ -146,7 +133,7 @@ export const AllocationStrategy = ({
       sortColumnType: SORT_STR,
     },
     {
-      title: formatMessage(globalMessage.type),
+      title: formatMessage(messages.allocationType),
       description: formatMessage(messages.delayInAccrual),
       width: '20%',
       dataKey: 'allocationType',
@@ -162,13 +149,13 @@ export const AllocationStrategy = ({
       columnType: SINGLE_TAG_VAL,
     },
     {
-      title: formatMessage(globalMessage.details),
+      title: formatMessage(messages.details),
       width: '20%',
       dataKey: 'details',
       columnType: DETAILS,
     },
     {
-      title: formatMessage(globalMessage.module),
+      title: formatMessage(messages.module),
       width: '13%',
       dataKey: 'module',
       columnType: SINGLE_TEXT_VAL,
@@ -185,92 +172,83 @@ export const AllocationStrategy = ({
   const modifiedDatasource = useMemo(
     () =>
       Array.isArray(allocationStrategyDetails) &&
-        allocationStrategyDetails.length > 0
+      allocationStrategyDetails.length > 0
         ? allocationStrategyDetails
-          .filter(
-            allocationDetail =>
-              (!searchValue ||
-                allocationDetail.name
-                  .toUpperCase()
-                  .indexOf(searchValue.toUpperCase()) !== -1) &&
-              (!filterValue.length ||
-                filterValue.includes(allocationDetail.owner)),
-          )
-          .map(
-            ({
-              id,
-              name,
-              description,
-              owner,
-              propertyValues: {
-                allocation_values,
-                allocation_type,
-                min_allocation_criteria,
-                max_allocation_criteria,
-                custom_field_scope,
-                custom_field_name,
-                is_delayed_accrual,
-                delayed_accrual_time_unit,
-                delayed_accrual_value,
-              },
-            }) => {
-              const modifiedObj = {
+            .filter(
+              allocationDetail =>
+                (!searchValue ||
+                  allocationDetail.name
+                    .toUpperCase()
+                    .indexOf(searchValue.toUpperCase()) !== -1) &&
+                (!filterValue.length ||
+                  filterValue.includes(allocationDetail.owner)),
+            )
+            .map(
+              ({
                 id,
-                name: formatMessageHandler(
-                  formatMessage,
-                  messages[ALLOCATION_STRATEGY_NAME_MAP[name]],
+                name,
+                description,
+                owner,
+                propertyValues: {
+                  allocation_values,
+                  allocation_type,
+                  min_allocation_criteria,
+                  max_allocation_criteria,
+                  custom_field_scope,
+                  custom_field_name,
+                  is_delayed_accrual,
+                  delayed_accrual_time_unit,
+                  delayed_accrual_value,
+                },
+              }) => {
+                const modifiedObj = {
+                  id,
                   name,
-                ),
-                description: (messages[ALLOCATION_STRATEGY_NAME_MAP[name]] && basic_details.name)
-                  ? formatMessage(globalMessage.strategyDescription, {
-                    strategyName: formatMessage(messages[ALLOCATION_STRATEGY_NAME_MAP[name]]),
-                    orgName: basic_details.name,
-                  })
-                  : description,
-                module: formatMessageHandler(
-                  formatMessage,
-                  globalMessage[MODULE_MAP[owner]],
-                  owner,
-                ),
-                workflow: 'N/A',
-                allocationValues: allocation_values,
-                allocationBasedOn: ALLOCATION_BASED_ON_MAP[allocation_type],
-                allocationType:
-                  allocation_type &&
-                  formatMessageHandler(
+                  description,
+                  module: formatMessageHandler(
                     formatMessage,
-                    messages[ALLOCATION_TYPE_MAP[allocation_type]],
-                    allocation_type,
+                    globalMessage[MODULE_MAP[owner]],
+                    owner,
                   ),
-                details: {
-                  slabType: getSlabType(allocation_type),  
-                  allocationOn: getAllocationOn(allocation_type),
-                  allocationType: allocation_type,
+                  workflow: 'N/A',
                   allocationValues: allocation_values,
-                  minAllocationCriteria: min_allocation_criteria,
-                  maxAllocationCriteria: max_allocation_criteria,
-                  customFieldName: custom_field_name,
-                  customFieldScope: custom_field_scope,
-                  slabs: currentProgram.slabs,
-                },
-              };
+                  allocationBasedOn: ALLOCATION_BASED_ON_MAP[allocation_type],
+                  allocationType:
+                    allocation_type &&
+                    formatMessageHandler(
+                      formatMessage,
+                      messages[ALLOCATION_TYPE_MAP[allocation_type]],
+                      allocation_type,
+                    ),
+                  details: {
+                    slabType: getSlabType(allocation_type),
+                    allocationOn: getAllocationOn(allocation_type),
+                    allocationType: allocation_type,
+                    allocationValues: allocation_values,
+                    minAllocationCriteria: min_allocation_criteria,
+                    maxAllocationCriteria: max_allocation_criteria,
+                    customFieldName: custom_field_name,
+                    customFieldScope: custom_field_scope,
+                    slabs: currentProgram.slabs,
+                  },
+                };
 
-              if (is_delayed_accrual) {
-                modifiedObj.delayedAccrual = `${formatMessage(
-                  messages.after,
-                )} ${delayed_accrual_value} ${formatMessageHandler(
-                  formatMessage,
-                  messages[TIME_UNIT_MAP[delayed_accrual_time_unit]],
-                  delayed_accrual_time_unit,
-                )}`;
-              } else {
-                modifiedObj.delayedAccrual = `${formatMessage(
-                  messages.noDelay,
-                )}`;
-              }
-              return modifiedObj;
-            },
-          )
+                if (is_delayed_accrual) {
+                  modifiedObj.delayedAccrual = `${formatMessage(
+                    messages.after,
+                  )} ${delayed_accrual_value} ${formatMessageHandler(
+                    formatMessage,
+                    messages[TIME_UNIT_MAP[delayed_accrual_time_unit]],
+                    delayed_accrual_time_unit,
+                  )}`;
+                } else {
+                  modifiedObj.delayedAccrual = `${formatMessage(
+                    messages.noDelay,
+                  )}`;
+                }
+                return modifiedObj;
+              },
+            )
         : [],
     [searchValue, filterValue, allocationStrategyDetails],
   );
@@ -318,10 +296,10 @@ export const AllocationStrategy = ({
       getColumnByType(columnType, allocationStrategyDetail, dataKey, dataValue),
     ...(sortColumnName
       ? {
-        sortDirections: [DESCEND, ASCEND],
-        sorter: (first, next) =>
-          sorterHandler(sortColumnType, sortColumnName, first, next),
-      }
+          sortDirections: [DESCEND, ASCEND],
+          sorter: (first, next) =>
+            sorterHandler(sortColumnType, sortColumnName, first, next),
+        }
       : {}),
   });
 
@@ -362,16 +340,7 @@ export const AllocationStrategy = ({
     function handleEditClick() {
       onEditClick(rowData);
     }
-    const isDefaultStrategy = checkDefaultConfiguration(
-      rowData,
-      currentProgram.slabs.length, 
-    );
-    return isDefaultStrategy ? (
-      <DisabledMoreIcon
-        title={formatMessage(globalMessage.defaultEditTooltip)}
-        disabled
-      />
-    ) : (
+    return (
       <TableOption
         onEditClick={handleEditClick}
         className="lp-menu-config-points"
@@ -465,8 +434,8 @@ export const AllocationStrategy = ({
     !isEditable
       ? columns.map((columnData, index) => getColumnProps(columnData, index))
       : editableColumn.map((columnData, index) =>
-        getColumnProps(columnData, index),
-      );
+          getColumnProps(columnData, index),
+        );
 
   const tableProps = {
     columns: getColumns(isEditable),
@@ -503,37 +472,15 @@ export const AllocationStrategy = ({
             </CapHeading>
           }
         />
-        {!isEditable ? !hasInsightsChartDisabled && 
-        <CapReportLink 
-          link={appConstants.POINTS_CONDITION_REPORT_PATH}
-          tooltip={formatMessage(globalMessage.pointsConditionPointsStandardReportToolTip)} 
-          title={formatMessage(globalMessage.viewReports)} 
-        /> : null}
         {isEditable ? (
-          <div style={{ display: "flex", alignItems: "center" }}>
-            {
-              !hasInsightsChartDisabled &&
-              <>
-                <CapReportLink link={appConstants.POINTS_CONDITION_REPORT_PATH} 
-                  tooltip={formatMessage(globalMessage.pointsConditionPointsStandardReportToolTip)} 
-                  isIconOnly={true} 
-                />
-                <CapDivider 
-                  data-testid="cap-report-link-divider" 
-                  type="vertical" 
-                  style={{ height: "20px" }} 
-                />
-              </>
-            }
-            <CapButton
-              onClick={buttonAction}
-              isAddBtn
-              type="flat"
-              className="lp-btn-config-add-points"
-            >
-              {buttonDescription}
-            </CapButton>
-          </div>
+          <CapButton
+            onClick={buttonAction}
+            isAddBtn
+            type="flat"
+            className="lp-btn-config-add-points"
+          >
+            {buttonDescription}
+          </CapButton>
         ) : null}
       </FlexApart>
       <CapRow>
@@ -549,15 +496,9 @@ export const AllocationStrategy = ({
         <CapColumn span={5} className="module-selector-select">
           <CapMultiSelect
             treeData={getUniqueModules()}
-            placeholder={formatMessage(globalMessage.module)}
+            placeholder={formatMessage(messages.module)}
             onSelect={handleFilterValueChange}
             appliedKeys={filterValue}
-            searchPlaceholder={formatMessage(globalMessage.search)}
-            closeText={formatMessage(globalMessage.close)}
-            selectedText={formatMessage(globalMessage.selected)}
-            selectAllText={formatMessage(globalMessage.selectAll)}
-            selectText={formatMessage(globalMessage.select)}
-            noResultsFoundText={formatMessage(globalMessage.noResultsFound)}
           />
         </CapColumn>
       </CapRow>
@@ -573,9 +514,8 @@ AllocationStrategy.defaultProps = {
   currentProgram: {},
   allocationStrategyDetails: [],
   isEditable: false,
-  buttonAction: () => { },
+  buttonAction: () => {},
   buttonDescription: '',
-  currentOrgDetails: {},
 };
 
 AllocationStrategy.propTypes = {
@@ -591,7 +531,6 @@ AllocationStrategy.propTypes = {
   isEditable: PropTypes.bool,
   buttonAction: PropTypes.func,
   buttonDescription: PropTypes.string,
-  currentOrgDetails: PropTypes.object,
 };
 
 export default withErrorBoundary(

package/components/organisms/AllocationStrategy/constants.js

@@ -14,7 +14,3 @@ export const ROUND_UP = 'ROUND_UP';
 export const TIME_UNIT_MAP = {
   NUM_DAYS: 'days',
 };
-export const ALLOCATION_STRATEGY_NAME_MAP = {
-  DEFAULT_TRACKER_ALLOC100: 'as_trackerAllocate100_name',
-  PRORATED_SLAB0: 'as_proratedSlab_name',
-}

package/components/organisms/AllocationStrategy/messages.js

@@ -13,6 +13,10 @@ export default defineMessages({
     id: `${scope}.allocationBasedOn`,
     defaultMessage: 'Allocate based on',
   },
+  allocationType: {
+    id: `${scope}.allocationType`,
+    defaultMessage: 'Type',
+  },
   noDelay: {
     id: `${scope}.noDelay`,
     defaultMessage: 'No Delay',
@@ -21,10 +25,18 @@ export default defineMessages({
     id: `${scope}.delayInAccrual`,
     defaultMessage: 'Delay in Accrual (if any)',
   },
+  details: {
+    id: `${scope}.details`,
+    defaultMessage: 'Details',
+  },
   toAllTiers: {
     id: `${scope}.toAllTiers`,
     defaultMessage: 'to all tiers',
   },
+  to: {
+    id: `${scope}.to`,
+    defaultMessage: 'to',
+  },
   upto: {
     id: `${scope}.upto`,
     defaultMessage: 'up to',
@@ -41,6 +53,14 @@ export default defineMessages({
     id: `${scope}.from`,
     defaultMessage: 'from',
   },
+  roundPointsBalance: {
+    id: `${scope}.roundPointsBalance`,
+    defaultMessage: 'Round',
+  },
+  module: {
+    id: `${scope}.module`,
+    defaultMessage: 'Module',
+  },
   noAllocationStrategy: {
     id: `${scope}.noAllocationStrategy`,
     defaultMessage: 'No allocation strategy found.',
@@ -51,18 +71,20 @@ export default defineMessages({
   },
   allocationDescription: {
     id: `${scope}.allocationDescription`,
-    defaultMessage: 'Define how customers will earn reward currencies',
+    defaultMessage: 'Define how customers will earn points',
   },
   after: {
     id: `${scope}.after`,
     defaultMessage: 'After',
   },
-  //Required as this is used in map to fetch intlmessage
+  na: {
+    id: `${scope}.na`,
+    defaultMessage: 'NA',
+  },
   days: {
     id: `${scope}.days`,
     defaultMessage: 'Days',
   },
-  //Required as this is used in map to fetch intlmessage
   fixed: {
     id: `${scope}.fixed`,
     defaultMessage: 'Fixed',
@@ -71,10 +93,6 @@ export default defineMessages({
     id: `${scope}.prorated`,
     defaultMessage: 'Prorated',
   },
-  stepFunction: {
-    id: `${scope}.stepFunction`,
-    defaultMessage: 'Prorated -in terms of step function',
-  },
   round_up: {
     id: `${scope}.round_up`,
     defaultMessage: 'Round up',
@@ -83,16 +101,12 @@ export default defineMessages({
     id: `${scope}.pointsMultiplier`,
     defaultMessage: 'Points multiplier',
   },
+  tiers: {
+    id: `${scope}.tiers`,
+    defaultMessage: 'Tiers',
+  },
   customFields: {
     id: `${scope}.customFields`,
     defaultMessage: 'Custom Field',
   },
-  as_trackerAllocate100_name: {
-    id: `${scope}.as_trackerAllocate100_name`,
-    defaultMessage: 'DEFAULT_TRACKER_ALLOC100',
-  },
-  as_proratedSlab_name: {
-    id: `${scope}.as_proratedSlab_name`,
-    defaultMessage: 'PRORATED_SLAB0',
-  },
 });

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

@@ -1,53 +1,5 @@
-import { render } from "../../../../tests/test-utils"
-import { AllocationStrategy } from "../AllocationStrategy";
-import { screen, waitFor } from '@testing-library/dom'
-import '@testing-library/jest-dom';
-import userEvent from '@testing-library/user-event';
-import { injectIntl } from 'react-intl';
-import { allocationStrategyDetails, currentProgram } from "./mockData";
-import globalMessages from "../../../pages/Cap/messages.js"
-
-const initializeAllocationStrategy = (isEditable = false) => {
-  const Component = injectIntl(AllocationStrategy);
-  const propsObj = {
-    allocationStrategyDetails: allocationStrategyDetails,
-    currentProgram: currentProgram,
-    isEditable,
-    buttonAction: jest.fn(() => { }),
-    buttonDescription: "",
-    onOptionClick: undefined,
-
-  };
-
-  render(Component, undefined, propsObj);
-};
 describe('<ProgramPerformance />', () => {
-  const spyWindowOpen = jest.spyOn(window, 'open');
-  spyWindowOpen.mockImplementation(jest.fn());
   it('Expect to have unit tests specified', () => {
-    initializeAllocationStrategy();
     expect(true).toEqual(true);
   });
-  it("Expect Allocation Strategry  have Link and toolTip", async () => {
-    initializeAllocationStrategy();
-    const linkvar = screen.getByText(globalMessages.viewReports.defaultMessage);
-    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 Allocation Strategry  have Link and toolTip after Editable is true", async () => {
-    initializeAllocationStrategy(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);
-  });
 });