fix: check whether the dashboard id has been set after the check for …

…existing dashboards [DHIS2-9738] [patch/2.35.0] (#1167)

* fix: check whether the dashboard id has been set after the check for existing dashboards [DHIS2-9738] (#1164)

The state checks need to happen in a certain order, unfortunately. In an empty database, the id never gets set, resulting in an infinite circular loader. So that check needs to happen after the check for existing dashboards. In an empty database, there are no dashboards.

* fix: adjust test to replicate empty dashboards state

src/components/Dashboard/Dashboard.js

@@ -81,7 +81,7 @@ export const Dashboard = ({
         }
     }, [])
 
-    if (!dashboardsLoaded || id === null) {
+    if (!dashboardsLoaded) {
         return (
             <Layer translucent>
                 <CenteredContent>
@@ -121,6 +121,16 @@ export const Dashboard = ({
         )
     }
 
+    if (id === null) {
+        return (
+            <Layer translucent>
+                <CenteredContent>
+                    <CircularLoader />
+                </CenteredContent>
+            </Layer>
+        )
+    }
+
     return dashboardMap[mode]
 }
 

src/components/Dashboard/__tests__/Dashboard.spec.js

@@ -75,7 +75,7 @@ describe('Dashboard', () => {
     it('renders correctly when no dashboards found', () => {
         props.dashboardsLoaded = true
         props.dashboardsIsEmpty = true
-        props.id = 'rainbowdash'
+        props.id = null
         props.mode = VIEW
         expect(toJson(dashboard())).toMatchSnapshot()
     })