fix: allow form to reload when offline

dhis2 · Feb 5, 2025 · e81bb47 · e81bb47
1 parent d6dab34
commit e81bb47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/bottom-bar/validation-results-sidebar/validation-results-sidebar.test.js b/src/bottom-bar/validation-results-sidebar/validation-results-sidebar.test.js
@@ -221,6 +221,7 @@ describe('ValidationResultsSidebar', () => {
         fireEvent.click(getByText('Run validation again'))
 
         await findByText('Running validation...')
+        await waitForLoaderToDisappear()
         expect(queryByText('There was a problem running validation')).toBeNull()
         expect(getByText('2 medium priority alerts')).toBeDefined()
     })

diff --git a/src/data-workspace/data-workspace.js b/src/data-workspace/data-workspace.js
@@ -16,6 +16,7 @@ import {
     useValueStore,
     dataValueSetQueryKey,
     useEntryFormStore,
+    useConnectionStatus,
 } from '../shared/index.js'
 import styles from './data-workspace.module.css'
 import { EntryForm } from './entry-form.js'
@@ -30,6 +31,7 @@ export const DataWorkspace = ({ selectionHasNoFormMessage }) => {
     useCheckLockStatus()
     const updateStore = useValueStore((state) => state.setDataValueSet)
     const initialDataValuesFetch = useDataValueSet()
+    const { offline } = useConnectionStatus()
 
     useEffect(() => {
         updateStore(initialDataValuesFetch.data)
@@ -83,7 +85,8 @@ export const DataWorkspace = ({ selectionHasNoFormMessage }) => {
     // or else we might use stale data that won't be updated once request completes
     if (
         initialDataValuesFetch.isFetching ||
-        (!initialDataValuesFetch.isFetchedAfterMount &&
+        (!offline &&
+            !initialDataValuesFetch.isFetchedAfterMount &&
             !initialDataValuesFetch.isPaused)
     ) {
         return (