Sync release-3.8.0 with main (fast-forward, 263 commits) - #462
Sync release-3.8.0 with main (fast-forward, 263 commits)#462snehar-nd wants to merge 263 commits into
Conversation
* fix: remove the additional slash in the url to fix the 404 issue * fix: past obstetric history dropdown changes --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com>
fix: amm-1730 action buttons issue fix in chief complaints
* fix: disply error msg based on the response * Revert "fix: disply error msg based on the response" This reverts commit 6273191. * fix for 1585, 1583 (#189) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * Amm-1579 (#192) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted * fix: amm-1579 --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * fix: amm-1580 * fix: amm-1597 * fix: amm-1583 * fix: amm-1655 * Update version in pom.xml to 3.4.0 * Update pom.xml * Update pom.xml * Update pom.xml * fix: show the message on token expiry (#200) * fix: amm-1416 (#199) * fix: refer resaon should disable initial (#203) * AMM-1577 & AMM-1578 Menstrual History & Obstetric History changes (#204) * fix: remove the additional slash in the url to fix the 404 issue * fix: past obstetric history dropdown changes --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> * fix: amm-1747 and amm-1583 (#208) * fix: amm-1730 action buttons issue fix in chief complaints --------- Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com>
fix: amm-1668 beneficiary details addition
* fix: remove the additional slash in the url to fix the 404 issue * fix: past obstetric history dropdown changes * Release 3.4.0 (#1) * fix: disply error msg based on the response * Revert "fix: disply error msg based on the response" This reverts commit 6273191. * fix for 1585, 1583 (#189) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * Amm-1579 (#192) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted * fix: amm-1579 --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * fix: amm-1580 * fix: amm-1597 * fix: amm-1583 * fix: amm-1655 * Update version in pom.xml to 3.4.0 * Update pom.xml * Update pom.xml * Update pom.xml * fix: show the message on token expiry (#200) * fix: amm-1416 (#199) * fix: refer resaon should disable initial (#203) * AMM-1577 & AMM-1578 Menstrual History & Obstetric History changes (#204) * fix: remove the additional slash in the url to fix the 404 issue * fix: past obstetric history dropdown changes --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> * fix: amm-1747 and amm-1583 (#208) * fix: amm-1730 action buttons issue fix in chief complaints --------- Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com> * fix(bug): ncd-care-diagnosis and provisional diagnosis doctor patch issue --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com>
* fix: provisonal diagnosis values patching issue * fix: added confirmatory feild name * fix: file upload issue, file displaying duplicate
fix: aam-1779 removing download masters for non-loggedin users
* fix for 1585, 1583 (#189) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * Amm-1579 (#192) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted * fix: amm-1579 --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * fix: amm-1580 * fix: amm-1597 * fix: amm-1583 * fix: amm-1655 * Update version in pom.xml to 3.4.0 * Update pom.xml * Update pom.xml * Update pom.xml * fix: show the message on token expiry (#200) * fix: amm-1416 (#199) * fix: refer resaon should disable initial (#203) * AMM-1577 & AMM-1578 Menstrual History & Obstetric History changes (#204) * fix: remove the additional slash in the url to fix the 404 issue * fix: past obstetric history dropdown changes --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> * fix: amm-1747 and amm-1583 (#208) * fix: amm-1730 action buttons issue fix in chief complaints * fix: amm-1668 beneficiary details addition * AMM-1595 - lymphs node patching issue (#211) * fix: amm-1747 and amm-1583 * fix: amm-1595 lymphnodes are not patching * fix: amm-1730 action buttons issue fix in chief complaints * fix: provisonal diagnosis values patching issue * fix: provisonal diagnosis values patching issue --------- Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com> * ncd care condtion and diagnosis patch issue (#212) * fix: remove the additional slash in the url to fix the 404 issue * fix: past obstetric history dropdown changes * Release 3.4.0 (#1) * fix: disply error msg based on the response * Revert "fix: disply error msg based on the response" This reverts commit 6273191. * fix for 1585, 1583 (#189) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * Amm-1579 (#192) * fix: amm-1584 * fix: amm-1583 * fix: amm-1589 * fix: code rabitt fixs * fix: amm-1593 * fix: amm-1590 aam-1591 * fix: amm-1592 * fix: removed extra angle bracket * fix: inventory redirection issue fixed * fix: remove the additional slash in the url to fix the 404 issue * fix: amm-1585 css fixes * fix: amm-1583 facilityId was passing encrypted * fix: amm-1579 --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> * fix: amm-1580 * fix: amm-1597 * fix: amm-1583 * fix: amm-1655 * Update version in pom.xml to 3.4.0 * Update pom.xml * Update pom.xml * Update pom.xml * fix: show the message on token expiry (#200) * fix: amm-1416 (#199) * fix: refer resaon should disable initial (#203) * AMM-1577 & AMM-1578 Menstrual History & Obstetric History changes (#204) * fix: remove the additional slash in the url to fix the 404 issue * fix: past obstetric history dropdown changes --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> * fix: amm-1747 and amm-1583 (#208) * fix: amm-1730 action buttons issue fix in chief complaints --------- Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com> * fix(bug): ncd-care-diagnosis and provisional diagnosis doctor patch issue --------- Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Co-authored-by: Vishwanath Balkur <118195001+vishwab1@users.noreply.github.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com> * Provisional diagnosis patch issue (#213) * fix: provisonal diagnosis values patching issue * fix: added confirmatory feild name * fix: file upload issue, file displaying duplicate * fix: amm-1744 file upload in gynecologist examination screen (#214) * fix: aam-1779 removing download masters for non-loggedin users * fix: remove the version number (#222) --------- Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Co-authored-by: Vanitha <vanitha@navadhiti.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com> Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: Helen Grace Karyamsetty <133211481+helenKaryamsetty@users.noreply.github.com> Co-authored-by: Karyamsetty Helen Grace <ka40094929@wipro.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com>
* fix: latest common-ui commit id * fix: added environment variables
Sn/qrcode
fix: reverted the datasync code changes
Release 3.6.3
Fix replace native alert() with confirmationService in AppHeaderComponent
…-leak fix(auth-guard): remove unmanaged currentLangugae$ subscription in canActivate
Bumps [karma-jasmine-html-reporter](https://github.com/dfederm/karma-jasmine-html-reporter) from 2.1.0 to 2.2.0. - [Release notes](https://github.com/dfederm/karma-jasmine-html-reporter/releases) - [Commits](dfederm/karma-jasmine-html-reporter@v2.1.0...v2.2.0) --- updated-dependencies: - dependency-name: karma-jasmine-html-reporter dependency-version: 2.2.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [websocket-driver](https://github.com/faye/websocket-driver-node) from 0.7.4 to 0.7.5. - [Changelog](https://github.com/faye/websocket-driver-node/blob/main/CHANGELOG.md) - [Commits](faye/websocket-driver-node@0.7.4...0.7.5) --- updated-dependencies: - dependency-name: websocket-driver dependency-version: 0.7.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [axios](https://github.com/axios/axios) from 1.16.0 to 1.18.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.16.0...v1.18.1) --- updated-dependencies: - dependency-name: axios dependency-version: 1.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [engine.io](https://github.com/socketio/socket.io) from 6.6.4 to 6.6.9. - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io/compare/engine.io@6.6.4...engine.io@6.6.9) --- updated-dependencies: - dependency-name: engine.io dependency-version: 6.6.9 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [immutable](https://github.com/immutable-js/immutable-js) from 4.3.8 to 4.3.9. - [Release notes](https://github.com/immutable-js/immutable-js/releases) - [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md) - [Commits](immutable-js/immutable-js@v4.3.8...v4.3.9) --- updated-dependencies: - dependency-name: immutable dependency-version: 4.3.9 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…4.3.9 chore(deps-dev): bump immutable from 4.3.8 to 4.3.9
…6.6.9 chore(deps): bump engine.io from 6.6.4 to 6.6.9
chore(deps-dev): bump axios from 1.16.0 to 1.18.1
…driver-0.7.5 chore(deps-dev): bump websocket-driver from 0.7.4 to 0.7.5
…ine-html-reporter-2.2.0 chore(deps-dev): bump karma-jasmine-html-reporter from 2.1.0 to 2.2.0
fix(rxjs): replace internal rxjs imports with public API paths
…a11y feat(core): add aria labels to mobile navbar toggler
implement standard Reactive Forms validation in DataSyncLoginComponent
…module docs: fix README setup instructions and Common-UI submodule initialization
docs: add CONTRIBUTING.md guide for MMU-UI contributors
…rt-app-header fix(core): replace native alert() with ConfirmationService in AppHeaderComponent
* fix: block data sync if user does not belong to same VAN Added providerServiceMapID validation in data sync login flow. After successful authentication, the data sync user's PSM is compared against the main session's PSM. If they differ (e.g., Mysuru nurse trying to sync a Vizag van), an alert is shown and sync is blocked. - Alert: 'Data sync user does not belong to the same VAN' - Clears serverKey so the sync screen remains locked - Applies to both normal and concurrent-login (doLogout) flows Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * Revert "fix: block data sync if user does not belong to same VAN" This reverts commit 3ea1285. * fix: validate data sync userID matches main session userID Block data sync login if the authenticated data sync user is different from the logged-in MMU session user. Compares userID from the userAuthenticate API response against the session's stored userID. Shows alert 'Sync user is not valid' and clears serverKey if mismatch. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Sneha <sneha@ADMINs-MacBook-Pro.local> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|


Summary
Brings
release-3.8.0up to date withmain. The branch has had no commits of its own since 2025-09-25 (ec923cb, "Update pom.xml") and is 263 commits behind main.release-3.8.0is a strict ancestor ofmain— it contains nothing that main doesn't — so this is a clean fast-forward with no merge conflicts and nothing on the branch at risk of being overwritten.Scope
102 files changed, +3695 / −1320, almost entirely under
src/app/app-modules(82 files).Raised as a PR because the org-level
PSMRIruleset requires a pull request on this branch; a direct fast-forward push is declined.Notes for the reviewer
Please confirm this is the intended target before merging — a few things make it worth a second look:
release-3.8.0identical tomain, so it stops being a 3.8.0 release snapshot. Anything deployed or built from this branch will pick up 11 months of changes at once.release-3.8.4(2026-07-31) andrelease-3.9.1(2025-12-03). If the goal is simply "a branch carrying current main", one of those — or a fresh branch off main — may be the better home.Verified locally:
git merge origin/mainonrelease-3.8.0fast-forwards to43e40e1with an empty resulting diff against main.🤖 Generated with Claude Code