Role Mapping Not Saving When Updating Multiple Roles (Registrar/Nurse/Counsellor) - #162
Merged
Conversation
existingRoleIDs (from group.roles) and newRoleIDs (from roleIDs_duringEdit) were compared with plain Array.includes() with no type coercion. When one source returns roleID as a numeric string and the other as a number, an already-existing role fails the match and gets bucketed into both rolesToAdd and rolesToRemove, firing simultaneous create+delete calls that race each other and can silently drop a role (e.g. Counsellor) on update. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
rolesToAdd previously fired one SaveWorkLocationMapping POST per role in parallel via forkJoin. The backend treats a create as the sole active role for the user+serviceline+block scope, so separate parallel creates raced each other and only the last commit stayed active - dropping roles added alongside others (reproduced with StopTB Counsellor + Nurse, where Nurse's row was born already deleted). Batch all rolesToAdd into one call instead, with every new role in the previleges[0].ID array - the same shape already used when two roles are added together via Create New Mapping, which works correctly. Location fields (incl. StopTB's nikshayTUID/nikshayFacilityID) are per-group, not per-role, so batching does not change what is sent for them. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
- newly-added roles (e.g. Nurse + Counsellor) must go out in a single SaveWorkLocationMapping call, not one per role - an existing roleID stored as a numeric string must be treated as equal to the same roleID selected as a number, so it is kept in-place rather than spuriously added and removed at once Regression coverage for the StopTB Counsellor/Nurse role-dropping bug fixed in the previous two commits. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…HWC/FLW
Two related changes to updateGroupedWorkLocation()'s edit flow, both
scoped to make the Select Role checkboxes behave as the single source
of truth: checked = active, unchecked = soft-deleted, and re-checking a
previously-removed role reactivates it rather than piling up duplicates.
1. Stop TB rows are now grouped by user+TU (Nikshay block), same as
HWC/FLW already are, so multiple roles for one user+location show as
one row with multiple role chips instead of a separate row per role.
This also removes the risk of an edit on one role's row reaching into
an unrelated sibling row's role, since everything for that
user+location is already one group.
2. A role in rolesToAdd that has an old soft-deleted row (group.roles
keeps deleted entries; only existingRoleIDs filters them out) is now
reactivated in place via the same {uSRMappingID, deleted:false} call
the existing Activate button already uses, with its location/role
fields refreshed to the current edit form — instead of always
creating a brand-new duplicate row. Only roles with no prior row at
all go through the batched create path added in the previous fix.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5 <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: Advanced 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 |
|
snehar-nd
approved these changes
Sep 11, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📋 Description
JIRA ID: PSMRI/Admin-API#148
Please provide a summary of the change and the motivation behind it. Include relevant context and details.
✅ Type of Change
ℹ️ Additional Information
Please describe how the changes were tested, and include any relevant screenshots, logs, or other information that provides additional context.