From ed8535f3cd98b1605cc5ffca14b3bb26ad4481d2 Mon Sep 17 00:00:00 2001 From: mukund-egov Date: Wed, 29 Jan 2025 14:07:03 +0530 Subject: [PATCH] Solved tenantId problem in bill-gen --- .../micro-ui-internals/example/package.json | 4 ++-- .../packages/modules/bills/package.json | 2 +- .../src/pages/employee/DownloadBill/index.js | 22 ++++++++----------- frontend/micro-ui/web/package.json | 2 +- 4 files changed, 13 insertions(+), 17 deletions(-) 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 cc519906512..b4cc02a3984 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -14,14 +14,14 @@ "@egovernments/digit-ui-module-engagement": "1.7.0-beta.5", "@egovernments/digit-ui-module-fsm": "1.7.0-beta.6", "@egovernments/digit-ui-module-mcollect": "1.7.0-beta.3", - "@egovernments/digit-ui-module-noc": "1.7.0-beta.2", + "@egovernments/digit-ui-module-noc": "1.7.0-beta.2", "@egovernments/digit-ui-module-obps": "1.7.0-beta.10", "@egovernments/digit-ui-module-pgr": "1.7.0-beta.2", "@egovernments/digit-ui-module-pt": "1.7.0-beta.4", "@egovernments/digit-ui-module-receipts": "1.7.0-beta.2", "@egovernments/digit-ui-module-tl": "1.7.0-beta.8", "@egovernments/digit-ui-module-ws": "1.7.0-beta.4", - "@egovernments/digit-ui-module-bills": "1.7.0-beta.2", + "@egovernments/digit-ui-module-bills": "1.7.0-beta.4", "@egovernments/digit-ui-module-commonpt": "1.7.0-beta.2", "@egovernments/digit-ui-module-hrms":"1.7.0-beta.2", "@egovernments/digit-ui-module-core":"1.7.0-beta.5", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json index f0b5848c11f..1da0cfefbf6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/package.json @@ -1,6 +1,6 @@ { "name": "@egovernments/digit-ui-module-bills", - "version": "1.7.0-beta.3", + "version": "1.7.0-beta.4", "description": "BILLS", "license": "MIT", "main": "dist/index.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/pages/employee/DownloadBill/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/pages/employee/DownloadBill/index.js index 2f10b3763f4..78ab6913ff7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/pages/employee/DownloadBill/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/bills/src/pages/employee/DownloadBill/index.js @@ -17,15 +17,14 @@ const DownloadBillInbox = () => { const [pageSize, setPageSize] = useState(10); const filters = { - // offset: 0, - // limit: 100, + tenantId: Digit.ULBService.getCurrentTenantId(), }; const { data, isLoading, isError, error } = Digit.Hooks.useBulkPdfDetails({ filters: filters }); const showingToastMessage = (message) => { setShowToast(message); }; - const columns = useSearchApplicationTableConfig(showingToastMessage,data,isLoading,isMobile); + const columns = useSearchApplicationTableConfig(showingToastMessage, data, isLoading, isMobile); useEffect(() => { setTotalRecords(data?.groupBillrecords.length); @@ -41,9 +40,6 @@ const DownloadBillInbox = () => { setPageOffset((prevState) => prevState - pageSize); }; - - - const TableComponent = useCallback(() => { if (isLoading) { return ; @@ -58,16 +54,16 @@ const DownloadBillInbox = () => {

))} - ) : - isMobile ? ( {}, - handleDetailCardClick : (e) => {}, + handleDetailCardClick: (e) => {}, data: [...columns], serviceRequestIdKey: t("TL_DATE_LABEL"), - }} - />) : - ( + }} + /> + ) : ( <>