fix: use period name in invalid period warning

dhis2 · Sep 27, 2024 · 968311e · 968311e
1 parent 43492f7
commit 968311e
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/context-selection/period-selector-bar-item/period-selector-bar-item.js b/src/context-selection/period-selector-bar-item/period-selector-bar-item.js
@@ -109,16 +109,18 @@ export const PeriodSelectorBarItem = () => {
     ])
 
     useEffect(() => {
-        const resetPeriod = (id) => {
-            showWarningAlert(`The Period (${id}) is not open or is invalid.`)
-            i18n.t('The Period ({{id}}) is not open or is invalid.', {
-                id,
-            })
+        const resetPeriod = (id, displayName) => {
+            showWarningAlert(
+                i18n.t('The Period ({{id}}) is not open or is invalid.', {
+                    id: displayName ? displayName : id,
+                })
+            )
             setPeriodId(undefined)
         }
 
         if (selectedPeriod) {
             const endDate = selectedPeriod?.endDate
+            const displayName = selectedPeriod?.displayName
 
             // date comparison
             if (
@@ -127,11 +129,11 @@ export const PeriodSelectorBarItem = () => {
                     calendar,
                 })
             ) {
-                resetPeriod(periodId)
+                resetPeriod(periodId, displayName)
             }
 
             if (selectedPeriod?.periodType !== dataSetPeriodType) {
-                resetPeriod(periodId)
+                resetPeriod(periodId, selectedPeriod?.displayName)
             }
         } else if (periodId) {
             setPeriodId(undefined)