X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0ac876abda98d11364e59846789e36bb4546765e..4b956bd2e3bcccdeb808df7391d135659cf85b94:/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts diff --git a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts index 3f9948fc..71e1f6e8 100644 --- a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts +++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts @@ -2,19 +2,20 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { unionize, ofType, UnionOf } from "~/common/unionize"; +import { unionize, ofType, UnionOf } from "common/unionize"; import { Dispatch } from "redux"; -import { CollectionFilesTree, CollectionFileType, createCollectionFilesTree } from "~/models/collection-file"; -import { ServiceRepository } from "~/services/services"; +import servicesProvider from 'common/service-provider'; +import { CollectionFilesTree, CollectionFileType, createCollectionFilesTree } from "models/collection-file"; +import { ServiceRepository } from "services/services"; import { RootState } from "../../store"; import { snackbarActions, SnackbarKind } from "../../snackbar/snackbar-actions"; import { dialogActions } from '../../dialog/dialog-actions'; -import { getNodeValue, mapTreeValues } from "~/models/tree"; +import { getNodeValue, mapTreeValues } from "models/tree"; import { filterCollectionFilesBySelection } from './collection-panel-files-state'; import { startSubmit, stopSubmit, initialize, FormErrors } from 'redux-form'; -import { getDialog } from "~/store/dialog/dialog-reducer"; -import { getFileFullPath, sortFilesTree } from "~/services/collection-service/collection-service-files-response"; -import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions"; +import { getDialog } from "store/dialog/dialog-reducer"; +import { getFileFullPath, sortFilesTree } from "services/collection-service/collection-service-files-response"; +import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions"; import { loadCollectionPanel } from "../collection-panel-action"; export const collectionPanelFilesAction = unionize({ @@ -31,6 +32,13 @@ export type CollectionPanelFilesAction = UnionOf (dispatch: any) => { + const tree = createCollectionFilesTree(files, joinParents); + const sorted = sortFilesTree(tree); + const mapped = mapTreeValues(servicesProvider.getServices().collectionService.extendFileURL)(sorted); + dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(mapped)); +}; + export const loadCollectionFiles = (uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(progressIndicatorActions.START_WORKING(COLLECTION_PANEL_LOAD_FILES)); @@ -42,12 +50,13 @@ export const loadCollectionFiles = (uuid: string) => const mapped = mapTreeValues(services.collectionService.extendFileURL)(sorted); dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(mapped)); dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PANEL_LOAD_FILES)); - }).catch(e => { + }).catch(() => { dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PANEL_LOAD_FILES)); dispatch(snackbarActions.OPEN_SNACKBAR({ - message: `Error getting file list: ${e.errors[0]}`, + message: `Error getting file list`, hideDuration: 2000, - kind: SnackbarKind.ERROR })); + kind: SnackbarKind.ERROR + })); }); }; @@ -149,7 +158,7 @@ export const renameFile = (newFullPath: string) => dispatch(loadCollectionPanel(currentCollection.uuid, true)); dispatch(dialogActions.CLOSE_DIALOG({ id: RENAME_FILE_DIALOG })); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'File name changed.', hideDuration: 2000 })); - }).catch (e => { + }).catch(e => { const errors: FormErrors = { path: `Could not rename the file: ${e.responseText}` };