feat: [DHIS2-20842] Deactivate tracked entity#4525
Conversation
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
|
🚀 Deployed on https://deploy-preview-4525.capture.netlify.dhis2.org |
henrikmv
changed the base branch from
master
to
hv/chore/DHIS2-21371_EnrollmentDashboardReadOnly
…hv/feat/DHIS2-20842_DeactivateTrackedEntity
| const readOnly = !hasProgramWrite || !hasTETWrite || inactiveReadOnly | ||
| ? { tooltipContent: i18n.t('You do not have access to edit this enrollment') } | ||
| : undefined; |
There was a problem hiding this comment.
🟡 EnrollmentEditEventPage shows wrong readOnly tooltip when tracked entity is deactivated
When a tracked entity is deactivated, inactiveReadOnly is { tooltipContent: 'Tracked entity is deactivated' } (truthy). The condition !hasProgramWrite || !hasTETWrite || inactiveReadOnly evaluates to true, but the code always assigns the generic tooltip 'You do not have access to edit this enrollment', discarding the specific deactivation message.
Compare with EnrollmentPageDefault.container.tsx:187-190 which handles this correctly by separating the two cases:
const accessReadOnly = !hasProgramWrite || !hasTETWrite ? { tooltipContent: ... } : undefined;
const readOnly = inactiveReadOnly ?? accessReadOnly;The edit event page should use the same pattern so users see "Tracked entity is deactivated" instead of the misleading access-denied message.
| const readOnly = !hasProgramWrite || !hasTETWrite || inactiveReadOnly | |
| ? { tooltipContent: i18n.t('You do not have access to edit this enrollment') } | |
| : undefined; | |
| const accessReadOnly = !hasProgramWrite || !hasTETWrite | |
| ? { tooltipContent: i18n.t('You do not have access to edit this enrollment') } | |
| : undefined; | |
| const readOnly = inactiveReadOnly ?? accessReadOnly; |
Was this helpful? React with 👍 or 👎 to provide feedback.
…hv/feat/DHIS2-20842_DeactivateTrackedEntity
…hv/feat/DHIS2-20842_DeactivateTrackedEntity
…into hv/feat/DHIS2-20842_DeactivateTrackedEntity
…ashboardReadOnly' into hv/feat/DHIS2-20842_DeactivateTrackedEntity
…hv/feat/DHIS2-20842_DeactivateTrackedEntity
…_DeactivateTrackedEntity
…ashboardReadOnly' into hv/feat/DHIS2-20842_DeactivateTrackedEntity
…mentEditEvent components
…hv/feat/DHIS2-20842_DeactivateTrackedEntity
…hv/feat/DHIS2-20842_DeactivateTrackedEntity
|
1 participant
DHIS2-20842