From f1195b8035a81b011caf89f3aaca3caadd2e99ed Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Fri, 10 Sep 2021 14:03:19 -0400 Subject: [PATCH] 18029: Fix divide by zero on empty pagination by defaulting to 0 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/favorite-panel/favorite-panel-middleware-service.ts | 2 +- .../public-favorites-middleware-service.ts | 2 +- 4 files changed, 4 insertions(+), 4 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 88b64e62..05c8882d 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), + page: Math.floor(processItems.offset / processItems.limit) || 0, 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 983b309a..42bb476b 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), + page: Math.floor(response.offset / response.limit) || 0, rowsPerPage: response.limit })); } diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts index f88f7b91..7177e5a7 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), + page: Math.floor(response.offset / response.limit) || 0, 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 dd21a380..8a8876c1 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), + page: Math.floor(response.offset / response.limit) || 0, rowsPerPage: response.limit })); api.dispatch(updatePublicFavorites(response.items.map((item: any) => item.uuid))); -- 2.30.2