[ARVADOS-WORKBENCH2] updated: 1.1.4-644-g42f46bf
Git user
git at public.curoverse.com
Sat Aug 18 05:23:04 EDT 2018
Summary of changes:
.../collection-service/collection-service.ts | 7 +++++
.../collection-panel-files-actions.ts | 33 +++++++++++++++++++++-
src/store/dialog/dialog-reducer.ts | 6 ++--
.../collection-files-item-action-set.ts | 7 ++---
.../rename-file-dialog/rename-file-dialog.tsx | 24 +++++-----------
5 files changed, 53 insertions(+), 24 deletions(-)
via 42f46bf682cf6590b1d87424d616c5c9b9c9154d (commit)
via 5a98bccbd21405c97baa35c288898fac16c2d567 (commit)
via b4f091ebd9f78c76cc7a182802d656f55c722f6d (commit)
from c1787278642d2ef02234ea27f94aaae9cdd52d40 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 42f46bf682cf6590b1d87424d616c5c9b9c9154d
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Sat Aug 18 11:22:46 2018 +0200
Implement file renaming
Feature #14015
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
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 f2dc551..818197d 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
@@ -11,9 +11,10 @@ import { snackbarActions } from "../../snackbar/snackbar-actions";
import { dialogActions } from '../../dialog/dialog-actions';
import { getNodeValue } from "~/models/tree";
import { filterCollectionFilesBySelection } from './collection-panel-files-state';
-import { startSubmit, initialize, SubmissionError, stopSubmit } from 'redux-form';
+import { startSubmit, initialize, SubmissionError, stopSubmit, reset } from 'redux-form';
import { loadProjectTreePickerProjects } from '../../../views-components/project-tree-picker/project-tree-picker';
import { getCommonResourceServiceError, CommonResourceServiceError } from "~/common/api/common-resource-service";
+import { getDialog } from "~/store/dialog/dialog-reducer";
export const collectionPanelFilesAction = unionize({
SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),
@@ -136,3 +137,33 @@ export const doCollectionPartialCopy = ({ name, description, projectUuid }: Coll
}
};
+export const RENAME_FILE_DIALOG = 'renameFileDialog';
+export interface RenameFileDialogData {
+ name: string;
+ id: string;
+}
+
+export const openRenameFileDialog = (data: RenameFileDialogData) =>
+ (dispatch: Dispatch) => {
+ dispatch(reset(RENAME_FILE_DIALOG));
+ dispatch(dialogActions.OPEN_DIALOG({ id: RENAME_FILE_DIALOG, data }));
+ };
+
+export const renameFile = (newName: string) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const dialog = getDialog<RenameFileDialogData>(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<any>(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' }));
+ }
+ }
+ };
diff --git a/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
index a3bfa0b..0bc693c 100644
--- a/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
@@ -3,17 +3,16 @@
// SPDX-License-Identifier: AGPL-3.0
import { ContextMenuActionSet } from "../context-menu-action-set";
-import { RenameIcon, DownloadIcon, RemoveIcon } from "~/components/icon/icon";
-import { openRenameFileDialog } from "../../rename-file-dialog/rename-file-dialog";
+import { RenameIcon, RemoveIcon } from "~/components/icon/icon";
import { DownloadCollectionFileAction } from "../actions/download-collection-file-action";
-import { openFileRemoveDialog } from "../../../store/collection-panel/collection-panel-files/collection-panel-files-actions";
+import { openFileRemoveDialog, openRenameFileDialog } from '../../../store/collection-panel/collection-panel-files/collection-panel-files-actions';
export const collectionFilesItemActionSet: ContextMenuActionSet = [[{
name: "Rename",
icon: RenameIcon,
execute: (dispatch, resource) => {
- dispatch<any>(openRenameFileDialog(resource.name));
+ dispatch<any>(openRenameFileDialog({ name: resource.name, id: resource.uuid }));
}
}, {
component: DownloadCollectionFileAction,
diff --git a/src/views-components/rename-file-dialog/rename-file-dialog.tsx b/src/views-components/rename-file-dialog/rename-file-dialog.tsx
index f23d4c0..20116fc 100644
--- a/src/views-components/rename-file-dialog/rename-file-dialog.tsx
+++ b/src/views-components/rename-file-dialog/rename-file-dialog.tsx
@@ -3,33 +3,23 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Dispatch, compose } from 'redux';
+import { compose } from 'redux';
import { reduxForm, reset, startSubmit, stopSubmit, InjectedFormProps, Field } from 'redux-form';
import { withDialog, WithDialogProps } from '~/store/dialog/with-dialog';
-import { dialogActions } from "~/store/dialog/dialog-actions";
import { FormDialog } from '~/components/form-dialog/form-dialog';
import { DialogContentText } from '@material-ui/core';
import { TextField } from '~/components/text-field/text-field';
-
-export const RENAME_FILE_DIALOG = 'renameFileDialog';
-
-export const openRenameFileDialog = (originalName: string) =>
- (dispatch: Dispatch) => {
- dispatch(reset(RENAME_FILE_DIALOG));
- dispatch(dialogActions.OPEN_DIALOG({ id: RENAME_FILE_DIALOG, data: originalName }));
- };
+import { RENAME_FILE_DIALOG, RenameFileDialogData, renameFile } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
export const RenameFileDialog = compose(
withDialog(RENAME_FILE_DIALOG),
reduxForm({
form: RENAME_FILE_DIALOG,
- onSubmit: (data, dispatch) => {
- dispatch(startSubmit(RENAME_FILE_DIALOG));
- // TODO: call collection file renaming action here
- setTimeout(() => dispatch(stopSubmit(RENAME_FILE_DIALOG, { name: 'Invalid name' })), 2000);
+ onSubmit: (data: { name: string }, dispatch) => {
+ dispatch<any>(renameFile(data.name));
}
})
-)((props: WithDialogProps<string> & InjectedFormProps<{ name: string }>) =>
+)((props: WithDialogProps<RenameFileDialogData> & InjectedFormProps<{ name: string }>) =>
<FormDialog
dialogTitle='Rename'
formFields={RenameDialogFormFields}
@@ -37,9 +27,9 @@ export const RenameFileDialog = compose(
{...props}
/>);
-const RenameDialogFormFields = (props: WithDialogProps<string>) => <>
+const RenameDialogFormFields = (props: WithDialogProps<RenameFileDialogData>) => <>
<DialogContentText>
- {`Please, enter a new name for ${props.data}`}
+ {`Please, enter a new name for ${props.data.name}`}
</DialogContentText>
<Field
name='name'
commit 5a98bccbd21405c97baa35c288898fac16c2d567
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Sat Aug 18 11:22:15 2018 +0200
Create getDialog selector
Feature #14015
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/store/dialog/dialog-reducer.ts b/src/store/dialog/dialog-reducer.ts
index 34d38fd..1675db4 100644
--- a/src/store/dialog/dialog-reducer.ts
+++ b/src/store/dialog/dialog-reducer.ts
@@ -6,9 +6,9 @@ import { DialogAction, dialogActions } from "./dialog-actions";
export type DialogState = Record<string, Dialog>;
-export interface Dialog {
+export interface Dialog <T = any> {
open: boolean;
- data: any;
+ data: T;
}
export const dialogReducer = (state: DialogState = {}, action: DialogAction) =>
@@ -20,3 +20,5 @@ export const dialogReducer = (state: DialogState = {}, action: DialogAction) =>
default: () => state,
});
+export const getDialog = <T>(state: DialogState, id: string) =>
+ state[id] ? state[id] as Dialog<T> : undefined;
commit b4f091ebd9f78c76cc7a182802d656f55c722f6d
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Sat Aug 18 11:21:39 2018 +0200
Implement collection service mvoeFile method
Feature #14015
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index 671a1e1..576ba21 100644
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -40,6 +40,13 @@ export class CollectionService extends CommonResourceService<CollectionResource>
}
}
+ moveFile(collectionUuid: string, oldPath: string, newPath: string) {
+ return this.webdavClient.move(
+ `/c=${collectionUuid}${oldPath}`,
+ `/c=${collectionUuid}${encodeURI(newPath)}`
+ );
+ }
+
private extendFileURL = (file: CollectionDirectory | CollectionFile) => ({
...file,
url: this.webdavClient.defaults.baseURL + file.url + '?api_token=' + this.authService.getApiToken()
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list