From a37f3b9be68ecf75c4254fe4a3cacb93145e6722 Mon Sep 17 00:00:00 2001 From: Anoushka Srivastava <92670920+anou1234@users.noreply.github.com> Date: Tue, 11 Aug 2026 13:13:26 +0530 Subject: [PATCH 1/3] ws modify cionnection summary page documents not visible fixed --- .../src/ui-config/screens/specs/wns/applyResource/footer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js index f50f7b65f7..e31b44a475 100644 --- a/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js +++ b/web/rainmaker/dev-packages/egov-wns-dev/src/ui-config/screens/specs/wns/applyResource/footer.js @@ -215,6 +215,7 @@ const getMdmsData = async (state, dispatch) => { const callBackForNext = async (state, dispatch) => { window.scrollTo(0, 0); let activeStep = get(state.screenConfiguration.screenConfig["apply"], "components.div.children.stepper.props.activeStep", 0); + await pushTheDocsUploadedToRedux(state, dispatch); let isFormValid = true; let hasFieldToaster = false; /* validations for property details screen */ From 184bc94932f5ef2c320ea85aea95c8f6a2c15bcb Mon Sep 17 00:00:00 2001 From: Anoushka Srivastava <92670920+anou1234@users.noreply.github.com> Date: Fri, 7 Aug 2026 16:48:25 +0530 Subject: [PATCH 2/3] addition of service deprecation adhocdialog for uc services under ndc , adv and chb --- .../screens/specs/uc/newCollection.js | 15 ++++++++ .../newCollectionServiceDetails.js | 36 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollection.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollection.js index 3e1d9190e0..124c3bfa95 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollection.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollection.js @@ -490,6 +490,21 @@ const newCollection = { newCollectionFooter, }, }, + adhocDialog: { + uiFramework: "custom-containers-local", + moduleName: "egov-uc", + componentPath: "DialogContainer", + props: { + open: false, + maxWidth: "sm", + screenKey: "newCollection" + }, + children: { + message: getLabel({ + labelKey: "MCOLLECT_CATEGORY_POPUP_MESSAGE" + }) + } +} }, }; diff --git a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollectionResource/newCollectionServiceDetails.js b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollectionResource/newCollectionServiceDetails.js index db73903698..85fa2ca774 100644 --- a/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollectionResource/newCollectionServiceDetails.js +++ b/web/rainmaker/dev-packages/egov-uc-dev/src/ui-config/screens/specs/uc/newCollectionResource/newCollectionServiceDetails.js @@ -16,6 +16,20 @@ import "./index.css"; import { setServiceCategory } from "../../utils"; const tenantId = getTenantId(); +const matchesPopupService = value => { + const code = String( + typeof value === "object" ? value.code || value.value || value.name : value || "" + ) + .replace(/[_\s.-]/g, "") + .toLowerCase(); + + return ["advt", "chb", "noduescertificate", "noduecertificate"].some(item => { + const isMatch = code.includes(item); + console.log("code, item, isMatch", code, item, isMatch); + return isMatch; + }); +}; + export const newCollectionServiceDetailsCard = getCommonCard( { header: getCommonTitle( @@ -228,6 +242,28 @@ export const newCollectionServiceDetailsCard = getCommonCard( "preparedFinalObject.applyScreenMdmsData.nestedServiceData", {} ); + const selectedCategory = action.value; + const categoryData = serviceData[selectedCategory] || {}; + const childServices = Array.isArray(categoryData.child) + ? categoryData.child + : []; + + const shouldShowPopup = + matchesPopupService(selectedCategory) || + childServices.some(matchesPopupService); + + console.log(shouldShowPopup , selectedCategory,childServices, "shouldShowPopup selectedCategory childServices" ) + + if (shouldShowPopup) { + dispatch( + handleField( + "newCollection", + "components.adhocDialog", + "props.open", + true, + ), + ); + } if (action.value) { let visibleFlag = false; From d025a5f02ec63c29c31f985ac0b713319689e0ce Mon Sep 17 00:00:00 2001 From: Anoushka Srivastava <92670920+anou1234@users.noreply.github.com> Date: Tue, 11 Aug 2026 16:43:56 +0530 Subject: [PATCH 3/3] maintainence banner removal --- .../packages/citizen/src/modules/citizen/User/Login/index.js | 4 ++-- .../citizen/src/modules/citizen/User/Register/index.js | 4 ++-- .../employee/src/modules/employee/User/Login/index.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/rainmaker/packages/citizen/src/modules/citizen/User/Login/index.js b/web/rainmaker/packages/citizen/src/modules/citizen/User/Login/index.js index 2ff0d0145b..92400fd139 100644 --- a/web/rainmaker/packages/citizen/src/modules/citizen/User/Login/index.js +++ b/web/rainmaker/packages/citizen/src/modules/citizen/User/Login/index.js @@ -14,9 +14,9 @@ class Login extends Component { return ( - + {/* Scheduled Maintenance Notice: The mSeva Portal will undergo scheduled maintenance and database optimization from 7:00 PM on 07 August 2026 to 6:00 PM on 09 August 2026. Services may be temporarily unavailable or experience intermittent interruptions during this period. We regret the inconvenience caused and appreciate your patience and cooperation. - Team mSeva, Punjab Municipal Infrastructure Development Company (PMIDC) - + */} ); diff --git a/web/rainmaker/packages/citizen/src/modules/citizen/User/Register/index.js b/web/rainmaker/packages/citizen/src/modules/citizen/User/Register/index.js index dbd645d977..1ed9fe1ca2 100644 --- a/web/rainmaker/packages/citizen/src/modules/citizen/User/Register/index.js +++ b/web/rainmaker/packages/citizen/src/modules/citizen/User/Register/index.js @@ -12,9 +12,9 @@ class Register extends Component { const { bannerUrl, logoUrl,qrCodeURL,enableWhatsApp } = this.props; return ( - + {/* Scheduled Maintenance Notice: The mSeva Portal will undergo scheduled maintenance and database optimization from 7:00 PM on 07 August 2026 to 6:00 PM on 09 August 2026. Services may be temporarily unavailable or experience intermittent interruptions during this period. We regret the inconvenience caused and appreciate your patience and cooperation. - Team mSeva, Punjab Municipal Infrastructure Development Company (PMIDC) - + */} ); diff --git a/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js b/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js index c92e93bb98..820754f0e9 100644 --- a/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js +++ b/web/rainmaker/packages/employee/src/modules/employee/User/Login/index.js @@ -10,7 +10,7 @@ const LoginFormHOC = formHoc({ formKey: "employeeLogin" })(LoginForm); const Login = ({ bannerUrl, logoUrl }) => { return ( -
{ Team mSeva, Punjab Municipal Infrastructure Development Company (PMIDC) -
+ */} );