From 0ebcec63d6618ccfc2462f6834919f9f6eab34f5 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 21 Mar 2023 16:08:57 -0400 Subject: [PATCH] 20251: Increase/set containers list request to match count of requested container details (= dataExplorer pagination size) Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- src/store/processes/processes-actions.ts | 8 ++++++-- .../project-panel/project-panel-middleware-service.ts | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts index 0b2de837..b26c2017 100644 --- a/src/store/processes/processes-actions.ts +++ b/src/store/processes/processes-actions.ts @@ -23,6 +23,7 @@ import { UserResource } from "models/user"; import { CommandOutputParameter } from "cwlts/mappings/v1.0/CommandOutputParameter"; import { ContainerResource } from "models/container"; import { ContainerRequestResource, ContainerRequestState } from "models/container-request"; +import { FilterBuilder } from "services/api/filter-builder"; export const loadProcess = (containerRequestUuid: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise => { @@ -60,9 +61,12 @@ export const loadProcess = (containerRequestUuid: string) => return { containerRequest }; }; -export const loadContainers = (filters: string, loadMounts: boolean = true) => +export const loadContainers = (containerUuids: string[], loadMounts: boolean = true) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - let args: any = { filters }; + let args: any = { + filters: new FilterBuilder().addIn('uuid', containerUuids).getFilters(), + limit: containerUuids.length, + }; if (!loadMounts) { args.select = containerFieldsNoMounts; } diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts index cc8511a4..e939e59d 100644 --- a/src/store/project-panel/project-panel-middleware-service.ts +++ b/src/store/project-panel/project-panel-middleware-service.ts @@ -89,7 +89,7 @@ export const loadMissingProcessesInformation = (resources: GroupContentsResource }, []); if (containerUuids.length > 0) { await dispatch(loadContainers( - new FilterBuilder().addIn('uuid', containerUuids).getFilters(), + containerUuids, false )); } -- 2.30.2