From 264e8d55b4f30244cf3084c33c8f27141caa9082 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Fri, 10 Sep 2021 16:37:58 -0400 Subject: [PATCH] 18029: Handle empty data explorer in data explorer reducer Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- .../all-processes-panel-middleware-service.ts | 2 +- .../collections-content-address-middleware-service.ts | 2 +- src/store/data-explorer/data-explorer-reducer.ts | 2 +- src/store/favorite-panel/favorite-panel-middleware-service.ts | 2 +- .../public-favorites-middleware-service.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/store/all-processes-panel/all-processes-panel-middleware-service.ts b/src/store/all-processes-panel/all-processes-panel-middleware-service.ts index 05c8882d..88b64e62 100644 --- a/src/store/all-processes-panel/all-processes-panel-middleware-service.ts +++ b/src/store/all-processes-panel/all-processes-panel-middleware-service.ts @@ -45,7 +45,7 @@ export class AllProcessesPanelMiddlewareService extends DataExplorerMiddlewareSe api.dispatch(allProcessesPanelActions.SET_ITEMS({ items: processItems.items.map((resource: any) => resource.uuid), itemsAvailable: processItems.itemsAvailable, - page: Math.floor(processItems.offset / processItems.limit) || 0, + page: Math.floor(processItems.offset / processItems.limit), rowsPerPage: processItems.limit })); } catch { diff --git a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts index 42bb476b..983b309a 100644 --- a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts +++ b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts @@ -112,7 +112,7 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl api.dispatch(collectionsContentAddressActions.SET_ITEMS({ items: response.items.map((resource: any) => resource.uuid), itemsAvailable: response.itemsAvailable, - page: Math.floor(response.offset / response.limit) || 0, + page: Math.floor(response.offset / response.limit), rowsPerPage: response.limit })); } diff --git a/src/store/data-explorer/data-explorer-reducer.ts b/src/store/data-explorer/data-explorer-reducer.ts index c6aa7116..f67cccdc 100644 --- a/src/store/data-explorer/data-explorer-reducer.ts +++ b/src/store/data-explorer/data-explorer-reducer.ts @@ -57,7 +57,7 @@ export const dataExplorerReducer = (state: DataExplorerState = {}, action: DataE update(state, id, mapColumns(setFilters(columnName, filters))), SET_ITEMS: ({ id, items, itemsAvailable, page, rowsPerPage }) => - update(state, id, explorer => ({ ...explorer, items, itemsAvailable, page, rowsPerPage })), + update(state, id, explorer => ({ ...explorer, items, itemsAvailable, page: page || 0, rowsPerPage })), APPEND_ITEMS: ({ id, items, itemsAvailable, page, rowsPerPage }) => update(state, id, explorer => ({ diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts index 7177e5a7..f88f7b91 100644 --- a/src/store/favorite-panel/favorite-panel-middleware-service.ts +++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts @@ -103,7 +103,7 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic api.dispatch(favoritePanelActions.SET_ITEMS({ items: response.items.map((resource: any) => resource.uuid), itemsAvailable: response.itemsAvailable, - page: Math.floor(response.offset / response.limit) || 0, + page: Math.floor(response.offset / response.limit), rowsPerPage: response.limit })); api.dispatch(updateFavorites(response.items.map((item: any) => item.uuid))); diff --git a/src/store/public-favorites-panel/public-favorites-middleware-service.ts b/src/store/public-favorites-panel/public-favorites-middleware-service.ts index 8a8876c1..dd21a380 100644 --- a/src/store/public-favorites-panel/public-favorites-middleware-service.ts +++ b/src/store/public-favorites-panel/public-favorites-middleware-service.ts @@ -100,7 +100,7 @@ export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareServ api.dispatch(publicFavoritePanelActions.SET_ITEMS({ items: response.items.map((resource: any) => resource.uuid), itemsAvailable: response.itemsAvailable, - page: Math.floor(response.offset / response.limit) || 0, + page: Math.floor(response.offset / response.limit), rowsPerPage: response.limit })); api.dispatch(updatePublicFavorites(response.items.map((item: any) => item.uuid))); -- 2.30.2