dhis2 · kabaros · Mar 6, 2024 · Feb 23, 2024 · Nov 3, 2023 · Feb 23, 2024
diff --git a/src/components/Inputs/AtomicMode.js b/src/components/Inputs/AtomicMode.js
@@ -4,7 +4,7 @@ import { RadioGroupField } from '../index.js'
 
 const atomicModeOptions = [
     { value: 'ALL', label: i18n.t('Do not import') },
-    { value: 'NONE', label: i18n.t('Import') },
+    { value: 'OBJECT', label: i18n.t('Import') },
 ]
 const defaultAtomicModeOption = atomicModeOptions[0].value
 

diff --git a/src/components/Inputs/EndDate.js b/src/components/Inputs/EndDate.js
@@ -1,5 +1,6 @@
 import i18n from '@dhis2/d2-i18n'
 import { hasValue, composeValidators } from '@dhis2/ui'
+import PropTypes from 'prop-types'
 import React from 'react'
 import { DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
@@ -9,13 +10,18 @@ const DATATEST = 'input-end-date'
 const LABEL = i18n.t('End date')
 const VALIDATOR = composeValidators(hasValue, DATE_VALIDATOR)
 
-const EndDate = () => (
+const EndDate = ({ name, label }) => (
     <DatePickerField
-        name={NAME}
+        name={name ?? NAME}
         validator={VALIDATOR}
-        label={LABEL}
+        label={label ?? LABEL}
         dataTest={DATATEST}
     />
 )
 
+EndDate.propTypes = {
+    label: PropTypes.string,
+    name: PropTypes.string,
+}
+
 export { EndDate }
diff --git a/src/components/Inputs/FollowUpStatus.js b/src/components/Inputs/FollowUpStatus.js
@@ -5,12 +5,12 @@ import { RadioGroupField } from '../index.js'
 
 const followUpStatusOptions = [
     { value: 'ALL', label: i18n.t('All') },
-    { value: 'TRUE', label: i18n.t('Marked for follow-up') },
-    { value: 'FALSE', label: i18n.t('Not marked for follow-up') },
+    { value: 'true', label: i18n.t('Marked for follow-up') },
+    { value: 'false', label: i18n.t('Not marked for follow-up') },
 ]
 const defaultFollowUpStatusOption = followUpStatusOptions[0].value
 
-const NAME = 'followUpStatus'
+const NAME = 'followup'
 const DATATEST = 'input-follow-up-status'
 const LABEL = i18n.t('Include only entities with follow-up status')
 

diff --git a/src/components/Inputs/LastUpdatedDuration.js b/src/components/Inputs/LastUpdatedDuration.js
@@ -5,7 +5,7 @@ import React from 'react'
 import { DURATION_VALIDATOR } from '../Duration/DurationField.js'
 import { DurationField } from '../index.js'
 
-const NAME = 'lastUpdatedDuration'
+const NAME = 'updatedWithin'
 const DATATEST = 'input-last-updated-duration'
 const LABEL = i18n.t('Last updated duration')
 const VALIDATOR = composeValidators(hasValue, DURATION_VALIDATOR)

diff --git a/src/components/Inputs/LastUpdatedEndDate.js b/src/components/Inputs/LastUpdatedEndDate.js
@@ -5,7 +5,7 @@ import React from 'react'
 import { OPTIONAL_DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
 
-const NAME = 'lastUpdatedEndDate'
+const NAME = 'updatedBefore'
 const DATATEST = 'input-last-updated-end-date'
 const LABEL = i18n.t('Last updated end date')
 const VALIDATOR = composeValidators(OPTIONAL_DATE_VALIDATOR)

diff --git a/src/components/Inputs/LastUpdatedStartDate.js b/src/components/Inputs/LastUpdatedStartDate.js
@@ -5,7 +5,7 @@ import React from 'react'
 import { OPTIONAL_DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
 
-const NAME = 'lastUpdatedStartDate'
+const NAME = 'updatedAfter'
 const DATATEST = 'input-last-updated-start-date'
 const LABEL = i18n.t('Last updated start date')
 const VALIDATOR = composeValidators(OPTIONAL_DATE_VALIDATOR)

diff --git a/src/components/Inputs/ProgramEndDate.js b/src/components/Inputs/ProgramEndDate.js
@@ -5,7 +5,7 @@ import React from 'react'
 import { OPTIONAL_DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
 
-const NAME = 'programEndDate'
+const NAME = 'enrollmentEnrolledBefore'
 const DATATEST = 'input-program-end-date'
 const LABEL = i18n.t('End date')
 const VALIDATOR = composeValidators(OPTIONAL_DATE_VALIDATOR)

diff --git a/src/components/Inputs/ProgramStartDate.js b/src/components/Inputs/ProgramStartDate.js
@@ -5,7 +5,7 @@ import React from 'react'
 import { OPTIONAL_DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
 
-const NAME = 'programStartDate'
+const NAME = 'enrollmentEnrolledAfter'
 const DATATEST = 'input-program-start-date'
 const LABEL = i18n.t('Start date')
 const VALIDATOR = composeValidators(OPTIONAL_DATE_VALIDATOR)

diff --git a/src/components/Inputs/StartDate.js b/src/components/Inputs/StartDate.js
@@ -1,5 +1,6 @@
 import i18n from '@dhis2/d2-i18n'
 import { hasValue, composeValidators } from '@dhis2/ui'
+import PropTypes from 'prop-types'
 import React from 'react'
 import { DATE_VALIDATOR } from '../DatePicker/DatePickerField.js'
 import { DatePickerField } from '../index.js'
@@ -9,13 +10,17 @@ const DATATEST = 'input-start-date'
 const LABEL = i18n.t('Start date')
 const VALIDATOR = composeValidators(hasValue, DATE_VALIDATOR)
 
-const StartDate = () => (
+const StartDate = ({ name, label }) => (
     <DatePickerField
-        name={NAME}
+        name={name ?? NAME}
         validator={VALIDATOR}
-        label={LABEL}
+        label={label ?? LABEL}
         dataTest={DATATEST}
     />
 )
 
+StartDate.propTypes = {
+    label: PropTypes.string,
+    name: PropTypes.string,
+}
 export { StartDate }
diff --git a/src/components/Inputs/TEITypeFilter.js b/src/components/Inputs/TEITypeFilter.js
@@ -3,7 +3,6 @@ import React from 'react'
 import { RadioGroupField } from '../index.js'
 
 const teiTypeFilterOptions = [
-    { value: 'NONE', label: i18n.t('None') },
     { value: 'PROGRAM', label: i18n.t('Program') },
     { value: 'TE', label: i18n.t('Tracked entity type') },
 ]

diff --git a/src/components/JobSummary/SingleSummary/SingleSummary.js b/src/components/JobSummary/SingleSummary/SingleSummary.js
@@ -20,6 +20,7 @@ const SingleSummary = ({
     status,
     description,
     conflicts,
+    validationReport,
     id,
 }) => (
     <div>
@@ -29,7 +30,7 @@ const SingleSummary = ({
             name="summary"
         >
             <>
-                {status && (
+                {status && description && (
                     <SingleStatusTable
                         description={description}
                         status={status}
@@ -47,16 +48,61 @@ const SingleSummary = ({
                     </TableHead>
                     <TableBody>
                         <TableRow>
-                            <TableCell>{importCount.imported}</TableCell>
-                            <TableCell>{importCount.deleted}</TableCell>
-                            <TableCell>{importCount.ignored}</TableCell>
-                            <TableCell>{importCount.updated}</TableCell>
-                            <TableCell>{importCount.total}</TableCell>
+                            <TableCell>
+                                {importCount?.imported ?? '0'}
+                            </TableCell>
+                            <TableCell>{importCount?.deleted}</TableCell>
+                            <TableCell>{importCount?.ignored}</TableCell>
+                            <TableCell>{importCount?.updated}</TableCell>
+                            <TableCell>{importCount?.total}</TableCell>
                         </TableRow>
                     </TableBody>
                 </Table>
             </>
         </FormField>
+        {!!validationReport?.errorReports?.length && (
+            <FormField
+                label={`${i18n.t('Reports')}`}
+                dataTest="tracker-summary-reports"
+                name="tracker-reports"
+            >
+                <Table>
+                    <TableHead>
+                        <TableRowHead>
+                            <TableCellHead>{i18n.t('UID')}</TableCellHead>
+                            <TableCellHead>
+                                {i18n.t('Error Code')}
+                            </TableCellHead>
+                            <TableCellHead>{i18n.t('Message')}</TableCellHead>
+                            <TableCellHead>
+                                {i18n.t('Tracker Type')}
+                            </TableCellHead>
+                            {/* <TableCellHead>{i18n.t('')}</TableCellHead> */}
+                        </TableRowHead>
+                    </TableHead>
+                    <TableBody>
+                        {validationReport.errorReports.map((c, i) => (
+                            <TableRow
+                                key={`job-summary-report-${c.object}-${i}`}
+                            >
+                                <TableCell>{c.uid}</TableCell>
+                                <TableCell>
+                                    <a
+                                        target="_blank"
+                                        rel="noreferrer"
+                                        href="https://docs.dhis2.org/en/develop/using-the-api/dhis-core-version-master/tracker.html#webapi_nti_error_codes"
+                                    >
+                                        {c.warningCode ?? c.errorCode}
+                                    </a>
+                                </TableCell>
+                                <TableCell>{c.message}</TableCell>
+                                <TableCell>{c.trackerType}</TableCell>
+                            </TableRow>
+                        ))}
+                    </TableBody>
+                </Table>
+            </FormField>
+        )}
         {conflicts && (
             <FormField
                 label={`${i18n.t('Conflicts')}`}
@@ -107,6 +153,24 @@ SingleSummary.propTypes = {
     id: PropTypes.string,
     importType: PropTypes.string,
     status: PropTypes.string,
+    validationReport: PropTypes.shape({
+        errorReports: PropTypes.arrayOf(
+            PropTypes.shape({
+                errorCode: PropTypes.string,
+                message: PropTypes.string,
+                trackerType: PropTypes.string,
+                uid: PropTypes.string,
+            })
+        ),
+        warningReports: PropTypes.arrayOf(
+            PropTypes.shape({
+                errorCode: PropTypes.string,
+                message: PropTypes.string,
+                trackerType: PropTypes.string,
+                uid: PropTypes.string,
+            })
+        ),
+    }),
 }
 
 export { SingleSummary }
diff --git a/src/components/JobSummary/Summary/Summary.js b/src/components/JobSummary/Summary/Summary.js
@@ -49,6 +49,7 @@ const Summary = ({ summary, importType }) => {
             importCount={importCount}
             status={summary.status}
             description={summary.description}
+            validationReport={summary.validationReport}
             conflicts={
                 summary.conflicts &&
                 (summary.conflicts.length || null) &&

diff --git a/src/components/JobSummary/__test__/__snapshots__/Summary.test.js.snap b/src/components/JobSummary/__test__/__snapshots__/Summary.test.js.snap
@@ -172,51 +172,6 @@ exports[`different job type summaries matches snapshot - EVENT_IMPORT 1`] = `
         >
           Summary
         </span>
-        <table
-          class="jsx-2430604489 "
-          data-test="dhis2-uicore-table"
-        >
-          <thead
-            data-test="dhis2-uicore-tablehead"
-          >
-            <tr
-              class="jsx-3124144591 zebraStriping"
-              data-test="dhis2-uicore-tablerowhead"
-            >
-              <th
-                class="jsx-1796049005 "
-                data-test="dhis2-uicore-tablecellhead"
-              >
-                Status
-              </th>
-              <th
-                class="jsx-1796049005 "
-                data-test="dhis2-uicore-tablecellhead"
-              >
-                Description
-              </th>
-            </tr>
-          </thead>
-          <tbody
-            data-test="dhis2-uicore-tablebody"
-          >
-            <tr
-              class="jsx-3124144591 zebraStriping"
-              data-test="dhis2-uicore-tablerow"
-            >
-              <td
-                class="jsx-996330601 "
-                data-test="dhis2-uicore-tablecell"
-              >
-                ERROR
-              </td>
-              <td
-                class="jsx-996330601 "
-                data-test="dhis2-uicore-tablecell"
-              />
-            </tr>
-          </tbody>
-        </table>
         <table
           class="jsx-2430604489 "
           data-test="dhis2-uicore-table"
@@ -758,51 +713,6 @@ exports[`different job type summaries matches snapshot - METADATA_IMPORT 1`] = `
         >
           Summary
         </span>
-        <table
-          class="jsx-2430604489 "
-          data-test="dhis2-uicore-table"
-        >
-          <thead
-            data-test="dhis2-uicore-tablehead"
-          >
-            <tr
-              class="jsx-3124144591 zebraStriping"
-              data-test="dhis2-uicore-tablerowhead"
-            >
-              <th
-                class="jsx-1796049005 "
-                data-test="dhis2-uicore-tablecellhead"
-              >
-                Status
-              </th>
-              <th
-                class="jsx-1796049005 "
-                data-test="dhis2-uicore-tablecellhead"
-              >
-                Description
-              </th>
-            </tr>
-          </thead>
-          <tbody
-            data-test="dhis2-uicore-tablebody"
-          >
-            <tr
-              class="jsx-3124144591 zebraStriping"
-              data-test="dhis2-uicore-tablerow"
-            >
-              <td
-                class="jsx-996330601 "
-                data-test="dhis2-uicore-tablecell"
-              >
-                OK
-              </td>
-              <td
-                class="jsx-996330601 "
-                data-test="dhis2-uicore-tablecell"
-              />
-            </tr>
-          </tbody>
-        </table>
         <table
           class="jsx-2430604489 "
           data-test="dhis2-uicore-table"
@@ -856,7 +766,9 @@ exports[`different job type summaries matches snapshot - METADATA_IMPORT 1`] = `
               <td
                 class="jsx-996330601 "
                 data-test="dhis2-uicore-tablecell"
-              />
+              >
+                0
+              </td>
               <td
                 class="jsx-996330601 "
                 data-test="dhis2-uicore-tablecell"

diff --git a/src/components/Sidebar/Sidebar.js b/src/components/Sidebar/Sidebar.js
@@ -53,7 +53,7 @@ const metadataImportPage = {
     icon: <MetadataImportIcon />,
 }
 const teiImportPage = {
-    name: i18n.t('TEI import'),
+    name: i18n.t('Tracked entity import'),
     code: 'tei-import',
     path: '/import/tei',
     icon: <TEIIcon />,
@@ -88,7 +88,7 @@ const metadataExportPage = {
 }
 
 const teiExportPage = {
-    name: i18n.t('TEI export'),
+    name: i18n.t('Tracked entity export'),
     code: 'tei-export',
     path: '/export/tei',
     icon: <TEIIcon />,