From a0a35d9be91d6002935d03dc6c5bf7616f262328 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Sat, 21 Sep 2024 12:40:21 +0530 Subject: [PATCH 01/21] published PT, DSS and WS module --- .../micro-ui-internals/example/package.json | 4 +- .../web/micro-ui-internals/package.json | 2 +- .../packages/modules/dss/package.json | 2 +- .../modules/dss/src/components/CustomTable.js | 109 ++++++++++++------ .../packages/modules/pt/package.json | 2 +- .../packages/modules/ws/package.json | 2 +- frontend/micro-ui/web/package.json | 6 +- 7 files changed, 85 insertions(+), 42 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 475dcda5641..5328a584948 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -17,10 +17,10 @@ "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-obps": "1.8.3", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.4", + "@upyog/digit-ui-module-pt": "1.8.5", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.4", + "@upyog/digit-ui-module-ws": "1.8.5", "@upyog/digit-ui-module-commonpt": "1.8.0", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 5c7ea547ef1..88249ce75c5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -53,7 +53,7 @@ "buildD:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", - "build:dss": "cd packages/modules/dss && yarn build", + "buildD: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", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json index 90950ed3f54..7c8e6269e5b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-dss", - "version": "1.8.1", + "version": "1.8.2", "license": "MIT", "description": "Digit Dashboard Module", "main": "dist/index.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js index 98acb4dec23..4f5d0af9d23 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js @@ -79,12 +79,13 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, return response?.responseData?.data?.map((rows, id) => { const lyData = lastYearResponse?.responseData?.data?.find((lyRow) => lyRow?.headerName === rows?.headerName); return rows?.plots?.reduce((acc, row, currentIndex) => { - let cellValue = row?.value !== null ? row?.value : row?.label || ""; + let cellValue = row?.value !== null ? row?.value : row?.label || 0; if (row?.strValue && row?.symbol === "string" && !row?.label) { cellValue = row?.strValue; } let prevData = lyData?.plots?.[currentIndex]?.value; let insight = null; + console.log("cellValuecellValue",cellValue) //Commented since it was causing mismatch data for the Capacity FSM: SM-1282 // if (row?.name === "CapacityUtilization" && chartKey !== "fsmVehicleLogReportByVehicleNo") { // const { range } = value; @@ -105,6 +106,7 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, // prevData = calculateFSTPCapacityUtilization(prevData, tankCapcity?.value); // } + console.log("ddddddddd",row) if ( (row?.symbol === "number" || row?.symbol === "percentage" || row?.symbol === "amount") && row?.name !== "CitizenAverageRating" && @@ -123,21 +125,60 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, acc[t(`DSS_HEADER_${Digit.Utils.locale.getTransformedLocale(row?.name)}`)] = insight !== null ? { value: cellValue, insight } : row?.name === "S.N." ? id + 1 : cellValue; acc["key"] = rows?.headerName; + console.log("accacc",acc) return acc; }, {}); }); }, [response, lastYearResponse]); + function addMissingFinancialYears(data) { + // Get the current year and calculate the last three financial years dynamically + const currentYear = new Date().getFullYear(); + const lastThreeYears = [ + `${currentYear - 1}-${currentYear}`, // 2023-2024 + `${currentYear - 2}-${currentYear - 1}`, // 2022-2023 + `${currentYear }-${currentYear + 1}` // 2021-2022 + ]; + // Iterate over the data array + data.forEach(item => { + lastThreeYears.forEach(year => { + // Check if the year is missing in the object, if so, add it with value 0 + if (!item[year]) { + item[year] = 0; + } + }); + }); + return data; +} useEffect(() => { if (tableData) { - const result = tableData?.map((row) => { - return Object.keys(row).reduce((acc, key) => { - if (key === "key") return acc; - acc[key] = typeof row?.[key] === "object" ? row?.[key]?.value : row?.[key]; - return acc; - }, {}); - }); - setChartData(result); + if(window.location.href.includes("national-propertytax") && tableData?.[0]?.State =="Jharkhand") + { + const updatedData = addMissingFinancialYears(tableData); + + console.log("updatedData",updatedData) + const result = updatedData?.map((row) => { + console.log("tableDatatableData",tableData) + return Object.keys(row).reduce((acc, key) => { + if (key === "key") return acc; + acc[key] = typeof row?.[key] === "object" ? row?.[key]?.value : row?.[key]; + return acc; + }, {}); + }); + setChartData(result); + } + else { + const result = tableData?.map((row) => { + console.log("tableDatatableData",tableData) + return Object.keys(row).reduce((acc, key) => { + if (key === "key") return acc; + acc[key] = typeof row?.[key] === "object" ? row?.[key]?.value : row?.[key]; + return acc; + }, {}); + }); + setChartData(result); + } + } else { const result = []; setChartData(result); @@ -305,13 +346,7 @@ if(chartKey == "xptFyByStatesv3") "strValue": null, "symbol": "text" }, - { - "label": null, - "name": "2021-22", - "value": "", - "strValue": null, - "symbol": "number" - }, + { "label": null, "name": "2022-23", @@ -325,7 +360,14 @@ if(chartKey == "xptFyByStatesv3") "value": "", "strValue": null, "symbol": "number" - } + }, + { + "label": null, + "name": "2024-25", + "value": "", + "strValue": null, + "symbol": "number" + } ] } @@ -351,13 +393,7 @@ if(chartKey == "xptFyByStatesv3") "strValue": null, "symbol": "text" }, - { - "label": null, - "name": "2021-22", - "value": "", - "strValue": null, - "symbol": "number" - }, + { "label": null, "name": "2022-23", @@ -371,7 +407,14 @@ if(chartKey == "xptFyByStatesv3") "value": "", "strValue": null, "symbol": "number" - } + }, + { + "label": null, + "name": "2024-25", + "value": "", + "strValue": null, + "symbol": "number" + } ] } } @@ -397,13 +440,6 @@ else if (chartKey == "xptFyByWardv3") "strValue": null, "symbol": "text" }, - { - "label": null, - "name": "2021-22", - "value": "", - "strValue": null, - "symbol": "number" - }, { "label": null, "name": "2022-23", @@ -417,7 +453,14 @@ else if (chartKey == "xptFyByWardv3") "value": "", "strValue": null, "symbol": "number" - } + }, + { + "label": null, + "name": "2024-25", + "value": "", + "strValue": null, + "symbol": "number" + }, ] } } 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 eefbe0825fe..f3f4174c285 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.8.4", + "version": "1.8.5", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json index 957866fc27a..f913072994e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-ws", - "version": "1.8.4", + "version": "1.8.5", "description": "", "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 56c044a7656..5a61a4ba870 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -17,7 +17,7 @@ "@upyog/digit-ui-module-common": "1.8.0", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.1", + "@upyog/digit-ui-module-dss": "1.8.2", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", @@ -25,10 +25,10 @@ "@upyog/digit-ui-module-obps": "1.8.3", "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.4", + "@upyog/digit-ui-module-pt": "1.8.5", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.4", + "@upyog/digit-ui-module-ws": "1.8.5", "@upyog/digit-ui-react-components": "1.8.0", "babel-loader": "8.1.0", "react": "17.0.2", From 2db4fa4d80d5f43c6c7658a753d7d2d6d46cc7e7 Mon Sep 17 00:00:00 2001 From: Deepa Date: Mon, 23 Sep 2024 06:31:25 +0000 Subject: [PATCH 02/21] Added property Id in edcr files --- .../org/egov/edcr/contract/ComparisonRequest.java | 12 +++++++++++- .../org/egov/edcr/entity/EdcrApplicationDetail.java | 12 +++++++++++- .../org/egov/edcr/entity/OcComparisonDetail.java | 11 +++++++++++ .../egov/edcr/service/OcComparisonReportService.java | 4 +++- .../org/egov/edcr/service/OcComparisonService.java | 2 ++ 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/contract/ComparisonRequest.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/contract/ComparisonRequest.java index b50b44d1a2c..828969f9d99 100644 --- a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/contract/ComparisonRequest.java +++ b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/contract/ComparisonRequest.java @@ -64,8 +64,18 @@ public class ComparisonRequest { private String ocdcrNumber; private String tenantId; + + private String propertyId; - public RequestInfo getRequestInfo() { + public String getPropertyId() { + return propertyId; + } + + public void setPropertyId(String propertyId) { + this.propertyId = propertyId; + } + + public RequestInfo getRequestInfo() { return requestInfo; } diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/EdcrApplicationDetail.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/EdcrApplicationDetail.java index 12fea844425..89e414be7a8 100644 --- a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/EdcrApplicationDetail.java +++ b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/EdcrApplicationDetail.java @@ -118,8 +118,18 @@ public class EdcrApplicationDetail extends AbstractAuditable { @SafeHtml private String tenantId; + + public String propertyId; - @Override + public String getPropertyId() { + return propertyId; + } + + public void setPropertyId(String propertyId) { + this.propertyId = propertyId; + } + + @Override public Long getId() { return id; } diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/OcComparisonDetail.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/OcComparisonDetail.java index a85b924448a..c9a66546c54 100644 --- a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/OcComparisonDetail.java +++ b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/OcComparisonDetail.java @@ -83,6 +83,8 @@ public class OcComparisonDetail extends AbstractAuditable { private String status; private String tenantId; + + private String propertyId; @Transient private InputStream output; @@ -92,6 +94,7 @@ public class OcComparisonDetail extends AbstractAuditable { @Transient private EdcrApplicationDetail permitDcr; + @Override public Long getId() { @@ -170,5 +173,13 @@ public EdcrApplicationDetail getPermitDcr() { public void setPermitDcr(EdcrApplicationDetail permitDcr) { this.permitDcr = permitDcr; } + public String getPropertyId() { + return propertyId; + } + + public void setPropertyId(String propertyId) { + this.propertyId = propertyId; + + } } diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonReportService.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonReportService.java index 35aca6ce64f..ebe8cfcfa02 100644 --- a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonReportService.java +++ b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonReportService.java @@ -140,7 +140,8 @@ public InputStream generateOcComparisonReport(EdcrApplicationDetail ocDcr, valuesMap.put("applicationDate", applicationDate); valuesMap.put("applicantName", ocDcr.getApplication().getApplicantName()); valuesMap.put("reportGeneratedDate", DateUtils.toDefaultDateTimeFormat(new Date())); - + valuesMap.put("propertyId", comparisonDetail.getPropertyId()); + String imageURL = ReportUtil.getImageURL("/egi/resources/global/images/digit-logo-black.png"); valuesMap.put("egovLogo", imageURL); valuesMap.put("cityLogo", cityService.getCityLogoURLByCurrentTenant()); @@ -292,6 +293,7 @@ public InputStream generatePreOcComparisonReport(EdcrApplicationDetail ocDcr, valuesMap.put("applicationDate", applicationDate); valuesMap.put("applicantName", ocDcr.getApplication().getApplicantName()); valuesMap.put("reportGeneratedDate", DateUtils.toDefaultDateTimeFormat(new Date())); + valuesMap.put("propertyId", comparisonDetail.getPropertyId()); String imageURL = ReportUtil.getImageURL("/egi/resources/global/images/digit-logo-black.png"); valuesMap.put("egovLogo", imageURL); valuesMap.put("cityLogo", cityService.getCityLogoURLByCurrentTenant()); diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonService.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonService.java index f5853c2194d..227e57b72f0 100644 --- a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonService.java +++ b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonService.java @@ -64,6 +64,7 @@ public ComparisonDetail process(ComparisonRequest comparisonRequest) { String ocdcrNo = comparisonRequest.getOcdcrNumber(); String dcrNo = comparisonRequest.getEdcrNumber(); String tenantId = comparisonRequest.getTenantId(); + String propertyId = comparisonRequest.getPropertyId(); ComparisonDetail comparisonDetail = new ComparisonDetail(); OcComparisonDetail ocComparisonDetail = ocComparisonDetailService.findByOcDcrNoAndDcrNumberAndTenant(ocdcrNo, dcrNo, @@ -99,6 +100,7 @@ public ComparisonDetail process(ComparisonRequest comparisonRequest) { ocComparisonDetailE.setOcdcrNumber(ocdcrNo); ocComparisonDetailE.setDcrNumber(dcrNo); ocComparisonDetailE.setTenantId(tenantId); + ocComparisonDetailE.setPropertyId(propertyId); InputStream ocreportStream = generateOcComparisonReport(applicationDate, amd, ocDcr, permitDcr, ocComparisonDetailE); From 10a23b95a22dc9848e6a242c0260fad04bf34752 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 11:25:04 +0530 Subject: [PATCH 03/21] added D in dss chanhges --- frontend/micro-ui/web/micro-ui-internals/package.json | 2 +- 1 file changed, 1 insertion(+), 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 88249ce75c5..5c7ea547ef1 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -53,7 +53,7 @@ "buildD:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", - "buildD:dss": "cd packages/modules/dss && yarn build", + "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", From 97774fe7b111c650fa9e6f41138bb9c0f95e7325 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 14:55:53 +0530 Subject: [PATCH 04/21] added published DSS --- frontend/micro-ui/web/docker/Dockerfile | 2 +- frontend/micro-ui/web/micro-ui-internals/example/package.json | 1 + .../web/micro-ui-internals/packages/modules/dss/package.json | 2 +- frontend/micro-ui/web/package.json | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 1cdc89bc5f7..7c6e35eaf25 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -6,7 +6,7 @@ RUN yarn add @upyog/digit-ui-libraries RUN yarn add @upyog/digit-ui-module-pt RUN yarn add @upyog/digit-ui-module-fsm RUN yarn add @upyog/digit-ui-module-tl -RUN yarn add @upyog/digit-ui-module-dss +RUN yarn add @upyog/digit-ui-module-dss@1.8.3 RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr RUN yarn add @upyog/digit-ui-module-noc 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 5328a584948..bae58fe879d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -21,6 +21,7 @@ "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", "@upyog/digit-ui-module-ws": "1.8.5", + "@upyog/digit-ui-module-dss":"1.8.3", "@upyog/digit-ui-module-commonpt": "1.8.0", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json index 7c8e6269e5b..a88a469dfc8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-dss", - "version": "1.8.2", + "version": "1.8.3", "license": "MIT", "description": "Digit Dashboard Module", "main": "dist/index.js", diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 5a61a4ba870..2cee264e218 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -17,7 +17,7 @@ "@upyog/digit-ui-module-common": "1.8.0", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.2", + "@upyog/digit-ui-module-dss": "1.8.3", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", From 60dd8d02094854edb1ab2d22a95e6ef5f12311dc Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 17:14:04 +0530 Subject: [PATCH 05/21] published DSS changes --- frontend/micro-ui/web/docker/Dockerfile | 2 +- .../micro-ui-internals/example/package.json | 2 +- .../packages/modules/dss/package.json | 2 +- .../modules/dss/src/components/CustomTable.js | 45 ++++++++++--------- frontend/micro-ui/web/package.json | 2 +- 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 7c6e35eaf25..1cdc89bc5f7 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -6,7 +6,7 @@ RUN yarn add @upyog/digit-ui-libraries RUN yarn add @upyog/digit-ui-module-pt RUN yarn add @upyog/digit-ui-module-fsm RUN yarn add @upyog/digit-ui-module-tl -RUN yarn add @upyog/digit-ui-module-dss@1.8.3 +RUN yarn add @upyog/digit-ui-module-dss RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr RUN yarn add @upyog/digit-ui-module-noc 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 bae58fe879d..d023b153429 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -21,7 +21,7 @@ "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", "@upyog/digit-ui-module-ws": "1.8.5", - "@upyog/digit-ui-module-dss":"1.8.3", + "@upyog/digit-ui-module-dss":"1.8.4", "@upyog/digit-ui-module-commonpt": "1.8.0", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json index a88a469dfc8..2a5bcdc5974 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-dss", - "version": "1.8.3", + "version": "1.8.4", "license": "MIT", "description": "Digit Dashboard Module", "main": "dist/index.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js index 4f5d0af9d23..cd02e53c98a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/src/components/CustomTable.js @@ -68,6 +68,28 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, addlFilter: filterStack[filterStack.length - 1]?.addlFilter, moduleLevel: value?.moduleLevel || moduleCode, }); + const addMissingFinancialYears = (data) => { + // Get the current year and calculate the last three financial years dynamically + const currentYear = new Date().getFullYear(); + const lastThreeYears = [ + `${currentYear - 1}-${currentYear}`, // 2023-2024 + `${currentYear - 2}-${currentYear - 1}`, // 2022-2023 + `${currentYear}-${currentYear + 1}` // 2024-2025 + ]; + + // Iterate over the data array + data.forEach(item => { + lastThreeYears.forEach(year => { + // Check if the year is missing in the object, if so, add it with value 0 + if (!item[year]) { + item[year] = 0; + } + }); + }); + + return data; +}; + useEffect(() => { const { id } = data; setChartKey(id); @@ -85,7 +107,6 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, } let prevData = lyData?.plots?.[currentIndex]?.value; let insight = null; - console.log("cellValuecellValue",cellValue) //Commented since it was causing mismatch data for the Capacity FSM: SM-1282 // if (row?.name === "CapacityUtilization" && chartKey !== "fsmVehicleLogReportByVehicleNo") { // const { range } = value; @@ -106,7 +127,6 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, // prevData = calculateFSTPCapacityUtilization(prevData, tankCapcity?.value); // } - console.log("ddddddddd",row) if ( (row?.symbol === "number" || row?.symbol === "percentage" || row?.symbol === "amount") && row?.name !== "CitizenAverageRating" && @@ -130,26 +150,8 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, }, {}); }); }, [response, lastYearResponse]); - function addMissingFinancialYears(data) { - // Get the current year and calculate the last three financial years dynamically - const currentYear = new Date().getFullYear(); - const lastThreeYears = [ - `${currentYear - 1}-${currentYear}`, // 2023-2024 - `${currentYear - 2}-${currentYear - 1}`, // 2022-2023 - `${currentYear }-${currentYear + 1}` // 2021-2022 - ]; - // Iterate over the data array - data.forEach(item => { - lastThreeYears.forEach(year => { - // Check if the year is missing in the object, if so, add it with value 0 - if (!item[year]) { - item[year] = 0; - } - }); - }); + - return data; -} useEffect(() => { if (tableData) { if(window.location.href.includes("national-propertytax") && tableData?.[0]?.State =="Jharkhand") @@ -185,6 +187,7 @@ const CustomTable = ({ data = {}, onSearch, setChartData, setChartDenomination, } }, [tableData]); + const filterValue = useCallback((rows, id, filterValue = "") => { return rows.filter((row) => { const res = Object.keys(row?.values).find((key) => { diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 2cee264e218..811bdaa1a25 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -17,7 +17,7 @@ "@upyog/digit-ui-module-common": "1.8.0", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.3", + "@upyog/digit-ui-module-dss": "1.8.4", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", From aa2cae09be1cc796185b0b0284e08e28a4ee63fd Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 18:12:18 +0530 Subject: [PATCH 06/21] Added D in the package.json --- frontend/micro-ui/web/micro-ui-internals/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 5c7ea547ef1..764f422e75b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -8,7 +8,6 @@ "example", "packages/react-components", "packages/modules/*" - ], "license": "MIT", "private": true, @@ -53,7 +52,7 @@ "buildD:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", - "build:dss": "cd packages/modules/dss && yarn build", + "buildD: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", @@ -61,7 +60,7 @@ "buildD:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", "buildD:noc": "cd packages/modules/noc && yarn build", - "build:ws": "cd packages/modules/ws && yarn build", + "buildD:ws": "cd packages/modules/ws && yarn build", "buildD:bills": "cd packages/modules/bills && yarn build", "buildR:reports": "cd packages/modules/reports && yarn build", "deploy:jenkins": "./scripts/jenkins.sh" From 988e789e5a9eb306f25b96b46f491f4301a78639 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 20:31:13 +0530 Subject: [PATCH 07/21] added modules in package.json --- .../web/micro-ui-internals/package.json | 19 ++++++++++++------- frontend/micro-ui/web/package.json | 8 +++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 764f422e75b..ec26baaa32c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -7,7 +7,12 @@ "packages/css", "example", "packages/react-components", - "packages/modules/*" + "packages/modules/pt", + "packages/modules/tl", + "packages/modules/ws", + "packages/modules/dss", + "packages/modules/common", + "packages/modules/core" ], "license": "MIT", "private": true, @@ -45,22 +50,22 @@ "build": "run-p build:**", "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", - "buildD:common": "cd packages/modules/common && yarn build", - "buildD:pt": "cd packages/modules/pt && yarn build", + "build:common": "cd packages/modules/common && yarn build", + "build:pt": "cd packages/modules/pt && yarn build", "build:ptr": "cd packages/modules/ptr && yarn build", "buildD:commonPt": "cd packages/modules/commonPt && yarn build", - "buildD:core": "cd packages/modules/core && yarn build", + "build:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", - "buildD:dss": "cd packages/modules/dss && yarn build", + "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:hrms": "cd packages/modules/hrms && yarn build", "buildD:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", "buildD:noc": "cd packages/modules/noc && yarn build", - "buildD:ws": "cd packages/modules/ws && yarn build", + "build:ws": "cd packages/modules/ws && yarn build", "buildD:bills": "cd packages/modules/bills && yarn build", "buildR:reports": "cd packages/modules/reports && yarn build", "deploy:jenkins": "./scripts/jenkins.sh" diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 811bdaa1a25..77b8f41331c 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -5,7 +5,13 @@ "homepage": "/digit-ui", "workspaces": [ "micro-ui-internals/packages/libraries", - "micro-ui-internals/packages/react-components" + "micro-ui-internals/packages/react-components", + "micro-ui-internals/packages/pt", + "micro-ui-internals/packages/tl", + "micro-ui-internals/packages/ws", + "micro-ui-internals/packages/dss", + "micro-ui-internals/packages/common", + "micro-ui-internals/packages/core" ], "engines": { "node": ">=14" From 5238434b62f8802fc75f2b13cea9cb4801e2f234 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 21:30:06 +0530 Subject: [PATCH 08/21] added DSS in package.json --- frontend/micro-ui/web/micro-ui-internals/package.json | 3 +-- frontend/micro-ui/web/package.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index ec26baaa32c..3595eecb2aa 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -10,7 +10,6 @@ "packages/modules/pt", "packages/modules/tl", "packages/modules/ws", - "packages/modules/dss", "packages/modules/common", "packages/modules/core" ], @@ -57,7 +56,7 @@ "build:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", - "build:dss": "cd packages/modules/dss && yarn build", + "buildD: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", diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 77b8f41331c..e3fb895ea9e 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -9,7 +9,6 @@ "micro-ui-internals/packages/pt", "micro-ui-internals/packages/tl", "micro-ui-internals/packages/ws", - "micro-ui-internals/packages/dss", "micro-ui-internals/packages/common", "micro-ui-internals/packages/core" ], From b256aed8e4f383c71caf7725ace179825fafe6ff Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 22:15:59 +0530 Subject: [PATCH 09/21] added module in package --- frontend/micro-ui/web/docker/Dockerfile | 6 +++--- .../micro-ui-internals/example/package.json | 7 +++---- .../web/micro-ui-internals/package.json | 19 ++++++++----------- frontend/micro-ui/web/package.json | 15 +++++---------- 4 files changed, 19 insertions(+), 28 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 1cdc89bc5f7..391b28b0ca8 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -3,10 +3,10 @@ FROM upyogio/alpine-node-builder-14:yarn AS build RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 RUN yarn add @upyog/digit-ui-libraries -RUN yarn add @upyog/digit-ui-module-pt +RUN yarn add @upyog/digit-ui-module-pt@1.8.4 RUN yarn add @upyog/digit-ui-module-fsm RUN yarn add @upyog/digit-ui-module-tl -RUN yarn add @upyog/digit-ui-module-dss +RUN yarn add @upyog/digit-ui-module-dss@1.8.1 RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr RUN yarn add @upyog/digit-ui-module-noc @@ -15,7 +15,7 @@ RUN yarn add @upyog/digit-ui-module-hrms RUN yarn add @upyog/digit-ui-module-core RUN yarn add @upyog/digit-ui-module-obps RUN yarn add @upyog/digit-ui-module-common -RUN yarn add @upyog/digit-ui-module-ws +RUN yarn add @upyog/digit-ui-module-ws@1.8.4 RUN yarn add @upyog/digit-ui-module-commonpt RUN yarn add @upyog/digit-ui-module-bills 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 d023b153429..8589ec91aac 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -17,11 +17,10 @@ "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-obps": "1.8.3", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.5", + "@upyog/digit-ui-module-pt": "1.8.4", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.5", - "@upyog/digit-ui-module-dss":"1.8.4", + "@upyog/digit-ui-module-ws": "1.8.4", "@upyog/digit-ui-module-commonpt": "1.8.0", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", @@ -35,4 +34,4 @@ "not dead", "not op_mini all" ] -} +} \ No newline at end of file diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 3595eecb2aa..d7ce0518cef 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -7,11 +7,8 @@ "packages/css", "example", "packages/react-components", - "packages/modules/pt", - "packages/modules/tl", - "packages/modules/ws", - "packages/modules/common", - "packages/modules/core" + "packages/modules/*" + ], "license": "MIT", "private": true, @@ -49,17 +46,17 @@ "build": "run-p build:**", "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", - "build:common": "cd packages/modules/common && yarn build", - "build:pt": "cd packages/modules/pt && yarn build", + "buildD:common": "cd packages/modules/common && yarn build", + "buildD:pt": "cd packages/modules/pt && yarn build", "build:ptr": "cd packages/modules/ptr && yarn build", "buildD:commonPt": "cd packages/modules/commonPt && yarn build", - "build:core": "cd packages/modules/core && yarn build", + "buildD:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", - "buildD:dss": "cd packages/modules/dss && yarn build", + "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:hrms": "cd packages/modules/hrms && yarn build", "buildD:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", @@ -89,4 +86,4 @@ "**/@babel/preset-env": "7.14.0", "**/@babel/plugin-transform-modules-commonjs": "7.14.0" } -} +} \ No newline at end of file diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index e3fb895ea9e..67a3ae35412 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -5,12 +5,7 @@ "homepage": "/digit-ui", "workspaces": [ "micro-ui-internals/packages/libraries", - "micro-ui-internals/packages/react-components", - "micro-ui-internals/packages/pt", - "micro-ui-internals/packages/tl", - "micro-ui-internals/packages/ws", - "micro-ui-internals/packages/common", - "micro-ui-internals/packages/core" + "micro-ui-internals/packages/react-components" ], "engines": { "node": ">=14" @@ -22,7 +17,7 @@ "@upyog/digit-ui-module-common": "1.8.0", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.4", + "@upyog/digit-ui-module-dss": "1.8.1", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", @@ -30,10 +25,10 @@ "@upyog/digit-ui-module-obps": "1.8.3", "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.5", + "@upyog/digit-ui-module-pt": "1.8.4", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.5", + "@upyog/digit-ui-module-ws": "1.8.4", "@upyog/digit-ui-react-components": "1.8.0", "babel-loader": "8.1.0", "react": "17.0.2", @@ -69,4 +64,4 @@ "not dead", "not op_mini all" ] -} +} \ No newline at end of file From 0ecdc4ae5a8ede9bcc2bfe26732ebe935a6d8836 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 22:35:29 +0530 Subject: [PATCH 10/21] added module in workspace --- frontend/micro-ui/web/docker/Dockerfile | 6 +++--- .../micro-ui-internals/example/package.json | 2 +- .../web/micro-ui-internals/package.json | 21 ++++++++++++------- frontend/micro-ui/web/package.json | 14 ++++++++++--- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 391b28b0ca8..1cdc89bc5f7 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -3,10 +3,10 @@ FROM upyogio/alpine-node-builder-14:yarn AS build RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 RUN yarn add @upyog/digit-ui-libraries -RUN yarn add @upyog/digit-ui-module-pt@1.8.4 +RUN yarn add @upyog/digit-ui-module-pt RUN yarn add @upyog/digit-ui-module-fsm RUN yarn add @upyog/digit-ui-module-tl -RUN yarn add @upyog/digit-ui-module-dss@1.8.1 +RUN yarn add @upyog/digit-ui-module-dss RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr RUN yarn add @upyog/digit-ui-module-noc @@ -15,7 +15,7 @@ RUN yarn add @upyog/digit-ui-module-hrms RUN yarn add @upyog/digit-ui-module-core RUN yarn add @upyog/digit-ui-module-obps RUN yarn add @upyog/digit-ui-module-common -RUN yarn add @upyog/digit-ui-module-ws@1.8.4 +RUN yarn add @upyog/digit-ui-module-ws RUN yarn add @upyog/digit-ui-module-commonpt RUN yarn add @upyog/digit-ui-module-bills 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 8589ec91aac..f44b8ae946b 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.8.0", "@upyog/digit-ui-module-obps": "1.8.3", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.4", + "@upyog/digit-ui-module-pt": "1.8.5", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", "@upyog/digit-ui-module-ws": "1.8.4", diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index d7ce0518cef..29ff9c26afc 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -7,7 +7,14 @@ "packages/css", "example", "packages/react-components", - "packages/modules/*" + "packages/modules/core", + "packages/modules/common", + "packages/modules/pt", + "packages/modules/dss", + "packages/modules/tl", + "packages/modules/ws", + "packages/modules/obps", + "packages/modules/fsm" ], "license": "MIT", @@ -46,19 +53,19 @@ "build": "run-p build:**", "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", - "buildD:common": "cd packages/modules/common && yarn build", - "buildD:pt": "cd packages/modules/pt && yarn build", + "build:common": "cd packages/modules/common && yarn build", + "build:pt": "cd packages/modules/pt && yarn build", "build:ptr": "cd packages/modules/ptr && yarn build", "buildD:commonPt": "cd packages/modules/commonPt && yarn build", - "buildD:core": "cd packages/modules/core && yarn build", + "build:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", - "buildD:fsm": "cd packages/modules/fsm && yarn build", + "build:fsm": "cd packages/modules/fsm && yarn build", "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:hrms": "cd packages/modules/hrms && yarn build", - "buildD:obps": "cd packages/modules/obps && yarn build", + "build:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", "buildD:noc": "cd packages/modules/noc && yarn build", "build:ws": "cd packages/modules/ws && yarn build", diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 67a3ae35412..c1b8103492a 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -5,7 +5,15 @@ "homepage": "/digit-ui", "workspaces": [ "micro-ui-internals/packages/libraries", - "micro-ui-internals/packages/react-components" + "micro-ui-internals/packages/react-components", + "micro-ui-internals/packages/common", + "micro-ui-internals/packages/core", + "micro-ui-internals/packages/pt", + "micro-ui-internals/packages/tl", + "micro-ui-internals/packages/dss", + "micro-ui-internals/packages/obps", + "micro-ui-internals/packages/ws", + "micro-ui-internals/packages/fsm" ], "engines": { "node": ">=14" @@ -17,7 +25,7 @@ "@upyog/digit-ui-module-common": "1.8.0", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.1", + "@upyog/digit-ui-module-dss": "1.8.4", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", @@ -25,7 +33,7 @@ "@upyog/digit-ui-module-obps": "1.8.3", "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.4", + "@upyog/digit-ui-module-pt": "1.8.5", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", "@upyog/digit-ui-module-ws": "1.8.4", From 5b1259c35b705419bdd9afb743f8e0a86b9bbef5 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Tue, 24 Sep 2024 23:18:01 +0530 Subject: [PATCH 11/21] published the ws changes --- frontend/micro-ui/web/micro-ui-internals/example/package.json | 2 +- .../packages/libraries/src/services/atoms/Download.js | 2 +- .../web/micro-ui-internals/packages/modules/ws/package.json | 4 ++-- frontend/micro-ui/web/package.json | 2 +- 4 files changed, 5 insertions(+), 5 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 f44b8ae946b..00265afdc51 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-pt": "1.8.5", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.4", + "@upyog/digit-ui-module-ws": "1.8.6", "@upyog/digit-ui-module-commonpt": "1.8.0", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js index c256ff4e889..2fbd3622956 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js @@ -1,7 +1,7 @@ import ReactDOM from "react-dom"; import html2canvas from "html2canvas"; import jsPDF from "jspdf"; -import XLSX from "xlsx"; +import * as XLSX from 'xlsx'; import domtoimage from "dom-to-image"; const changeClasses=(class1,class2)=>{ diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json index f913072994e..a93e9000855 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-ws", - "version": "1.8.5", + "version": "1.8.6", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -26,7 +26,7 @@ "react-i18next": "11.16.2", "react-query": "3.6.1", "react-router-dom": "5.3.0", - "xlsx": "^0.18.5" + "xlsx": "0.17.5" }, "author": "", "license": "MIT" diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index c1b8103492a..d65e5be2f39 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -36,7 +36,7 @@ "@upyog/digit-ui-module-pt": "1.8.5", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.4", + "@upyog/digit-ui-module-ws": "1.8.6", "@upyog/digit-ui-react-components": "1.8.0", "babel-loader": "8.1.0", "react": "17.0.2", From b9adfe13c03056617bd9ad5540c5a08d0ec15863 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 25 Sep 2024 00:29:49 +0530 Subject: [PATCH 12/21] added older version of module --- frontend/micro-ui/web/docker/Dockerfile | 8 +++---- .../micro-ui-internals/example/package.json | 6 +++--- .../example/public/index.html | 2 +- .../web/micro-ui-internals/package.json | 21 +++++++------------ frontend/micro-ui/web/package.json | 18 +++++----------- frontend/micro-ui/web/public/index.html | 2 +- 6 files changed, 21 insertions(+), 36 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 1cdc89bc5f7..0e408a13e65 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -3,19 +3,19 @@ FROM upyogio/alpine-node-builder-14:yarn AS build RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 RUN yarn add @upyog/digit-ui-libraries -RUN yarn add @upyog/digit-ui-module-pt +RUN yarn add @upyog/digit-ui-module-pt@1.8.3 RUN yarn add @upyog/digit-ui-module-fsm RUN yarn add @upyog/digit-ui-module-tl -RUN yarn add @upyog/digit-ui-module-dss +RUN yarn add @upyog/digit-ui-module-dss@1.8.2 RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr RUN yarn add @upyog/digit-ui-module-noc RUN yarn add @upyog/digit-ui-module-engagement RUN yarn add @upyog/digit-ui-module-hrms RUN yarn add @upyog/digit-ui-module-core -RUN yarn add @upyog/digit-ui-module-obps +RUN yarn add @upyog/digit-ui-module-obps@1.8.2 RUN yarn add @upyog/digit-ui-module-common -RUN yarn add @upyog/digit-ui-module-ws +RUN yarn add @upyog/digit-ui-module-ws@1.8.4 RUN yarn add @upyog/digit-ui-module-commonpt RUN yarn add @upyog/digit-ui-module-bills 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 00265afdc51..48cc1a09273 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -15,12 +15,12 @@ "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-mcollect": "1.8.0", "@upyog/digit-ui-module-noc": "1.8.0", - "@upyog/digit-ui-module-obps": "1.8.3", + "@upyog/digit-ui-module-obps": "1.8.2", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.5", + "@upyog/digit-ui-module-pt": "1.8.3", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.6", + "@upyog/digit-ui-module-ws": "1.8.4", "@upyog/digit-ui-module-commonpt": "1.8.0", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html index af791798c82..49edba7b9cb 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html +++ b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html @@ -10,7 +10,7 @@ - + diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 29ff9c26afc..d7ce0518cef 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -7,14 +7,7 @@ "packages/css", "example", "packages/react-components", - "packages/modules/core", - "packages/modules/common", - "packages/modules/pt", - "packages/modules/dss", - "packages/modules/tl", - "packages/modules/ws", - "packages/modules/obps", - "packages/modules/fsm" + "packages/modules/*" ], "license": "MIT", @@ -53,19 +46,19 @@ "build": "run-p build:**", "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", - "build:common": "cd packages/modules/common && yarn build", - "build:pt": "cd packages/modules/pt && yarn build", + "buildD:common": "cd packages/modules/common && yarn build", + "buildD:pt": "cd packages/modules/pt && yarn build", "build:ptr": "cd packages/modules/ptr && yarn build", "buildD:commonPt": "cd packages/modules/commonPt && yarn build", - "build:core": "cd packages/modules/core && yarn build", + "buildD:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", - "build:fsm": "cd packages/modules/fsm && yarn build", + "buildD:fsm": "cd packages/modules/fsm && yarn build", "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:hrms": "cd packages/modules/hrms && yarn build", - "build:obps": "cd packages/modules/obps && yarn build", + "buildD:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", "buildD:noc": "cd packages/modules/noc && yarn build", "build:ws": "cd packages/modules/ws && yarn build", diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index d65e5be2f39..809ba77e6aa 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -5,15 +5,7 @@ "homepage": "/digit-ui", "workspaces": [ "micro-ui-internals/packages/libraries", - "micro-ui-internals/packages/react-components", - "micro-ui-internals/packages/common", - "micro-ui-internals/packages/core", - "micro-ui-internals/packages/pt", - "micro-ui-internals/packages/tl", - "micro-ui-internals/packages/dss", - "micro-ui-internals/packages/obps", - "micro-ui-internals/packages/ws", - "micro-ui-internals/packages/fsm" + "micro-ui-internals/packages/react-components" ], "engines": { "node": ">=14" @@ -25,18 +17,18 @@ "@upyog/digit-ui-module-common": "1.8.0", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.4", + "@upyog/digit-ui-module-dss": "1.8.1", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", "@upyog/digit-ui-module-commonpt":"1.8.0", - "@upyog/digit-ui-module-obps": "1.8.3", + "@upyog/digit-ui-module-obps": "1.8.2", "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.5", + "@upyog/digit-ui-module-pt": "1.8.3", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.6", + "@upyog/digit-ui-module-ws": "1.8.4", "@upyog/digit-ui-react-components": "1.8.0", "babel-loader": "8.1.0", "react": "17.0.2", diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html index 355bbab5ab1..373919f7ddb 100644 --- a/frontend/micro-ui/web/public/index.html +++ b/frontend/micro-ui/web/public/index.html @@ -9,7 +9,7 @@ - + UPYOG From a6b08026b9fa424475085859a0703f368111e180 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 25 Sep 2024 09:29:21 +0530 Subject: [PATCH 13/21] published modules --- frontend/micro-ui/web/docker/Dockerfile | 8 ++++---- .../micro-ui/web/micro-ui-internals/example/package.json | 6 +++--- .../libraries/src/hooks/tl/useTradeLicenseSearch.js | 2 +- .../packages/libraries/src/hooks/ws/useInbox.js | 2 +- .../services/molecules/OBPS/ApplicationUpdateActions.js | 2 +- .../micro-ui-internals/packages/modules/dss/package.json | 2 +- .../micro-ui-internals/packages/modules/obps/package.json | 3 ++- .../micro-ui-internals/packages/modules/pt/package.json | 2 +- .../micro-ui-internals/packages/modules/ws/package.json | 2 +- frontend/micro-ui/web/package.json | 8 ++++---- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 0e408a13e65..1cdc89bc5f7 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -3,19 +3,19 @@ FROM upyogio/alpine-node-builder-14:yarn AS build RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 RUN yarn add @upyog/digit-ui-libraries -RUN yarn add @upyog/digit-ui-module-pt@1.8.3 +RUN yarn add @upyog/digit-ui-module-pt RUN yarn add @upyog/digit-ui-module-fsm RUN yarn add @upyog/digit-ui-module-tl -RUN yarn add @upyog/digit-ui-module-dss@1.8.2 +RUN yarn add @upyog/digit-ui-module-dss RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr RUN yarn add @upyog/digit-ui-module-noc RUN yarn add @upyog/digit-ui-module-engagement RUN yarn add @upyog/digit-ui-module-hrms RUN yarn add @upyog/digit-ui-module-core -RUN yarn add @upyog/digit-ui-module-obps@1.8.2 +RUN yarn add @upyog/digit-ui-module-obps RUN yarn add @upyog/digit-ui-module-common -RUN yarn add @upyog/digit-ui-module-ws@1.8.4 +RUN yarn add @upyog/digit-ui-module-ws RUN yarn add @upyog/digit-ui-module-commonpt RUN yarn add @upyog/digit-ui-module-bills 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 48cc1a09273..7e80e64215e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -15,12 +15,12 @@ "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-mcollect": "1.8.0", "@upyog/digit-ui-module-noc": "1.8.0", - "@upyog/digit-ui-module-obps": "1.8.2", + "@upyog/digit-ui-module-obps": "1.8.5", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.3", + "@upyog/digit-ui-module-pt": "1.8.6", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.4", + "@upyog/digit-ui-module-ws": "1.8.7", "@upyog/digit-ui-module-commonpt": "1.8.0", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js index dfb1bde05a0..7394ba6c770 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js @@ -1,4 +1,4 @@ -import { useEffect } from "react"; +import React, {useEffect} from 'react'; import { useQuery, useQueryClient } from "react-query"; const useTradeLicenseSearch = ({ tenantId, filters, auth }, config = {}) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js index 2b4217e675d..b46270ff728 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js @@ -1,5 +1,5 @@ import useInbox from "../useInbox"; -import { useEffect } from "react"; +import React, {useEffect} from 'react'; const useWSInbox = ({ tenantId, filters, config = {} }) => { const { filterForm, searchForm, tableForm } = filters; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js index 8a29d5a3605..78bf623cba8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import React,{ useEffect, useState } from "react"; import { OBPSService } from "../../elements/OBPS"; import { PTService } from "../../elements/PT"; import { useTranslation } from "react-i18next"; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json index 2a5bcdc5974..b2889b6efa6 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-dss", - "version": "1.8.4", + "version": "1.8.5", "license": "MIT", "description": "Digit Dashboard Module", "main": "dist/index.js", 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 dedde7b704f..a8159dc6ef8 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.8.3", + "version": "1.8.5", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -15,6 +15,7 @@ }, "peerDependencies": { "react": "17.0.2", + "react-dom": "17.0.2", "react-router-dom": "5.3.0" }, "dependencies": { 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 f3f4174c285..85ea6f3f5af 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.8.5", + "version": "1.8.6", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json index a93e9000855..5d3e27c1125 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-ws", - "version": "1.8.6", + "version": "1.8.7", "description": "", "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 809ba77e6aa..56db916135b 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -17,18 +17,18 @@ "@upyog/digit-ui-module-common": "1.8.0", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.1", + "@upyog/digit-ui-module-dss": "1.8.5", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", "@upyog/digit-ui-module-commonpt":"1.8.0", - "@upyog/digit-ui-module-obps": "1.8.2", + "@upyog/digit-ui-module-obps": "1.8.5", "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.3", + "@upyog/digit-ui-module-pt": "1.8.6", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.4", + "@upyog/digit-ui-module-ws": "1.8.7", "@upyog/digit-ui-react-components": "1.8.0", "babel-loader": "8.1.0", "react": "17.0.2", From adb751fb3b2ede3c2f4c68773921cb00c775078d Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 25 Sep 2024 20:50:55 +0530 Subject: [PATCH 14/21] Removed WS from package.json --- frontend/micro-ui/web/docker/Dockerfile | 16 ---------------- .../web/micro-ui-internals/example/src/index.js | 1 - .../micro-ui/web/micro-ui-internals/package.json | 15 ++++++++++----- .../ws/src/pages/citizen/WSApplicationDetails.js | 2 +- frontend/micro-ui/web/package.json | 8 +++++++- frontend/micro-ui/web/src/App.js | 1 - 6 files changed, 18 insertions(+), 25 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 1cdc89bc5f7..c71ce35929a 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -2,22 +2,6 @@ FROM upyogio/alpine-node-builder-14:yarn AS build #FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 -RUN yarn add @upyog/digit-ui-libraries -RUN yarn add @upyog/digit-ui-module-pt -RUN yarn add @upyog/digit-ui-module-fsm -RUN yarn add @upyog/digit-ui-module-tl -RUN yarn add @upyog/digit-ui-module-dss -RUN yarn add @upyog/digit-ui-module-mcollect -RUN yarn add @upyog/digit-ui-module-pgr -RUN yarn add @upyog/digit-ui-module-noc -RUN yarn add @upyog/digit-ui-module-engagement -RUN yarn add @upyog/digit-ui-module-hrms -RUN yarn add @upyog/digit-ui-module-core -RUN yarn add @upyog/digit-ui-module-obps -RUN yarn add @upyog/digit-ui-module-common -RUN yarn add @upyog/digit-ui-module-ws -RUN yarn add @upyog/digit-ui-module-commonpt -RUN yarn add @upyog/digit-ui-module-bills ARG WORK_DIR WORKDIR /app diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js index 4af7d76a4d5..d20b57b16ca 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js @@ -56,7 +56,6 @@ const enabledModules = [ "OBPS", "Engagement", "NOC", - "WS", "CommonPT", "NDSS", "Bills", diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index d7ce0518cef..9523ebce71c 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -7,7 +7,12 @@ "packages/css", "example", "packages/react-components", - "packages/modules/*" + "packages/modules/pt", + "packages/modules/core", + "packages/modules/ws", + "packages/modules/tl", + "packages/modules/common", + "packages/modules/obps" ], "license": "MIT", @@ -47,18 +52,18 @@ "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", "buildD:common": "cd packages/modules/common && yarn build", - "buildD:pt": "cd packages/modules/pt && yarn build", + "build:pt": "cd packages/modules/pt && yarn build", "build:ptr": "cd packages/modules/ptr && yarn build", "buildD:commonPt": "cd packages/modules/commonPt && yarn build", - "buildD:core": "cd packages/modules/core && yarn build", + "build:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", "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:hrms": "cd packages/modules/hrms && yarn build", - "buildD:obps": "cd packages/modules/obps && yarn build", + "build:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", "buildD:noc": "cd packages/modules/noc && yarn build", "build:ws": "cd packages/modules/ws && yarn build", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js index f69aa5b2d37..955b3661350 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/citizen/WSApplicationDetails.js @@ -757,4 +757,4 @@ let serviceType = data && data?.WaterConnection?.[0] ? "WATER" : "SEWERAGE"; ); }; -export default WSApplicationDetails; +export default WSApplicationDetails; \ No newline at end of file diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 56db916135b..4181a06e821 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -5,7 +5,13 @@ "homepage": "/digit-ui", "workspaces": [ "micro-ui-internals/packages/libraries", - "micro-ui-internals/packages/react-components" + "micro-ui-internals/packages/react-components", + "micro-ui-internals/packages/core", + "micro-ui-internals/packages/pt", + "micro-ui-internals/packages/tl", + "micro-ui-internals/packages/ws", + "micro-ui-internals/packages/obps", + "micro-ui-internals/packages/common" ], "engines": { "node": ">=14" diff --git a/frontend/micro-ui/web/src/App.js b/frontend/micro-ui/web/src/App.js index 90be45b85a2..b52bea8966f 100644 --- a/frontend/micro-ui/web/src/App.js +++ b/frontend/micro-ui/web/src/App.js @@ -57,7 +57,6 @@ const enabledModules = [ "NOC", "Engagement", "CommonPT", - "WS", "Reports", "Bills", "SW", From 0f01f88954951124240d9b7c58d88f2b3418fa07 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 25 Sep 2024 21:24:13 +0530 Subject: [PATCH 15/21] added docker file changes --- frontend/micro-ui/web/docker/Dockerfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index c71ce35929a..1cdc89bc5f7 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -2,6 +2,22 @@ FROM upyogio/alpine-node-builder-14:yarn AS build #FROM ghcr.io/egovernments/alpine-node-builder-14:yarn AS build RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 +RUN yarn add @upyog/digit-ui-libraries +RUN yarn add @upyog/digit-ui-module-pt +RUN yarn add @upyog/digit-ui-module-fsm +RUN yarn add @upyog/digit-ui-module-tl +RUN yarn add @upyog/digit-ui-module-dss +RUN yarn add @upyog/digit-ui-module-mcollect +RUN yarn add @upyog/digit-ui-module-pgr +RUN yarn add @upyog/digit-ui-module-noc +RUN yarn add @upyog/digit-ui-module-engagement +RUN yarn add @upyog/digit-ui-module-hrms +RUN yarn add @upyog/digit-ui-module-core +RUN yarn add @upyog/digit-ui-module-obps +RUN yarn add @upyog/digit-ui-module-common +RUN yarn add @upyog/digit-ui-module-ws +RUN yarn add @upyog/digit-ui-module-commonpt +RUN yarn add @upyog/digit-ui-module-bills ARG WORK_DIR WORKDIR /app From aa2c0a6a5a0a6024e3ec1f70c731b00051a3780c Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 25 Sep 2024 22:35:57 +0530 Subject: [PATCH 16/21] updated docker file --- frontend/micro-ui/web/docker/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 1cdc89bc5f7..4f91ce36b2d 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -3,9 +3,7 @@ FROM upyogio/alpine-node-builder-14:yarn AS build RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 RUN yarn add @upyog/digit-ui-libraries -RUN yarn add @upyog/digit-ui-module-pt RUN yarn add @upyog/digit-ui-module-fsm -RUN yarn add @upyog/digit-ui-module-tl RUN yarn add @upyog/digit-ui-module-dss RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr @@ -13,9 +11,7 @@ RUN yarn add @upyog/digit-ui-module-noc RUN yarn add @upyog/digit-ui-module-engagement RUN yarn add @upyog/digit-ui-module-hrms RUN yarn add @upyog/digit-ui-module-core -RUN yarn add @upyog/digit-ui-module-obps RUN yarn add @upyog/digit-ui-module-common -RUN yarn add @upyog/digit-ui-module-ws RUN yarn add @upyog/digit-ui-module-commonpt RUN yarn add @upyog/digit-ui-module-bills From 512d958fa87ad66f3f7ca6c8cb32cb066d1d44b0 Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Wed, 25 Sep 2024 22:55:11 +0530 Subject: [PATCH 17/21] adding logs --- frontend/micro-ui/web/micro-ui-internals/example/src/index.js | 4 ++-- .../web/micro-ui-internals/packages/modules/core/src/App.js | 1 + .../micro-ui-internals/packages/modules/core/src/Module.js | 1 + .../packages/modules/core/src/components/ErrorBoundaries.js | 3 +++ frontend/micro-ui/web/src/App.js | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js index d20b57b16ca..7d55cdcfde0 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js @@ -141,9 +141,9 @@ const initDigitUI = () => { }, }; - const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pb"; + const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pg"; initTokens(stateCode); - +console.log("enabledModules1111",enabledModules,stateCode) const registry = window?.Digit.ComponentRegistryService.getRegistry(); ReactDOM.render(, document.getElementById("root")); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js index ef794c9e62e..30f183e69e7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js @@ -4,6 +4,7 @@ import EmployeeApp from "./pages/employee"; import CitizenApp from "./pages/citizen"; export const DigitApp = ({ stateCode, modules, appTenants, logoUrl, initData }) => { + console.log("DigitApp", stateCode, modules) const history = useHistory(); const { pathname } = useLocation(); const innerWidth = window.innerWidth; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js index 6d0bc3a0402..21ba32238ed 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js @@ -14,6 +14,7 @@ import ErrorBoundary from "./components/ErrorBoundaries"; import { useState } from "react"; const DigitUIWrapper = ({ stateCode, enabledModules, moduleReducers }) => { + console.log("DigitUIWrapper",enabledModules) const { isLoading, data: initData } = Digit.Hooks.useInitStore(stateCode, enabledModules); if (isLoading) { return ; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js index 0140781bc02..cb9a2ac994a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js @@ -2,6 +2,7 @@ import React from "react"; import ErrorComponent from "./ErrorComponent"; const Redircter = () => { + console.log("Redircter") const path = Digit.UserService.getType() === "employee" ? "/digit-ui/employee/user/error" : "/digit-ui/citizen/error"; if ( window.location.href.includes("employee/user/error") || @@ -22,12 +23,14 @@ class ErrorBoundary extends React.Component { } static getDerivedStateFromError(error) { + console.log("getDerivedStateFromError",error) // Update state so the next render will show the fallback UI. return { error: error?.message, hasError: true, errorStack: error?.stack }; } componentDidCatch(error, errorInfo) { // Catch errors in any components below and re-render with error message + console.log("componentDidCatch",error) this.setState({ error: error?.message, hasError: true, errorStack: error?.stack }); // You can also log error messages to an error reporting service here } diff --git a/frontend/micro-ui/web/src/App.js b/frontend/micro-ui/web/src/App.js index b52bea8966f..4fe344afb22 100644 --- a/frontend/micro-ui/web/src/App.js +++ b/frontend/micro-ui/web/src/App.js @@ -59,7 +59,6 @@ const enabledModules = [ "CommonPT", "Reports", "Bills", - "SW", "BillAmendment", "FireNoc", "Birth", @@ -107,6 +106,7 @@ function App() { if (!stateCode) { return

stateCode is not defined

; } + console.log("enabledModulesenabledModules",enabledModules) return ( Date: Thu, 26 Sep 2024 10:00:57 +0530 Subject: [PATCH 18/21] updated pgr for bug --- .../main/java/org/egov/pgr/repository/PGRRepository.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/municipal-services/pgr-services/src/main/java/org/egov/pgr/repository/PGRRepository.java b/municipal-services/pgr-services/src/main/java/org/egov/pgr/repository/PGRRepository.java index aa140a48ab0..66c94de651c 100644 --- a/municipal-services/pgr-services/src/main/java/org/egov/pgr/repository/PGRRepository.java +++ b/municipal-services/pgr-services/src/main/java/org/egov/pgr/repository/PGRRepository.java @@ -124,8 +124,10 @@ public Map fetchDynamicData(String tenantId) { throw new CustomException("PGR_SEARCH_ERROR", "TenantId length is not sufficient to replace query schema in a multi state instance"); } - int averageResolutionTime = jdbcTemplate.queryForObject(query, preparedStmtListAverageResolutionTime.toArray(),Integer.class); - + int averageResolutionTime=0; + if(complaintsResolved>0) { + averageResolutionTime = jdbcTemplate.queryForObject(query, preparedStmtListAverageResolutionTime.toArray(),Integer.class); + } Map dynamicData = new HashMap(); dynamicData.put(PGRConstants.COMPLAINTS_RESOLVED, complaintsResolved); dynamicData.put(PGRConstants.AVERAGE_RESOLUTION_TIME, averageResolutionTime); From c378ae0ed6e3ae1fb37b0ea5cf473fc3759d463b Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Thu, 26 Sep 2024 14:29:39 +0530 Subject: [PATCH 19/21] v1.8.8 --- .../web/micro-ui-internals/packages/css/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json index deed0cccbd8..16dc87379c2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@upyog-niua/upyog-css", - "version": "1.8.1", + "version": "1.8.8", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", @@ -45,7 +45,7 @@ "postcss-prefixer": "2.1.3", "postcss-preset-env": "6.7.1", "postcss-scss": "3.0.5", - "sass": "^1.26.11" + "sass": "1.26.11" }, "files": [ "dist/index.min.css", @@ -62,4 +62,4 @@ "digit-ui", "css" ] -} \ No newline at end of file +} From 272c702c5ab80267820ff154fb2ce605323bb55a Mon Sep 17 00:00:00 2001 From: sriranjan-s Date: Fri, 27 Sep 2024 00:48:42 +0530 Subject: [PATCH 20/21] v1.8.11 --- frontend/micro-ui/web/docker/Dockerfile | 4 ++++ .../micro-ui-internals/example/package.json | 14 ++++++------ .../example/public/index.html | 2 +- .../micro-ui-internals/example/src/index.js | 5 +++-- .../web/micro-ui-internals/package.json | 19 ++++++---------- .../packages/css/example/package.json | 2 +- .../packages/css/package.json | 2 +- .../src/hooks/tl/useTradeLicenseSearch.js | 2 +- .../libraries/src/hooks/ws/useInbox.js | 2 +- .../libraries/src/services/atoms/Download.js | 2 +- .../OBPS/ApplicationUpdateActions.js | 2 +- .../packages/modules/common/package.json | 2 +- .../src/payments/citizen/response/index.js | 2 +- .../packages/modules/core/src/App.js | 1 - .../packages/modules/core/src/Module.js | 1 - .../packages/modules/dss/package.json | 4 ++-- .../packages/modules/obps/package.json | 5 ++--- .../packages/modules/pt/package.json | 2 +- .../packages/modules/ws/package.json | 2 +- .../pageComponents/WSRoadCuttingDetails.js | 4 ++-- frontend/micro-ui/web/package.json | 22 +++++++------------ frontend/micro-ui/web/public/index.html | 2 +- frontend/micro-ui/web/src/App.js | 3 ++- 23 files changed, 49 insertions(+), 57 deletions(-) diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile index 4f91ce36b2d..2f1e53821e5 100644 --- a/frontend/micro-ui/web/docker/Dockerfile +++ b/frontend/micro-ui/web/docker/Dockerfile @@ -4,6 +4,10 @@ RUN apk update && apk upgrade RUN apk add --no-cache git>2.30.0 RUN yarn add @upyog/digit-ui-libraries RUN yarn add @upyog/digit-ui-module-fsm +RUN yarn add @upyog/digit-ui-module-pt +RUN yarn add @upyog/digit-ui-module-tl +RUN yarn add @upyog/digit-ui-module-obps +RUN yarn add @upyog/digit-ui-module-ws RUN yarn add @upyog/digit-ui-module-dss RUN yarn add @upyog/digit-ui-module-mcollect RUN yarn add @upyog/digit-ui-module-pgr 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 7e80e64215e..478f30d7a7f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -10,28 +10,28 @@ }, "devDependencies": { "@upyog/digit-ui-module-bills": "1.8.0", - "@upyog/digit-ui-module-common": "1.8.0", + "@upyog/digit-ui-module-common": "1.8.1", "@upyog/digit-ui-module-engagement": "1.8.0", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-mcollect": "1.8.0", "@upyog/digit-ui-module-noc": "1.8.0", - "@upyog/digit-ui-module-obps": "1.8.5", + "@upyog/digit-ui-module-obps": "1.8.4", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.6", + "@upyog/digit-ui-module-pt": "1.8.9", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.7", + "@upyog/digit-ui-module-ws": "1.8.9", "@upyog/digit-ui-module-commonpt": "1.8.0", - "http-proxy-middleware": "^1.0.5", + "http-proxy-middleware": "1.0.5", "react": "17.0.2", "react-dom": "17.0.2", "react-i18next": "11.16.2", "react-router-dom": "5.3.0", - "react-scripts": "^4.0.1" + "react-scripts": "4.0.1" }, "browserslist": [ ">0.2%", "not dead", "not op_mini all" ] -} \ No newline at end of file +} diff --git a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html index 49edba7b9cb..af791798c82 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/public/index.html +++ b/frontend/micro-ui/web/micro-ui-internals/example/public/index.html @@ -10,7 +10,7 @@ - + diff --git a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js index 7d55cdcfde0..4af7d76a4d5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/src/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/example/src/index.js @@ -56,6 +56,7 @@ const enabledModules = [ "OBPS", "Engagement", "NOC", + "WS", "CommonPT", "NDSS", "Bills", @@ -141,9 +142,9 @@ const initDigitUI = () => { }, }; - const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pg"; + const stateCode = window?.globalConfigs?.getConfig("STATE_LEVEL_TENANT_ID") || "pb"; initTokens(stateCode); -console.log("enabledModules1111",enabledModules,stateCode) + const registry = window?.Digit.ComponentRegistryService.getRegistry(); ReactDOM.render(, document.getElementById("root")); }; diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 9523ebce71c..88249ce75c5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -7,12 +7,7 @@ "packages/css", "example", "packages/react-components", - "packages/modules/pt", - "packages/modules/core", - "packages/modules/ws", - "packages/modules/tl", - "packages/modules/common", - "packages/modules/obps" + "packages/modules/*" ], "license": "MIT", @@ -52,18 +47,18 @@ "build:libraries": "cd packages/libraries && yarn build", "build:components": "cd packages/react-components && yarn build", "buildD:common": "cd packages/modules/common && yarn build", - "build:pt": "cd packages/modules/pt && yarn build", + "buildD:pt": "cd packages/modules/pt && yarn build", "build:ptr": "cd packages/modules/ptr && yarn build", "buildD:commonPt": "cd packages/modules/commonPt && yarn build", - "build:core": "cd packages/modules/core && yarn build", + "buildD:core": "cd packages/modules/core && yarn build", "buildD:pgr": "cd packages/modules/pgr && yarn build", "buildD:fsm": "cd packages/modules/fsm && yarn build", - "build:dss": "cd packages/modules/dss && yarn build", + "buildD: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:hrms": "cd packages/modules/hrms && yarn build", - "build:obps": "cd packages/modules/obps && yarn build", + "buildD:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", "buildD:noc": "cd packages/modules/noc && yarn build", "build:ws": "cd packages/modules/ws && yarn build", @@ -91,4 +86,4 @@ "**/@babel/preset-env": "7.14.0", "**/@babel/plugin-transform-modules-commonjs": "7.14.0" } -} \ No newline at end of file +} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/example/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/example/package.json index 1d90ecddf4a..d5e10f428c8 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/example/package.json @@ -10,7 +10,7 @@ "@egovernments/digit-ui.css": "link:.." }, "devDependencies": { - "http-server": "^0.12.3" + "http-server": "0.12.3" }, "eslintConfig": { "extends": "react-app" diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json index 16dc87379c2..88564ca0af5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json @@ -1,6 +1,6 @@ { "name": "@upyog-niua/upyog-css", - "version": "1.8.8", + "version": "1.8.11", "license": "MIT", "main": "dist/index.css", "author": "Jagankumar ", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js index 7394ba6c770..dfb1bde05a0 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/tl/useTradeLicenseSearch.js @@ -1,4 +1,4 @@ -import React, {useEffect} from 'react'; +import { useEffect } from "react"; import { useQuery, useQueryClient } from "react-query"; const useTradeLicenseSearch = ({ tenantId, filters, auth }, config = {}) => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js index b46270ff728..2b4217e675d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/ws/useInbox.js @@ -1,5 +1,5 @@ import useInbox from "../useInbox"; -import React, {useEffect} from 'react'; +import { useEffect } from "react"; const useWSInbox = ({ tenantId, filters, config = {} }) => { const { filterForm, searchForm, tableForm } = filters; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js index 2fbd3622956..c256ff4e889 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/atoms/Download.js @@ -1,7 +1,7 @@ import ReactDOM from "react-dom"; import html2canvas from "html2canvas"; import jsPDF from "jspdf"; -import * as XLSX from 'xlsx'; +import XLSX from "xlsx"; import domtoimage from "dom-to-image"; const changeClasses=(class1,class2)=>{ diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js index 78bf623cba8..8a29d5a3605 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/molecules/OBPS/ApplicationUpdateActions.js @@ -1,4 +1,4 @@ -import React,{ useEffect, useState } from "react"; +import { useEffect, useState } from "react"; import { OBPSService } from "../../elements/OBPS"; import { PTService } from "../../elements/PT"; import { useTranslation } from "react-i18next"; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json index 58e1b494d39..54793e7a06d 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-common", - "version": "1.8.0", + "version": "1.8.1", "license": "MIT", "description": "Digit Common Payment Module", "main": "dist/index.js", 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 dedcab3e65f..855a59379be 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 @@ -165,7 +165,7 @@ export const convertEpochToDate = (dateEpoch) => { let assessmentYear="",assessmentYearForReceipt=""; let count=0; let toDate,fromDate; - if(payments.Payments[0].paymentDetails[0].businessService=="PT"){ + if(payments?.Payments?.[0]?.paymentDetails?.[0].businessService=="PT" || payments?.Payments?.[0].paymentDetails[0].businessService=="PT.MUTATION"){ payments.Payments[0].paymentDetails[0].bill.billDetails.map(element => { diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js index 30f183e69e7..ef794c9e62e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js @@ -4,7 +4,6 @@ import EmployeeApp from "./pages/employee"; import CitizenApp from "./pages/citizen"; export const DigitApp = ({ stateCode, modules, appTenants, logoUrl, initData }) => { - console.log("DigitApp", stateCode, modules) const history = useHistory(); const { pathname } = useLocation(); const innerWidth = window.innerWidth; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js index 21ba32238ed..6d0bc3a0402 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/Module.js @@ -14,7 +14,6 @@ import ErrorBoundary from "./components/ErrorBoundaries"; import { useState } from "react"; const DigitUIWrapper = ({ stateCode, enabledModules, moduleReducers }) => { - console.log("DigitUIWrapper",enabledModules) const { isLoading, data: initData } = Digit.Hooks.useInitStore(stateCode, enabledModules); if (isLoading) { return ; diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json index b2889b6efa6..5b70fe8f118 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-dss", - "version": "1.8.5", + "version": "1.8.9", "license": "MIT", "description": "Digit Dashboard Module", "main": "dist/index.js", @@ -33,6 +33,6 @@ "react-simple-maps": "2.0.0", "react-time-picker": "4.2.1", "react-tooltip": "4.1.2", - "recharts": "^2.0.9" + "recharts": "2.0.9" } } 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 a8159dc6ef8..f7e4b61f7e1 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.8.5", + "version": "1.8.4", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", @@ -15,7 +15,6 @@ }, "peerDependencies": { "react": "17.0.2", - "react-dom": "17.0.2", "react-router-dom": "5.3.0" }, "dependencies": { @@ -27,7 +26,7 @@ "react-i18next": "11.16.2", "react-query": "3.6.1", "react-router-dom": "5.3.0", - "uuid": "^9.0.1" + "uuid": "9.0.1" }, "author": "", "license": "MIT" 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 85ea6f3f5af..8b0df0f19fe 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.8.6", + "version": "1.8.9", "license": "MIT", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json index 5d3e27c1125..a443102faa3 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json @@ -1,6 +1,6 @@ { "name": "@upyog/digit-ui-module-ws", - "version": "1.8.7", + "version": "1.8.9", "description": "", "main": "dist/index.js", "module": "dist/index.modern.js", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js index e99d171c92f..b30b942dcda 100755 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pageComponents/WSRoadCuttingDetails.js @@ -21,7 +21,7 @@ const WSRoadCuttingDetails = ({ config, onSelect, userType, formData, setError, const isEditScreen = pathname.includes("/modify-application/" ) const stateCode = Digit.ULBService.getStateId(); - const { isMdmsLoading, data: mdmsData } = Digit.Hooks.ws.useMDMS(stateCode, "sw-services-calculation", ["RoadType"]); + const { isMdmsLoading, data: mdmsData } = Digit.Hooks.ws.useMDMS(stateCode, window.location.href.includes("sewerage")?"sw-services-calculation":"ws-services-calculation", ["RoadType"]); const [roadCuttingDetails, setRoadCuttingDetails] = useState(formData?.roadCuttingDetails || [createRoadCuttingDetails()]); const [focusIndex, setFocusIndex] = useState({ index: -1, type: "" }); @@ -94,7 +94,7 @@ const RoadCuttForm = (_props) => { const { errors } = localFormState; const roadCuttingTypeMenu = useMemo(() => { - const RoadTypes = mdmsData?.["sw-services-calculation"]?.RoadType || []; + const RoadTypes = window.location.href.includes("sewerage")?mdmsData?.["sw-services-calculation"]?.RoadType : mdmsData?.["ws-services-calculation"]?.RoadType || []; const filteredRoadTypes = RoadTypes.filter(data => data?.isActive === true); // Filter out road types with isActive: true filteredRoadTypes.forEach(data => data.i18nKey = `WS_ROADTYPE_${stringReplaceAll(data?.code?.toUpperCase(), " ", "_")}`); return filteredRoadTypes; diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json index 4181a06e821..b3917b1d8c9 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -5,13 +5,7 @@ "homepage": "/digit-ui", "workspaces": [ "micro-ui-internals/packages/libraries", - "micro-ui-internals/packages/react-components", - "micro-ui-internals/packages/core", - "micro-ui-internals/packages/pt", - "micro-ui-internals/packages/tl", - "micro-ui-internals/packages/ws", - "micro-ui-internals/packages/obps", - "micro-ui-internals/packages/common" + "micro-ui-internals/packages/react-components" ], "engines": { "node": ">=14" @@ -20,21 +14,21 @@ "@upyog-niua/upyog-css": "1.0.10", "@upyog/digit-ui-libraries": "1.8.0", "@upyog/digit-ui-module-bills": "1.8.0", - "@upyog/digit-ui-module-common": "1.8.0", + "@upyog/digit-ui-module-common": "1.8.1", "@upyog/digit-ui-module-core": "1.8.0", "@upyog/digit-ui-module-engagement": "1.8.0", - "@upyog/digit-ui-module-dss": "1.8.5", + "@upyog/digit-ui-module-dss": "1.8.9", "@upyog/digit-ui-module-fsm": "1.8.4", "@upyog/digit-ui-module-hrms": "1.8.0", "@upyog/digit-ui-module-mcollect": "1.8.0", "@upyog/digit-ui-module-commonpt":"1.8.0", - "@upyog/digit-ui-module-obps": "1.8.5", + "@upyog/digit-ui-module-obps": "1.8.4", "@upyog/digit-ui-module-noc": "1.8.0", "@upyog/digit-ui-module-pgr": "1.8.0", - "@upyog/digit-ui-module-pt": "1.8.6", + "@upyog/digit-ui-module-pt": "1.8.9", "@upyog/digit-ui-module-receipts": "1.8.0", "@upyog/digit-ui-module-tl": "1.8.3", - "@upyog/digit-ui-module-ws": "1.8.7", + "@upyog/digit-ui-module-ws": "1.8.9", "@upyog/digit-ui-react-components": "1.8.0", "babel-loader": "8.1.0", "react": "17.0.2", @@ -42,7 +36,7 @@ "react-router-dom": "5.3.0", "react-scripts": "4.0.1", "web-vitals": "1.1.2", - "terser-brunch": "^4.1.0" + "terser-brunch": "4.1.0" }, "devDependencies": { "http-proxy-middleware": "1.3.1" @@ -70,4 +64,4 @@ "not dead", "not op_mini all" ] -} \ No newline at end of file +} diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html index 373919f7ddb..355bbab5ab1 100644 --- a/frontend/micro-ui/web/public/index.html +++ b/frontend/micro-ui/web/public/index.html @@ -9,7 +9,7 @@ - + UPYOG diff --git a/frontend/micro-ui/web/src/App.js b/frontend/micro-ui/web/src/App.js index 4fe344afb22..90be45b85a2 100644 --- a/frontend/micro-ui/web/src/App.js +++ b/frontend/micro-ui/web/src/App.js @@ -57,8 +57,10 @@ const enabledModules = [ "NOC", "Engagement", "CommonPT", + "WS", "Reports", "Bills", + "SW", "BillAmendment", "FireNoc", "Birth", @@ -106,7 +108,6 @@ function App() { if (!stateCode) { return

stateCode is not defined

; } - console.log("enabledModulesenabledModules",enabledModules) return ( Date: Fri, 27 Sep 2024 00:49:23 +0530 Subject: [PATCH 21/21] published cdd --- frontend/micro-ui/web/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/public/index.html b/frontend/micro-ui/web/public/index.html index 355bbab5ab1..93f601ebd56 100644 --- a/frontend/micro-ui/web/public/index.html +++ b/frontend/micro-ui/web/public/index.html @@ -5,7 +5,7 @@ - +