diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js index 7b49e368806..31ca08778ba 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/AddProductField.js @@ -3,11 +3,17 @@ import { AddIcon, Button, Card, CardText, Dropdown, Header, TextInput } from "@e import { useTranslation } from "react-i18next"; import { LabelFieldPair } from "@egovernments/digit-ui-react-components"; import { DustbinIcon } from "./icons/DustbinIcon"; -import { productType } from "../configs/productType"; +// import { productType } from "../configs/productType"; import { PRIMARY_COLOR } from "../utils"; const AddProductField = ({ onSelect }) => { const { t } = useTranslation(); + const tenantId = Digit.ULBService.getCurrentTenantId(); + const { isLoading: productTypeLoading, data: productType } = Digit.Hooks.useCustomMDMS(tenantId, "HCM-ADMIN-CONSOLE", [{ name: "productType" }], { + select: (data) => { + return data?.["HCM-ADMIN-CONSOLE"]?.productType; + }, + }); const [productFieldData, setProductFieldData] = useState([{ key: 1, name: null, type: null, variant: null }]); useEffect(() => { diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/attributeConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/attributeConfig.js index 9521a1f4175..75864d62ab5 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/attributeConfig.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/attributeConfig.js @@ -1,3 +1,4 @@ +//migrated to mdms export const attributeConfig = [ { key: 1, diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/deliveryConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/deliveryConfig.js index 7cbee548952..2d1d53fbf8f 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/deliveryConfig.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/deliveryConfig.js @@ -1,3 +1,4 @@ +//migrated to mdms export const deliveryConfig = [ { projectType: "LLIN-mz", diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/operatorConfig.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/operatorConfig.js index 72f1e4f5fcd..94ffd6c4e56 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/operatorConfig.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/operatorConfig.js @@ -1,3 +1,4 @@ +//migrated to mdms export const operatorConfig = [ { key: 1, diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/productType.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/productType.js index 3e7059b13b2..449b55450b1 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/productType.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/productType.js @@ -1,3 +1,4 @@ +//migrated to mdms export const productType = [ { key: 1, diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/AddProduct.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/AddProduct.js index b3bc143c8eb..627a375eaad 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/AddProduct.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/AddProduct.js @@ -1,8 +1,9 @@ -import { Loader, FormComposerV2, Header, Toast } from "@egovernments/digit-ui-react-components"; +import { Loader, FormComposerV2, Header } from "@egovernments/digit-ui-react-components"; import React, { useState, useEffect } from "react"; import { useTranslation } from "react-i18next"; import { useHistory, useLocation } from "react-router-dom"; import { addProductConfig } from "../../configs/addProductConfig"; +import { Toast } from "@egovernments/digit-ui-components"; function AddProduct() { const { t } = useTranslation(); diff --git a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddDeliverycontext.js b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddDeliverycontext.js index 4c482688f91..9e08dea5efe 100644 --- a/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddDeliverycontext.js +++ b/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/deliveryRule/AddDeliverycontext.js @@ -13,8 +13,8 @@ import { import { SVG } from "@egovernments/digit-ui-react-components"; import React, { Fragment, useContext, useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; -import { attributeConfig } from "../../../configs/attributeConfig"; -import { operatorConfig } from "../../../configs/operatorConfig"; +// import { attributeConfig } from "../../../configs/attributeConfig"; +// import { operatorConfig } from "../../../configs/operatorConfig"; import RemoveableTagNew from "../../../components/RemovableTagNew"; import AddProducts from "./AddProductscontext"; import { CycleContext } from "."; @@ -37,7 +37,18 @@ const makeSequential = (jsonArray, keyName) => { })); }; -const AddAttributeField = ({ deliveryRuleIndex, delivery, deliveryRules, setDeliveryRules, attribute, setAttributes, index, onDelete }) => { +const AddAttributeField = ({ + deliveryRuleIndex, + delivery, + deliveryRules, + setDeliveryRules, + attribute, + setAttributes, + index, + onDelete, + attributeConfig, + operatorConfig, +}) => { const [val, setVal] = useState(""); const [showAttribute, setShowAttribute] = useState(null); const [showOperator, setShowOperator] = useState(null); @@ -272,6 +283,7 @@ const AddCustomAttributeField = ({ setAttributes, index, onDelete, + operatorConfig, }) => { const [val, setVal] = useState(""); const [showAttribute, setShowAttribute] = useState(null); @@ -449,7 +461,27 @@ const AddCustomAttributeField = ({ const AddAttributeWrapper = ({ deliveryRuleIndex, delivery, deliveryRules, setDeliveryRules, index, key }) => { const { campaignData, dispatchCampaignData, filteredDeliveryConfig } = useContext(CycleContext); const { t } = useTranslation(); - + const tenantId = Digit.ULBService.getCurrentTenantId(); + const { isLoading: attributeConfigLoading, data: attributeConfig } = Digit.Hooks.useCustomMDMS( + tenantId, + "HCM-ADMIN-CONSOLE", + [{ name: "attributeConfig" }], + { + select: (data) => { + return data?.["HCM-ADMIN-CONSOLE"]?.attributeConfig; + }, + } + ); + const { isLoading: operatorConfigLoading, data: operatorConfig } = Digit.Hooks.useCustomMDMS( + tenantId, + "HCM-ADMIN-CONSOLE", + [{ name: "operatorConfig" }], + { + select: (data) => { + return data?.["HCM-ADMIN-CONSOLE"]?.operatorConfig; + }, + } + ); const [attributes, setAttributes] = useState([{ key: 1, deliveryRuleIndex, attribute: "", operator: "", value: "" }]); const reviseIndexKeys = () => { setAttributes((prev) => prev.map((unit, index) => ({ ...unit, key: index + 1 }))); @@ -503,6 +535,7 @@ const AddAttributeWrapper = ({ deliveryRuleIndex, delivery, deliveryRules, setDe key={index} index={index} onDelete={() => deleteAttribute(item, deliveryRuleIndex)} + operatorConfig={operatorConfig} /> )) : delivery.attributes.map((item, index) => ( @@ -516,9 +549,11 @@ const AddAttributeWrapper = ({ deliveryRuleIndex, delivery, deliveryRules, setDe key={index} index={index} onDelete={() => deleteAttribute(item, deliveryRuleIndex)} + attributeConfig={attributeConfig} + operatorConfig={operatorConfig} /> ))} - {!filteredDeliveryConfig?.attrAddDisable && delivery.attributes.length !== attributeConfig.length && ( + {!filteredDeliveryConfig?.attrAddDisable && delivery.attributes.length !== attributeConfig?.length && (