From 03a7facd44f9fbe91c7a77e694dc8fb13b371563 Mon Sep 17 00:00:00 2001 From: chinmoy-eGov <115543497+chinmoy-eGov@users.noreply.github.com> Date: Tue, 9 Apr 2024 16:40:03 +0530 Subject: [PATCH] UM-6631 Pt MDMS v2 call modification --- .../micro-ui-internals/example/package.json | 2 +- .../packages/libraries/src/hooks/index.js | 2 + .../packages/libraries/src/hooks/useMDMSV2.js | 44 +++++++++++++++++++ .../packages/modules/pt/package.json | 2 +- .../pt/src/pageComponents/SelectPTUnits.js | 2 +- frontend/micro-ui/web/package.json | 2 +- 6 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useMDMSV2.js diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index e4e9e947833..b4ee1d4dd39 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -17,7 +17,7 @@ "@upyog/digit-ui-module-noc": "1.7.3", "@upyog/digit-ui-module-obps": "1.7.2", "@upyog/digit-ui-module-pgr": "1.7.8", - "@upyog/digit-ui-module-pt": "1.7.6", + "@upyog/digit-ui-module-pt": "1.7.7", "@upyog/digit-ui-module-receipts": "1.7.3", "@upyog/digit-ui-module-tl": "1.7.2", "@upyog/digit-ui-module-ws": "1.7.3", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js index 43ca8727c06..760a95394d9 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js @@ -21,6 +21,7 @@ import { useUserSearch } from "./userSearch"; import { useApplicationsForBusinessServiceSearch } from "./useApplicationForBillSearch"; import useBoundaryLocalities from "./useLocalities"; import useCommonMDMS from "./useMDMS"; +import useCommonMDMSV2 from "./useMDMSV2"; import useCustomMDMS from "./useCustomMDMS"; import useCustomAPIHook from "./useCustomAPIHook"; import useInboxGeneral from "./useInboxGeneral/useInboxGeneral"; @@ -521,6 +522,7 @@ const Hooks = { useEmployeeSearch, useBoundaryLocalities, useCommonMDMS, + useCommonMDMSV2, useApplicationStatusGeneral, useModuleTenants, useRecieptSearch, diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useMDMSV2.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useMDMSV2.js new file mode 100644 index 00000000000..c1564ceccb4 --- /dev/null +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/useMDMSV2.js @@ -0,0 +1,44 @@ +import { MdmsServiceV2 } from "../services/elements/MDMSV2"; +import { useQuery } from "react-query"; + +const useMDMS = (tenantId, moduleCode, type, config = {}, payload = []) => { + const usePaymentGateway = () => { + return useQuery("PAYMENT_GATEWAY", () => MdmsServiceV2.getPaymentGateway(tenantId, moduleCode, type), { + select: (data) => { + return data?.[moduleCode]?.[type].filter((e) => e.active).map(({ gateway }) => gateway); + }, + ...config, + }); + }; + + const useReceiptKey = () => { + return useQuery("RECEIPT_KEY", () => MdmsServiceV2.getReceiptKey(tenantId, moduleCode, type), config); + }; + + const useBillsGenieKey = () => { + return useQuery("BILLS_GENIE_KEY", () => MdmsServiceV2.getBillsGenieKey(tenantId, moduleCode, type), config); + }; + + const useFSTPPlantInfo = () => { + return useQuery("FSTP_PLANTINFO", () => MdmsServiceV2.getFSTPPlantInfo(tenantId, moduleCode, type), config); + }; + + const _default = () => { + return useQuery([tenantId, moduleCode, type], () => MdmsServiceV2.getMultipleTypes(tenantId, moduleCode, type), config); + }; + + switch (type) { + case "PaymentGateway": + return usePaymentGateway(); + case "ReceiptKey": + return useReceiptKey(); + case "FSTPPlantInfo": + return useFSTPPlantInfo(); + case "BillsGenieKey": + return useBillsGenieKey(); + default: + return _default(); + } +}; + +export default useMDMS; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json index 4965d7340f8..e4969afe944 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-pt", - "version": "1.7.6", + "version": "1.7.7", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectPTUnits.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectPTUnits.js index 1a4e1f7b403..6a723cfa84c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectPTUnits.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pageComponents/SelectPTUnits.js @@ -65,7 +65,7 @@ const SelectPTUnits = React.memo(({ t, config, onSelect, userType, formData }) = } }; - const { data: mdmsData, isLoading } = Digit.Hooks.useCommonMDMS( + const { data: mdmsData, isLoading } = Digit.Hooks.useCommonMDMSV2( Digit.ULBService.getStateId(), "PropertyTax", ["Floor", "OccupancyType", "UsageCategory"], diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 1d9f6f48c84..a7952bf57e4 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -25,7 +25,7 @@ "@upyog/digit-ui-module-obps": "1.7.2", "@upyog/digit-ui-module-noc": "1.7.3", "@upyog/digit-ui-module-pgr": "1.7.8", - "@upyog/digit-ui-module-pt": "1.7.6", + "@upyog/digit-ui-module-pt": "1.7.7", "@upyog/digit-ui-module-receipts": "1.7.3", "@upyog/digit-ui-module-tl": "1.7.2", "@upyog/digit-ui-module-ws": "1.7.3",