//
// 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";
export const collectionPanelFilesAction = unionize({
SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),
export type CollectionPanelFilesAction = UnionOf<typeof collectionPanelFilesAction>;
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) => {
- dispatch(progressIndicatorActions.START_WORKING(COLLECTION_PANEL_LOAD_FILES));
- const files = await services.collectionService.files(uuid);
-
- // 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));
- };
+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...' }));
- try {
- await services.collectionService.deleteFiles(currentCollection.uuid, filePaths);
- dispatch<any>(loadCollectionFiles(currentCollection.uuid));
+ services.collectionService.deleteFiles(currentCollection.uuid, filePaths).then(() => {
dispatch(snackbarActions.OPEN_SNACKBAR({
message: 'Removed.',
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- } catch (e) {
+ }).catch(e =>
dispatch(snackbarActions.OPEN_SNACKBAR({
message: 'Could not remove file.',
hideDuration: 2000,
kind: SnackbarKind.ERROR
- }));
- }
+ }))
+ );
}
};
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 filePath = getFileFullPath(file);
const isDirectory = file.type === CollectionFileType.DIRECTORY;
const title = isDirectory
? 'Removing directory'
export interface RenameFileDialogData {
name: string;
id: string;
+ path: string;
}
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<RenameFileDialogData>(getState().dialog, RENAME_FILE_DIALOG);
const currentCollection = getState().collectionPanel.item;
if (dialog && currentCollection) {
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);
- dispatch<any>(loadCollectionFiles(currentCollection.uuid));
+ 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) {
+ }).catch(e => {
const errors: FormErrors<RenameFileDialogData, string> = {
- name: 'Could not rename the file'
+ path: `Could not rename the file: ${e.responseText}`
};
dispatch(stopSubmit(RENAME_FILE_DIALOG, errors));
- }
+ });
}
}
};
projects / arvados-workbench2.git / blobdiff