fix: [DHIS2-18620][DHIS2-21937] Hidden TEA is displayed in the TEI profile

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-11T09:39:26.174Z\n"
-"PO-Revision-Date: 2026-09-11T09:39:26.174Z\n"
+"POT-Creation-Date: 2026-09-10T09:13:28.812Z\n"
+"PO-Revision-Date: 2026-09-10T09:13:28.812Z\n"
 
 msgid "The application could not be loaded."
 msgstr "The application could not be loaded."
@@ -1697,12 +1697,12 @@ msgstr "View profile"
 msgid "Profile widget could not be loaded. Please try again later"
 msgstr "Profile widget could not be loaded. Please try again later"
 
-msgid "No attributes configured for {{trackedEntityTypeName}}"
-msgstr "No attributes configured for {{trackedEntityTypeName}}"
-
 msgid "No attributes configured"
 msgstr "No attributes configured"
 
+msgid "No attributes configured to display"
+msgstr "No attributes configured to display"
+
 msgid "{{trackedEntityTypeName}} profile"
 msgstr "{{trackedEntityTypeName}} profile"
 

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.container.tsx

@@ -16,7 +16,8 @@ import {
     updateEnrollmentDate,
     updateIncidentDate,
     useCommonEnrollmentDomainData,
-    useRuleEffects,
+    useEnrollmentScopeRuleEffects,
+    selectEnrollmentWidgetEffects,
 } from '../../common/EnrollmentOverviewDomain';
 import {
     deleteEnrollment,
@@ -28,7 +29,6 @@ import { useCoreOrgUnit } from '../../../../metadataRetrieval/coreOrgUnit';
 import { DataStoreKeyByPage, EnrollmentPageLayout } from '../../common/EnrollmentOverviewDomain/EnrollmentPageLayout';
 import { useProgramMetadata, useProgramStages } from './hooks';
 import { useNavigate, buildUrlQueryString, useLocationQuery } from '../../../../utils/routing';
-import { useFilteredWidgetData } from './hooks/useFilteredWidgetData';
 import { useLinkedRecordClick } from '../../common/TEIRelationshipsWidget';
 import {
     useEnrollmentPageLayout,
@@ -53,7 +53,6 @@ export const EnrollmentPageDefault = () => {
     const { fromClientDate } = useTimeZoneConversion();
     const { status: widgetEnrollmentStatus } = useSelector(({ widgetEnrollment }: any) => widgetEnrollment);
     const { enrollmentId, programId, teiId, orgUnitId } = useLocationQuery();
-    const { orgUnit, error } = useCoreOrgUnit(orgUnitId);
     const { onLinkedRecordClick } = useLinkedRecordClick();
     const {
         pageLayout,
@@ -64,13 +63,15 @@ export const EnrollmentPageDefault = () => {
         dataStoreKey: DataStoreKeyByPage.ENROLLMENT_OVERVIEW,
     });
 
-    const program = useTrackerProgram(programId);
     const {
         error: enrollmentsError,
         enrollment,
         attributeValues,
         readOnly: trackedEntityInactive,
+        ownerOrgUnitId,
     } = useCommonEnrollmentDomainData(teiId, enrollmentId, programId);
+    const program = useTrackerProgram(programId);
+    const { orgUnit: ownerOrgUnit, error: ownerOrgUnitError } = useCoreOrgUnit(ownerOrgUnitId);
 
     const onStatusToggleSuccess = useCallback(() => {
         dispatch(setTrackedEntityInactiveStatus(!trackedEntityInactive));
@@ -87,20 +88,21 @@ export const EnrollmentPageDefault = () => {
         https://dhis2.atlassian.net/browse/DHIS2-17574
     */
 
-    if (programMetaDataError || enrollmentsError) {
+    if (programMetaDataError || enrollmentsError || ownerOrgUnitError) {
         log.error(errorCreator('Enrollment page could not be loaded')(
-            { programMetaDataError, enrollmentsError },
+            { programMetaDataError, enrollmentsError, ownerOrgUnitError },
         ));
     }
 
-    const ruleEffects = useRuleEffects({
-        orgUnit,
+    useEnrollmentScopeRuleEffects({
+        enrollmentId,
+        orgUnit: ownerOrgUnit,
         program,
         apiEnrollment: enrollment,
         apiAttributeValues: attributeValues,
     });
 
-    const outputEffects = useFilteredWidgetData(ruleEffects);
+    const outputEffects = useSelector(selectEnrollmentWidgetEffects);
     const hideWidgets = useHideWidgetByRuleLocations(program.programRules);
 
     const onDeleteTrackedEntitySuccess = useCallback(() => {
@@ -193,10 +195,6 @@ export const EnrollmentPageDefault = () => {
         );
     }
 
-    if (error) {
-        return error?.errorComponent;
-    }
-
     return (
         <EnrollmentAccessProvider program={program} trackedEntityInactive={trackedEntityInactive}>
             <EnrollmentPageLayout
@@ -205,6 +203,7 @@ export const EnrollmentPageDefault = () => {
                 availableWidgets={WidgetsForEnrollmentPageDefault}
                 teiId={teiId}
                 orgUnitId={orgUnitId}
+                ownerOrgUnitId={ownerOrgUnitId}
                 program={program}
                 stages={stages}
                 events={enrollment?.events}
@@ -230,7 +229,6 @@ export const EnrollmentPageDefault = () => {
                 onUpdateEnrollmentStatus={onUpdateEnrollmentStatus}
                 onUpdateEnrollmentStatusSuccess={onUpdateEnrollmentStatusSuccess}
                 onUpdateEnrollmentStatusError={onUpdateEnrollmentStatusError}
-                ruleEffects={ruleEffects}
                 widgetEnrollmentStatus={widgetEnrollmentStatus}
                 onAccessLostFromTransfer={onAccessLostFromTransfer}
                 feedbackEmptyText={i18n.t('No feedback for this enrollment yet')}

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentPageDefault.types.ts

@@ -1,4 +1,3 @@
-import { effectActions } from '@dhis2/rules-engine-javascript';
 import type { TrackerProgram } from 'capture-core/metaData';
 import type { HideWidgets, WidgetEffects } from '../../common/EnrollmentOverviewDomain';
 import type { Event } from '../../common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData';
@@ -44,7 +43,6 @@ export type Props = {
     onUpdateEnrollmentStatus: (enrollment: any) => void;
     onUpdateEnrollmentStatusSuccess: (params?: { redirect?: boolean }) => void;
     onUpdateEnrollmentStatusError: (message: string) => void;
-    ruleEffects?: Array<{id: string; type: keyof typeof effectActions}>;
     widgetEnrollmentStatus?: string | null;
     pageLayout: PageLayoutConfig;
     availableWidgets: Readonly<{ [key: string]: WidgetConfig }>;

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.component.tsx

@@ -1,13 +1,14 @@
 import React, { useState, useMemo, ComponentType } from 'react';
+import { useSelector } from 'react-redux';
 import i18n from '@dhis2/d2-i18n';
 import { colors, spacers, IconAdd16, IconCalendar16 } from '@dhis2/ui';
 import { withStyles, WithStyles } from 'capture-core-utils/styles';
-import type { OutputEffect } from '@dhis2/rules-engine-javascript';
 import { Widget } from '../../../../Widget';
 import { QuickActionButton } from './QuickActionButton/QuickActionButton';
 import { tabMode } from '../../../EnrollmentAddEvent/NewEventWorkspace/newEventWorkspace.constants';
 import { useNavigate, buildUrlQueryString, useLocationQuery } from '../../../../../utils/routing';
 import { useEnrollmentAccessContext } from '../../../common/EnrollmentOverviewDomain/EnrollmentAccessContext';
+import { selectEnrollmentHiddenProgramStageIds } from '../../../common/EnrollmentOverviewDomain';
 import { OwnProps, ProgramStage, EventCount } from './EnrollmentQuickActions.types';
 
 const styles = {
@@ -23,14 +24,15 @@ type Props = OwnProps & WithStyles<typeof styles>;
 const EnrollmentQuickActionsComponentPlain = ({
     stages,
     events,
-    ruleEffects,
     classes,
 }: Props) => {
     const [open, setOpen] = useState<boolean>(true);
     const { navigate } = useNavigate();
     const { enrollmentId, programId, teiId, orgUnitId } = useLocationQuery();
     const { anyStageWriteAccess } = useEnrollmentAccessContext();
 
+    const hiddenProgramStageIds = useSelector(selectEnrollmentHiddenProgramStageIds);
+
     const stagesWithEventCount = useMemo(() => stages.map((stage) => {
         const mutatedStage = { ...stage };
         mutatedStage.eventCount = (events
@@ -40,21 +42,15 @@ const EnrollmentQuickActionsComponentPlain = ({
         return mutatedStage;
     }), [events, stages]);
 
-    const hiddenProgramStageRuleEffects = useMemo(
-        () => ruleEffects?.filter((ruleEffect: OutputEffect): boolean => ruleEffect.type === 'HIDEPROGRAMSTAGE'),
-        [ruleEffects],
-    );
-
     const noStageAvailable = useMemo(
         () =>
             stagesWithEventCount.every(
                 (programStage: ProgramStage & EventCount) =>
                     (!programStage.dataAccess?.write) ||
                     (!programStage.repeatable && (programStage.eventCount ?? 0) > 0) ||
-                    hiddenProgramStageRuleEffects
-                        ?.find((ruleEffect: OutputEffect) => ruleEffect.id === programStage.id),
+                    Boolean(hiddenProgramStageIds?.[programStage.id]),
             ),
-        [stagesWithEventCount, hiddenProgramStageRuleEffects],
+        [stagesWithEventCount, hiddenProgramStageIds],
     );
 
     const onNavigationFromQuickActions = (tab: string) => {

src/core_modules/capture-core/components/Pages/Enrollment/EnrollmentPageDefault/EnrollmentQuickActions/EnrollmentQuickActions.types.ts

@@ -1,5 +1,3 @@
-import type { OutputEffect } from '@dhis2/rules-engine-javascript';
-
 export type EventCount = { eventCount?: number };
 
 export type ProgramStage = {
@@ -15,5 +13,4 @@ export type Event = { programStage: string };
 export type OwnProps = {
     stages: Array<ProgramStage & EventCount>;
     events: Array<Event>;
-    ruleEffects?: Array<OutputEffect>;
 };

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPage.container.tsx

@@ -66,6 +66,7 @@ const EnrollmentAddEventPagePlain = ({ classes }: WithStyles<typeof styles>) =>
         attributeValues,
         error: commonDataError,
         readOnly: trackedEntityInactive,
+        ownerOrgUnitId,
     } = useCommonEnrollmentDomainData(teiId, enrollmentId, programId);
     const { pageLayout, isLoading } = useEnrollmentPageLayout({
         selectedScopeId: validIds[IdTypes.PROGRAM_ID]?.id ?? null,
@@ -96,9 +97,10 @@ const EnrollmentAddEventPagePlain = ({ classes }: WithStyles<typeof styles>) =>
             <EnrollmentAddEventPageDefault
                 pageLayout={pageLayout!}
                 enrollment={enrollment}
-                attributeValues={attributeValues as Record<string, unknown> | null | undefined}
+                attributeValues={attributeValues}
                 commonDataError={Boolean(commonDataError)}
                 trackedEntityInactive={Boolean(trackedEntityInactive)}
+                ownerOrgUnitId={ownerOrgUnitId}
             />
         );
     }

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.tsx

@@ -20,7 +20,10 @@ import {
     showEnrollmentError,
     updateEnrollmentAndEvents,
     updateOrAddEnrollmentEvents,
+    useEnrollmentScopeRuleEffects,
 } from '../../common/EnrollmentOverviewDomain';
+import { useTrackerProgram } from '../../../../hooks/useTrackerProgram';
+import { useCoreOrgUnit } from '../../../../metadataRetrieval/coreOrgUnit';
 import { dataEntryHasChanges as getDataEntryHasChanges } from '../../../DataEntry/common/dataEntryHasChanges';
 import type { ContainerProps } from './EnrollmentAddEventPageDefault.types';
 import { WidgetsForEnrollmentEventNew } from '../PageLayout/DefaultPageLayout.constants';
@@ -34,6 +37,7 @@ export const EnrollmentAddEventPageDefault = ({
     attributeValues,
     commonDataError,
     trackedEntityInactive,
+    ownerOrgUnitId,
 }: ContainerProps) => {
     const { programId, stageId, orgUnitId, teiId, enrollmentId } = useLocationQuery();
 
@@ -111,6 +115,16 @@ export const EnrollmentAddEventPageDefault = ({
 
     const dataEntryHasChanges = useSelector((state: ReduxState) => getDataEntryHasChanges(state, widgetReducerName));
     const { program } = useProgramInfo(programId);
+    const trackerProgram = useTrackerProgram(programId);
+    const { orgUnit: ownerOrgUnit } = useCoreOrgUnit(ownerOrgUnitId);
+
+    useEnrollmentScopeRuleEffects({
+        enrollmentId,
+        orgUnit: ownerOrgUnit,
+        program: trackerProgram,
+        apiEnrollment: enrollment ?? undefined,
+        apiAttributeValues: attributeValues ?? undefined,
+    });
     const selectedProgramStage = [...program?.stages.values() ?? []].find((item: any) => item.id === stageId);
     const outputEffects = useWidgetDataFromStore(widgetReducerName);
     const hideWidgets = useHideWidgetByRuleLocations(program?.programRules.concat(selectedProgramStage?.programRules ?? []));
@@ -205,6 +219,7 @@ export const EnrollmentAddEventPageDefault = ({
                 onUpdateEnrollmentStatusError={onUpdateEnrollmentStatusError}
                 onAccessLostFromTransfer={onAccessLostFromTransfer}
                 trackedEntityInactive={trackedEntityInactive}
+                ownerOrgUnitId={ownerOrgUnitId}
             />
         </>
     );

src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.types.ts

@@ -1,5 +1,6 @@
 import type { ApiEnrollmentEvent } from 'capture-core-utils/types/api-types';
 import type { HideWidgets, WidgetEffects } from '../../common/EnrollmentOverviewDomain';
+import type { AttributeValue } from '../../common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData';
 import type { ExternalSaveHandler } from '../../../WidgetEnrollmentEventNew';
 import type {
     PageLayoutConfig,
@@ -9,6 +10,7 @@ import { Program } from '../../../../metaData';
 
 export type Props = {
     program: Program | null | undefined;
+    ownerOrgUnitId?: string;
     stageId: string;
     orgUnitId: string;
     teiId: string;
@@ -48,7 +50,8 @@ export type ContainerProps = {
         occurredAt?: string;
         enrollment?: string;
     } | null | undefined;
-    attributeValues: Record<string, unknown> | null | undefined;
+    attributeValues: Array<AttributeValue> | null | undefined;
     commonDataError: boolean;
     trackedEntityInactive: boolean;
+    ownerOrgUnitId?: string;
 };