diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 7c91ab420f9..41ee4f31c65 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -12,7 +12,7 @@ RUN yarn add @upyog/digit-ui-module-noc@1.7.0-beta.3 RUN yarn add @upyog/digit-ui-module-engagement@1.7.0-beta.4 RUN yarn add @upyog/digit-ui-module-hrms@1.7.0-beta.3 RUN yarn add @upyog/digit-ui-module-core@1.7.0-beta.3 -RUN yarn add @upyog/digit-ui-module-obps@1.7.0-beta.17 +RUN yarn add @upyog/digit-ui-module-obps@1.7.0-beta.20 RUN yarn add @upyog/digit-ui-module-common@1.7.0-beta.5 RUN yarn add @upyog/digit-ui-module-ws@1.7.0-beta.12 RUN yarn add @upyog/digit-ui-module-commonpt@1.7.0-beta.4 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 d2d129f096a..55e028aa8d5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json @@ -16,7 +16,7 @@ "@upyog/digit-ui-module-fsm":"1.7.0-beta.18", "@upyog/digit-ui-module-mcollect":"1.7.0-beta.4", "@upyog/digit-ui-module-noc":"1.7.0-beta.3", - "@upyog/digit-ui-module-obps":"1.7.0-beta.17", + "@upyog/digit-ui-module-obps":"1.7.0-beta.20", "@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", 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 08d18870bfe..e929e8c7124 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -16,7 +16,7 @@ "@upyog/digit-ui-module-fsm": "1.7.0-beta.18", "@upyog/digit-ui-module-mcollect": "1.7.0-beta.4", "@upyog/digit-ui-module-noc": "1.7.0-beta.3", - "@upyog/digit-ui-module-obps": "1.7.0-beta.17", + "@upyog/digit-ui-module-obps": "1.7.0-beta.20", "@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", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js index 60affc6bd6c..36bd0fc1e8e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js @@ -307,7 +307,11 @@ export const convertEpochToDate = (dateEpoch) => { setTimeout(() => URL.revokeObjectURL(link.href), 7000); } }; - + // let workflowDetails = Digit.Hooks.useWorkflowDetails({ + // tenantId: data?.[0]?.tenantId, + // id: data?.[0]?.applicationNo, + // moduleCode: "OBPS", + // }); const getPermitOccupancyOrderSearch = async(order, mode="download") => { let queryObj = { applicationNo: bpaData?.[0]?.applicationNo }; let bpaResponse = await Digit.OBPSService.BPASearch(bpaData?.[0]?.tenantId, queryObj); @@ -321,12 +325,14 @@ export const convertEpochToDate = (dateEpoch) => { const state = Digit.ULBService.getStateId(); let count=0; - for(let i=0;i. This regularization falls within the jurisdiction of "+ state +".Any form of misrepresentation of the NoC is strictly prohibited. Such misrepresentation renders the building plan null and void, and it will be regarded as an act of impersonation. Criminal proceedings will be initiated against the owner and concerned architect / engineer/ building designer / supervisor involved in such actions" diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json index 83416aef166..8fc9f987c2d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-obps", - "version": "1.7.0-beta.17", + "version": "1.7.0-beta.20", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js index c14f20ffd6b..842624a2c89 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js @@ -37,8 +37,8 @@ import EXIF from 'exif-js'; const DocumentDetails = ({ t, config, onSelect, userType, formData, setError: setFormError, clearErrors: clearFormErrors, formState, onSubmit }) => { const stateId = Digit.ULBService.getStateId(); - const tenantId = "pg.citya"; - const [documents, setDocuments] = useState(formData?.documents?.documents || []); + const tenantId = Digit.ULBService.getCurrentTenantId(); + const [documents, setDocuments] = useState(formData?.documents?.documents|| formData?.documents ||[]); const [error, setError] = useState(null); const [enableSubmit, setEnableSubmit] = useState(true) const [checkRequiredFields, setCheckRequiredFields] = useState(false); @@ -78,17 +78,17 @@ const DocumentDetails = ({ t, config, onSelect, userType, formData, setError: se ...updatedFormData.landInfo?.address, city: updatedFormData.landInfo?.address?.city?.code, // Ensure city is a string }, - owners: updatedFormData.landInfo?.owners.map(owner => ({ + owners: updatedFormData?.landInfo?.owners.map(owner => ({ ...owner, gender: owner.gender?.code // Ensure gender is a string })), - unit: updatedFormData.landInfo?.unit.map(unit => ({ - id: unit.id, - floorNo: unit.floorNo, - unitType: unit.unitType, - blockIndex: unit.blockIndex, - usageCategory: unit.usageCategory, - occupancyType: unit.occupancyType // Only necessary fields + unit: updatedFormData?.landInfo?.unit?.map(unit => ({ + id: unit?.id, + floorNo: unit?.floorNo, + unitType: unit?.unitType, + blockIndex: unit?.blockIndex, + usageCategory: unit?.usageCategory, + occupancyType: unit?.occupancyType // Only necessary fields })), }, @@ -123,7 +123,7 @@ const DocumentDetails = ({ t, config, onSelect, userType, formData, setError: se let document = formData.documents; let documentStep; let RealignedDocument = []; - bpaTaxDocuments && bpaTaxDocuments.map((ob) => { + bpaTaxDocuments && bpaTaxDocuments?.map((ob) => { documents && documents.filter(x => ob.code === stringReplaceAll(x?.additionalDetails.category,"_",".")).map((doc) => { RealignedDocument.push(doc); }) @@ -187,11 +187,11 @@ const DocumentDetails = ({ t, config, onSelect, userType, formData, setError: se })} {error && setError(null)} error />} {/*Adding Save As Draft Button */} - {/* */} + />

: } {(window.location.href.includes("/bpa/building_plan_scrutiny/new_construction") || window.location.href.includes("/ocbpa/building_oc_plan_scrutiny/new_construction")) && formData?.applicationNo ? : ""} @@ -422,13 +422,21 @@ const SelectDocument = React.memo(function MyComponent({ const allowedFileTypes = /(.*?)(jpg|jpeg|png|image|pdf)$/i; - const uploadedFilesPreFill = useMemo(()=>{ - let selectedUplDocs=[]; - formData?.documents?.documents?.filter((ob) => ob.documentType === selectedDocument.code).forEach(e => - selectedUplDocs.push([e.fileName, {file: {name: e.fileName, type: e.documentType}, fileStoreId: {fileStoreId: e.fileStoreId, tenantId}}]) - ) + const uploadedFilesPreFill = useMemo(() => { + if (!formData) return []; + const docs = formData.documents?.documents || formData.documents || []; + const selectedUplDocs = docs + .filter(ob => ob.documentType === selectedDocument.code) + .map(e => [ + e.fileName, + { + file: { name: e.fileName, type: e.documentType }, + fileStoreId: { fileStoreId: e.fileStoreId, tenantId }, + }, + ]); return selectedUplDocs; - },[formData]) + }, [formData, selectedDocument.code, tenantId]); + return ( diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 53da490dad2..7c0cabc3249 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -29,7 +29,7 @@ "@upyog/digit-ui-module-hrms": "1.7.0-beta.3", "@upyog/digit-ui-module-mcollect": "1.7.0-beta.4", "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4", - "@upyog/digit-ui-module-obps": "1.7.0-beta.17", + "@upyog/digit-ui-module-obps": "1.7.0-beta.20", "@upyog/digit-ui-module-noc": "1.7.0-beta.3", "@upyog/digit-ui-module-pgr": "1.7.0-beta.6", "@upyog/digit-ui-module-pt": "1.7.0-beta.4",