X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9be874f7744b5ceb53f4be20d1748db34859468a..7b8e48c2f9130d799a42c81440bc8b4e04224d4e:/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 9d3ae861..1d2a40b2 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 @@ -14,6 +14,8 @@ 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 { loadDetailsPanel } from "~/store/details-panel/details-panel-action"; export const collectionPanelFilesAction = unionize({ SET_COLLECTION_FILES: ofType(), @@ -21,42 +23,53 @@ export const collectionPanelFilesAction = unionize({ TOGGLE_COLLECTION_FILE_SELECTION: ofType<{ id: string }>(), SELECT_ALL_COLLECTION_FILES: ofType<{}>(), UNSELECT_ALL_COLLECTION_FILES: ofType<{}>(), + ON_SEARCH_CHANGE: ofType(), }); export type CollectionPanelFilesAction = UnionOf; -export const loadCollectionFiles = (uuid: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const files = await services.collectionService.files(uuid); +export const COLLECTION_PANEL_LOAD_FILES = 'collectionPanelLoadFiles'; +export const COLLECTION_PANEL_LOAD_FILES_THRESHOLD = 40000; - // Given the array of directories and files, create the appropriate tree nodes, - // sort them, and add the complete url to each. - const tree = createCollectionFilesTree(files); - const sorted = sortFilesTree(tree); - const mapped = mapTreeValues(services.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)); + services.collectionService.files(uuid).then(files => { + // Given the array of directories and files, create the appropriate tree nodes, + // sort them, and add the complete url to each. + const tree = createCollectionFilesTree(files); + const sorted = sortFilesTree(tree); + const mapped = mapTreeValues(services.collectionService.extendFileURL)(sorted); + dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(mapped)); + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PANEL_LOAD_FILES)); + }).catch(e => { + dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PANEL_LOAD_FILES)); + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: `Error getting file list: ${e.errors[0]}`, + hideDuration: 2000, + kind: SnackbarKind.ERROR })); + }); }; export const removeCollectionFiles = (filePaths: string[]) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const currentCollection = getState().collectionPanel.item; if (currentCollection) { - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing...' })); - try { - await services.collectionService.deleteFiles(currentCollection.uuid, filePaths); + services.collectionService.deleteFiles(currentCollection.uuid, filePaths).then(() => { dispatch(loadCollectionFiles(currentCollection.uuid)); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removed.', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); - } catch (e) { + dispatch(loadDetailsPanel(currentCollection.uuid)); + }).catch(e => dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not remove file.', hideDuration: 2000, kind: SnackbarKind.ERROR - })); - } + })) + ); } }; @@ -114,6 +127,7 @@ export const RENAME_FILE_DIALOG = 'renameFileDialog'; export interface RenameFileDialogData { name: string; id: string; + path: string; } export const openRenameFileDialog = (data: RenameFileDialogData) => @@ -122,8 +136,8 @@ export const openRenameFileDialog = (data: RenameFileDialogData) => dispatch(dialogActions.OPEN_DIALOG({ id: RENAME_FILE_DIALOG, data })); }; -export const renameFile = (newName: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +export const renameFile = (newFullPath: string) => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const dialog = getDialog(getState().dialog, RENAME_FILE_DIALOG); const currentCollection = getState().collectionPanel.item; if (dialog && currentCollection) { @@ -131,18 +145,18 @@ export const renameFile = (newName: string) => if (file) { dispatch(startSubmit(RENAME_FILE_DIALOG)); const oldPath = getFileFullPath(file); - const newPath = getFileFullPath({ ...file, name: newName }); - try { - await services.collectionService.moveFile(currentCollection.uuid, oldPath, newPath); + const newPath = newFullPath; + services.collectionService.moveFile(currentCollection.uuid, oldPath, newPath).then(() => { dispatch(loadCollectionFiles(currentCollection.uuid)); dispatch(dialogActions.CLOSE_DIALOG({ id: RENAME_FILE_DIALOG })); dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'File name changed.', hideDuration: 2000 })); - } catch (e) { + dispatch(loadDetailsPanel(currentCollection.uuid)); + }).catch (e => { const errors: FormErrors = { - name: 'Could not rename the file' + path: `Could not rename the file: ${e.responseText}` }; dispatch(stopSubmit(RENAME_FILE_DIALOG, errors)); - } + }); } } };