fix: working list filter runtime error when dd-mm-yyyy format is passed

dhis2 · Dec 10, 2024 · ec75f9e · ec75f9e
1 parent 0294f8d
commit ec75f9e
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/core_modules/capture-core/utils/converters/date/convertIsoToLocalCalendar.js b/src/core_modules/capture-core/utils/converters/date/convertIsoToLocalCalendar.js
@@ -1,4 +1,5 @@
 // @flow
+import moment from 'moment';
 import {
     convertFromIso8601,
 } from '@dhis2/multi-calendar-dates';
@@ -16,10 +17,18 @@ export function convertIsoToLocalCalendar(isoDate: ?string): string {
     if (!isoDate) {
         return '';
     }
+
+    const momentDate = moment(isoDate);
+    if (!momentDate.isValid()) {
+        return '';
+    }
+
+    const formattedIsoDate = momentDate.format('YYYY-MM-DD');
+
     const calendar = systemSettingsStore.get().calendar;
     const dateFormat = systemSettingsStore.get().dateFormat;
 
-    const { year, eraYear, month, day } = convertFromIso8601(isoDate, calendar);
+    const { year, eraYear, month, day } = convertFromIso8601(formattedIsoDate, calendar);
     const localYear = calendar === 'ethiopian' ? eraYear : year;
 
     return dateFormat === 'DD-MM-YYYY'