fix: fix map center point when no org unit

dhis2 · Dec 9, 2024 · 3274b43 · 3274b43
1 parent 0a9847d
commit 3274b43
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 36 deletions.
diff --git a/i18n/en.pot b/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: 2024-12-08T13:28:49.327Z\n"
-"PO-Revision-Date: 2024-12-08T13:28:49.327Z\n"
+"POT-Creation-Date: 2024-12-09T14:19:09.122Z\n"
+"PO-Revision-Date: 2024-12-09T14:19:09.122Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1270,6 +1270,9 @@ msgstr "organisation unit could not be retrieved. Please try again later."
 msgid "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}"
 msgstr "Saving to {{stageName}} for {{programName}} in {{orgUnitName}}"
 
+msgid "Saving to {{stageName}} for {{programName}}"
+msgstr "Saving to {{stageName}} for {{programName}}"
+
 msgid "program or stage is invalid"
 msgstr "program or stage is invalid"
 

diff --git a/src/core_modules/capture-core/components/FormFields/New/HOC/withCenterPoint.js b/src/core_modules/capture-core/components/FormFields/New/HOC/withCenterPoint.js
@@ -17,7 +17,10 @@ const convertToClientCoordinates = ({ coordinates, type }: { coordinates: any[],
 
 const getCenterPoint = (InnerComponent: ComponentType<any>) => (props: Object) => {
     const { orgUnit, ...passOnProps } = props;
-    const [orgUnitKey, setOrgUnitKey] = useState(orgUnit?.id);
+    if (!orgUnit || !orgUnit.id) {
+        return <InnerComponent {...passOnProps} center={DEFAULT_CENTER} onOpenMap={() => {}} />;
+    }
+    const [orgUnitKey, setOrgUnitKey] = useState(orgUnit.id);
     const [shouldFetch, setShouldFetch] = useState(false);
     const queryKey = ['organisationUnit', 'geometry', orgUnitKey];
     const queryFn = {
@@ -28,8 +31,8 @@ const getCenterPoint = (InnerComponent: ComponentType<any>) => (props: Object) =
         },
     };
     const queryOptions = useMemo(
-        () => ({ enabled: Boolean(orgUnit?.id) && shouldFetch }),
-        [shouldFetch, orgUnit?.id],
+        () => ({ enabled: Boolean(orgUnit.id) && shouldFetch }),
+        [shouldFetch, orgUnit.id],
     );
     const { data } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);
 

diff --git a/...dules/capture-core/components/WidgetEnrollmentEventNew/SavingText/SavingText.component.js b/...dules/capture-core/components/WidgetEnrollmentEventNew/SavingText/SavingText.component.js
@@ -7,8 +7,11 @@ import type { Props } from './savingText.types';
 export const SavingText = ({ orgUnitName, stageName, programName }: Props) => (
     <InfoIconText>
         <span>
-            {i18n.t('Saving to {{stageName}} for {{programName}} in {{orgUnitName}}',
-                { orgUnitName, stageName, programName, interpolation: { escapeValue: false } })}
+            {orgUnitName
+                ? i18n.t('Saving to {{stageName}} for {{programName}} in {{orgUnitName}}',
+                    { orgUnitName, stageName, programName, interpolation: { escapeValue: false } })
+                : i18n.t('Saving to {{stageName}} for {{programName}}',
+                    { stageName, programName, interpolation: { escapeValue: false } })}
         </span>
     </InfoIconText>
 );
diff --git a/...core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.component.js b/...core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.component.js
@@ -59,7 +59,6 @@ const WidgetEventSchedulePlain = ({
         setScheduledOrgUnit(undefined);
     };
 
-
     return (
         <Widget
             noncollapsible
@@ -73,23 +72,20 @@ const WidgetEventSchedulePlain = ({
                     dataTest="schedule-section"
                     sectionName={i18n.t('Schedule info')}
                 >
-                    <div className={classes.test}>
-                        <ScheduleOrgUnit
-                            orgUnit={orgUnit}
-                            onSelectOrgUnit={onSelectOrgUnit}
-                            onDeselectOrgUnit={onDeselectOrgUnit}
-                            {...passOnProps}
-                        />
-                        <ScheduleDate
-                            programId={programId}
-                            stageId={stageId}
-                            orgUnit={orgUnit}
-                            scheduleDate={scheduleDate}
-                            serverSuggestedScheduleDate={serverSuggestedScheduleDate}
-                            {...passOnProps}
-                        />
-                    </div>
-
+                    <ScheduleOrgUnit
+                        orgUnit={orgUnit}
+                        onSelectOrgUnit={onSelectOrgUnit}
+                        onDeselectOrgUnit={onDeselectOrgUnit}
+                        {...passOnProps}
+                    />
+                    <ScheduleDate
+                        programId={programId}
+                        stageId={stageId}
+                        orgUnit={orgUnit}
+                        scheduleDate={scheduleDate}
+                        serverSuggestedScheduleDate={serverSuggestedScheduleDate}
+                        {...passOnProps}
+                    />
                 </DataSection>
                 {programCategory && <DataSection
                     dataTest="category-options-section"

diff --git a/...core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js b/...core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.container.js
@@ -41,17 +41,14 @@ export const WidgetEventSchedule = ({
     const { programStageScheduleConfig } = useScheduleConfigFromProgramStage(stageId);
     const { programConfig } = useScheduleConfigFromProgram(programId);
     const suggestedScheduleDate = useDetermineSuggestedScheduleDate({
-        programStageScheduleConfig,
-        programConfig,
-        initialScheduleDate,
-        ...passOnProps,
+        programStageScheduleConfig, programConfig, initialScheduleDate, ...passOnProps,
     });
-    const orgUnit = useOrgUnitNameWithAncestors(initialOrgUnitId);
-    const orgUnitInitial = initialOrgUnitId && orgUnit?.displayName
-        ? { id: initialOrgUnitId, name: orgUnit.displayName } : undefined;
+    const orgUnitData = useOrgUnitNameWithAncestors(initialOrgUnitId);
+    const orgUnit = initialOrgUnitId && orgUnitData
+        ? { id: initialOrgUnitId, name: orgUnitData.displayName } : undefined;
     const { currentUser, noteId } = useNoteDetails();
     const [scheduleDate, setScheduleDate] = useState('');
-    const [scheduledOrgUnit, setScheduledOrgUnit] = useState(orgUnitInitial);
+    const [scheduledOrgUnit, setScheduledOrgUnit] = useState(orgUnit);
     const convertFn = pipe(convertFormToClient, convertClientToServer);
     const serverScheduleDate = convertFn(scheduleDate, dataElementTypes.DATE);
     const serverSuggestedScheduleDate = convertFn(suggestedScheduleDate, dataElementTypes.DATE);
@@ -66,9 +63,7 @@ export const WidgetEventSchedule = ({
     const [categoryOptionsError, setCategoryOptionsError] = useState();
     const { programCategory } = useCategoryCombinations(programId);
     useEffect(() => {
-        if (!scheduleDate && suggestedScheduleDate) {
-            setScheduleDate(suggestedScheduleDate);
-        }
+        if (!scheduleDate && suggestedScheduleDate) { setScheduleDate(suggestedScheduleDate); }
     }, [suggestedScheduleDate, scheduleDate]);
 
     useEffect(() => {