@@ -484,4 +518,4 @@ const DashBoard = ({ stateCode }) => {
);
};
-export default DashBoard;
+export default DashBoard;
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/README.md
index 43c336249ed..d8d30d71c66 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/README.md
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/README.md
@@ -22,10 +22,10 @@ frontend/micro-ui/web/package.json
## Changelog
-### Summary for Version [1.7.10] - 2025-02-13
+### Summary for Version [1.7.35] - 2025-03-20
Solved survey create and edit problem by adding tenantId in the api calls
### Contributors
-[jagankumar-egov] [hari-egov] [mukund-egov]
+[jagankumar-egov] [hari-egov] [mukund-egov]
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json
index 8e7e2b391b8..4171d724515 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/package.json
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-engagement",
- "version": "1.7.10",
+ "version": "1.7.36",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/EngagementCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/EngagementCard.js
index b1d3c284dfb..16e179f34ad 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/EngagementCard.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/components/EngagementCard.js
@@ -13,12 +13,17 @@ import {
const EngagementCard = () => {
const userRoles = Digit.SessionStorage.get("User")?.info?.roles;
const isEmployee = userRoles.find((role) => role.code === "EMPLOYEE");
+ const isSyAdmin = userRoles.length === 1 && userRoles[0].code === "SY_ADMIN";
+
+
useEffect(() => {
Digit.SessionStorage.set("CITIZENSURVEY.INBOX", null);
}, []);
- if (!isEmployee) return null;
+ if (!isSyAdmin && !isEmployee) {
+ return null;
+ }
const tenantId = Digit.ULBService.getCurrentTenantId();
const { data: documentsCount, isLoading: isLoadingDocs } = Digit.Hooks.engagement.useDocSearch(
{ tenantIds: tenantId },
@@ -152,16 +157,27 @@ const EngagementCard = () => {
};
const engagementSubModulesProps = [propsForDocumentModuleCard, propsForEventsModuleCard, propsForPMBModuleCard, propsForSurveyModuleCard];
-
- if (isEmployee)
+ const surveyModulesProps = [propsForSurveyModuleCard];
+ if (isSyAdmin) {
result = (
<>
- {engagementSubModulesProps.map((propsForModuleCard, index) => (
+ {surveyModulesProps.map((propsForModuleCard, index) => (
))}
);
+ return result;
+ }
+ else if (isEmployee)
+ result = (
+ <>
+ {engagementSubModulesProps.map((propsForModuleCard, index) => (
+
+ ))}
+
+ );
+
return result;
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js
index 6b0a17c4db2..c2573ca675a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/engagement/src/pages/employee/CitizenSurveys/SurveyDetails.js
@@ -195,8 +195,28 @@ const SurveyDetails = ({ location, match }) => {
};
const handleMarkInactive = () => {
+ const toEpoch = (dateStr, timeStr) => {
+ // Combine date and time to a single ISO string and convert to epoch
+ return new Date(`${dateStr}T${timeStr}:00`).getTime();
+ };
+
+ const updatedSurveyData = {
+ ...surveyData,
+ startDate: toEpoch(surveyData.fromDate, surveyData.fromTime),
+ endDate: toEpoch(surveyData.toDate, surveyData.toTime),
+ tenantId,
+ questions: surveyData.questions.map(filterQuestion),
+ status: "INACTIVE"
+ };
+
+ // Remove fromDate and toDate
+ delete updatedSurveyData.fromDate;
+ delete updatedSurveyData.toDate;
+ delete updatedSurveyData.fromTime;
+ delete updatedSurveyData.toTime;
+
const details = {
- SurveyEntity: { ...surveyData, tenantId, questions: surveyData.questions.map(filterQuestion), status: "INACTIVE" },
+ SurveyEntity: updatedSurveyData,
};
history.push("/digit-ui/employee/engagement/surveys/update-response", details);
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/README.md
new file mode 100644
index 00000000000..12cbde8a5db
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/README.md
@@ -0,0 +1,31 @@
+# digit-ui-module-finance
+
+## Install
+
+```bash
+npm install --save @egovernments/digit-ui-module-finance
+```
+
+## Limitation
+
+```bash
+This Package is more specific to Urban
+```
+
+## Usage
+
+After adding the dependency make sure you have this dependency in
+
+```bash
+frontend/micro-ui/web/package.json
+```
+
+## Changelog
+
+### Summary for Version [0.0.1] - 2025-06-13
+
+Created finance module with submenu card and iframe pages
+
+### Contributors
+
+[kamalesh-egov]
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/package.json
new file mode 100644
index 00000000000..e7bd2452d34
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/package.json
@@ -0,0 +1,26 @@
+{
+ "name": "@egovernments/digit-ui-module-finance",
+ "version": "0.0.1-sandbox",
+ "description": "FINANCE",
+ "license": "MIT",
+ "main": "dist/index.js",
+ "module": "dist/index.modern.js",
+ "source": "src/Module.js",
+ "files": [
+ "dist"
+ ],
+ "scripts": {
+ "start": "microbundle-crl watch --no-compress --format modern,cjs",
+ "build": "microbundle-crl --compress --no-sourcemap --format cjs",
+ "prepublish": "yarn build"
+ },
+ "dependencies": {
+ "@egovernments/digit-ui-react-components": "^1.7.0-beta.2",
+ "react": "17.0.2",
+ "react-dom": "17.0.2",
+ "react-hook-form": "6.15.8",
+ "react-i18next": "11.16.2",
+ "react-query": "3.6.1",
+ "react-router-dom": "5.3.0"
+ }
+}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/FinanceHomeCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/FinanceHomeCard.js
new file mode 100644
index 00000000000..2b8208e30dc
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/FinanceHomeCard.js
@@ -0,0 +1,63 @@
+import { CollectionIcon, Header } from "@egovernments/digit-ui-react-components";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import LandingPageSubMenuCard from "./components/LandingPageSubMenuCard";
+
+const buildMenuDict = (items) => {
+ const root = {};
+ items?.forEach(item => {
+ const parts = item.path.split('.');
+ let current = root;
+ parts?.forEach((part, idx) => {
+ if (!current[part]) current[part] = {};
+ if (idx === parts.length - 1) {
+ // attach leaf data
+ current[part] = {
+ ...current[part],
+ _meta: {
+ label: item.displayName,
+ link: item.navigationURL,
+ }
+ };
+ }
+ current = current[part];
+ });
+ });
+ return root;
+}
+
+const FinanceCard = () => {
+ const { t } = useTranslation();
+ const userRoles = Digit.SessionStorage.get("User")?.info?.roles;
+ const allowedRoles = [
+ "EMPLOYEE_FINANCE",
+ "EGF_VOUCHER_CREATOR",
+ "EGF_MASTER_ADMIN",
+ "EGF_REPORT_VIEW",
+ "EGF_BILL_CREATOR",
+ "EGF_ADMINISTRATOR",
+ "EGF_BILL_APPROVER",
+ "SYS_INTEGRATOR_FINANCE",
+ "EGF_PAYMENT_CREATOR",
+ "EGF_VOUCHER_APPROVER",
+ "WORKS_FINANCIAL_APPROVER",
+ "EGF_PAYMENT_APPROVER"
+ ];
+ const isFinanceEmployee = userRoles.find((role) => allowedRoles.includes(role.code));
+ const { isLoading, data } = Digit.Hooks.useAccessControl();
+ const menuDict = buildMenuDict(data?.actions)?.Finance;
+
+ if (!isFinanceEmployee || !menuDict) return null;
+ return (
+
+
{t("ACTION_TEST_FINANCE")}
+
+ {Object.entries(menuDict).map(([key, value]) => (
+ } moduleName={key} menuDict={value} />
+ ))}
+
+
+ )
+};
+
+export default FinanceCard;
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/Module.js
new file mode 100644
index 00000000000..d0c7830acaa
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/Module.js
@@ -0,0 +1,31 @@
+import React, { useEffect } from "react";
+import { useRouteMatch } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import EmployeeApp from "./pages/employee";
+import FinanceCard from "./FinanceHomeCard";
+
+export const FinanceModule = ({ stateCode, userType, tenants }) => {
+ const tenantId = Digit.SessionStorage.get("CITIZEN.COMMON.HOME.CITY")?.code || Digit.ULBService.getCurrentTenantId();
+ const moduleCode = ["finance"];
+
+ const language = Digit.StoreData.getCurrentLanguage();
+ const { isLoading, data: store } = Digit.Services.useStore({ stateCode, moduleCode, language });
+ const { path, url } = useRouteMatch();
+
+ Digit.SessionStorage.set("FINANCE_TENANTS", tenants);
+
+ if (userType === "employee") {
+ return
;
+ } else return null;
+};
+
+const componentsToRegister = {
+ FinanceModule,
+ FinanceCard,
+};
+
+export const initFinanceComponents = () => {
+ Object.entries(componentsToRegister).forEach(([key, value]) => {
+ Digit.ComponentRegistryService.setComponent(key, value);
+ });
+};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/components/EGF/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/components/EGF/index.js
new file mode 100644
index 00000000000..c0cf80cee16
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/components/EGF/index.js
@@ -0,0 +1,78 @@
+import { fromPairs } from "lodash";
+import React, { Component } from "react";
+
+class EGFFinance extends Component {
+ constructor(props) {
+ super(props);
+ this.onFrameLoad = this.onFrameLoad.bind(this);
+ this.resetIframe = this.resetIframe.bind(this);
+ }
+ onFrameLoad() {
+ document.getElementById("erp_iframe").style.display = "block";
+ }
+
+ render() {
+ let auth_token = Digit.UserService.getUser()?.access_token,
+ locale = localStorage.getItem("locale"),
+ menuUrl = this.props.location,
+ loc = window.location,
+ subdomainurl,
+ domainurl,
+ finEnv,
+ hostname = loc.hostname,
+ winheight = window.innerHeight - 200,
+ erp_url,
+ tenantId = Digit.ULBService.getCurrentTenantId();
+ //Reading domain name from the request url
+ domainurl = hostname.substring(hostname.indexOf(".") + 1);
+ // Reading environment name (ex: dev, qa, uat, fin-uat etc) from the globalconfigs if exists else reading from the .env file
+ finEnv = this.globalConfigExists() ? window.globalConfigs.getConfig("FIN_ENV") : process.env.REACT_APP_FIN_ENV;
+ // Preparing finance subdomain url using the above environment name and the domain url
+ subdomainurl = !!(finEnv) ? "-" + finEnv + "." + domainurl : "." + domainurl;
+ erp_url = loc.protocol + "//" + tenantId.split(".")[1] + subdomainurl + menuUrl;
+
+ return (
+
+
+
+
+ );
+ }
+ componentDidMount() {
+ window.addEventListener("message", this.onMessage, false);
+ window.addEventListener("loacaleChangeEvent", this.resetIframe, false);
+ // document.getElementById("erp_iframe").addEventListener("load", this.onFrameLoad);
+ document.forms["erp_form"].submit();
+ }
+ componentDidUpdate() {
+ let isSecure = window.location.protocol === "https";
+ let localeCookie = "locale=" + localStorage.getItem("locale") + ";path=/;domain=." + this.getSubdomain();
+ if (isSecure) {
+ localeCookie += ";secure";
+ }
+ window.document.cookie = localeCookie;
+ document.forms["erp_form"].submit();
+ }
+ onMessage = (event) => {
+ if (event.data != "close") return;
+ // document.getElementById('erp_iframe').style.display='none';
+ this.props.history.push("/inbox");
+ };
+ resetIframe() {
+ this.forceUpdate();
+ }
+ getSubdomain() {
+ let hostname = window.location.hostname;
+ return hostname.substring(hostname.indexOf(".") + 1);
+ }
+ globalConfigExists() {
+ return typeof window.globalConfigs !== "undefined" && typeof window.globalConfigs.getConfig === "function";
+ }
+}
+
+export default EGFFinance;
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/components/LandingPageSubMenuCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/components/LandingPageSubMenuCard.js
new file mode 100644
index 00000000000..b1891c4727e
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/components/LandingPageSubMenuCard.js
@@ -0,0 +1,80 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useHistory } from 'react-router-dom';
+import {
+ ArrowForward,
+ ArrowVectorDown,
+} from "@egovernments/digit-ui-react-components";
+
+const RenderMenuDict = ({ t, tree, level = 0 }) => {
+ const history = useHistory();
+ const [openKeys, setOpenKeys] = useState({});
+
+ const toggle = (key) => {
+ setOpenKeys(prev => ({ ...prev, [key]: !prev[key] }));
+ };
+
+ const indentPx = level * 16;
+ const buttonBaseStyle = {
+ display: 'flex',
+ justifyContent: 'space-between',
+ alignItems: 'center',
+ padding: '8px 4px',
+ cursor: 'pointer',
+ fontSize: '16px',
+ color: "#F47738",
+ };
+
+ return Object.entries(tree).sort().map(([key, node], idx) => {
+ const meta = node._meta || {};
+ const hasChildren = Object.keys(node).some(childKey => childKey !== '_meta');
+ const isOpen = openKeys[key];
+
+ return (
+
+
hasChildren ? toggle(key) : meta.link && (
+ meta.link.includes(`${window.contextPath}/`) ? history.push(meta.link) : window.location.href = meta.link
+ )}
+ >
+ {t(meta.label || key)}
+ {hasChildren && (isOpen ? : )}
+
+ {hasChildren && isOpen && (
+
+ k !== '_meta')
+ )} level={level + 1} />
+
+ )}
+
+ );
+ });
+};
+
+const LandingPageSubMenuCard = ({ t, Icon, moduleName, menuDict = {}}) => {
+ return (
+
+
+
+ {t(moduleName)}
+ {Icon}
+
+
+
+
+ );
+};
+
+LandingPageSubMenuCard.propTypes = {
+ icon: PropTypes.node,
+ moduleName: PropTypes.string.isRequired,
+ menuDict: PropTypes.object
+};
+
+export default LandingPageSubMenuCard;
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/pages/employee/EGF.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/pages/employee/EGF.js
new file mode 100644
index 00000000000..1f303136810
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/pages/employee/EGF.js
@@ -0,0 +1,14 @@
+import React, { useState, useEffect } from "react";
+import EGFFinance from "../../components/EGF";
+
+const EGF = () => {
+ let location = window.location.pathname;
+ location = location.substring(location.indexOf("/services"));
+ return (
+
+
+
+ );
+};
+
+export default EGF;
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/pages/employee/index.js
new file mode 100644
index 00000000000..035110831da
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/pages/employee/index.js
@@ -0,0 +1,52 @@
+import { PrivateRoute,BreadCrumb } from "@egovernments/digit-ui-react-components";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Link, Switch, useLocation } from "react-router-dom";
+import EGF from "./EGF";
+
+const FinanceBreadCrumbs = ({ location }) => {
+ const { t } = useTranslation();
+
+ const search = useLocation().search;
+
+ const fromScreen = new URLSearchParams(search).get("from") || null;
+
+ const crumbs = [
+ {
+ path: "/digit-ui/employee",
+ content: t("ES_COMMON_HOME"),
+ show: true,
+ },
+ {
+ path: "/digit-ui/employee/services",
+ content: t("FINANCE_SERVICES_HEADER"),
+ show: location.pathname.includes("/services") ? true : false,
+ }
+ ];
+
+ return
;
+};
+
+
+const EmployeeApp = ({ path, url, userType }) => {
+ const { t } = useTranslation();
+ const location = useLocation();
+ const mobileView = innerWidth <= 640;
+ const tenantId = Digit.ULBService.getCurrentTenantId();
+ return (
+
+
+
+
+
+ );
+};
+
+export default EmployeeApp;
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/utils/index.js
new file mode 100644
index 00000000000..81ac8b54140
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/finance/src/utils/index.js
@@ -0,0 +1,7 @@
+import React, { useEffect,useState,Fragment } from "react";
+import { useTranslation } from "react-i18next";
+
+
+export const getUserType=()=>{
+ return window?.Digit?.SessionStorage?.get("userType")||"employee";
+}
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/package.json
new file mode 100644
index 00000000000..d21440a57d2
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/package.json
@@ -0,0 +1,32 @@
+{
+ "name": "@egovernments/digit-ui-module-firenoc",
+ "version": "0.0.1-sandbox",
+ "description": "FireNoc Module UI",
+ "main": "dist/index.js",
+ "module": "dist/index.modern.js",
+ "source": "src/Module.js",
+ "files": [
+ "dist"
+ ],
+ "scripts": {
+ "start": "microbundle-crl watch --no-compress --format modern,cjs",
+ "build": "microbundle-crl --compress --no-sourcemap --format cjs",
+ "prepublish": "yarn build"
+ },
+ "peerDependencies": {
+ "react": "17.0.2",
+ "react-router-dom": "5.3.0"
+ },
+ "dependencies": {
+ "@egovernments/digit-ui-react-components": "1.7.35",
+ "react": "17.0.2",
+ "react-date-range": "^1.4.0",
+ "react-dom": "17.0.2",
+ "react-hook-form": "6.15.8",
+ "react-i18next": "11.16.2",
+ "react-query": "3.6.1",
+ "react-router-dom": "5.3.0"
+ },
+ "author": "Mukund
",
+ "license": "MIT"
+}
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/Module.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/Module.js
new file mode 100644
index 00000000000..b5ee3463fba
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/Module.js
@@ -0,0 +1,43 @@
+import { Loader} from "@egovernments/digit-ui-react-components";
+import React from "react";
+import FirenocCard from "./components/FireNocCard";
+import EmployeeApp from "./pages/employee";
+import { useRouteMatch } from "react-router-dom";
+
+export const FirenocModule = ({ stateCode, userType, tenants }) => {
+
+
+ const tenantId = Digit.ULBService.getCurrentTenantId();
+ const moduleCode = "firenoc";
+ const language = Digit.StoreData.getCurrentLanguage();
+ const { path, url } = useRouteMatch();
+
+ const { isLoading, data: store } = Digit.Services.useStore({
+ stateCode,
+ moduleCode,
+ language,
+ });
+
+if (isLoading) {
+ return ;
+ }
+ if (userType === "employee") {
+ return ;
+ } else return Citizen
+
+}
+
+const componentsToRegister = {
+ FirenocModule,
+ FirenocCard,
+ EmployeeApp
+ };
+
+export const initFirenocComponents = () => {
+ Object.entries(componentsToRegister).forEach(([key, value]) => {
+ Digit.ComponentRegistryService.setComponent(key, value);
+ });
+}
+
+
+
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/components/FireNocCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/components/FireNocCard.js
new file mode 100644
index 00000000000..a7e8b50b0b2
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/components/FireNocCard.js
@@ -0,0 +1,41 @@
+import React, { useEffect, useState } from "react";
+import { Link } from "react-router-dom";
+import { useTranslation } from "react-i18next";
+import { EmployeeModuleCard, PropertyHouse } from "@egovernments/digit-ui-react-components";
+import { CaseIcon } from "@egovernments/digit-ui-react-components";
+
+const FirenocCard = () => {
+
+ if (!Digit.Utils.FirenocAccess()) return null;
+ const { t } = useTranslation();
+
+
+ window.localStorage.setItem("Employee.locale", "en_IN");
+ window.localStorage.setItem("locale", "en_IN");
+ window.localStorage.setItem("Employee.tenant-id", Digit.ULBService.getCurrentTenantId());
+ window.localStorage.setItem("tenant-id",Digit.ULBService.getCurrentTenantId());
+
+ const links = [
+ {
+ label: t("ES_COMMON_INBOX"),
+ link: `https://unified-demo.digit.org/employee/fire-noc/inbox`,
+ hyperlink: true
+ },
+ {
+ label: t("ES_COMMON_SEARCH"),
+ link: `https://unified-demo.digit.org/employee/fire-noc/search`,
+ hyperlink: true
+
+ }
+ ];
+
+ const propsForModuleCard = {
+ moduleName: t("COMMON_FIRENOC"),
+ links: links,
+ icon:
+}
+
+ return ;
+};
+
+export default FirenocCard;
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/pages/employee/index.js
new file mode 100644
index 00000000000..076ff799b15
--- /dev/null
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/firenoc/src/pages/employee/index.js
@@ -0,0 +1,25 @@
+import React from "react";
+import { PrivateRoute } from "@egovernments/digit-ui-react-components";
+import { Switch } from "react-router-dom/cjs/react-router-dom.min";
+
+const EmployeeApp = ({ path, url, userType }) => {
+ return (
+
+
+
+
+
(
+ FireNoc
+ )}
+ />
+
+
{t("UC_TOTAL_DUE_AMOUT_LABEL")}}
- text={`₹${totalDueAmount}`}
+ text={`₹${challanDetails?.applicationStatus === "PAID" ? "0" : totalDueAmount}`}
textStyle={{ fontSize: "24px", padding: "10px 0px", fontWeight: "700" }}
/>
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js
index 1dd43890283..ea7735f7324 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/mCollect/src/components/DesktopInbox.js
@@ -109,6 +109,13 @@ const DesktopInbox = ({ tableConfig, filterComponent, columns, ...props }) => {
Cell: ({ row }) => {
const amount = row.original?.totalAmount;
let action = "ACTIVE";
+ if (row.original?.applicationStatus == "PAID") {
+ return (
+
+ {getActionButton(row.original?.["businessService"], row.original?.["challanNo"])}
+
+ );
+ }
if (amount > 0) action = "COLLECT";
if (action == "COLLECT") {
return (
@@ -124,13 +131,8 @@ const DesktopInbox = ({ tableConfig, filterComponent, columns, ...props }) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js
index 5de18ef39b1..a0c3432ff7a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js
@@ -175,7 +175,8 @@ const BpaApplicationDetail = () => {
history.replace(`/digit-ui/citizen/obps/sendbacktocitizen/ocbpa/${data?.applicationData?.tenantId}/${data?.applicationData?.applicationNo}/check`, { data: data?.applicationData, edcrDetails: data?.edcrDetails });
}
if (action === "PAY") {
- window.location.assign(`${window.location.origin}/digit-ui/citizen/payment/collect/${`${getBusinessServices(data?.businessService, data?.applicationStatus)}/${id}/${data?.tenantId}?tenantId=${data?.tenantId}`}`);
+ // window.location.assign(`${window.location.origin}/digit-ui/citizen/payment/collect/${`${getBusinessServices(data?.businessService, data?.applicationStatus)}/${id}/${data?.tenantId}?tenantId=${data?.tenantId}`}`);
+ window.location.assign(`${window.location.origin}/digit-ui/citizen/payment/my-bills/${`${getBusinessServices(data?.businessService, data?.applicationStatus)}/${id}/${data?.tenantId}?tenantId=${data?.tenantId}`}`);
}
if (action === "SEND_TO_CITIZEN"){
if (workflowDetails?.data?.processInstances?.length > 2) {
@@ -221,7 +222,7 @@ const BpaApplicationDetail = () => {
const userInfo = Digit.UserService.getUser();
const rolearray = userInfo?.info?.roles;
if (data?.applicationData?.status == "CITIZEN_APPROVAL_INPROCESS") {
- if(rolearray?.length == 1 && rolearray?.[0]?.code == "CITIZEN") {
+ if(rolearray?.length == 1 && (rolearray?.[0]?.code == "CITIZEN" || rolearray?.[0]?.code == "BPA_CITIZEN")) {
workflowDetails.data.nextActions = workflowDetails?.data?.nextActions;
} else {
workflowDetails.data.nextActions = [];
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/home.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/home.js
index cab3ea1c1bf..dfb3b26ec0f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/home.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/home.js
@@ -6,6 +6,7 @@ import { useLocation } from "react-router-dom";
const BPACitizenHomeScreen = ({ parentRoute }) => {
const userInfo = Digit.UserService.getUser();
const userRoles = userInfo?.info?.roles?.map((roleData) => roleData.code);
+ const tenantId = Digit.ULBService.getCitizenCurrentTenant();
const stateCode = Digit.ULBService.getStateId();
const [stakeHolderRoles, setStakeholderRoles] = useState(false);
const { data: stakeHolderDetails, isLoading: stakeHolderDetailsLoading } = Digit.Hooks.obps.useMDMS(
@@ -40,7 +41,7 @@ const BPACitizenHomeScreen = ({ parentRoute }) => {
const inboxSearchParams = { limit: 10, offset: 0, mobileNumber: userInfo?.info?.mobileNumber };
const { isLoading: bpaLoading, data: bpaInboxData } = Digit.Hooks.obps.useArchitectInbox({
- tenantId: stateCode,
+ tenantId: tenantId,
moduleName: "bpa-services",
businessService: ["BPA_LOW", "BPA", "BPA_OC"],
filters: {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/EmployeeCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/EmployeeCard.js
index 3073e31e47e..190aad1e32d 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/EmployeeCard.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/EmployeeCard.js
@@ -15,7 +15,7 @@ const OBPSEmployeeHomeCard = () => {
const tenantId = Digit.ULBService.getCurrentTenantId();
const stateCode = Digit.ULBService.getStateId();
- const stakeholderEmployeeRoles = [ { code: "BPAREG_DOC_VERIFIER", tenantId: stateCode }, { code: "BPAREG_APPROVER", tenantId: stateCode }];
+ const stakeholderEmployeeRoles = [ { code: "BPAREG_EMPLOYEE", tenantId: stateCode }, { code: "BPAREG_DOC_VERIFIER", tenantId: stateCode }, { code: "BPAREG_APPROVER", tenantId: stateCode }];
const bpaEmployeeRoles = [ "BPA_FIELD_INSPECTOR", "BPA_NOC_VERIFIER", "BPA_APPROVER", "BPA_VERIFIER", "CEMP"];
const checkingForStakeholderRoles = showHidingLinksForStakeholder(stakeholderEmployeeRoles);
@@ -123,6 +123,10 @@ const OBPSEmployeeHomeCard = () => {
label: t("ES_COMMON_SEARCH_APPLICATION"),
link: `/digit-ui/employee/obps/search/application`
},
+ {
+ label: t("OBPS_DASHBOARD"),
+ link: `/digit-ui/employee/dss/dashboard/obps`
+ },
]
}),[isInboxLoading, isInboxLoadingOfStakeholder, dataOfStakeholder, dataOfBPA, totalCount, totalCountEs]);
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/stakeholderInbox/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/stakeholderInbox/index.js
index 5e4b87f7484..56caf0afc94 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/stakeholderInbox/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/stakeholderInbox/index.js
@@ -98,7 +98,7 @@ const Inbox = ({ parentRoute }) => {
const { data: localitiesForEmployeesCurrentTenant, isLoading: loadingLocalitiesForEmployeesCurrentTenant } = Digit.Hooks.useBoundaryLocalities(tenantId, "revenue", {}, t);
- const { isLoading: isInboxLoading, data: { table, statuses, totalCount } = {} } = Digit.Hooks.obps.useBPAInbox({
+ const { isLoading: isInboxLoading, data: { table, statuses, totalCount } = {} } = Digit.Hooks.obps.useBPAInboxV1({
tenantId,
filters: { ...formState }
});
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
index 6524a959712..8575e24e68a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
@@ -739,7 +739,7 @@ export const showHidingLinksForStakeholder = (roles = []) => {
let checkedRoles = [];
const rolearray = roles?.map((role) => {
userInfo?.value?.info?.roles?.map((item) => {
- if (item.code === role.code && item.tenantId === role.tenantId) {
+ if (item.code === role.code) {
checkedRoles.push(item);
}
});
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/README.md
index 4d9743e2ef5..34373ad01ce 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/README.md
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/README.md
@@ -22,10 +22,10 @@ frontend/micro-ui/web/package.json
## Changelog
-### Summary for Version [1.7.10] - 2025-02-13
+### Summary for Version [1.7.35] - 2025-03-20
No specific change. Version matched as used in URBAN.
### Contributors
-[jagankumar-egov] [hari-egov] [mukund-egov]
+[jagankumar-egov] [hari-egov] [mukund-egov]
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
index 31058300a71..6f03be04bab 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-pgr",
- "version": "1.7.10",
+ "version": "1.7.38",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
@@ -18,7 +18,6 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
-
"@egovernments/digit-ui-react-components": "^1.7.0-beta.2",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
@@ -31,4 +30,4 @@
"redux": "4.1.2",
"redux-thunk": "2.4.1"
}
-}
+}
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
index 0c114462961..27c3905a112 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/components/PGRCard.js
@@ -7,6 +7,7 @@ import { EmployeeModuleCard } from "@egovernments/digit-ui-react-components";
const PGRCard = () => {
const { t } = useTranslation();
const [count, setCount] = useState(0);
+ const [countNSLA, setCountNSLA] = useState(0);
const tenantId = Digit.ULBService.getCurrentTenantId();
const allLinks = [
@@ -36,9 +37,16 @@ const PGRCard = () => {
useEffect(() => {
(async () => {
let response = await Digit.PGRService.count(tenantId, {} );
+ let responseNSLA = await Digit.PGRService.count(tenantId, {
+ slaDeltaMaxLimit: 345600000,
+ slaDeltaMinLimit: 0
+ } );
if (response?.count) {
setCount(response.count);
}
+ if (responseNSLA?.count) {
+ setCountNSLA(responseNSLA.count);
+ }
})();
});
@@ -55,7 +63,7 @@ const PGRCard = () => {
label: t("TOTAL_PGR"),
link: `/digit-ui/employee/pgr/inbox`
},
- {
+ { count: countNSLA && countNSLA,
label: t("TOTAL_NEARING_SLA"),
link: `/digit-ui/employee/pgr/inbox`
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
index 9741b1bd34b..ec767a58d54 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/Steps/SelectAddress.js
@@ -28,7 +28,11 @@ const SelectAddress = ({ t, config, onSelect, value }) => {
if (selectedCity && fetchedLocalities) {
const { pincode } = value;
let __localityList = pincode ? fetchedLocalities.filter((city) => city["pincode"] == pincode) : fetchedLocalities;
- setLocalities(__localityList);
+ if (__localityList && __localityList.length > 0) {
+ setLocalities(__localityList);
+ } else {
+ setLocalities(fetchedLocalities);
+ }
}
}, [selectedCity, fetchedLocalities]);
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/index.js
index 740de4a682f..bb9d79c3009 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/citizen/Create/index.js
@@ -93,6 +93,7 @@ export const CreateComplaint = () => {
await dispatch(createComplaint(data));
await client.refetchQueries(["complaintsList"]);
history.push(`${match.path}/response`);
+ setParams({});
}
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/ComplaintDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/ComplaintDetails.js
index 91641378146..ba0923b9447 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/ComplaintDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/ComplaintDetails.js
@@ -367,12 +367,12 @@ export const ComplaintDetails = (props) => {
if (checkpoint.status === "PENDINGFORASSIGNMENT" && complaintDetails?.audit) {
if(isFirstPendingForAssignment){
const caption = {
- date: Digit.DateUtils.ConvertTimestampToDate(complaintDetails.audit.details.createdTime),
+ date: Digit.DateUtils.convertTimestampToDateFormat(complaintDetails.audit.details.createdTime),
};
return
;
} else {
const caption = {
- date: Digit.DateUtils.ConvertTimestampToDate(complaintDetails.audit.details.createdTime),
+ date: Digit.DateUtils.convertTimestampToDateFormat(complaintDetails.audit.details.createdTime),
};
return <>
{checkpoint?.wfComment ? {checkpoint?.wfComment?.map( e =>
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
index 889a2d6694a..215722b05e2 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/CreateComplaint/index.js
@@ -28,7 +28,6 @@ export const CreateComplaint = ({ parentUrl }) => {
},
t
);
-
const [localities, setLocalities] = useState(fetchedLocalities);
const [selectedLocality, setSelectedLocality] = useState(null);
const [canSubmit, setSubmitValve] = useState(false);
@@ -64,12 +63,25 @@ export const CreateComplaint = ({ parentUrl }) => {
setSelectedLocality(null);
const __localityList = fetchedLocalities;
const __filteredLocalities = __localityList.filter((city) => city["pincode"] == pincode);
- setLocalities(__filteredLocalities);
+ if (__filteredLocalities && __filteredLocalities.length > 0) {
+ setLocalities(__filteredLocalities);
+ } else {
+ setLocalities(fetchedLocalities);
+ }
} else if (pincode === "" || pincode === null) {
setPincodeNotValid(false);
setLocalities(fetchedLocalities);
} else {
- setPincodeNotValid(true);
+ if (pincode) {
+ if (!Digit.Utils.getPattern("Pincode").test(pincode)) setPincodeNotValid(true);
+ const foundValue = cities?.find((obj) => obj.pincode?.find((item) => item.toString() === pincode));
+ if (foundValue) {
+ setPincodeNotValid(false)
+ }
+ else{
+ setPincodeNotValid(true)
+ }
+ }
}
}, [pincode]);
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/Inbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/Inbox.js
index 106d9573d92..d12601b2b01 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/Inbox.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/src/pages/employee/Inbox.js
@@ -12,7 +12,7 @@ const Inbox = () => {
const [pageOffset, setPageOffset] = useState(0);
const [pageSize, setPageSize] = useState(10);
const [totalRecords, setTotalRecords] = useState(0);
- const [searchParams, setSearchParams] = useState({ filters: { wfFilters: { assignee: [{ code: uuid }] } }, search: "", sort: {} });
+ const [searchParams, setSearchParams] = useState({ filters: { wfFilters: { assignee: [{ }] } }, search: "", sort: {} });
useEffect(() => {
(async () => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/README.md
index c81bfb56157..3eb72ad6174 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/README.md
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/README.md
@@ -22,10 +22,10 @@ frontend/micro-ui/web/package.json
## Changelog
-### Summary for Version [1.7.10] - 2025-02-13
+### Summary for Version [1.7.35] - 2025-03-20
Started using inboxV2 api
### Contributors
-[jagankumar-egov] [hari-egov] [mukund-egov]
+[jagankumar-egov] [hari-egov] [mukund-egov]
\ No newline at end of file
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 d4465524186..9ecf19a8848 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": "@egovernments/digit-ui-module-pt",
- "version": "1.7.10",
+ "version": "0.0.1-sandbox",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
@@ -18,7 +18,6 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
-
"@egovernments/digit-ui-react-components": "^1.7.0-beta.2",
"lodash.merge": "^4.6.2",
"react": "17.0.2",
@@ -28,4 +27,4 @@
"react-query": "3.6.1",
"react-router-dom": "5.3.0"
}
-}
+}
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/components/PTCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/components/PTCard.js
index 3778e84137f..21021c728a3 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/components/PTCard.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/components/PTCard.js
@@ -45,6 +45,10 @@ const PTCard = () => {
label: t("ES_COMMON_APPLICATION_SEARCH"),
link: `/digit-ui/employee/pt/application-search`,
},
+ {
+ label: t("PT_DASHBOARD"),
+ link: `/digit-ui/employee/dss/dashboard/propertytax`
+ }
];
const PT_CEMP = Digit.UserService.hasAccess(["PT_CEMP"]) || false;
const propsForModuleCard = {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/config/inbox-table-config.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/config/inbox-table-config.js
index 9042cebdf55..2a9bff67609 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/config/inbox-table-config.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/config/inbox-table-config.js
@@ -141,11 +141,13 @@ export const TableConfig = (t) => ({
Header: t("ES_INBOX_SLA_DAYS_REMAINING"),
accessor: "createdTime",
Cell: ({ row }) => {
- const wf = row.original.workflowData;
+ const wf = row.original.searchData?.serviceSla;
const math = Math.round((wf?.businesssServiceSla || 0) / (24 * 60 * 60 * 1000)) || "-";
- return GetSlaCell(math);
+ return GetSlaCell(wf);
},
- mobileCell: (original) => GetSlaCell(Math.round((original?.workflowData?.["businesssServiceSla"] || 0) / (24 * 60 * 60 * 1000))),
+ // mobileCell: (original) => GetSlaCell(Math.round((original?.searchData?.serviceSla || 0) / (24 * 60 * 60 * 1000))),
+ mobileCell :(original) => GetSlaCell(original?.searchData?.serviceSla?.businesssServiceSla),
+
},
],
serviceRequestIdKey: (original) => original?.[t("ES_INBOX_UNIQUE_PROPERTY_ID")]?.props?.children,
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/getPTAcknowledgementData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/getPTAcknowledgementData.js
index 84e13bf8564..be5f5f62bb0 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/getPTAcknowledgementData.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/getPTAcknowledgementData.js
@@ -21,7 +21,7 @@ const getOwner = (application, t, customTitle) => {
application.ownershipCategory = application?.transferorDetails?.ownershipCategory;
owners = [...(application?.transferorDetails?.owners) || []];
} else {
- owners = [...(application?.owners.filter((owner) => owner.status == "INACTIVE") || [])];
+ owners = [...(application?.ownersInit || [])];
}
else
owners = [...(application?.owners.filter((owner) => owner.status == "ACTIVE") || [])];
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js
index 88f0f79b52e..f4a03eb3378 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/citizen/PTApplicationDetails.js
@@ -22,7 +22,7 @@ import PTCitizenFeedbackPopUp from "../../pageComponents/PTCitizenFeedbackPopUp"
//import PTCitizenFeedback from "@egovernments/digit-ui-module-core/src/components/PTCitizenFeedback";
import get from "lodash/get";
-import { size } from "lodash";
+// import { size } from "lodash";
const PTApplicationDetails = () => {
const { t } = useTranslation();
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/AssessmentDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/AssessmentDetails.js
index 4409e1d6111..80d3d23f6c0 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/AssessmentDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/AssessmentDetails.js
@@ -5,7 +5,7 @@ import ApplicationDetailsTemplate from "../../../../templates/ApplicationDetails
import { useParams, useLocation, useHistory } from "react-router-dom";
import { ActionBar, Header, Loader, SubmitBar,Card,CardSubHeader,CardSectionHeader,LinkLabel, CardLabel, CardHeader, CardText} from "@egovernments/digit-ui-react-components";
import { useQueryClient } from "react-query";
-import _, { first, update } from "lodash";
+import _ from "lodash";
import { Modal,Dropdown, Row, StatusTable } from "@egovernments/digit-ui-react-components";
import {convertEpochToDate} from "../../utils/index";
@@ -473,7 +473,7 @@ const Penality_menu=[
return (
- {t("PT_CALC_DETAILS")}
+ {/* {t("PT_CALC_DETAILS")}
*/}
{t("PT_CALC_LOGIC_HEADER")}
{t("PT_CALC_LOGIC")}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/MutationApplicatinDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/MutationApplicatinDetails.js
index 0468c99af64..23e1bdb22fb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/MutationApplicatinDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pt/src/pages/employee/MutationApplicatinDetails.js
@@ -12,8 +12,9 @@ import { newConfigMutate } from "../../config/Mutate/config";
import _ from "lodash";
import get from "lodash/get";
import { pdfDownloadLink } from "../../utils";
-
+import { useQueryClient } from "react-query";
const MutationApplicationDetails = ({ propertyId, acknowledgementIds, workflowDetails, mutate}) => {
+ const [showToast, setShowToast] = useState(null);
const { t } = useTranslation();
const [displayMenu, setDisplayMenu] = useState(false);
const [showOptions, setShowOptions] = useState(false);
@@ -30,7 +31,7 @@ const MutationApplicationDetails = ({ propertyId, acknowledgementIds, workflowDe
);
const [billAmount, setBillAmount] = useState(null);
const [billStatus, setBillStatus] = useState(null);
-
+ const queryClient = useQueryClient();
const properties = get(data, "Properties", []);
// const propertyId = get(data, "Properties[0].propertyId", []);
let property = (properties && properties.length > 0 && properties[0]) || {};
@@ -64,6 +65,10 @@ const MutationApplicationDetails = ({ propertyId, acknowledgementIds, workflowDe
const [selectedAction, setSelectedAction] = useState(null);
const { isLoading: isLoadingApplicationDetails, isError: isErrorApplicationDetails, data: applicationDetails, error: errorApplicationDetails } = Digit.Hooks.pt.useApplicationDetail(t, tenantId, propertyId);
+ const closeToast = () => {
+ setShowToast(null);
+ };
+
useEffect(async ()=>{
if(acknowledgementIds){
const res = await Digit.PaymentService.searchBill(tenantId, {Service: businessService, consumerCode: acknowledgementIds});
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/README.md
index ebf002f48e1..8e1560c4125 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/README.md
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/README.md
@@ -22,10 +22,10 @@ frontend/micro-ui/web/package.json
## Changelog
-### Summary for Version [1.7.10] - 2025-02-13
+### Summary for Version [1.7.35] - 2025-03-20
No specific change. Version matched as used in URBAN.
### Contributors
-[jagankumar-egov] [hari-egov] [mukund-egov]
+[jagankumar-egov] [hari-egov] [mukund-egov]
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json
index 403a4994218..e71fb5714f2 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/receipts/package.json
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-receipts",
- "version": "1.7.10",
+ "version": "1.7.0-beta.2",
"description": "RECEIPTS",
"license": "MIT",
"main": "dist/index.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json
index 6b40411386c..14c829dc57b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/reports/package.json
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-reports",
- "version": "1.0.0",
+ "version": "1.7.35",
"description": "REPORTS",
"license": "MIT",
"main": "dist/index.js",
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/PTActionModal.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/PTActionModal.js
index 4955c7d8b4e..37b3d996177 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/PTActionModal.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/PTActionModal.js
@@ -1,7 +1,7 @@
import { Loader, Modal, FormComposer } from "@egovernments/digit-ui-react-components";
import React, { useState, useEffect } from "react";
-import { configPTRejectApplication, configPTVerifyApplication, configPTApproverApplication, configPTAssessProperty } from "../config";
+import { configPTApproverApplication, configPTAssessProperty } from "../config";
import * as predefinedConfig from "../config";
const Heading = (props) => {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js
index 16146ec087d..f7e08995a63 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js
@@ -9,7 +9,7 @@ import {
Row,
StatusTable,
} from "@egovernments/digit-ui-react-components";
-import { values } from "lodash";
+// import { values } from "lodash";
import React, { Fragment } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/TLApproverApplication.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/TLApproverApplication.js
index 23b20e5be2b..87d545b1de4 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/TLApproverApplication.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/config/TLApproverApplication.js
@@ -52,15 +52,18 @@ export const configTLApproverApplication = ({
{
label: t("TL_APPROVAL_CHECKLIST_BUTTON_UP_FILE"),
populators: (
-
{
- setUploadedFile(null);
- }}
- message={uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`)}
- />
+
+
{t("TL_DOCUMENTS_ATTACH_RESTRICTIONS_SIZE")}
+
{
+ setUploadedFile(null);
+ }}
+ message={uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`)}
+ />
+
+
-
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/config/config.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/config/config.js
index 5599c944ba7..7559f18851e 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/config/config.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/config/config.js
@@ -192,22 +192,6 @@ export const newConfig = [
"nextStep": "owner-ship-details",
"hideInEmployee": true
},
- {
- "type": "component",
- "route": "proof",
- "component": "TLProof",
- "withoutLabel": true,
- "texts": {
- "headerCaption": "TL_OWNERS_DETAILS",
- "header": "TL_OWNERS_PHOTOGRAPH_HEADER",
- "cardText": "",
- "nextText": "CS_COMMON_NEXT",
- "submitBarLabel": "CS_COMMON_NEXT"
- },
- "key": "owners",
- "nextStep": null,
- "hideInEmployee": true
- }
]
},
{
@@ -466,7 +450,7 @@ export const newConfig = [
},
key: "owners",
withoutLabel: true,
- nextStep: "proof",
+ "nextStep": null,
hideInEmployee: true,
},
{
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/SelectOwnershipProof.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/SelectOwnershipProof.js
index 13b76801962..0f89b8a4f2f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/SelectOwnershipProof.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/SelectOwnershipProof.js
@@ -27,6 +27,10 @@ const SelectOwnershipProof = ({ t, config, onSelect, userType, formData }) => {
// setDropdownValue(dropdownValue);
// }
+ useEffect(() => {
+ localStorage.setItem("TLAppSubmitEnabled", "true");
+ }, []);
+
const handleSubmit = () => {
let fileStoreId = uploadedFile;
let fileDetails = file;
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLProof.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLProof.js
index cdde52f50da..d32d2c5eb24 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLProof.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLProof.js
@@ -1,12 +1,13 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect,useCallback } from "react";
import { FormStep, UploadFile, CardLabelDesc, Dropdown, CardLabel } from "@egovernments/digit-ui-react-components";
import { stringReplaceAll } from "../utils";
import Timeline from "../components/TLTimeline";
const TLProof = ({ t, config, onSelect, userType, formData }) => {
//let index = window.location.href.charAt(window.location.href.length - 1);
- const [uploadedFile, setUploadedFile] = useState(formData?.owners?.documents?.OwnerPhotoProof?.fileStoreId || null);
- const [file, setFile] = useState(formData?.owners?.documents?.OwnerPhotoProof);
+ const [uploadedFile, setUploadedFile] = useState(formData?.owners?.documents?.OwnerPhotoProof?.fileStoreId);
+ console.log("uploadedFile", uploadedFile);
+ const [file, setFile] = useState(formData?.owners?.documents?.OwnerPhotoProof || []);
const [error, setError] = useState(null);
const cityDetails = Digit.ULBService.getCurrentUlb();
let acceptFormat = ".jpg,.png,.pdf,.jpeg";
@@ -15,7 +16,10 @@ const TLProof = ({ t, config, onSelect, userType, formData }) => {
// let dropdownData = [];
const tenantId = Digit.ULBService.getCurrentTenantId();
const stateId = Digit.ULBService.getStateId();
- const { data: Documentsob = {} } = Digit.Hooks.pt.usePropertyMDMS(stateId, "PropertyTax", "Documents");
+ const { data: Documentsob = {} } = Digit.Hooks.useCustomMDMS(stateId, "PropertyTax", [{ name: "Documents" }], {});
+ console.log("data", Documentsob);
+
+ // const { data: Documentsob = {} } = Digit.Hooks.pt.usePropertyMDMS(stateId, "PropertyTax", "Documents");
const docs = Documentsob?.PropertyTax?.Documents;
const ownerPhotoProof = Array.isArray(docs) && docs.filter((doc) => doc.code.includes("ADDRESSPROOF"));
// if (ownerPhotoProof.length > 0) {
@@ -75,6 +79,11 @@ const TLProof = ({ t, config, onSelect, userType, formData }) => {
})();
}, [file]);
+ const handleDelete = useCallback(() => {
+ setUploadedFile(null);
+ setFile(null);
+ }, []);
+
return (
{window.location.href.includes("/citizen") ? : null}
@@ -96,9 +105,7 @@ const TLProof = ({ t, config, onSelect, userType, formData }) => {
extraStyleName={"propertyCreate"}
accept=".jpg,.png,.pdf,.jpeg"
onUpload={selectfile}
- onDelete={() => {
- setUploadedFile(null);
- }}
+ onDelete={handleDelete}
message={uploadedFile ? `1 ${t(`TL_ACTION_FILEUPLOADED`)}` : t(`TL_ACTION_NO_FILEUPLOADED`)}
error={error}
/>
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLSelectOwnerShipDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLSelectOwnerShipDetails.js
index 6ccfac933ee..e2d41fe10cb 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLSelectOwnerShipDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pageComponents/TLSelectOwnerShipDetails.js
@@ -162,7 +162,7 @@ const TLSelectOwnerShipDetails = ({ t, config, onSelect, userType, formData, onB
value={ownershipCategory}
labelKey="PT_OWNERSHIP"
isDependent={true}
- disabled={isEdit}
+ disabled={isEdit || isSameAsPropertyOwner}
isTLFlow={true}
/>
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/Application.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/Application.js
index 52fc8aa3612..22cc7047a81 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/Application.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/Application.js
@@ -15,11 +15,11 @@ const TLMyApplications = ({ view }) => {
config: { enabled: view === "bills" },
})
: Digit.Hooks.tl.useTLSearchApplication(
- { tenantId: Digit.ULBService.getCitizenCurrentTenant() },
+ { tenantId: Digit.ULBService.getCitizenCurrentTenant(),limit:50 },
{
enabled: view !== "bills",
},
- t
+ t,
);
if (isLoading) {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js
index b39efe4c674..92fc932d96b 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Applications/ApplicationDetails.js
@@ -408,7 +408,7 @@ const TLApplicationDetails = () => {
{application?.status === "PENDINGPAYMENT" ? (
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/CheckPage.js
index 39ee62775bf..710714c3eb6 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/CheckPage.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/CheckPage.js
@@ -52,11 +52,11 @@ const WrapCheckPage = ({ onSubmit, value }) => {
new Date(newdate).getDate().toString() + "/" + (new Date(newdate).getMonth() + 1).toString() + "/" + new Date(newdate).getFullYear().toString()
}`;
}
- useEffect(() => {
- return () => {
- localStorage.setItem("TLAppSubmitEnabled", "false");
- };
- }, []);
+ // useEffect(() => {
+ // return () => {
+ // localStorage.setItem("TLAppSubmitEnabled", "false");
+ // };
+ // }, []);
function routeTo(jumpTo) {
sessionStorage.getItem("isDirectRenewal") ? sessionStorage.removeItem("isDirectRenewal") : "";
@@ -91,6 +91,7 @@ const WrapCheckPage = ({ onSubmit, value }) => {
}
else
onSubmit();
+ localStorage.setItem("TLAppSubmitEnabled", "false");
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/TLAcknowledgement.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/TLAcknowledgement.js
index 75f41b2dd7b..de834d17515 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/TLAcknowledgement.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Create/TLAcknowledgement.js
@@ -1,5 +1,5 @@
import { Banner, Card, CardText, LinkButton, Loader, SubmitBar } from "@egovernments/digit-ui-react-components";
-import React, { useEffect } from "react";
+import React, { useEffect,useRef } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { convertToEditTrade, convertToResubmitTrade, convertToTrade, convertToUpdateTrade, stringToBoolean } from "../../../utils";
@@ -32,12 +32,32 @@ const BannerPicker = (props) => {
);
};
+function getFinancialYear() {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = today.getMonth() + 1;
+
+ if (month >= 4) {
+ return `${year}-${(year + 1).toString().slice(-2)}`;
+ } else {
+ return `${year - 1}-${year.toString().slice(-2)}`;
+ }
+}
+
const TLAcknowledgement = ({ data, onSuccess, onUpdateSuccess }) => {
+ const hasTriggeredMutation = useRef(false);
const { t } = useTranslation();
const [mutationHappened, setMutationHappened, clear] = Digit.Hooks.useSessionStorage("CITIZEN_TL_MUTATION_HAPPENED", false);
const resubmit = window.location.href.includes("edit-application");
const tenantId = Digit.ULBService.getCurrentTenantId();
const isRenewTrade = !window.location.href.includes("renew-trade")
+
+ const { isLoading: mdmsLoading, data: mdmsBillingData } = Digit.Hooks.useGetPaymentRulesForBusinessServices(tenantId);
+
+ const financialYearStart = getFinancialYear().slice(0, 4);
+ const filteredData = mdmsBillingData?.MdmsRes?.BillingService?.TaxPeriod?.filter(
+ (item) => item.service === "TL" && item.code === `TLRENEWAL${financialYearStart}`
+ );
const mutation = Digit.Hooks.tl.useTradeLicenseAPI(
data?.cpt?.details?.address?.tenantId ? data?.cpt?.details?.address?.tenantId : tenantId,
isRenewTrade
@@ -59,6 +79,10 @@ const TLAcknowledgement = ({ data, onSuccess, onUpdateSuccess }) => {
useEffect(() => {
+ if (!filteredData || filteredData.length === 0) return;
+ if (hasTriggeredMutation.current) return; // Prevent re-trigger
+
+ hasTriggeredMutation.current = true;
const onSuccessedit = () => {
setMutationHappened(true);
};
@@ -106,7 +130,7 @@ const TLAcknowledgement = ({ data, onSuccess, onUpdateSuccess }) => {
}
} catch (err) {
}
- }, [fydata]);
+ }, [filteredData]);
useEffect(() => {
if (mutation.isSuccess || (mutation1.isSuccess && isEdit && !isDirectRenewal)) {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/EditTrade/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/EditTrade/index.js
index 294c932dd3d..b4f578e2a2a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/EditTrade/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/EditTrade/index.js
@@ -209,6 +209,14 @@ const EditTrade = ({ parentRoute }) => {
application.isEditProperty = true;
}
sessionStorage.setItem("tradeInitialObject", JSON.stringify({ ...application }));
+ application?.tradeLicenseDetail?.applicationDocuments?.forEach((doc) => {
+ if (doc.documentType === "BUSINESSREGISTRATIONCERTIFICATE") {
+ doc.documentType = "OWNERSHIPPROOF";
+ }
+ if (doc.documentType === "IDENTIFICATIONPROOF") {
+ doc.documentType = "OWNERIDPROOF";
+ }
+ });
let tradeEditDetails = getTradeEditDetails(application,t,wfdata);
setParams({ ...params, ...tradeEditDetails });
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/index.js
index 6017476de22..70dd2415188 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/index.js
@@ -13,8 +13,8 @@ export const TLList = () => {
if (licenseno) filter1.licenseNumbers = licenseno;
if (licenseno) filter1.tenantId = tenantID;
if (!licenseno) filter1.mobileNumber = userInfo?.info?.mobileNumber;
- filter1 = { ...filter1, tenantId: tenantId || tenantID, status: "APPROVED,CANCELLED,EXPIRED,MANUALEXPIRED" };
- const { isLoading, isError, error, data } = Digit.Hooks.tl.useTradeLicenseSearch({ filters: filter1 }, {});
+ filter1 = { ...filter1, tenantId: tenantId || tenantID, status: "APPROVED,CANCELLED,EXPIRED,MANUALEXPIRED",limit:50 };
+ const { isLoading, isError, error, data } = Digit.Hooks.tl.useTradeLicenseSearch({ filters: filter1, }, {});
useEffect(() => {
localStorage.setItem("TLAppSubmitEnabled", "true");
}, []);
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js
index 7274b425700..f29185de02a 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/Renewal/renewTrade.js
@@ -198,6 +198,14 @@ const RenewTrade = ({ parentRoute }) => {
if (editProperty) {
application.isEditProperty = true;
}
+ application?.tradeLicenseDetail?.applicationDocuments?.forEach((doc) => {
+ if (doc.documentType === "BUSINESSREGISTRATIONCERTIFICATE") {
+ doc.documentType = "OWNERSHIPPROOF";
+ }
+ if (doc.documentType === "IDENTIFICATIONPROOF") {
+ doc.documentType = "OWNERIDPROOF";
+ }
+ });
sessionStorage.setItem("tradeInitialObject", JSON.stringify({ ...application }));
let tradeEditDetails = getTradeEditDetails(application,t);
if(window.location.href.includes("property-details"))
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/index.js
index c80bca25f66..fc87a51e714 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/pages/citizen/index.js
@@ -16,30 +16,41 @@ const App = () => {
let isCommonPTPropertyScreen = window.location.href.includes("/tl/tradelicence/new-application/property-details");
const ApplicationDetails = Digit.ComponentRegistryService.getComponent("TLApplicationDetails");
- const CreateTradeLicence = Digit?.ComponentRegistryService?.getComponent('TLCreateTradeLicence');
- const EditTrade = Digit?.ComponentRegistryService?.getComponent('TLEditTrade');
- const RenewTrade = Digit?.ComponentRegistryService?.getComponent('TLRenewTrade');
- const TradeLicense = Digit?.ComponentRegistryService?.getComponent('TradeLicense');
- const TLList = Digit?.ComponentRegistryService?.getComponent('TLList');
- const SearchTradeComponent = Digit?.ComponentRegistryService?.getComponent('TLSearchTradeComponent');
- const TLMyApplications = Digit?.ComponentRegistryService?.getComponent('TLMyApplications');
+ const CreateTradeLicence = Digit?.ComponentRegistryService?.getComponent("TLCreateTradeLicence");
+ const EditTrade = Digit?.ComponentRegistryService?.getComponent("TLEditTrade");
+ const RenewTrade = Digit?.ComponentRegistryService?.getComponent("TLRenewTrade");
+ const TradeLicense = Digit?.ComponentRegistryService?.getComponent("TradeLicense");
+ const TLList = Digit?.ComponentRegistryService?.getComponent("TLList");
+ const SearchTradeComponent = Digit?.ComponentRegistryService?.getComponent("TLSearchTradeComponent");
+ const TLMyApplications = Digit?.ComponentRegistryService?.getComponent("TLMyApplications");
const getBackPageNumber = () => {
let goBacktoFromProperty = -1;
- if(sessionStorage.getItem("VisitedCommonPTSearch") === "true" && (sessionStorage.getItem("VisitedAccessoriesDetails") === "true" || sessionStorage.getItem("VisitedisAccessories") === "true") && isCommonPTPropertyScreen)
- {
- goBacktoFromProperty = -4;
- sessionStorage.removeItem("VisitedCommonPTSearch");
+ if (
+ sessionStorage.getItem("VisitedCommonPTSearch") === "true" &&
+ (sessionStorage.getItem("VisitedAccessoriesDetails") === "true" || sessionStorage.getItem("VisitedisAccessories") === "true") &&
+ isCommonPTPropertyScreen
+ ) {
+ goBacktoFromProperty = -4;
+ sessionStorage.removeItem("VisitedCommonPTSearch");
+ return goBacktoFromProperty;
+ }
return goBacktoFromProperty;
- }
- return goBacktoFromProperty;
- }
+ };
return (
- {!(window.location.href.includes('/acknowledgement'))&&window.location.href.includes('tl/tradelicence') &&Back}
+ {!window.location.href.includes("/acknowledgement") && window.location.href.includes("tl/tradelicence") && (
+
+ Back
+
+ )}
@@ -49,8 +60,8 @@ const App = () => {
-
-
+
+
);
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/utils/index.js
index 5530395bfb5..95e7746a12f 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/utils/index.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/src/utils/index.js
@@ -546,6 +546,7 @@ export const stringToBoolean = (value) => {
export const convertToEditTrade = (data, fy = []) => {
const currrentFYending = fy?.filter(item => item?.code === data?.financialYear)?.[0]?.endingDate;
const nextFinancialYearForRenewal = fy?.filter(item => item?.startingDate === currrentFYending)?.[0]?.code;
+
let isDirectrenewal = stringToBoolean(sessionStorage.getItem("isDirectRenewal"));
let isSameAsPropertyOwner = sessionStorage.getItem("isSameAsPropertyOwner");
let formdata = {
@@ -563,7 +564,7 @@ export const convertToEditTrade = (data, fy = []) => {
applicationDate: data?.applicationDate,
commencementDate: data?.commencementDate,
issuedDate: data?.issuedDate,
- financialYear: nextFinancialYearForRenewal || "2022-23",
+ financialYear: nextFinancialYearForRenewal || "2025-26",
validFrom: data?.validFrom,
validTo: data?.validTo,
action: "INITIATE",
@@ -885,7 +886,8 @@ export const getPattern = type => {
case "NoOfEmp":
return /^(0)*[1-9][0-9]{0,6}$/i;
case "GSTNo":
- return /^\d{2}[A-Z]{5}\d{4}[A-Z]{1}\d[Z]{1}[A-Z\d]{1}$/i;
+ return /^[a-zA-Z-0-9_@/#&+-.`' ]*$/i;
+ // return /^\d{2}[A-Z]{5}\d{4}[A-Z]{1}\d[Z]{1}[A-Z\d]{1}$/i;
case "DoorHouseNo":
return /^[^\$\"'<>?\\\\~`!@$%^()+={}\[\]*:;“”‘’]{1,50}$/i;
case "BuildingStreet":
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/README.md
index 45e9703899f..2e5a1699f0d 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/README.md
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/README.md
@@ -22,7 +22,7 @@ frontend/micro-ui/web/package.json
## Changelog
-### Summary for Version [1.7.10] - 2025-02-13
+### Summary for Version [1.7.36] - 2025-03-28
No specific change. Version matched as used in URBAN.
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 7326dc63263..6f09cc38e80 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": "@egovernments/digit-ui-module-ws",
- "version": "1.7.10",
+ "version": "0.0.1-sandbox",
"description": "",
"main": "dist/index.js",
"module": "dist/index.modern.js",
@@ -18,7 +18,6 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
-
"@egovernments/digit-ui-react-components": "^1.7.0-beta.2",
"react": "17.0.2",
"react-dom": "17.0.2",
@@ -29,4 +28,4 @@
},
"author": "",
"license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js
index 97fc0271b57..c797964b5b4 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/components/WSCard.js
@@ -91,6 +91,10 @@ const WSCard = () => {
link: `/digit-ui/employee/ws/water/search-application`,
roles: ["WS_CEMP", "WS_APPROVER", "WS_FIELD_INSPECTOR", "WS_DOC_VERIFIER", "WS_CLERK"],
},
+ {
+ label: t("WS_DASHBOARD"),
+ link: `/digit-ui/employee/dss/dashboard/ws`
+ }
],
};
return ;
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 c6ddc17842c..10da99d9cda 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
@@ -135,13 +135,13 @@ const WSApplicationDetails = () => {
const wsEstimateDownloadObject = {
order: 1,
label: t("WS_ESTIMATION_NOTICE"),
- onClick: () => data?.WaterConnection?.[0] ? getFiles([data?.WaterConnection?.[0]?.additionalDetails?.estimationFileStoreId], stateCode) : getFiles([data?.SewerageConnections?.[0]?.additionalDetails?.estimationFileStoreId], stateCode),
+ onClick: () => data?.WaterConnection?.[0] ? getFiles([data?.WaterConnection?.[0]?.additionalDetails?.estimationFileStoreId], tenantId) : getFiles([data?.SewerageConnections?.[0]?.additionalDetails?.estimationFileStoreId], tenantId),
};
const sanctionDownloadObject = {
order: 2,
label: t("WS_SANCTION_LETTER"),
- onClick: () => data?.WaterConnection?.[0] ? getFiles([data?.WaterConnection?.[0]?.additionalDetails?.sanctionFileStoreId], stateCode) : getFiles([data?.SewerageConnections?.[0]?.additionalDetails?.sanctionFileStoreId], stateCode),
+ onClick: () => data?.WaterConnection?.[0] ? getFiles([data?.WaterConnection?.[0]?.additionalDetails?.sanctionFileStoreId], tenantId) : getFiles([data?.SewerageConnections?.[0]?.additionalDetails?.sanctionFileStoreId], tenantId),
};
const applicationDownloadObject = {
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js
index 131729d35c4..5be115022ed 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/pages/employee/ApplicationBillAmendment.js
@@ -615,29 +615,29 @@ const ApplicationBillAmendment = () => {
submit={true}
label={state?.data?.action ? t("WF_CITIZEN_NEWSW1_RESUBMIT_APPLICATION") : t("WS_COMMON_BUTTON_SUBMIT")}
disabled={
- (servicev1 == "WS" && ischeckedReduce &&
- ((getValues().WS_REDUCED_AMOUNT.WS_CHARGE == "" || getValues().WS_REDUCED_AMOUNT.WS_CHARGE == null)
- && (getValues().WS_REDUCED_AMOUNT.WS_TIME_PENALTY == "" || getValues().WS_REDUCED_AMOUNT.WS_TIME_PENALTY == null)
- && (getValues().WS_REDUCED_AMOUNT.WS_TIME_INTEREST == "" || getValues().WS_REDUCED_AMOUNT.WS_TIME_INTEREST == null)
- && (getValues().WS_REDUCED_AMOUNT.WS_WATER_CESS == "" || getValues().WS_REDUCED_AMOUNT.WS_WATER_CESS == null)))
- ||
- (servicev1 == "SW" && ischeckedReduce &&
- ((getValues().SW_REDUCED_AMOUNT.SW_CHARGE == "" || getValues().SW_REDUCED_AMOUNT.SW_CHARGE == null)
- && (getValues().SW_REDUCED_AMOUNT.SW_TIME_PENALTY == "" || getValues().SW_REDUCED_AMOUNT.SW_TIME_PENALTY == null)
- && (getValues().SW_REDUCED_AMOUNT.SW_TIME_INTEREST == "" || getValues().SW_REDUCED_AMOUNT.SW_TIME_INTEREST == null)
- && (getValues().SW_REDUCED_AMOUNT.SW_SEWERAGE_CESS == "" || getValues().SW_REDUCED_AMOUNT.SW_SEWERAGE_CESS == null)))
- ||
- (servicev1 == "WS" && ischeckedAddition &&
- ((getValues().WS_ADDITIONAL_AMOUNT.WS_CHARGE == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_CHARGE == null)
- && (getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_PENALTY == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_PENALTY == null)
- && (getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_INTEREST == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_INTEREST == null)
- && (getValues().WS_ADDITIONAL_AMOUNT.WS_WATER_CESS == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_WATER_CESS == null)))
- ||
- (servicev1 == "SW" && ischeckedAddition &&
- ((getValues().SW_ADDITIONAL_AMOUNT.SW_CHARGE == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_CHARGE == null)
- && (getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_PENALTY == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_PENALTY == null)
- && (getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_INTEREST == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_INTEREST == null)
- && (getValues().SW_ADDITIONAL_AMOUNT.SW_SEWERAGE_CESS == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_SEWERAGE_CESS == null)))
+ (
+ (servicev1 == "WS" && ischeckedReduce &&
+ ((getValues().WS_REDUCED_AMOUNT.WS_CHARGE == "" || getValues().WS_REDUCED_AMOUNT.WS_CHARGE == null) &&
+ (getValues().WS_REDUCED_AMOUNT.WS_TIME_PENALTY == "" || getValues().WS_REDUCED_AMOUNT.WS_TIME_PENALTY == null) &&
+ (getValues().WS_REDUCED_AMOUNT.WS_TIME_INTEREST == "" || getValues().WS_REDUCED_AMOUNT.WS_TIME_INTEREST == null) &&
+ (getValues().WS_REDUCED_AMOUNT.WS_WATER_CESS == "" || getValues().WS_REDUCED_AMOUNT.WS_WATER_CESS == null))) ||
+ (servicev1 == "SW" && ischeckedReduce &&
+ ((getValues().SW_REDUCED_AMOUNT.SW_CHARGE == "" || getValues().SW_REDUCED_AMOUNT.SW_CHARGE == null) &&
+ (getValues().SW_REDUCED_AMOUNT.SW_TIME_PENALTY == "" || getValues().SW_REDUCED_AMOUNT.SW_TIME_PENALTY == null) &&
+ (getValues().SW_REDUCED_AMOUNT.SW_TIME_INTEREST == "" || getValues().SW_REDUCED_AMOUNT.SW_TIME_INTEREST == null) &&
+ (getValues().SW_REDUCED_AMOUNT.SW_SEWERAGE_CESS == "" || getValues().SW_REDUCED_AMOUNT.SW_SEWERAGE_CESS == null))) ||
+ (servicev1 == "WS" && ischeckedAddition &&
+ ((getValues().WS_ADDITIONAL_AMOUNT.WS_CHARGE == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_CHARGE == null) &&
+ (getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_PENALTY == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_PENALTY == null) &&
+ (getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_INTEREST == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_TIME_INTEREST == null) &&
+ (getValues().WS_ADDITIONAL_AMOUNT.WS_WATER_CESS == "" || getValues().WS_ADDITIONAL_AMOUNT.WS_WATER_CESS == null))) ||
+ (servicev1 == "SW" && ischeckedAddition &&
+ ((getValues().SW_ADDITIONAL_AMOUNT.SW_CHARGE == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_CHARGE == null) &&
+ (getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_PENALTY == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_PENALTY == null) &&
+ (getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_INTEREST == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_TIME_INTEREST == null) &&
+ (getValues().SW_ADDITIONAL_AMOUNT.SW_SEWERAGE_CESS == "" || getValues().SW_ADDITIONAL_AMOUNT.SW_SEWERAGE_CESS == null)))
+ ) &&
+ !(getValues().WS_REBATE || getValues().WS_PENALTY || getValues().SW_REBATE || getValues().SW_PENALTY)
}
//UM-4354:: Above code is used To disable the button when reduced amount or additional amount is selected and none of the fields have any value
/>
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js
index 3f049cef186..edd39aef050 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/src/utils/getWSAcknowledgementData.js
@@ -41,12 +41,12 @@ const getOwnerDetails = (application, t) => {
};
}
};
-const getPropertyAddress = (property) => {
+const getPropertyAddress = (property,t) => {
const doorNo = property?.doorNo;
const street = property?.street;
const landMark = property?.landmark;
const locality = property?.locality?.name;
- const city = property?.city;
+ const city = t(`TENANT_TENANTS_${property?.tenantId?.toUpperCase?.()?.replace(".", "_")}`);
const pinCode = property?.pincode;
const formattedAddress = `${doorNo ? doorNo + ", " : ""}${street ? street + ", " : ""}${landMark ? landMark + ", " : ""}${locality ? locality + ", " : ""}${city ? city : ""}${pinCode ? ", " + pinCode : ""}`
return formattedAddress;
@@ -60,7 +60,7 @@ const getPropertyDetails = (application, t) => {
values: [
{ title: t("WS_PROPERTY_ID_LABEL"), value: t(`${application?.propertyId}`) || t("CS_NA") },
{ title: t("WS_OWN_DETAIL_NAME"), value: names || t("CS_NA") },
- { title: t("WS_PROPERTY_ADDRESS_LABEL"), value: getPropertyAddress(application?.address) || t("CS_NA") }
+ { title: t("WS_PROPERTY_ADDRESS_LABEL"), value: getPropertyAddress(application?.address,t) || t("CS_NA") }
],
};
};
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/README.md b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/README.md
index d1dc27c451b..65bb8804666 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/README.md
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/README.md
@@ -29,10 +29,10 @@ class Example extends Component {
## Changelog
-### Summary for Version [1.7.10] - 2025-02-13
+### Summary for Version [1.7.35] - 2025-03-20
Matched the version to that of other modules of URBAN
## License
-MIT © [abhinav-egov](https://github.com/abhinav-egov)
+MIT © [abhinav-egov](https://github.com/abhinav-egov)
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json
index 6b72813d6ac..2de19a2acad 100644
--- a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json
+++ b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/package.json
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-react-components",
- "version": "1.7.10",
+ "version": "1.7.35",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
@@ -53,7 +53,7 @@
},
"browserslist": [
">0.2%",
- "not dead",
- "not op_mini all"
- ]
+ "not dead",
+ "not op_mini all"
+ ]
}
diff --git a/frontend/micro-ui/web/micro-ui-internals/publish-beta.sh b/frontend/micro-ui/web/micro-ui-internals/publish-beta.sh
index 671d926dc4f..a05bdc47807 100644
--- a/frontend/micro-ui/web/micro-ui-internals/publish-beta.sh
+++ b/frontend/micro-ui/web/micro-ui-internals/publish-beta.sh
@@ -14,10 +14,10 @@ msg "Building and publishing css"
cd "$BASEDIR/packages/css" && rm -rf node_modules && rm -rf dist && yarn && npm publish --access public
msg "Building and publishing libraries"
-cd "$BASEDIR/packages/libraries" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/libraries" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing react-components"
-cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
# sleep 10
# msg "Updating dependencies"
@@ -25,49 +25,52 @@ cd "$BASEDIR/packages/react-components" && rm -rf node_modules && rm -rf dist
# sleep 5
msg "Building and publishing PGR module"
-cd "$BASEDIR/packages/modules/pgr" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/pgr" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing FSM module"
-cd "$BASEDIR/packages/modules/fsm" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/fsm" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing PT module"
-cd "$BASEDIR/packages/modules/pt" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/pt" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing DSS module"
-cd "$BASEDIR/packages/modules/dss" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/dss" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing Common module"
-cd "$BASEDIR/packages/modules/common" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/common" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing Core module"
-cd "$BASEDIR/packages/modules/core" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/core" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing OBPS module"
-cd "$BASEDIR/packages/modules/obps" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/obps" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing tl module"
-cd "$BASEDIR/packages/modules/tl" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/tl" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing bills module"
-cd "$BASEDIR/packages/modules/bills" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/bills" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing noc module"
-cd "$BASEDIR/packages/modules/noc" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/noc" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing commonPt module"
-cd "$BASEDIR/packages/modules/commonPt" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/commonPt" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing engagement module"
-cd "$BASEDIR/packages/modules/engagement" && rm -rf node_modules && rm -rf dis && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/engagement" && rm -rf node_modules && rm -rf dis && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing receipts module"
-cd "$BASEDIR/packages/modules/receipts" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/receipts" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing hrms module"
-cd "$BASEDIR/packages/modules/hrms" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/hrms" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing ws module"
-cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
msg "Building and publishing mCollect module"
-cd "$BASEDIR/packages/modules/mCollect" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-beta
+cd "$BASEDIR/packages/modules/mCollect" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
+
+msg "Building and publishing finance module"
+cd "$BASEDIR/packages/modules/finance" && rm -rf node_modules && rm -rf dist && yarn && npm publish --tag urban-2.9-sandbox-beta
\ No newline at end of file
diff --git a/frontend/micro-ui/web/micro-ui-internals/publish.sh b/frontend/micro-ui/web/micro-ui-internals/publish.sh
index 1854370bcfd..4ffbb5ed7f7 100644
--- a/frontend/micro-ui/web/micro-ui-internals/publish.sh
+++ b/frontend/micro-ui/web/micro-ui-internals/publish.sh
@@ -42,6 +42,9 @@ cd "$BASEDIR/packages/modules/common" && rm -rf node_modules && rm -rf dist
msg "Building and publishing Core module"
cd "$BASEDIR/packages/modules/core" && rm -rf node_modules && rm -rf dist && npm publish --access public
+msg "Building and publishing mcollect module"
+cd "$BASEDIR/packages/modules/mCollect" && rm -rf node_modules && rm -rf dist && npm publish --access public
+
msg "Building and publishing OBPS module"
cd "$BASEDIR/packages/modules/obps" && rm -rf node_modules && rm -rf dist && npm publish --access public
@@ -67,4 +70,7 @@ msg "Building and publishing hrms module"
cd "$BASEDIR/packages/modules/hrms" && rm -rf node_modules && rm -rf dist && npm publish --access public
msg "Building and publishing ws module"
-cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && npm publish --access public
\ No newline at end of file
+cd "$BASEDIR/packages/modules/ws" && rm -rf node_modules && rm -rf dist && npm publish --access public
+
+msg "Building and publishing finance module"
+cd "$BASEDIR/packages/modules/finance" && rm -rf node_modules && rm -rf dist && npm publish --access public
diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
index 5867d43503c..70164792f06 100644
--- a/frontend/micro-ui/web/package.json
+++ b/frontend/micro-ui/web/package.json
@@ -3,35 +3,51 @@
"version": "1.7.0-beta.2",
"private": true,
"author": "JaganKumar ",
-
"homepage": "/digit-ui",
"workspaces": [
- "micro-ui-internals/packages/libraries",
"micro-ui-internals/packages/css",
- "micro-ui-internals/packages/react-components"
+ "micro-ui-internals/packages/libraries",
+ "micro-ui-internals/packages/react-components",
+ "micro-ui-internals/packages/modules/birth",
+ "micro-ui-internals/packages/modules/core",
+ "micro-ui-internals/packages/modules/death",
+ "micro-ui-internals/packages/modules/firenoc",
+ "micro-ui-internals/packages/modules/obps",
+ "micro-ui-internals/packages/modules/pt",
+ "micro-ui-internals/packages/modules/dss",
+ "micro-ui-internals/packages/modules/bills",
+ "micro-ui-internals/packages/modules/engagement",
+ "micro-ui-internals/packages/modules/commonPt",
+ "micro-ui-internals/packages/modules/finance",
+ "micro-ui-internals/packages/modules/common",
+ "micro-ui-internals/packages/modules/tl"
],
"engines": {
"node": ">=14"
},
"dependencies": {
- "@egovernments/digit-ui-libraries": "1.7.10",
- "@egovernments/digit-ui-module-common": "1.7.10",
- "@egovernments/digit-ui-module-engagement": "1.7.10",
- "@egovernments/digit-ui-module-fsm": "1.7.10",
- "@egovernments/digit-ui-module-mcollect": "1.7.10",
- "@egovernments/digit-ui-module-noc": "1.7.10",
- "@egovernments/digit-ui-module-obps": "1.7.10",
- "@egovernments/digit-ui-module-pgr": "1.7.10",
- "@egovernments/digit-ui-module-pt": "1.7.10",
- "@egovernments/digit-ui-module-receipts": "1.7.10",
- "@egovernments/digit-ui-module-tl": "1.7.10",
- "@egovernments/digit-ui-module-ws": "1.7.10",
- "@egovernments/digit-ui-module-bills": "1.7.10",
- "@egovernments/digit-ui-module-commonpt": "1.7.10",
- "@egovernments/digit-ui-module-hrms":"1.7.10",
- "@egovernments/digit-ui-module-core":"1.7.10",
- "@egovernments/digit-ui-module-dss":"1.7.10",
- "@egovernments/digit-ui-react-components":"1.7.10",
+ "@egovernments/digit-ui-libraries": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-common": "1.7.35",
+ "@egovernments/digit-ui-module-engagement": "1.7.36",
+ "@egovernments/digit-ui-module-fsm": "1.7.35",
+ "@egovernments/digit-ui-module-mcollect": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-noc": "1.7.35",
+ "@egovernments/digit-ui-module-obps": "0.0.2-sandbox",
+ "@egovernments/digit-ui-module-pgr": "1.7.38",
+ "@egovernments/digit-ui-module-pt": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-receipts": "1.7.0-beta.2",
+ "@egovernments/digit-ui-module-tl": "0.0.3-sandbox",
+ "@egovernments/digit-ui-module-ws": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-bills": "1.7.35",
+ "@egovernments/digit-ui-module-commonpt": "1.7.35",
+ "@egovernments/digit-ui-module-hrms": "1.7.35",
+ "@egovernments/digit-ui-module-core": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-dss": "0.0.2-sandbox",
+ "@egovernments/digit-ui-react-components": "1.7.35",
+ "@egovernments/digit-ui-module-firenoc": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-birth": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-death": "0.0.1-sandbox",
+ "@egovernments/digit-ui-module-finance": "0.0.1-sandbox",
"babel-loader": "8.1.0",
"clean-webpack-plugin": "4.0.0",
"react": "17.0.2",
@@ -43,7 +59,7 @@
"react-hook-form": "6.15.8",
"react-i18next": "11.16.2",
"react-query": "3.6.1",
- "css-loader":"5.2.6",
+ "css-loader": "5.2.6",
"style-loader": "2.0.0",
"webpack-cli": "4.10.0",
"@babel/core": "^7.26.0",
@@ -55,22 +71,19 @@
"microbundle-crl": "0.13.11",
"npm-run-all": "4.1.5",
"@babel/plugin-transform-optional-chaining": "7.25.9"
-
-
-
},
-
- "resolutions": {
- "**/@babel/traverse":"7.25.9",
- "**/styled-components": "5.0.0"
+ "resolutions": {
+ "**/@babel/traverse": "7.25.9",
+ "**/styled-components": "5.0.0",
+ "minimatch": "^3.0.4",
+ "glob": "^7.1.2"
},
- "scripts": {
+ "scripts": {
"start": "react-scripts start",
"build": "GENERATE_SOURCEMAP=false SKIP_PREFLIGHT_CHECK=true react-scripts build",
"build:webpack": "webpack --mode production",
"build:prepare": "./build.sh",
"clean": "rm -rf node_modules"
-
},
"eslintConfig": {
"extends": [
@@ -89,4 +102,4 @@
"last 1 safari version"
]
}
-}
+}
\ 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 57cc12a7601..ece9cb82c14 100644
--- a/frontend/micro-ui/web/public/index.html
+++ b/frontend/micro-ui/web/public/index.html
@@ -1,27 +1,72 @@
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
Digit
-
-
-
-
-
-
-
+
+
+