Skip to content

feat: [DHIS2-21635] Display custom terminology labels across UI - #4727

Open
henrikmv wants to merge 169 commits into
masterfrom
hv/feat/DHIS2-21635_display-custom-teminology
Open

feat: [DHIS2-21635] Display custom terminology labels across UI#4727
henrikmv wants to merge 169 commits into
masterfrom
hv/feat/DHIS2-21635_display-custom-teminology

Conversation

@henrikmv

@henrikmv henrikmv commented Sep 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

DHIS2-21635

Implements Custom Terminology in the Capture app by using these functions:

// Non-hook, from programCollection (epics, thunks, selectors)
getTermLabel(requests, { programId, stageId? })

// Non-hook, from a program object already in scope (self-contained widgets)
getTermLabelFromProgram(requests, { program })

// React hook (reads programId from Redux currentSelections if not passed)
useTermLabel(requests, { programId?, stageId? })

// HOC — injects resolved labels as props (class components, cross-cutting subtrees)
withCustomLabels(customLabels)(Component)

Requests are batched: [LabelKeys.enrollmentSingular, LabelKeys.eventPlural] returns { enrollmentLabel, eventsLabel }.

henrikmv added 30 commits July 23, 2026 08:24
@henrikmv
feat: add custom plural for note relationship attribute
f2f36de
@henrikmv
feat: update name assignment in TrackedEntityTypeFactory to use trans…
18351e9 
…lated name
@henrikmv
feat: metadata loading support custom plural labels based on server v…
5a895cd 
…ersion
@henrikmv
feat: add customTerminologyPlurals feature support
8cedb68
@henrikmv
Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-21878…
433aa56 
…_plural-custom-terminology-note-relationship-attribute
@henrikmv
Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-21878…
ab2685d 
…_plural-custom-terminology-note-relationship-attribute
@henrikmv
fix: separate base and plural fields for improved readability
c479953
@henrikmv
feat: temp change helper function and stop capitalize
e5b4d74
@henrikmv
feat: implement custom terminology handling with bootstrap
302cc2b
@henrikmv
fix: revert changes belonging to child branch
823f4e1
@henrikmv
Revert "fix: revert changes belonging to child branch"
9f8ccb6 
This reverts commit 823f4e1.
@henrikmv
feat: temp
e81170c
@henrikmv
fix: clean up
f29cb71 
Removed commented line from useProgram.ts.
@henrikmv
fix: sonar qube
764e73b
@henrikmv
Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-21635…
df95c4d 
…_display-custom-teminology
@henrikmv
Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-21878…
f27e6b5 
…_plural-custom-terminology-note-relationship-attribute
@henrikmv
Merge remote-tracking branch 'origin/hv/feat/DHIS2-21635_display-cust…
c3719e4 
…om-teminology' into hv/feat/DHIS2-21878_plural-custom-terminology-note-relationship-attribute
@henrikmv
fix: revert changes belonging to parent branch
9990864
@henrikmv
feat: code clean up
2e19a93
@henrikmv
Merge remote-tracking branch 'origin/hv/feat/DHIS2-21635_display-cust…
52dbd2b 
…om-teminology' into hv/feat/DHIS2-21878_plural-custom-terminology-note-relationship-attribute
@henrikmv
fix: type change
0a0d90a
@henrikmv
Merge remote-tracking branch 'origin/hv/feat/DHIS2-21635_display-cust…
aa4cd9c 
…om-teminology' into hv/feat/DHIS2-21878_plural-custom-terminology-note-relationship-attribute
@henrikmv
feat: update terminology
809aad6
@henrikmv
feat: enhance API program fields with custom terminology support
54d8332
@henrikmv
feat: clean up
45eb553
@henrikmv
Merge remote-tracking branch 'origin/hv/feat/DHIS2-21635_display-cust…
d482cc2 
…om-teminology' into hv/feat/DHIS2-21878_plural-custom-terminology-note-relationship-attribute
@henrikmv
Merge remote-tracking branch 'origin/master' into hv/feat/DHIS2-21878…
8fcc8ff 
…_plural-custom-terminology-note-relationship-attribute
@henrikmv
feat: temp devin review
de452bc
@henrikmv
fix: revert single event infrastructure
6a8cd9c
@henrikmv
feat: update terminology handling across components
56ac556
@henrikmv
Merge remote-tracking branch 'origin/hv/chore/DHIS2-21969_refine-conf…
0af0b01 
…igurable-terminology-support' into hv/feat/DHIS2-21878_plural-custom-terminology-notes-relationships-attributes
@henrikmv
feat: add consts to support plural of note, relationship, and attribu…
331da5e 
…te labels
@henrikmv
Merge remote-tracking branch 'origin/hv/feat/DHIS2-21878_plural-custo…
e70c0c7 
…m-terminology-notes-relationships-attributes' into hv/feat/DHIS2-21635_display-custom-teminology
@henrikmv
feat: refactor useTermLabel to utilise LabelKeys for improved termino…
9f3ae6c 
…logy consistency
@henrikmv
feat: clean up
cb04bb6
@henrikmv
Merge remote-tracking branch 'origin/hv/feat/DHIS2-21878_plural-custo…
0028520 
…m-terminology-notes-relationships-attributes' into hv/feat/DHIS2-21635_display-custom-teminology
@henrikmv
feat: refine custom terminology support
027ae64
@henrikmv
Merge branch 'hv/chore/DHIS2-21969_refined-custom-terminology-support…
8c72bc6 
…' into hv/feat/DHIS2-21878_plural-custom-terminology-notes-relationships-attributes
@henrikmv
Merge branch 'hv/feat/DHIS2-21878_plural-custom-terminology-notes-rel…
422ec78 
…ationships-attributes' into hv/feat/DHIS2-21635_display-custom-teminology
@henrikmv
feat: capitalize first letter for various labels in components with f…
dbe10fb 
…unction to remove them from pot
@henrikmv
fix: cypress temp
c609900
@henrikmv
feat: clean up hoc use
44daf16
@henrikmv
fix: clean up label usage and improve code readability across components
542f870
@henrikmv
henrikmv changed the base branch from master to hv/feat/DHIS2-21878_plural-custom-terminology-notes-relationships-attributes September 10, 2026 14:04
@henrikmv
henrikmv marked this pull request as ready for review September 10, 2026 14:05
@henrikmv
henrikmv requested a review from a team as a code owner September 10, 2026 14:05
@simonadomnisoru simonadomnisoru mentioned this pull request Sep 16, 2026
Merged
simonadomnisoru
simonadomnisoru reviewed Sep 16, 2026
View reviewed changes

@simonadomnisoru simonadomnisoru left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job and big effort on this PR 🥳 ! I just added a few small comments, and besides this, I was wondering if we can add at least 2-3 Cypress tests (perhaps in a follow-up ticket as this PR is already long enough).

Comment thread src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.tsx Outdated
Comment thread ...kingLists/EventWorkingListsCommon/EventBulkActions/Actions/CompleteAction/CompleteAction.tsx Outdated
Comment thread ..._modules/capture-core/components/WorkingLists/EventWorkingLists/eventWorkingLists.actions.ts Outdated
Comment thread src/core_modules/capture-core/components/WidgetRelatedStages/constants.ts
Comment thread ...-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.tsx
Comment thread ...ents/Pages/common/TEIRelationshipsWidget/TeiSearch/TeiSearchForm/TeiSearchForm.component.tsx Outdated
Comment thread ...modules/capture-core/components/EventsList/OfflineEventsList/OfflineEventsList.component.tsx
Comment thread ..._modules/capture-core/components/Breadcrumbs/BulkDataEntryBreadcrumb/hooks/useOriginLabel.ts
Comment thread ...odules/capture-core/components/Breadcrumbs/EnrollmentBreadcrumb/hooks/useWorkingListLabel.ts
@henrikmv

henrikmv commented Sep 16, 2026 •
edited by atlassian Bot
Loading

Copy link
Copy Markdown
Contributor Author

Thanks for the review. I have addressed your comments. A follow-up Cypress ticket has been created: DHIS2-22121.

simonadomnisoru
simonadomnisoru approved these changes Sep 17, 2026
View reviewed changes

@simonadomnisoru simonadomnisoru left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing work 👏 !

Base automatically changed from hv/feat/DHIS2-21878_plural-custom-terminology-notes-relationships-attributes to master September 17, 2026 11:18
@sonarqubecloud

sonarqubecloud Bot commented Sep 17, 2026

Copy link
Copy Markdown

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
2.5% Duplication on New Code

See analysis details on SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

Assignees

No one assigned

Labels

testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@henrikmv @simonadomnisoru