From 3d9235e17222fc60bfa9add77fe8504f8d311164 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Fri, 25 Oct 2024 12:59:19 +0530 Subject: [PATCH] Added TL changes --- .../src/services/atoms/Utils/Request.js | 8 ++++ .../libraries/src/services/atoms/urls.js | 3 +- .../src/services/elements/DigiLocker.js | 10 +++++ .../src/payments/employee/response/index.js | 45 +++++++++++++++++-- .../Applications/ApplicationDetails.js | 28 +++++++++++- .../src/pages/employee/ApplicationDetails.js | 25 +++++++++-- 6 files changed, 109 insertions(+), 10 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Utils/Request.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Utils/Request.js index a58f90dc354..8feea47060f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Utils/Request.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Utils/Request.js @@ -170,6 +170,14 @@ Newdata = {RequestInfo:data?.RequestInfo, Transaction :{fileStoreId:data?.fileSt : await Axios({ method, url: _url, data:Newdata, params, headers }); } +else if(url.includes("/requester-services-dx/eSign/filestoreId/v1/_search")) +{ + Newdata = {RequestInfo:data?.RequestInfo, Transaction :{module:data?.module,consumerCode:data?.consumerCode}} + + res = userDownload + ? await Axios({ method, url: _url, data:Newdata, params, headers, responseType: "arraybuffer" }) + : await Axios({ method, url: _url, data:Newdata, params, headers }); +} else{ res = userDownload ? await Axios({ method, url: _url, data, params, headers, responseType: "arraybuffer" }) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js index ca8eed8483a..96f8726215d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/urls.js @@ -202,7 +202,8 @@ digiLocker:{ uri:"/requester-services-dx/user/file" }, eSign:{ -pdfUrl:"/requester-services-dx/eSign/process" +pdfUrl:"/requester-services-dx/eSign/process", +fileStoreSearch:"/requester-services-dx/eSign/filestoreId/v1/_search" }, engagement: { document: { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/DigiLocker.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/DigiLocker.js index 1cee91f5cd0..3c499cceb9e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/DigiLocker.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/DigiLocker.js @@ -56,7 +56,17 @@ export const DigiLockerService = { auth: true, userService: true, data:{ pdfUrl:data?.TokenReq?.pdfUrl,redirectUrl:"",fileStoreId:data?.TokenReq?.fileStoreId,module:data?.TokenReq?.module,tenantId:data?.TokenReq?.tenantId,consumerCode:data?.TokenReq?.consumerCode} + }), + fileStoreSearch:(data) => + Request({ + url: Urls.eSign.fileStoreSearch, + useCache: false, + method: "POST", + auth: true, + userService: true, + data:{module:data?.TokenReq?.module,consumerCode:data?.TokenReq?.consumerCode} }) + }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js index 8fb37e63a3b..1a2e99f24b7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/employee/response/index.js @@ -115,12 +115,49 @@ export const SuccessfulPayment = (props) => { const generatePdfKeyForTL = "tlcertificate"; if (applicationDetails) { - let response = await Digit.PaymentService.generatePdf(state, { Licenses: applicationDetails?.Licenses }, generatePdfKeyForTL); - const fileStore = await Digit.PaymentService.printReciept(state, { fileStoreIds: response.filestoreIds[0] }); - window.open(fileStore[response.filestoreIds[0]], "_blank"); + console.log("applicationapplication",applicationDetails) + let res = await Digit.TLService.TLsearch({ tenantId: applicationDetails?.Licenses?.[0]?.tenantId, filters: { applicationNumber:applicationDetails?.Licenses?.[0]?.applicationNumber } }); + let TokenReq = { + module:"TL", + "consumerCode": res?.Licenses?.[0]?.licenseNumber + } + const res1 = await Digit.DigiLockerService.fileStoreSearch({TokenReq}) + console.log("res1res1res1",res1) + if(res1?.Transaction.length > 0 && res1?.Transaction?.[0]?.signedFilestoreId!==null) + { + const tenant = Digit.ULBService.getStateId() + const resneww = await Digit.UploadServices.Filefetch([res1?.Transaction?.[0]?.signedFilestoreId], tenant); + console.log("resneww11",resneww,resneww?.data?.fileStoreIds?.[0]?.url) + window.open(resneww?.data?.fileStoreIds?.[0]?.url, "_blank"); + } + else{ + const TLcertificatefile = await Digit.PaymentService.generatePdf(tenantId, { Licenses: res?.Licenses }, "tlcertificate"); + const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: TLcertificatefile.filestoreIds[0] }); + console.log("resres",res) + fetchDigiLockerDocuments(receiptFile[TLcertificatefile.filestoreIds[0]],TLcertificatefile.filestoreIds[0],res) + } + + + // let response = await Digit.PaymentService.generatePdf(state, { Licenses: applicationDetails?.Licenses }, generatePdfKeyForTL); + // const fileStore = await Digit.PaymentService.printReciept(state, { fileStoreIds: response.filestoreIds[0] }); + // window.open(fileStore[response.filestoreIds[0]], "_blank"); } }; - + const fetchDigiLockerDocuments = async (file,id,res) => { + console.log("res",res) + + let TokenReq = { + pdfUrl:file, + tenantId: "pg.citya", + module:"TL", + redirectUrl:"", + "fileStoreId":id, + "consumerCode": res?.Licenses?.[0]?.licenseNumber + } + const res1 = await Digit.DigiLockerService.pdfUrl({TokenReq}) + console.log("res1res1res1res1res1",res1) + window.location.href=res1 +} // const printpetCertificate = async () => { // const tenantId = Digit.ULBService.getCurrentTenantId(); // const state = Digit.ULBService.getStateId(); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js index 66836d8df7e..2f1a09f88c4 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js @@ -134,10 +134,36 @@ const TLApplicationDetails = () => { }; const downloadTLcertificate = async () => { - const TLcertificatefile = await Digit.PaymentService.generatePdf(tenantId, { Licenses: application }, "tlcertificate"); + console.log("applicationapplication",application) + let res = await Digit.TLService.TLsearch({ tenantId: application?.[0]?.tenantId, filters: { applicationNumber:application[0]?.applicationNumber } }); + let TokenReq = { + module:"TL", + "consumerCode": res?.Licenses?.[0]?.licenseNumber + } + const res1 = await Digit.DigiLockerService.fileStoreSearch({TokenReq}) +console.log("res1res1res1",res1) + if(res1?.Transaction.length > 0 && res1?.Transaction?.[0]?.signedFilestoreId!==null) + { + const tenant = Digit.ULBService.getStateId() + const resneww = await Digit.UploadServices.Filefetch([res1?.Transaction?.[0]?.signedFilestoreId], tenant); + console.log("resneww11",resneww,resneww?.data?.fileStoreIds?.[0]?.url) + window.open(resneww?.data?.fileStoreIds?.[0]?.url, "_blank"); + } + else{ + const TLcertificatefile = await Digit.PaymentService.generatePdf(tenantId, { Licenses: application }, "tlcertificate"); const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: TLcertificatefile.filestoreIds[0] }); window.open(receiptFile[TLcertificatefile.filestoreIds[0]], "_blank"); setShowOptions(false); + // const TLcertificatefile = await Digit.PaymentService.generatePdf(tenantId, { Licenses: res?.Licenses }, "tlcertificate"); + // const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: TLcertificatefile.filestoreIds[0] }); + // console.log("resres",res) + // fetchDigiLockerDocuments(receiptFile[TLcertificatefile.filestoreIds[0]],TLcertificatefile.filestoreIds[0],res) + } + + // const TLcertificatefile = await Digit.PaymentService.generatePdf(tenantId, { Licenses: application }, "tlcertificate"); + // const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: TLcertificatefile.filestoreIds[0] }); + // window.open(receiptFile[TLcertificatefile.filestoreIds[0]], "_blank"); + // setShowOptions(false); }; let propertyAddress = ""; 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 5691f8f7299..bc3bd6a0cd1 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 @@ -258,10 +258,27 @@ const ApplicationDetails = () => { } const printCertificate = async () => { let res = await Digit.TLService.TLsearch({ tenantId: applicationDetails?.tenantId, filters: { applicationNumber:applicationDetails?.applicationData?.applicationNumber } }); - 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]],TLcertificatefile.filestoreIds[0],res) - //window.open(receiptFile[TLcertificatefile.filestoreIds[0]], "_blank"); + let TokenReq = { + module:"TL", + "consumerCode": res?.Licenses?.[0]?.licenseNumber + } + const res1 = await Digit.DigiLockerService.fileStoreSearch({TokenReq}) + console.log("res1res1res1",res1) + if(res1?.Transaction.length > 0 && res1?.Transaction?.[0]?.signedFilestoreId!==null) + { + const tenant = Digit.ULBService.getStateId() + const resneww = await Digit.UploadServices.Filefetch([res1?.Transaction?.[0]?.signedFilestoreId], tenant); + console.log("resneww",resneww) + console.log("resneww11",resneww,resneww?.data?.fileStoreIds?.[0]?.url) + window.open(resneww?.data?.fileStoreIds?.[0]?.url, "_blank"); + } + else{ + const TLcertificatefile = await Digit.PaymentService.generatePdf(tenantId, { Licenses: res?.Licenses }, "tlcertificate"); + const receiptFile = await Digit.PaymentService.printReciept(tenantId, { fileStoreIds: TLcertificatefile.filestoreIds[0] }); + console.log("resres",res) + fetchDigiLockerDocuments(receiptFile[TLcertificatefile.filestoreIds[0]],TLcertificatefile.filestoreIds[0],res) + } + setIsDisplayDownloadMenu(false) } const [isDisplayDownloadMenu, setIsDisplayDownloadMenu] = useState(false);