fix: prefix program status with program id

dhis2 · Dec 27, 2023 · 8fd5a28 · 8fd5a28
1 parent 2faee1f
commit 8fd5a28
Showing 1 changed file with 33 additions and 5 deletions.
diff --git a/src/components/Dialogs/FixedDimension.js b/src/components/Dialogs/FixedDimension.js
@@ -17,7 +17,10 @@ import {
     DIMENSION_ID_PROGRAM_STATUS,
 } from '../../modules/dimensionConstants.js'
 import { removeLastPathSegment, getOuPath } from '../../modules/orgUnit.js'
-import { extractDimensionIdParts } from '../../modules/utils.js'
+import {
+    extractDimensionIdParts,
+    formatDimensionId,
+} from '../../modules/utils.js'
 import {
     STATUS_ACTIVE,
     STATUS_CANCELLED,
@@ -45,11 +48,15 @@ const FixedDimension = ({
     parentGraphMap,
     setUiItems,
     selectedItemsIds,
+    inputType,
 }) => {
     const { rootOrgUnits } = useCachedDataQuery()
     const { serverVersion } = useConfig()
     const statusNames = getStatusNames()
-    const { dimensionId } = extractDimensionIdParts(dimension.id)
+    const { programId, dimensionId } = extractDimensionIdParts(
+        dimension.id,
+        inputType
+    )
     const selectUiItems = ({ dimensionId, items }) => {
         setUiItems({
             dimensionId: dimension.id,
@@ -105,9 +112,30 @@ const FixedDimension = ({
 
     const renderProgramStatus = () => {
         const ALL_STATUSES = [
-            { id: STATUS_ACTIVE, name: statusNames[STATUS_ACTIVE] },
-            { id: STATUS_COMPLETED, name: statusNames[STATUS_COMPLETED] },
-            { id: STATUS_CANCELLED, name: statusNames[STATUS_CANCELLED] },
+            {
+                id: formatDimensionId({
+                    dimensionId: STATUS_ACTIVE,
+                    programId,
+                    outputType: inputType,
+                }),
+                name: statusNames[STATUS_ACTIVE],
+            },
+            {
+                id: formatDimensionId({
+                    dimensionId: STATUS_COMPLETED,
+                    programId,
+                    outputType: inputType,
+                }),
+                name: statusNames[STATUS_COMPLETED],
+            },
+            {
+                id: formatDimensionId({
+                    dimensionId: STATUS_CANCELLED,
+                    programId,
+                    outputType: inputType,
+                }),
+                name: statusNames[STATUS_CANCELLED],
+            },
         ]
 
         return (