From ac1c9dd22492f2fc708c61a2c0cbf24e5e4fa030 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 28 Aug 2024 09:49:12 +0530 Subject: [PATCH 1/9] Added TL redirect page --- .../web/micro-ui-internals/package.json | 2 +- .../packages/modules/tl/src/Module.js | 3 +- .../tl/src/pageComponents/CommonRedirect.js | 45 +++++++++++++------ .../src/pages/employee/ApplicationDetails.js | 2 +- .../modules/tl/src/pages/employee/index.js | 4 +- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 6c245dfddf9..f7ad3bfa9ef 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -61,7 +61,7 @@ "build:dss": "cd packages/modules/dss && yarn build", "buildD:mcollect": "cd packages/modules/mCollect && yarn build", "buildD:receipts": "cd packages/modules/receipts && yarn build", - "buildD:tl": "cd packages/modules/tl && yarn build", + "build:tl": "cd packages/modules/tl && yarn build", "buildD:ptr": "cd packages/modules/ptr && yarn build", "buildD:hrms": "cd packages/modules/hrms && yarn build", "build:obps": "cd packages/modules/obps && yarn build", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js index e63255d445b..1ceaf682747 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js @@ -55,7 +55,7 @@ import RenewTrade from "./pages/citizen/Renewal/renewTrade"; import SearchTradeComponent from "./pages/citizen/SearchTrade"; import SelectTradeUnitsInitial from "./pageComponents/SelectTradeUnitsInitial"; import TLTradeUnitsEmployeeInitial from "./pageComponents/TLTradeUnitsEmployeeInitial"; - +import CommonRedirect from "../src/pageComponents/CommonRedirect" import CitizenApp from "./pages/citizen"; import EmployeeApp from "./pages/employee"; @@ -153,6 +153,7 @@ const componentsToRegister = { SelectOtherTradeDetails, SelectTradeUnitsInitial, TLTradeUnitsEmployeeInitial, + CommonRedirect }; export const initTLComponents = () => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js index 6a6d017f442..f2a5932b577 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js @@ -1,14 +1,33 @@ -import React, { useState } from "react"; -import { FormStep, RadioOrSelect, RadioButtons } from "@upyog/digit-ui-react-components"; - -const CommonRedirect = ({ }) => { - - return ( - -
- Hello World -
- - ); +import React, { useEffect, useState } from "react"; + +const CommonRedirect = () => { + const [receipt, setReceipt] = useState(""); + const tenantId = Digit.ULBService.getCurrentTenantId(); + + useEffect(() => { + const fetchReceipt = async () => { + if (window.location.href.includes("filestore")) { + const filestoreId = window.location.href.split("filestore=")[1]; + const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: filestoreId }); + setReceipt(receiptFile); + } + }; + + fetchReceipt(); + }, [tenantId]); + + useEffect(() => { + const openReceipt = () => { + const filestoreId = window.location.href.split("filestore=")[1]; + if (receipt?.[filestoreId]) { + window.open(receipt[filestoreId], "_blank"); + } + }; + + openReceipt(); + }, [receipt]); + + return E Signed PDF Downloaded; }; -export default SelectAccessories; \ No newline at end of file + +export default CommonRedirect; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/ApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/ApplicationDetails.js index dd7c4fc0b66..e7d2ef3e5e7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/ApplicationDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/ApplicationDetails.js @@ -256,7 +256,7 @@ const ApplicationDetails = () => { const TLcertificatefile = await Digit.PaymentService.generatePdf(tenantId, { Licenses: res?.Licenses }, "tlcertificate"); const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: TLcertificatefile.filestoreIds[0] }); fetchDigiLockerDocuments(receiptFile[TLcertificatefile.filestoreIds[0]]) - window.open(receiptFile[TLcertificatefile.filestoreIds[0]], "_blank"); + //window.open(receiptFile[TLcertificatefile.filestoreIds[0]], "_blank"); setIsDisplayDownloadMenu(false) } const [isDisplayDownloadMenu, setIsDisplayDownloadMenu] = useState(false); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/index.js index 4eb670c52b5..acb146fbaf4 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/employee/index.js @@ -156,7 +156,7 @@ const EmployeeApp = ({ path, url, userType }) => { const ReNewApplication = Digit?.ComponentRegistryService?.getComponent('TLReNewApplication'); const Response = Digit?.ComponentRegistryService?.getComponent('TLResponse'); const Search = Digit?.ComponentRegistryService?.getComponent('TLSearch'); - + const CommonRedirect = Digit?.ComponentRegistryService?.getComponent('CommonRedirect') return ( @@ -189,7 +189,7 @@ const EmployeeApp = ({ path, url, userType }) => { )} /> } /> - } /> + } /> } /> } /> } /> From 9647135bbc142012467bb4aa5a62ebfc056fa564 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 28 Aug 2024 10:45:41 +0530 Subject: [PATCH 2/9] Added docker update --- frontend/micro-ui/web/docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 084181bf45e..e6b44017547 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -21,7 +21,7 @@ RUN yarn add @upyog-niua/upyog-ui-module-ptr@1.0.8 RUN yarn add @upyog/digit-ui-react-components@1.7.0-beta.4 ARG WORK_DIR WORKDIR /app -ENV NODE_OPTIONS "--max-old-space-size=4096" +ENV NODE_OPTIONS "--max-old-space-size=8192" ENV GENERATE_SOURCEMAP "false" COPY ${WORK_DIR} . @@ -30,7 +30,7 @@ RUN ls -lah #RUN node web/envs.js RUN cd web/ \ && node envs.js \ - && node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(4096*4096))' \ + && node -e 'console.log(v8.getHeapStatistics().heap_size_limit/(8192*8192))' \ && ./install-deps.sh \ && yarn install \ && yarn build From a5a50b9125e0bda9a2ff43d0095085660fb5dc80 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 28 Aug 2024 11:41:40 +0530 Subject: [PATCH 3/9] removed architect validation for plot size --- .../obps/src/pageComponents/OwnerDetails.js | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js index c240fade84d..7abdba96b04 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/OwnerDetails.js @@ -425,45 +425,45 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => { } payload.additionalDetails.isSelfCertificationRequired = isSelfCertificationRequired.toString(); // create BPA call - if(isSelfCertificationRequired===true && formData?.data.occupancyType==="Residential" && (parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER"|| parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR")){ - if(formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight > 15){ - alert("Height should not be more than 15 metres"); - } - //converting plot area which is in square meters to square yards by multiplying 1.196 - else if((parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER") && (formData?.data.edcrDetails.planDetail.planInformation.plotArea*1.19599) >500){ - alert("Architect/Engineer can apply for area less then 500 sq. yards. in self declaration") - } - else if((parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR") && (formData?.data.edcrDetails.planDetail.planInformation.plotArea*1.19599)>250){ - alert("Designer/Supervisor can apply for area less then 500 sq. yards. in self declaration") - } - else{ - Digit.OBPSService.create({ BPA: payload }, tenantId) - .then((result, err) => { - if (result?.BPA?.length > 0) { - result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => { - owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` } - }); - result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory }; - result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address; - result.BPA[0].address.city = formData.address.city; - result.BPA[0].address.locality = formData.address.locality; - result.BPA[0].placeName = formData?.address?.placeName; - result.BPA[0].data = formData.data; - result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit); - result.BPA[0].subOccupancy= formData?.subOccupancy; - result.BPA[0].uiFlow = formData?.uiFlow; - setIsDisable(false); - onSelect("", result.BPA[0], "", true); - } - }) - .catch((e) => { - setIsDisable(false); - setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message }); - }); - } + // if(isSelfCertificationRequired===true && formData?.data.occupancyType==="Residential" && (parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER"|| parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR")){ + // if(formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight > 15){ + // alert("Height should not be more than 15 metres"); + // } + // //converting plot area which is in square meters to square yards by multiplying 1.196 + // else if((parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER") && (formData?.data.edcrDetails.planDetail.planInformation.plotArea*1.19599) >500){ + // alert("Architect/Engineer can apply for area less then 500 sq. yards. in self declaration") + // } + // else if((parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR") && (formData?.data.edcrDetails.planDetail.planInformation.plotArea*1.19599)>250){ + // alert("Designer/Supervisor can apply for area less then 500 sq. yards. in self declaration") + // } + // else{ + // Digit.OBPSService.create({ BPA: payload }, tenantId) + // .then((result, err) => { + // if (result?.BPA?.length > 0) { + // result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => { + // owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` } + // }); + // result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory }; + // result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address; + // result.BPA[0].address.city = formData.address.city; + // result.BPA[0].address.locality = formData.address.locality; + // result.BPA[0].placeName = formData?.address?.placeName; + // result.BPA[0].data = formData.data; + // result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit); + // result.BPA[0].subOccupancy= formData?.subOccupancy; + // result.BPA[0].uiFlow = formData?.uiFlow; + // setIsDisable(false); + // onSelect("", result.BPA[0], "", true); + // } + // }) + // .catch((e) => { + // setIsDisable(false); + // setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message }); + // }); + // } - } - else{ + // } + // else{ Digit.OBPSService.create({ BPA: payload }, tenantId) .then((result, err) => { if (result?.BPA?.length > 0) { @@ -487,7 +487,7 @@ const OwnerDetails = ({ t, config, onSelect, userType, formData }) => { setIsDisable(false); setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message }); }); - } + // } } else { onSelect(config.key, ownerStep); } From 122fe2a45e7abb6d4867ef703906a8ee1f580917 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 28 Aug 2024 14:45:46 +0530 Subject: [PATCH 4/9] added hrms in packahe --- frontend/micro-ui/web/micro-ui-internals/package.json | 3 ++- frontend/micro-ui/web/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index f7ad3bfa9ef..a368d78531d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -13,7 +13,8 @@ "packages/modules/dss", "packages/modules/pt", "packages/modules/tl", - "packages/modules/obps" + "packages/modules/obps", + "packages/modules/hrms" ], "author": "Abhinav Kushwaha ", "license": "MIT", diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 76409f61f32..f0a5aed9e5f 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -12,7 +12,8 @@ "micro-ui-internals/packages/modules/dss", "micro-ui-internals/packages/modules/pt", "micro-ui-internals/packages/modules/tl", - "micro-ui-internals/packages/modules/obps" + "micro-ui-internals/packages/modules/obps", + "micro-ui-internals/packages/modules/hrms" ], "engines": { "node": ">=14" From 341b2ece727cdddf052fb54dad2a6c5d87cc5975 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 28 Aug 2024 15:28:04 +0530 Subject: [PATCH 5/9] published tl --- frontend/micro-ui/web/docker/Dockerfile | 2 +- .../micro-ui/web/micro-ui-internals/example/devpackage.json | 2 +- .../micro-ui/web/micro-ui-internals/example/package.json | 2 +- frontend/micro-ui/web/micro-ui-internals/package.json | 6 ++---- .../web/micro-ui-internals/packages/modules/tl/package.json | 2 +- frontend/micro-ui/web/package.json | 6 ++---- frontend/micro-ui/web/src/App.js | 3 +-- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index e6b44017547..42644eb0259 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --no-cache git>2.30.0 RUN yarn add @upyog/digit-ui-libraries@1.7.0-beta.5 RUN yarn add @upyog/digit-ui-module-pt@1.7.0-beta.4 RUN yarn add @upyog/digit-ui-module-fsm@1.7.0-beta.18 -RUN yarn add @upyog/digit-ui-module-tl@1.7.0-beta.8 +RUN yarn add @upyog/digit-ui-module-tl@1.7.0-beta.9 RUN yarn add @upyog/digit-ui-module-dss@1.7.0-beta.4 RUN yarn add @upyog/digit-ui-module-mcollect@1.7.0-beta.4 RUN yarn add @upyog/digit-ui-module-pgr@1.7.0-beta.6 diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json index 7491dd742ca..7c88dac13ba 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json @@ -20,7 +20,7 @@ "@upyog/digit-ui-module-pgr":"1.7.0-beta.6", "@upyog/digit-ui-module-pt":"1.7.0-beta.4", "@upyog/digit-ui-module-receipts":"1.7.0-beta.3", - "@upyog/digit-ui-module-tl":"1.7.0-beta.8", + "@upyog/digit-ui-module-tl":"1.7.0-beta.9", "@upyog/digit-ui-module-ws":"1.7.0-beta.12", "@upyog-niua/upyog-ui-module-ptr":"1.0.8", "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4", 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 2cee6c50781..b2a90f84e78 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -20,7 +20,7 @@ "@upyog/digit-ui-module-pgr": "1.7.0-beta.6", "@upyog/digit-ui-module-pt": "1.7.0-beta.4", "@upyog/digit-ui-module-receipts": "1.7.0-beta.3", - "@upyog/digit-ui-module-tl": "1.7.0-beta.8", + "@upyog/digit-ui-module-tl": "1.7.0-beta.9", "@upyog/digit-ui-module-ws": "1.7.0-beta.12", "@upyog/digit-ui-module-bills": "^1.7.0-beta.3", "@upyog/digit-ui-module-commonpt": "1.7.0-beta.4", diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index a368d78531d..e31e67ef7f4 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -12,9 +12,7 @@ "packages/modules/commonPt", "packages/modules/dss", "packages/modules/pt", - "packages/modules/tl", - "packages/modules/obps", - "packages/modules/hrms" + "packages/modules/obps" ], "author": "Abhinav Kushwaha ", "license": "MIT", @@ -62,7 +60,7 @@ "build:dss": "cd packages/modules/dss && yarn build", "buildD:mcollect": "cd packages/modules/mCollect && yarn build", "buildD:receipts": "cd packages/modules/receipts && yarn build", - "build:tl": "cd packages/modules/tl && yarn build", + "buildD:tl": "cd packages/modules/tl && yarn build", "buildD:ptr": "cd packages/modules/ptr && yarn build", "buildD:hrms": "cd packages/modules/hrms && yarn build", "build:obps": "cd packages/modules/obps && yarn build", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json index 6debeda134c..4df60477e3c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-tl", - "version": "1.7.0-beta.8", + "version": "1.7.0-beta.9", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index f0a5aed9e5f..ef8f5370ca6 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -11,9 +11,7 @@ "micro-ui-internals/packages/modules/commonPt", "micro-ui-internals/packages/modules/dss", "micro-ui-internals/packages/modules/pt", - "micro-ui-internals/packages/modules/tl", - "micro-ui-internals/packages/modules/obps", - "micro-ui-internals/packages/modules/hrms" + "micro-ui-internals/packages/modules/obps" ], "engines": { "node": ">=14" @@ -35,7 +33,7 @@ "@upyog/digit-ui-module-pgr": "1.7.0-beta.6", "@upyog/digit-ui-module-pt": "1.7.0-beta.4", "@upyog/digit-ui-module-receipts": "1.7.0-beta.3", - "@upyog/digit-ui-module-tl": "1.7.0-beta.8", + "@upyog/digit-ui-module-tl": "1.7.0-beta.9", "@upyog/digit-ui-module-ws": "1.7.0-beta.12", "@upyog/digit-ui-react-components": "1.7.0-beta.4", "@upyog-niua/upyog-ui-module-ptr": "1.0.8", diff --git a/frontend/micro-ui/web/src/App.js b/frontend/micro-ui/web/src/App.js index 0f65f1aa2e8..3e687bc5e1e 100644 --- a/frontend/micro-ui/web/src/App.js +++ b/frontend/micro-ui/web/src/App.js @@ -68,8 +68,7 @@ const enabledModules = [ "BillAmendment", "FireNoc", "Birth", - "Death", - "PTR" + "Death" ]; window.Digit.ComponentRegistryService.setupRegistry({ ...paymentConfigs, From 65bebab368cf0a9cf60e960d12dcc8397d0a18d0 Mon Sep 17 00:00:00 2001 From: sriranjan-s <111953844+sriranjan-s@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:34:32 +0530 Subject: [PATCH 6/9] Update Module.js --- .../web/micro-ui-internals/packages/modules/tl/src/Module.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js index 1ceaf682747..5c2e6a33d94 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/Module.js @@ -55,7 +55,7 @@ import RenewTrade from "./pages/citizen/Renewal/renewTrade"; import SearchTradeComponent from "./pages/citizen/SearchTrade"; import SelectTradeUnitsInitial from "./pageComponents/SelectTradeUnitsInitial"; import TLTradeUnitsEmployeeInitial from "./pageComponents/TLTradeUnitsEmployeeInitial"; -import CommonRedirect from "../src/pageComponents/CommonRedirect" +import CommonRedirect from "./pageComponents/CommonRedirect" import CitizenApp from "./pages/citizen"; import EmployeeApp from "./pages/employee"; From ab11a639a17785f160f16ed2c58a99177702475f Mon Sep 17 00:00:00 2001 From: sriranjan-s <111953844+sriranjan-s@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:40:56 +0530 Subject: [PATCH 7/9] Update CommonRedirect.js --- .../modules/tl/src/pageComponents/CommonRedirect.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js index f2a5932b577..a0ad8d6c071 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/CommonRedirect.js @@ -7,18 +7,18 @@ const CommonRedirect = () => { useEffect(() => { const fetchReceipt = async () => { if (window.location.href.includes("filestore")) { - const filestoreId = window.location.href.split("filestore=")[1]; + const filestoreId = window?.location?.href?.split("filestore=")[1]; const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: filestoreId }); setReceipt(receiptFile); } }; fetchReceipt(); - }, [tenantId]); + }, []); useEffect(() => { const openReceipt = () => { - const filestoreId = window.location.href.split("filestore=")[1]; + const filestoreId = window?.location?.href.split("filestore=")[1]; if (receipt?.[filestoreId]) { window.open(receipt[filestoreId], "_blank"); } From b96e81689e9732836b4372fc636811c93842ef02 Mon Sep 17 00:00:00 2001 From: sriranjan-s <111953844+sriranjan-s@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:42:19 +0530 Subject: [PATCH 8/9] Update package.json --- frontend/micro-ui/web/micro-ui-internals/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index e31e67ef7f4..01e68e5e973 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -12,6 +12,7 @@ "packages/modules/commonPt", "packages/modules/dss", "packages/modules/pt", + "packages/modules/tl", "packages/modules/obps" ], "author": "Abhinav Kushwaha ", @@ -92,4 +93,4 @@ "**/@babel/preset-env": "7.14.0", "**/@babel/plugin-transform-modules-commonjs": "7.14.0" } -} \ No newline at end of file +} From 7b71ec21aa6c205724e188209b932e6dc6454ada Mon Sep 17 00:00:00 2001 From: sriranjan-s <111953844+sriranjan-s@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:43:09 +0530 Subject: [PATCH 9/9] Update package.json --- frontend/micro-ui/web/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index ef8f5370ca6..3d05489de5c 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -11,6 +11,7 @@ "micro-ui-internals/packages/modules/commonPt", "micro-ui-internals/packages/modules/dss", "micro-ui-internals/packages/modules/pt", + "micro-ui-internals/packages/modules/tl", "micro-ui-internals/packages/modules/obps" ], "engines": { @@ -33,7 +34,7 @@ "@upyog/digit-ui-module-pgr": "1.7.0-beta.6", "@upyog/digit-ui-module-pt": "1.7.0-beta.4", "@upyog/digit-ui-module-receipts": "1.7.0-beta.3", - "@upyog/digit-ui-module-tl": "1.7.0-beta.9", + "@upyog/digit-ui-module-tl": "1.7.0-beta.8", "@upyog/digit-ui-module-ws": "1.7.0-beta.12", "@upyog/digit-ui-react-components": "1.7.0-beta.4", "@upyog-niua/upyog-ui-module-ptr": "1.0.8", @@ -72,4 +73,4 @@ "not dead", "not op_mini all" ] -} \ No newline at end of file +}