X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/59ee572e791985a36bdd2015c9b494145109e8ed..dcf2e835b33e926073dad1f636cf92a95493ca0b:/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 f214fd2f..547f1534 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,19 @@ // // 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 } 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 } 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, initialize, stopSubmit, reset } from 'redux-form'; -import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service"; -import { getDialog } from "~/store/dialog/dialog-reducer"; -import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions'; +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"; export const collectionPanelFilesAction = unionize({ SET_COLLECTION_FILES: ofType(), @@ -22,51 +22,71 @@ 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); - dispatch(collectionPanelFilesAction.SET_COLLECTION_FILES(files)); - }; +export const COLLECTION_PANEL_LOAD_FILES = 'collectionPanelLoadFiles'; + +export const setCollectionFiles = (files, joinParents = true) => (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 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(snackbarActions.OPEN_SNACKBAR({ + message: 'Removed.', + hideDuration: 2000, + kind: SnackbarKind.SUCCESS + })); + }).catch(e => + dispatch(snackbarActions.OPEN_SNACKBAR({ + message: 'Could not remove file.', + hideDuration: 2000, + kind: SnackbarKind.ERROR + })) + ); } }; export const removeCollectionsSelectedFiles = () => (dispatch: Dispatch, getState: () => RootState) => { - const paths = filterCollectionFilesBySelection(getState().collectionPanelFiles, true).map(file => file.id); + const paths = filterCollectionFilesBySelection(getState().collectionPanelFiles, true) + .map(getFileFullPath); dispatch(removeCollectionFiles(paths)); }; export const FILE_REMOVE_DIALOG = 'fileRemoveDialog'; -export const openFileRemoveDialog = (filePath: string) => +export const openFileRemoveDialog = (fileUuid: string) => (dispatch: Dispatch, getState: () => RootState) => { - const file = getNodeValue(filePath)(getState().collectionPanelFiles); + const file = getNodeValue(fileUuid)(getState().collectionPanelFiles); if (file) { - const title = file.type === CollectionFileType.DIRECTORY + const filePath = getFileFullPath(file); + const isDirectory = file.type === CollectionFileType.DIRECTORY; + const title = isDirectory ? 'Removing directory' : 'Removing file'; - const text = file.type === CollectionFileType.DIRECTORY + const text = isDirectory ? '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 address.' + : 'Removing a file will change content address.'; dispatch(dialogActions.OPEN_DIALOG({ id: FILE_REMOVE_DIALOG, data: { title, text, + info, confirmButtonLabel: 'Remove', filePath } @@ -82,6 +102,7 @@ export const openMultipleFilesRemoveDialog = () => data: { title: 'Removing files', text: 'Are you sure you want to remove selected files?', + info: 'Removing files will change content address.', confirmButtonLabel: 'Remove' } }); @@ -90,29 +111,34 @@ export const RENAME_FILE_DIALOG = 'renameFileDialog'; export interface RenameFileDialogData { name: string; id: string; + path: string; } export const openRenameFileDialog = (data: RenameFileDialogData) => (dispatch: Dispatch) => { - dispatch(reset(RENAME_FILE_DIALOG)); + dispatch(initialize(RENAME_FILE_DIALOG, data)); 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) { - dispatch(startSubmit(RENAME_FILE_DIALOG)); - const oldPath = dialog.data.id; - const newPath = dialog.data.id.replace(dialog.data.name, newName); - try { - await services.collectionService.moveFile(currentCollection.uuid, oldPath, newPath); - 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' })); + const file = getNodeValue(dialog.data.id)(getState().collectionPanelFiles); + if (file) { + dispatch(startSubmit(RENAME_FILE_DIALOG)); + const oldPath = getFileFullPath(file); + const newPath = newFullPath; + services.collectionService.renameFile(currentCollection.uuid, currentCollection.portableDataHash, oldPath, newPath).then(() => { + dispatch(dialogActions.CLOSE_DIALOG({ id: RENAME_FILE_DIALOG })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'File name changed.', hideDuration: 2000 })); + }).catch(e => { + const errors: FormErrors = { + path: `Could not rename the file: ${e.responseText}` + }; + dispatch(stopSubmit(RENAME_FILE_DIALOG, errors)); + }); } } };