From 6bdfd83b919b1386bfbfcbd190e0cd762fafb3ac Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 12 Nov 2024 17:41:10 -0500 Subject: [PATCH] 22000: Remove any types from setFaves and load public faves Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- .../side-panel-tree/side-panel-tree-actions.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts b/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts index 954a064baf..8677191372 100644 --- a/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts +++ b/services/workbench2/src/store/side-panel-tree/side-panel-tree-actions.ts @@ -13,7 +13,7 @@ import { getTreePicker, TreePicker } from 'store/tree-picker/tree-picker'; import { getNodeAncestors, getNodeAncestorsIds, getNode, TreeNode, initTreeNode, TreeNodeStatus } from 'models/tree'; import { ProjectResource } from 'models/project'; import { OrderBuilder } from 'services/api/order-builder'; -import { ResourceKind, extractUuidObjectType, ResourceObjectType } from 'models/resource'; +import { ResourceKind, extractUuidObjectType, ResourceObjectType, Resource } from 'models/resource'; import { CategoriesListReducer } from 'common/plugintypes'; import { pluginConfig } from 'plugins'; import { LinkClass, LinkResource } from 'models/link'; @@ -175,17 +175,17 @@ export const loadFavoritesTree = (updateTree: boolean) => async (dispatch: Dispa const setFaves = async(links: LinkResource[], dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const uuids = links.map(it => it.headUuid); - const groupItems: Promise = services.groupsService.list({ + const groupItems = services.groupsService.list({ filters: new FilterBuilder() .addIn("uuid", uuids) .getFilters() }); - const collectionItems: Promise = services.collectionService.list({ + const collectionItems = services.collectionService.list({ filters: new FilterBuilder() .addIn("uuid", uuids) .getFilters() }); - const processItems: Promise = services.containerRequestService.list({ + const processItems = services.containerRequestService.list({ filters: new FilterBuilder() .addIn("uuid", uuids) .getFilters() @@ -193,7 +193,7 @@ const setFaves = async(links: LinkResource[], dispatch: Dispatch, getState: () = const resolvedItems = await Promise.all([groupItems, collectionItems, processItems]); - const responseItems = resolvedItems.reduce((acc, response) => acc.concat(response.items), []); + const responseItems = resolvedItems.reduce((acc, response) => acc.concat(response.items), [] as Resource[]); //setting resources here so they won't be re-fetched in validation step dispatch(resourcesActions.SET_RESOURCES(responseItems)); @@ -233,19 +233,19 @@ export const loadPublicFavoritesTree = (updateTree: boolean) => async (dispatch: const { items } = await services.linkService.list(params); const uuids = items.map(it => it.headUuid); - const groupItems: Promise = services.groupsService.list({ + const groupItems = services.groupsService.list({ filters: new FilterBuilder() .addIn("uuid", uuids) .addIsA("uuid", typeFilters) .getFilters() }); - const collectionItems: Promise = services.collectionService.list({ + const collectionItems = services.collectionService.list({ filters: new FilterBuilder() .addIn("uuid", uuids) .addIsA("uuid", typeFilters) .getFilters() }); - const processItems: Promise = services.containerRequestService.list({ + const processItems = services.containerRequestService.list({ filters: new FilterBuilder() .addIn("uuid", uuids) .addIsA("uuid", typeFilters) @@ -254,7 +254,7 @@ export const loadPublicFavoritesTree = (updateTree: boolean) => async (dispatch: const resolvedItems = await Promise.all([groupItems, collectionItems, processItems]); - const responseItems = resolvedItems.reduce((acc, response) => acc.concat(response.items), []); + const responseItems = resolvedItems.reduce((acc, response) => acc.concat(response.items), [] as Resource[]); const filteredItems = items.filter(item => responseItems.some(responseItem => responseItem.uuid === item.headUuid)); -- 2.30.2