refactor: pass data item type to InfoTable

Needed for computing the url to Maintenance app.
dhis2 · Dec 18, 2024 · 7286c2a · 7286c2a
1 parent 3dd2a6b
commit 7286c2a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 11 deletions.
diff --git a/src/components/DataDimension/Info/CalculationInfo.js b/src/components/DataDimension/Info/CalculationInfo.js
@@ -20,7 +20,7 @@ const calculationQuery = {
     },
 }
 
-export const CalculationInfo = ({ id, displayNameProp }) => {
+export const CalculationInfo = ({ id, displayNameProp, type }) => {
     const [data, setData] = useState()
     const [error, setError] = useState()
     const [expressionError, setExpressionError] = useState()
@@ -71,7 +71,12 @@ export const CalculationInfo = ({ id, displayNameProp }) => {
 
     return (
         <>
-            <InfoTable data={data?.calculation} loading={loading} error={error}>
+            <InfoTable
+                type={type}
+                data={data?.calculation}
+                loading={loading}
+                error={error}
+            >
                 <tr>
                     <th>{i18n.t('Expression description')}</th>
                     <td>
@@ -97,4 +102,5 @@ export const CalculationInfo = ({ id, displayNameProp }) => {
 CalculationInfo.propTypes = {
     displayNameProp: PropTypes.string,
     id: PropTypes.string,
+    type: PropTypes.string,
 }
diff --git a/src/components/DataDimension/Info/DataElementInfo.js b/src/components/DataDimension/Info/DataElementInfo.js
@@ -24,14 +24,19 @@ const dataElementQuery = {
     },
 }
 
-export const DataElementInfo = ({ id, displayNameProp }) => {
+export const DataElementInfo = ({ id, displayNameProp, type }) => {
     const { loading, error, data } = useDataQuery(dataElementQuery, {
         variables: { id, displayNameProp },
     })
 
     return (
         <>
-            <InfoTable data={data?.dataElement} loading={loading} error={error}>
+            <InfoTable
+                type={type}
+                data={data?.dataElement}
+                loading={loading}
+                error={error}
+            >
                 <tr>
                     <th>{i18n.t('Data set(s)')}</th>
                     <td>
@@ -116,4 +121,5 @@ export const DataElementInfo = ({ id, displayNameProp }) => {
 DataElementInfo.propTypes = {
     displayNameProp: PropTypes.string,
     id: PropTypes.string,
+    type: PropTypes.string,
 }
diff --git a/src/components/DataDimension/Info/DataElementOperandInfo.js b/src/components/DataDimension/Info/DataElementOperandInfo.js
@@ -29,7 +29,7 @@ const dataElementOperandsQuery = {
     },
 }
 
-export const DataElementOperandInfo = ({ id, displayNameProp }) => {
+export const DataElementOperandInfo = ({ id, displayNameProp, type }) => {
     const [data, setData] = useState()
     const [error, setError] = useState()
     const [loading, setLoading] = useState(true)
@@ -85,6 +85,7 @@ export const DataElementOperandInfo = ({ id, displayNameProp }) => {
     return (
         <>
             <InfoTable
+                type={type}
                 data={data?.dataElementOperand}
                 loading={loading}
                 error={error}
@@ -222,4 +223,5 @@ export const DataElementOperandInfo = ({ id, displayNameProp }) => {
 DataElementOperandInfo.propTypes = {
     displayNameProp: PropTypes.string,
     id: PropTypes.string,
+    type: PropTypes.string,
 }
diff --git a/src/components/DataDimension/Info/DataSetInfo.js b/src/components/DataDimension/Info/DataSetInfo.js
@@ -17,14 +17,19 @@ const dataSetQuery = {
     },
 }
 
-export const DataSetInfo = ({ id, displayNameProp }) => {
+export const DataSetInfo = ({ id, displayNameProp, type }) => {
     const { loading, error, data } = useDataQuery(dataSetQuery, {
         variables: { id, displayNameProp },
     })
 
     return (
         <>
-            <InfoTable data={data?.dataSet} loading={loading} error={error}>
+            <InfoTable
+                type={type}
+                data={data?.dataSet}
+                loading={loading}
+                error={error}
+            >
                 <tr>
                     <th>{i18n.t('Period type')}</th>
                     <td>{data?.dataSet.periodType}</td>
@@ -83,4 +88,5 @@ export const DataSetInfo = ({ id, displayNameProp }) => {
 DataSetInfo.propTypes = {
     displayNameProp: PropTypes.string,
     id: PropTypes.string,
+    type: PropTypes.string,
 }
diff --git a/src/components/DataDimension/Info/EventDataItemInfo.js b/src/components/DataDimension/Info/EventDataItemInfo.js
@@ -44,7 +44,7 @@ export const EventDataItemInfo = ({ type, id, displayNameProp }) => {
 
     const renderInfoTable = (data) => (
         <>
-            <InfoTable data={data} loading={loading} error={error}>
+            <InfoTable type={type} data={data} loading={loading} error={error}>
                 <tr>
                     <th>{i18n.t('Type')}</th>
                     <td>

diff --git a/src/components/DataDimension/Info/IndicatorInfo.js b/src/components/DataDimension/Info/IndicatorInfo.js
@@ -24,7 +24,7 @@ const indicatorQuery = {
     },
 }
 
-export const IndicatorInfo = ({ id, displayNameProp }) => {
+export const IndicatorInfo = ({ id, displayNameProp, type }) => {
     const [data, setData] = useState()
     const [error, setError] = useState()
     const [loading, setLoading] = useState(true)
@@ -71,7 +71,12 @@ export const IndicatorInfo = ({ id, displayNameProp }) => {
 
     return (
         <>
-            <InfoTable data={data?.indicator} loading={loading} error={error}>
+            <InfoTable
+                type={type}
+                data={data?.indicator}
+                loading={loading}
+                error={error}
+            >
                 <tr>
                     <th>{i18n.t('Numerator description')}</th>
                     <td>
@@ -179,4 +184,5 @@ export const IndicatorInfo = ({ id, displayNameProp }) => {
 IndicatorInfo.propTypes = {
     displayNameProp: PropTypes.string,
     id: PropTypes.string,
+    type: PropTypes.string,
 }
diff --git a/src/components/DataDimension/Info/ProgramIndicatorInfo.js b/src/components/DataDimension/Info/ProgramIndicatorInfo.js
@@ -24,7 +24,7 @@ const programIndicatorQuery = {
     },
 }
 
-export const ProgramIndicatorInfo = ({ id, displayNameProp }) => {
+export const ProgramIndicatorInfo = ({ id, displayNameProp, type }) => {
     const [data, setData] = useState()
     const [error, setError] = useState()
     const [loading, setLoading] = useState(true)
@@ -88,6 +88,7 @@ export const ProgramIndicatorInfo = ({ id, displayNameProp }) => {
     return (
         <>
             <InfoTable
+                type={type}
                 data={data?.programIndicator}
                 loading={loading}
                 error={error}
@@ -212,4 +213,5 @@ export const ProgramIndicatorInfo = ({ id, displayNameProp }) => {
 ProgramIndicatorInfo.propTypes = {
     displayNameProp: PropTypes.string,
     id: PropTypes.string,
+    type: PropTypes.string,
 }