feat: clean up hoc use

Author: henrikmv

i18n/en.pot

@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2026-09-09T08:08:19.569Z\n"
-"PO-Revision-Date: 2026-09-09T08:08:19.569Z\n"
+"POT-Creation-Date: 2026-09-09T08:53:03.161Z\n"
+"PO-Revision-Date: 2026-09-09T08:53:03.161Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."

src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentDataEntry.component.tsx

@@ -39,9 +39,9 @@ import {
     ProgramStage,
     RenderFoundation,
     getProgramThrowIfNotFound,
-    getTermLabel,
     LabelKeys,
 } from '../../../metaData';
+import { withCustomLabels } from '../../../HOC/withCustomLabels';
 import { EnrollmentWithFirstStageDataEntry } from './EnrollmentWithFirstStageDataEntry';
 import {
     getCategoryOptionsValidatorContainers,
@@ -363,6 +363,7 @@ type FinalTeiDataEntryProps = {
         };
     };
     formFoundation: RenderFoundation;
+    enrollmentLabel: string;
 };
 // final step before the generic dataEntry is inserted
 class FinalEnrollmentDataEntry extends React.Component<FinalTeiDataEntryProps> {
@@ -371,9 +372,11 @@ class FinalEnrollmentDataEntry extends React.Component<FinalTeiDataEntryProps> {
     }
 
     render() {
-        const { enrollmentMetadata, firstStageMetaData, relatedStageActionsOptions, programId, ...passOnProps } = this.props;
+        const {
+            enrollmentMetadata, firstStageMetaData, relatedStageActionsOptions, programId,
+            enrollmentLabel, ...passOnProps
+        } = this.props;
 
-        const { enrollmentLabel } = getTermLabel([LabelKeys.enrollmentSingular], { programId });
         const dataEntrySections = {
             [sectionKeysForEnrollmentDataEntry.ENROLLMENT]: {
                 placement: placements.TOP,
@@ -402,10 +405,14 @@ class FinalEnrollmentDataEntry extends React.Component<FinalTeiDataEntryProps> {
     }
 }
 
+const FinalEnrollmentDataEntryWithLabels = withCustomLabels(
+    [LabelKeys.enrollmentSingular] as const,
+)(FinalEnrollmentDataEntry);
+
 const AOCFieldBuilderHOC = withAOCFieldBuilder(getAOCSettingsFn())(
     withDataEntryFields(
         getCategoryOptionsSettingsFn(),
-    )(FinalEnrollmentDataEntry));
+    )(FinalEnrollmentDataEntryWithLabels));
 const LocationHOC = withDataEntryFieldIfApplicable(getGeometrySettings())(AOCFieldBuilderHOC);
 const IncidentDateFieldHOC = withDataEntryFieldIfApplicable(getIncidentDateSettings())(LocationHOC);
 const EnrollmentDateFieldHOC = withDataEntryField(getEnrollmentDateSettings())(IncidentDateFieldHOC);

src/core_modules/capture-core/components/DataEntries/Enrollment/EnrollmentWithFirstStageDataEntry/EnrollmentWithFirstStageDataEntry.component.tsx

@@ -1,6 +1,7 @@
 import i18n from '@dhis2/d2-i18n';
 import { isLangRtl } from '../../../../utils/rtl';
-import { getTermLabel, LabelKeys } from '../../../../metaData';
+import { LabelKeys } from '../../../../metaData';
+import { withCustomLabels } from '../../../../HOC/withCustomLabels';
 import { DataEntry } from '../../../DataEntry';
 import { Assignee } from '../../SingleEventRegistrationEntry/DataEntryWrapper/DataEntry/Assignee';
 import {
@@ -177,15 +178,12 @@ const getCompleteFieldSettingsFn = () => {
     const completeSettings = {
         isApplicable: (props: any) => props.firstStageMetaData && props.firstStageMetaData.stage?.stageForm,
         getComponent: () => completeComponent,
-        getComponentProps: (props: any) => {
-            const { eventLabel } = getTermLabel([LabelKeys.eventSingular], { programId: props.programId });
-            return createComponentProps(props, {
-                label: i18n.t('Complete {{eventLabel}}', {
-                    eventLabel,
-                }),
-                id: 'complete',
-            });
-        },
+        getComponentProps: (props: any) => createComponentProps(props, {
+            label: i18n.t('Complete {{eventLabel}}', {
+                eventLabel: props.eventLabel,
+            }),
+            id: 'complete',
+        }),
         getPropName: () => stageMainDataIds.COMPLETE,
         getValidatorContainers: () => [],
         getMeta: () => ({
@@ -272,4 +270,7 @@ const getAssigneeSettingsFn = () => {
 const StageLocationHOC = withDataEntryFieldIfApplicable(getStageGeometrySettings())(withCleanUp()(DataEntry));
 const CompleteHOC = withDataEntryFieldIfApplicable(getCompleteFieldSettingsFn())(StageLocationHOC);
 const AssigneeHOC = withDataEntryFieldIfApplicable(getAssigneeSettingsFn())(CompleteHOC);
-export const FirstStageDataEntry = withDataEntryFieldIfApplicable(getReportDateSettingsFn())(AssigneeHOC);
+const ReportDateHOC = withDataEntryFieldIfApplicable(getReportDateSettingsFn())(AssigneeHOC);
+export const FirstStageDataEntry = withCustomLabels(
+    [LabelKeys.eventSingular] as const,
+)(ReportDateHOC);

src/core_modules/capture-core/components/Pages/ViewEvent/RightColumn/NotesSection/NotesSection.component.tsx

@@ -9,8 +9,9 @@ import { ViewEventSection } from '../../Section/ViewEventSection.component';
 import { ViewEventSectionHeader } from '../../Section/ViewEventSectionHeader.component';
 import { Notes } from '../../../../Notes/Notes.component';
 import { withLoadingIndicator } from '../../../../../HOC/withLoadingIndicator';
+import { withCustomLabels } from '../../../../../HOC/withCustomLabels';
 import type { PlainProps } from './NotesSection.types';
-import { getTermLabel, LabelKeys } from '../../../../../metaData';
+import { LabelKeys } from '../../../../../metaData';
 
 const LoadingNotes = withLoadingIndicator(null, props => ({ style: props.loadingIndicatorStyle }))(Notes);
 
@@ -32,14 +33,19 @@ const getStyles = (theme: any) => ({
     },
 });
 
-type Props = PlainProps & WithStyles<typeof getStyles>;
+type LabelProps = {
+    eventLabel: string;
+    noteLabel: string;
+    notesLabel: string;
+};
+
+type Props = PlainProps & LabelProps & WithStyles<typeof getStyles>;
 
 class NotesSectionPlain extends React.Component<Props> {
     renderHeader = () => {
-        const { classes, notes, ready, programId } = this.props;
+        const { classes, notes, ready, notesLabel } = this.props;
         const count = notes ? notes.length : 0;
         const badgeCount = ready ? count : undefined;
-        const { notesLabel } = getTermLabel([LabelKeys.notePlural], { programId });
         return (
             <ViewEventSectionHeader
                 icon={IconMessages24}
@@ -51,12 +57,11 @@ class NotesSectionPlain extends React.Component<Props> {
     }
 
     render() {
-        const { classes, notes, fieldValue, onAddNote, ready, readOnly, programId } = this.props;
+        const {
+            classes, notes, fieldValue, onAddNote, ready, readOnly, programId,
+            eventLabel, notesLabel, noteLabel,
+        } = this.props;
         const isEmpty = ready && (!notes || notes.length === 0);
-        const { eventLabel, notesLabel, noteLabel } = getTermLabel(
-            [LabelKeys.eventSingular, LabelKeys.notePlural, LabelKeys.noteSingular],
-            { programId },
-        );
         return (
             <ViewEventSection
                 collapsable
@@ -88,4 +93,6 @@ class NotesSectionPlain extends React.Component<Props> {
     }
 }
 
-export const NotesSectionComponent = withStyles(getStyles)(NotesSectionPlain) as ComponentType<PlainProps>;
+export const NotesSectionComponent = withCustomLabels(
+    [LabelKeys.eventSingular, LabelKeys.notePlural, LabelKeys.noteSingular] as const,
+)(withStyles(getStyles)(NotesSectionPlain)) as ComponentType<PlainProps>;

src/core_modules/capture-core/components/Pages/ViewEvent/RightColumn/RelationshipsSection/RelationshipsSection.component.tsx

@@ -9,10 +9,11 @@ import { ViewEventSection } from '../../Section/ViewEventSection.component';
 import { ViewEventSectionHeader } from '../../Section/ViewEventSectionHeader.component';
 import { Relationships } from '../../../../Relationships/Relationships.component';
 import { withLoadingIndicator } from '../../../../../HOC/withLoadingIndicator';
+import { withCustomLabels } from '../../../../../HOC/withCustomLabels';
 import { ConnectedEntity } from './ConnectedEntity';
 import type { Entity } from '../../../../Relationships/relationships.types';
 import type { PlainProps } from './RelationshipsSection.types';
-import { getTermLabel, LabelKeys } from '../../../../../metaData';
+import { LabelKeys } from '../../../../../metaData';
 
 const LoadingRelationships =
     withLoadingIndicator(null, props => ({ style: props.loadingIndicatorStyle }))(Relationships);
@@ -35,7 +36,12 @@ const getStyles = (theme: any) => ({
     },
 });
 
-type Props = PlainProps & WithStyles<typeof getStyles>;
+type LabelProps = {
+    eventLabel: string;
+    relationshipsLabel: string;
+};
+
+type Props = PlainProps & LabelProps & WithStyles<typeof getStyles>;
 
 class RelationshipsSectionPlain extends React.Component<Props> {
     handleOpenAddRelationship = () => {
@@ -47,10 +53,9 @@ class RelationshipsSectionPlain extends React.Component<Props> {
     }
 
     renderHeader = () => {
-        const { classes, relationships, ready, programId } = this.props;
+        const { classes, relationships, ready, relationshipsLabel } = this.props;
         const count = relationships ? relationships.length : 0;
         const badgeCount = ready ? count : undefined;
-        const { relationshipsLabel } = getTermLabel([LabelKeys.relationshipPlural], { programId });
         return (
             <ViewEventSectionHeader
                 icon={IconLink24}
@@ -79,18 +84,17 @@ class RelationshipsSectionPlain extends React.Component<Props> {
     }
 
     render() {
-        const { classes, programStage, programId, eventId, relationships, ready, readOnly } = this.props;
+        const {
+            classes, programStage, programId, eventId, relationships, ready, readOnly,
+            eventLabel, relationshipsLabel,
+        } = this.props;
         const relationshipTypes = programStage.relationshipTypes || [];
         const hasRelationshipTypes = relationshipTypes.length > 0;
 
         const writableRelationshipTypes =
             programStage.relationshipTypesWhereStageIsFrom.filter(rt => rt.access.data.write);
 
         const isEmpty = ready && (!relationships || relationships.length === 0);
-        const { eventLabel, relationshipsLabel } = getTermLabel(
-            [LabelKeys.eventSingular, LabelKeys.relationshipPlural],
-            { programId },
-        );
 
         return hasRelationshipTypes && (
             <ViewEventSection
@@ -125,4 +129,6 @@ class RelationshipsSectionPlain extends React.Component<Props> {
     }
 }
 
-export const RelationshipsSectionComponent = withStyles(getStyles)(RelationshipsSectionPlain) as ComponentType<PlainProps>;
+export const RelationshipsSectionComponent = withCustomLabels(
+    [LabelKeys.eventSingular, LabelKeys.relationshipPlural] as const,
+)(withStyles(getStyles)(RelationshipsSectionPlain)) as ComponentType<PlainProps>;

src/core_modules/capture-core/components/WidgetEventEdit/DataEntry/withDeleteButton.tsx

@@ -2,12 +2,15 @@ import * as React from 'react';
 import i18n from '@dhis2/d2-i18n';
 import { Modal, ModalTitle, ModalContent, ModalActions, ButtonStrip, Button } from '@dhis2/ui';
 import type { Props, State } from './withDeleteButton.types';
-import { getTermLabel, LabelKeys } from '../../../metaData';
+import { LabelKeys } from '../../../metaData';
+import { withCustomLabels } from '../../../HOC/withCustomLabels';
+
+type InternalProps = Props & { eventLabel: string };
 
 const getDeleteButton = (InnerComponent: React.ComponentType<any>) =>
-    class DeleteButtonHOC extends React.Component<Props, State> {
+    class DeleteButtonHOC extends React.Component<InternalProps, State> {
         innerInstance: any;
-        constructor(props: Props) {
+        constructor(props: InternalProps) {
             super(props);
             this.state = {
                 isOpen: false,
@@ -19,7 +22,7 @@ const getDeleteButton = (InnerComponent: React.ComponentType<any>) =>
         }
 
         renderDeleteButton = (hasDeleteButton?: boolean) => {
-            const { eventLabel } = getTermLabel([LabelKeys.eventSingular], { programId: this.props.programId });
+            const { eventLabel } = this.props;
             return (
                 hasDeleteButton ? (<div>
                     <Button
@@ -72,7 +75,7 @@ const getDeleteButton = (InnerComponent: React.ComponentType<any>) =>
         };
 
         render() {
-            const { onDelete, hasDeleteButton, ...passOnProps } = this.props;
+            const { onDelete, hasDeleteButton, eventLabel, ...passOnProps } = this.props;
 
             return (
                 <InnerComponent
@@ -85,4 +88,5 @@ const getDeleteButton = (InnerComponent: React.ComponentType<any>) =>
     };
 
 
-export const withDeleteButton = () => (InnerComponent: React.ComponentType<any>) => getDeleteButton(InnerComponent);
+export const withDeleteButton = () => (InnerComponent: React.ComponentType<any>) =>
+    withCustomLabels([LabelKeys.eventSingular] as const)(getDeleteButton(InnerComponent));