X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1f9a8ec32f818d8e78d683ad5569b9e4ae0f693a..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 4764d436..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 @@ -4,17 +4,18 @@ import { unionize, ofType, UnionOf } from "~/common/unionize"; import { Dispatch } from "redux"; -import { CollectionFilesTree, CollectionFileType } from "~/models/collection-file"; +import { CollectionFilesTree, CollectionFileType, createCollectionFilesTree } from "~/models/collection-file"; import { ServiceRepository } from "~/services/services"; import { RootState } from "../../store"; -import { snackbarActions } from "../../snackbar/snackbar-actions"; +import { snackbarActions, SnackbarKind } from "../../snackbar/snackbar-actions"; import { dialogActions } from '../../dialog/dialog-actions'; -import { getNodeValue } from "~/models/tree"; +import { getNodeValue, mapTreeValues } from "~/models/tree"; import { filterCollectionFilesBySelection } from './collection-panel-files-state'; -import { startSubmit, stopSubmit, reset, initialize } from 'redux-form'; +import { startSubmit, stopSubmit, initialize, FormErrors } from 'redux-form'; import { getDialog } from "~/store/dialog/dialog-reducer"; -import { getFileFullPath } from "~/services/collection-service/collection-service-files-response"; -import { resourcesDataActions } from "~/store/resources-data/resources-data-actions"; +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(), @@ -22,25 +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 COLLECTION_PANEL_LOAD_FILES = 'collectionPanelLoadFiles'; +export const COLLECTION_PANEL_LOAD_FILES_THRESHOLD = 40000; + export const loadCollectionFiles = (uuid: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const files = await services.collectionService.files(uuid); - dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(files)); - dispatch(resourcesDataActions.SET_FILES({ uuid, files })); + (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 ...' })); - await services.collectionService.deleteFiles(currentCollection.uuid, filePaths); - dispatch(loadCollectionFiles(currentCollection.uuid)); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removed.', hideDuration: 2000 })); + services.collectionService.deleteFiles(currentCollection.uuid, filePaths).then(() => { + dispatch(loadCollectionFiles(currentCollection.uuid)); + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: 'Removed.', + hideDuration: 2000, + kind: SnackbarKind.SUCCESS + })); + dispatch(loadDetailsPanel(currentCollection.uuid)); + }).catch(e => + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: 'Could not remove file.', + hideDuration: 2000, + kind: SnackbarKind.ERROR + })) + ); } }; @@ -65,8 +94,8 @@ export const openFileRemoveDialog = (filePath: string) => ? 'Are you sure you want to remove this directory?' : 'Are you sure you want to remove this file?'; const info = isDirectory - ? 'Removing files will change content adress.' - : 'Removing a file will change content adress.'; + ? 'Removing files will change content address.' + : 'Removing a file will change content address.'; dispatch(dialogActions.OPEN_DIALOG({ id: FILE_REMOVE_DIALOG, @@ -89,7 +118,7 @@ export const openMultipleFilesRemoveDialog = () => data: { title: 'Removing files', text: 'Are you sure you want to remove selected files?', - info: 'Removing files will change content adress.', + info: 'Removing files will change content address.', confirmButtonLabel: 'Remove' } }); @@ -98,6 +127,7 @@ export const RENAME_FILE_DIALOG = 'renameFileDialog'; export interface RenameFileDialogData { name: string; id: string; + path: string; } export const openRenameFileDialog = (data: RenameFileDialogData) => @@ -106,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) { @@ -115,15 +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(stopSubmit(RENAME_FILE_DIALOG, { name: 'Could not rename the file' })); - } + dispatch(loadDetailsPanel(currentCollection.uuid)); + }).catch (e => { + const errors: FormErrors = { + path: `Could not rename the file: ${e.responseText}` + }; + dispatch(stopSubmit(RENAME_FILE_DIALOG, errors)); + }); } } };