fix: stop row loaders if there is an error (#440)

dhis2 · Nov 14, 2024 · 44a8080 · 44a8080
1 parent 93b8d68
commit 44a8080
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/pages/organisationUnits/list/OrganisationUnitList.tsx b/src/pages/organisationUnits/list/OrganisationUnitList.tsx
@@ -105,19 +105,19 @@ export const OrganisationUnitList = () => {
         (column) => column.meta.fieldFilter
     )
 
+    const { queries, fetchNextPage } = usePaginatedChildrenOrgUnitsController({
+        parentIds: parentIdsToLoad,
+        fieldFilters,
+    })
     const isFiltering = !!identifiableFilter
+    const hasErrored = queries.some((query) => query.isError)
 
     const orgUnitFiltered = useFilteredOrgUnits({
         searchQuery: identifiableFilter,
         fieldFilters,
         enabled: isFiltering,
     })
 
-    const { queries, fetchNextPage } = usePaginatedChildrenOrgUnitsController({
-        parentIds: parentIdsToLoad,
-        fieldFilters,
-    })
-
     // expand ancestors of the filtered org units
     useEffect(() => {
         // reset state when not filtering
@@ -265,6 +265,7 @@ export const OrganisationUnitList = () => {
                             }
                             onShowDetailsClick={handleDetailsClick}
                             isFiltering={isFiltering}
+                            hasErrored={hasErrored}
                             fetchNextPage={fetchNextPage}
                         />
                     ))}

diff --git a/src/pages/organisationUnits/list/OrganisationUnitRow.tsx b/src/pages/organisationUnits/list/OrganisationUnitRow.tsx
@@ -23,13 +23,15 @@ export const OrganisationUnitRow = ({
     isFiltering,
     fetchNextPage,
     onShowDetailsClick,
+    hasErrored,
 }: {
     row: Row<OrganisationUnitListItem>
     toggleShowAll: (id: string) => void
     showAllActive: boolean
     isFiltering: boolean
     fetchNextPage: (id: string) => void
     onShowDetailsClick: (model: BaseListModel) => void
+    hasErrored: boolean
 }) => {
     const parentRow = row.getParentRow()
 
@@ -72,7 +74,8 @@ export const OrganisationUnitRow = ({
                                     dataTest="row-expand-icon"
                                     loading={
                                         row.getIsExpanded() &&
-                                        row.subRows.length < 1
+                                        row.subRows.length < 1 &&
+                                        !hasErrored
                                     }
                                     icon={
                                         row.getIsExpanded() ? (