fix: info box missing org unit optimisation

dhis2 · Jan 17, 2025 · 2854ec8 · 2854ec8
1 parent fc96d0e
commit 2854ec8
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/InfoBox/InfoBox.component.js b/src/core_modules/capture-core/components/WidgetEventSchedule/InfoBox/InfoBox.component.js
@@ -25,7 +25,7 @@ const InfoBoxPlain = ({
     orgUnitName,
     classes,
 }: Props) => {
-    if (!scheduleDate || !suggestedScheduleDate || !orgUnitName) {
+    if (!scheduleDate || !suggestedScheduleDate) {
         return null;
     }
 
@@ -54,17 +54,22 @@ const InfoBoxPlain = ({
                             },
                         )
                     }
-                    {' '}
-                    {i18n.t('There are {{count}} scheduled event in {{orgUnitName}} on this day.', {
-                        count: eventCountInOrgUnit,
-                        orgUnitName,
-                        defaultValue: 'There are {{count}} scheduled event in {{orgUnitName}} on this day.',
-                        defaultValue_plural: 'There are {{count}} scheduled events in {{orgUnitName}} on this day.',
-                        interpolation: {
-                            escapeValue: false,
-                        },
-                    })}
+                    {!!orgUnitName && (
+                        <>
+                            {' '}
+                            {i18n.t('There are {{count}} scheduled event in {{orgUnitName}} on this day.', {
+                                count: eventCountInOrgUnit,
+                                orgUnitName,
+                                defaultValue: 'There are {{count}} scheduled event in {{orgUnitName}} on this day.',
+                                defaultValue_plural: 'There are {{count}} scheduled events in {{orgUnitName}} on this day.',
+                                interpolation: {
+                                    escapeValue: false,
+                                },
+                            })}
+                        </>
+                    )}
                 </>
+
             )}
         </NoticeBox>
     );