X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/89a2555cc00f750dfa07dc57a2908059fc52c935..852a6a393297d03ca5259ddb6aa7aedff4a000ea:/src/store/collection-panel/collection-panel-action.ts diff --git a/src/store/collection-panel/collection-panel-action.ts b/src/store/collection-panel/collection-panel-action.ts index c50ff6a8..7bab8632 100644 --- a/src/store/collection-panel/collection-panel-action.ts +++ b/src/store/collection-panel/collection-panel-action.ts @@ -3,9 +3,6 @@ // SPDX-License-Identifier: AGPL-3.0 import { Dispatch } from "redux"; -import { - COLLECTION_PANEL_LOAD_FILES_THRESHOLD -} from "./collection-panel-files/collection-panel-files-actions"; import { CollectionResource } from 'models/collection'; import { RootState } from "store/store"; import { ServiceRepository } from "services/services"; @@ -18,8 +15,6 @@ import { loadDetailsPanel } from 'store/details-panel/details-panel-action'; export const collectionPanelActions = unionize({ SET_COLLECTION: ofType(), - LOAD_COLLECTION_SUCCESS: ofType<{ item: CollectionResource }>(), - LOAD_BIG_COLLECTIONS: ofType(), }); export type CollectionPanelAction = UnionOf; @@ -27,15 +22,15 @@ export type CollectionPanelAction = UnionOf; export const loadCollectionPanel = (uuid: string, forceReload = false) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const { collectionPanel: { item } } = getState(); - const collection = (item && item.uuid === uuid && !forceReload) - ? item - : await services.collectionService.get(uuid); - dispatch(loadDetailsPanel(collection.uuid)); - dispatch(collectionPanelActions.LOAD_COLLECTION_SUCCESS({ item: collection })); - dispatch(resourcesActions.SET_RESOURCES([collection])); - if (collection.fileCount <= COLLECTION_PANEL_LOAD_FILES_THRESHOLD && - !getState().collectionPanel.loadBigCollections) { + let collection: CollectionResource | null = null; + if (!item || item.uuid !== uuid || forceReload) { + collection = await services.collectionService.get(uuid); + dispatch(collectionPanelActions.SET_COLLECTION(collection)); + dispatch(resourcesActions.SET_RESOURCES([collection])); + } else { + collection = item; } + dispatch(loadDetailsPanel(collection.uuid)); return collection; };