fix: adapt error message to specific dimension (DHIS2-12915) (#2009)

* fix: adapt error message to specific dimension * fix: prevent fixed dimensions from getting the 'all' item
dhis2 · Apr 5, 2022 · 30e94e0 · 30e94e0
1 parent 090fbc0
commit 30e94e0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/packages/app/src/actions/index.js b/packages/app/src/actions/index.js
@@ -2,6 +2,10 @@ import {
     getDisplayNameByVisType,
     convertOuLevelsToUids,
     ALL_DYNAMIC_DIMENSION_ITEMS,
+    DIMENSION_ID_DATA,
+    DIMENSION_ID_PERIOD,
+    DIMENSION_ID_ORGUNIT,
+    DIMENSION_ID_ASSIGNED_CATEGORIES,
 } from '@dhis2/analytics'
 import i18n from '@dhis2/d2-i18n'
 import { apiPostDataStatistics } from '../api/dataStatistics.js'
@@ -58,12 +62,19 @@ const adaptAxisItems = (axis) =>
         ...ai,
         items: ai?.items?.length
             ? ai.items
-            : [
+            : ![
+                  DIMENSION_ID_DATA,
+                  DIMENSION_ID_PERIOD,
+                  DIMENSION_ID_ORGUNIT,
+                  DIMENSION_ID_ASSIGNED_CATEGORIES,
+              ].includes(ai.dimension)
+            ? [
                   {
                       id: ALL_DYNAMIC_DIMENSION_ITEMS,
                       name: i18n.t('All items'),
                   },
-              ],
+              ]
+            : null,
     }))
 
 // visualization, current, ui

diff --git a/packages/app/src/components/Visualization/Visualization.js b/packages/app/src/components/Visualization/Visualization.js
@@ -18,6 +18,7 @@ import {
     NoDataOrDataElementGroupSetError,
     CombinationDEGSRRError,
     NoOrgUnitResponseError,
+    NoDataError,
 } from '../../modules/error.js'
 import { removeLastPathSegment } from '../../modules/orgUnit.js'
 import { sGetCurrent } from '../../reducers/current.js'
@@ -63,9 +64,18 @@ export class UnconnectedVisualization extends Component {
                     error = new CombinationDEGSRRError()
                     break
                 case 'E7124':
-                    error = new NoOrgUnitResponseError()
+                    {
+                        if (response?.message?.includes('`dx`')) {
+                            error = new NoDataError(
+                                this.props.visualization.type
+                            )
+                        } else if (response?.message?.includes('`ou`')) {
+                            error = new NoOrgUnitResponseError()
+                        } else {
+                            error = new GenericServerError()
+                        }
+                    }
                     break
-
                 default:
                     error = response
             }