fix: prevent details panel crashing for catOptCombos

dhis2 · Aug 28, 2024 · e73f12c · e73f12c
1 parent a5898ba
commit e73f12c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/components/sectionList/detailsPanel/DefaultDetailsPanel.tsx b/src/components/sectionList/detailsPanel/DefaultDetailsPanel.tsx
@@ -89,15 +89,15 @@ const DetailsContent = ({ data }: { data: DetailsResponse }) => {
                 )}
                 <DetailItem label={i18n.t('Code')}>{data.code}</DetailItem>
                 <DetailItem label={i18n.t('Created by')}>
-                    {data.createdBy.displayName}
+                    {data.createdBy?.displayName}
                 </DetailItem>
                 <DetailItem label={i18n.t('Created')}>
-                    <ClientDateTime value={data.created} />
+                    <ClientDateTime value={data?.created} />
                 </DetailItem>
                 <DetailItem label={i18n.t('Last updated by')}>
                     {data.lastUpdatedBy
-                        ? data.lastUpdatedBy.displayName
-                        : data.createdBy.displayName}
+                        ? data.lastUpdatedBy?.displayName
+                        : data.createdBy?.displayName}
                 </DetailItem>
                 <DetailItem label={i18n.t('Last updated')}>
                     <ClientDateTime value={data.lastUpdated} />

diff --git a/src/pages/categoryOptionCombos/form/CategoryOptionComboFormFields.tsx b/src/pages/categoryOptionCombos/form/CategoryOptionComboFormFields.tsx
@@ -1,5 +1,7 @@
 import i18n from '@dhis2/d2-i18n'
+import { InputFieldFF } from '@dhis2/ui'
 import React from 'react'
+import { Field } from 'react-final-form'
 import {
     StandardFormField,
     StandardFormSection,
@@ -9,8 +11,6 @@ import {
     CustomAttributesSection,
 } from '../../../components'
 import { SECTIONS_MAP } from '../../../lib'
-import { Field } from 'react-final-form'
-import { InputFieldFF } from '@dhis2/ui'
 
 const section = SECTIONS_MAP.categoryCombo