}
pathPromise[key] = true;
- console.log(key);
return webdavClient.propfind(`c=${key}`, webDAVRequestConfig);
}
currentItemUuid: string;
elementPath?: string;
isMSToolbarVisible: boolean;
+ checkedList: TCheckedList;
}
interface DataExplorerActionProps<T> {
elementPath,
toggleMSToolbar,
setCheckedListOnStore,
+ checkedList,
} = this.props;
return (
<Paper
currentRoute={paperKey}
toggleMSToolbar={toggleMSToolbar}
setCheckedListOnStore={setCheckedListOnStore}
+ checkedList={checkedList}
/>
</Grid>
<Grid
currentRoute?: string;
toggleMSToolbar: (isVisible: boolean) => void;
setCheckedListOnStore: (checkedList: TCheckedList) => void;
+ checkedList: TCheckedList;
}
type CssRules =
class Component<T> extends React.Component<DataTableProps<T>> {
state: DataTableState = {
isSelected: false,
- checkedList: {},
+ checkedList: this.props.checkedList,
};
componentDidMount(): void {
function mapStateToProps(state: RootState) {
const { isVisible, checkedList } = state.multiselect;
+ // console.log("checkedList", checkedList); //here
return {
isVisible: isVisible,
checkedList: checkedList as TCheckedList,
default:
for (const kind in kindGroups) {
const action = findActionByName(selectedAction.name as string, kindToActionSet[kind]);
- console.log(action, kindGroups[kind]);
if (action) action.execute(dispatch, kindGroups[kind]);
}
break;
import { Dispatch } from "redux";
import { dialogActions } from "store/dialog/dialog-actions";
-import { FormErrors, initialize, startSubmit, stopSubmit } from 'redux-form';
-import { resetPickerProjectTree } from 'store/project-tree-picker/project-tree-picker-actions';
-import { RootState } from 'store/store';
-import { ServiceRepository } from 'services/services';
-import { getCommonResourceServiceError, CommonResourceServiceError } from 'services/common-service/common-resource-service';
-import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
+import { FormErrors, initialize, startSubmit, stopSubmit } from "redux-form";
+import { resetPickerProjectTree } from "store/project-tree-picker/project-tree-picker-actions";
+import { RootState } from "store/store";
+import { ServiceRepository } from "services/services";
+import { getCommonResourceServiceError, CommonResourceServiceError } from "services/common-service/common-resource-service";
+import { CopyFormDialogData } from "store/copy-dialog/copy-dialog";
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
-import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions';
+import { initProjectsTreePicker } from "store/tree-picker/tree-picker-actions";
import { getResource } from "store/resources/resources";
import { CollectionResource } from "models/collection";
-export const COLLECTION_COPY_FORM_NAME = 'collectionCopyFormName';
+export const COLLECTION_COPY_FORM_NAME = "collectionCopyFormName";
-export const openCollectionCopyDialog = (resource: { name: string, uuid: string }) =>
- (dispatch: Dispatch) => {
- dispatch<any>(resetPickerProjectTree());
- dispatch<any>(initProjectsTreePicker(COLLECTION_COPY_FORM_NAME));
- const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: '', uuid: resource.uuid };
- dispatch<any>(initialize(COLLECTION_COPY_FORM_NAME, initialData));
- dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_COPY_FORM_NAME, data: {} }));
- };
+export const openCollectionCopyDialog = (resource: { name: string; uuid: string; isSingle?: boolean }) => (dispatch: Dispatch) => {
+ dispatch<any>(resetPickerProjectTree());
+ dispatch<any>(initProjectsTreePicker(COLLECTION_COPY_FORM_NAME));
+ const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: "", uuid: resource.uuid, isSingle: resource.isSingle };
+ dispatch<any>(initialize(COLLECTION_COPY_FORM_NAME, initialData));
+ dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_COPY_FORM_NAME, data: {} }));
+};
-export const copyCollection = (resource: CopyFormDialogData) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+export const copyCollection =
+ (resource: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
dispatch(startSubmit(COLLECTION_COPY_FORM_NAME));
let collection = getResource<CollectionResource>(resource.uuid)(getState().resources);
try {
if (!collection) {
collection = await services.collectionService.get(resource.uuid);
}
- const collManifestText = await services.collectionService.get(resource.uuid, undefined, ['manifestText']);
+ const collManifestText = await services.collectionService.get(resource.uuid, undefined, ["manifestText"]);
collection.manifestText = collManifestText.manifestText;
- const {href, ...collectionRecord} = collection;
- const newCollection = await services.collectionService.create({ ...collectionRecord, ownerUuid: resource.ownerUuid, name: resource.name });
+ const { href, ...collectionRecord } = collection;
+ const newCollection = await services.collectionService.create({
+ ...collectionRecord,
+ ownerUuid: resource.ownerUuid,
+ name: resource.name,
+ });
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_COPY_FORM_NAME }));
return newCollection;
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
- dispatch(stopSubmit(
- COLLECTION_COPY_FORM_NAME,
- { ownerUuid: 'A collection with the same name already exists in the target project.' } as FormErrors
- ));
+ dispatch(
+ stopSubmit(COLLECTION_COPY_FORM_NAME, {
+ ownerUuid: "A collection with the same name already exists in the target project.",
+ } as FormErrors)
+ );
} else {
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_COPY_FORM_NAME }));
- throw new Error('Could not copy the collection.');
+ throw new Error("Could not copy the collection.");
}
return;
} finally {
name: string;
uuid: string;
ownerUuid: string;
-}
\ No newline at end of file
+ isSingle?: boolean;
+}
export const moveProject =
(data: MoveToFormDialogData, isSecondaryMove = false) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- console.log(data);
const checkedList = getState().multiselect.checkedList;
const uuidsToMove: string[] = data.isSingle ? [data.uuid] : selectedToArray(checkedList);
};
export const copyCollection = (data: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- try {
- const copyToProject = getResource(data.ownerUuid)(getState().resources);
- const collection = await dispatch<any>(collectionCopyActions.copyCollection(data));
- if (copyToProject && collection) {
- dispatch<any>(reloadProjectMatchingUuid([copyToProject.uuid]));
+ const checkedList = getState().multiselect.checkedList;
+ const uuidsToCopy: string[] = data.isSingle ? [data.uuid] : selectedToArray(checkedList);
+
+ //if no items in checkedlist && no items passed in, default to normal context menu behavior
+ if (!uuidsToCopy.length) uuidsToCopy.push(data.uuid);
+
+ const collectionsToCopy: Resource[] = uuidsToCopy
+ .map(uuid => getResource(uuid)(getState().resources) as any)
+ .filter(resource => resource.kind === ResourceKind.COLLECTION);
+
+ for (const collection of collectionsToCopy) {
+ await copySingleCollection(collection as Resource & { name: string });
+ }
+
+ async function copySingleCollection(copyToProject: Resource & { name: string }) {
+ const newName = data.isSingle ? data.name : `Copy of: ${copyToProject.name}`;
+ try {
+ const collection = await dispatch<any>(collectionCopyActions.copyCollection({ ...copyToProject, name: newName }));
+ if (copyToProject && collection) {
+ await dispatch<any>(reloadProjectMatchingUuid([copyToProject.uuid]));
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: "Collection has been copied.",
+ hideDuration: 3000,
+ kind: SnackbarKind.SUCCESS,
+ link: collection.ownerUuid,
+ })
+ );
+ }
+ } catch (e) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: "Collection has been copied.",
- hideDuration: 3000,
- kind: SnackbarKind.SUCCESS,
- link: collection.ownerUuid,
+ message: e.message,
+ hideDuration: 2000,
+ kind: SnackbarKind.ERROR,
})
);
}
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
}
};
icon: CopyIcon,
name: "Make a copy",
execute: (dispatch, resources) => {
- resources.forEach(resource => dispatch<any>(openCollectionCopyDialog(resource))); //here
+ dispatch<any>(openCollectionCopyDialog(resources[0]));
},
},
{
//
// SPDX-License-Identifier: AGPL-3.0
-import { connect } from 'react-redux';
-import { RootState } from 'store/store';
-import { DataExplorer as DataExplorerComponent } from 'components/data-explorer/data-explorer';
-import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
-import { Dispatch } from 'redux';
-import { dataExplorerActions } from 'store/data-explorer/data-explorer-action';
-import { DataColumn } from 'components/data-table/data-column';
-import { DataColumns, TCheckedList } from 'components/data-table/data-table';
-import { DataTableFilters } from 'components/data-table-filters/data-table-filters-tree';
-import { LAST_REFRESH_TIMESTAMP } from 'components/refresh-button/refresh-button';
-import { toggleMSToolbar, setCheckedListOnStore } from 'store/multiselect/multiselect-actions';
+import { connect } from "react-redux";
+import { RootState } from "store/store";
+import { DataExplorer as DataExplorerComponent } from "components/data-explorer/data-explorer";
+import { getDataExplorer } from "store/data-explorer/data-explorer-reducer";
+import { Dispatch } from "redux";
+import { dataExplorerActions } from "store/data-explorer/data-explorer-action";
+import { DataColumn } from "components/data-table/data-column";
+import { DataColumns, TCheckedList } from "components/data-table/data-table";
+import { DataTableFilters } from "components/data-table-filters/data-table-filters-tree";
+import { LAST_REFRESH_TIMESTAMP } from "components/refresh-button/refresh-button";
+import { toggleMSToolbar, setCheckedListOnStore } from "store/multiselect/multiselect-actions";
interface Props {
id: string;
}
const mapStateToProps = (state: RootState, { id }: Props) => {
- const progress = state.progressIndicator.find((p) => p.id === id);
+ const progress = state.progressIndicator.find(p => p.id === id);
const dataExplorerState = getDataExplorer(state.dataExplorer, id);
- const currentRoute = state.router.location ? state.router.location.pathname : '';
- const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || '';
- const currentItemUuid = currentRoute === '/workflows' ? state.properties.workflowPanelDetailsUuid : state.detailsPanel.resourceUuid;
+ const currentRoute = state.router.location ? state.router.location.pathname : "";
+ const currentRefresh = localStorage.getItem(LAST_REFRESH_TIMESTAMP) || "";
+ const currentItemUuid = currentRoute === "/workflows" ? state.properties.workflowPanelDetailsUuid : state.detailsPanel.resourceUuid;
const isMSToolbarVisible = state.multiselect.isVisible;
return {
...dataExplorerState,
paperKey: currentRoute,
currentItemUuid,
isMSToolbarVisible,
+ checkedList: state.multiselect.checkedList,
};
};
-const mapDispatchToProps = (dispatchFn) => {
+const mapDispatchToProps = dispatchFn => {
return (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
onSetColumns: (columns: DataColumns<any, any>) => {
dispatch(dataExplorerActions.SET_COLUMNS({ id, columns }));
// SPDX-License-Identifier: AGPL-3.0
import React from "react";
-import { memoize } from 'lodash/fp';
-import { InjectedFormProps, Field } from 'redux-form';
-import { WithDialogProps } from 'store/dialog/with-dialog';
-import { FormDialog } from 'components/form-dialog/form-dialog';
-import { ProjectTreePickerField } from 'views-components/projects-tree-picker/tree-picker-field';
-import { COPY_NAME_VALIDATION, COPY_FILE_VALIDATION } from 'validators/validators';
+import { memoize } from "lodash/fp";
+import { InjectedFormProps, Field } from "redux-form";
+import { WithDialogProps } from "store/dialog/with-dialog";
+import { FormDialog } from "components/form-dialog/form-dialog";
+import { ProjectTreePickerField } from "views-components/projects-tree-picker/tree-picker-field";
+import { COPY_NAME_VALIDATION, COPY_FILE_VALIDATION } from "validators/validators";
import { TextField } from "components/text-field/text-field";
-import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
-import { PickerIdProp } from 'store/tree-picker/picker-id';
+import { CopyFormDialogData } from "store/copy-dialog/copy-dialog";
+import { PickerIdProp } from "store/tree-picker/picker-id";
type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CopyFormDialogData>;
-export const DialogCopy = (props: CopyFormDialogProps & PickerIdProp) =>
+export const DialogCopy = (props: CopyFormDialogProps & PickerIdProp) => (
<FormDialog
- dialogTitle='Make a copy'
+ dialogTitle="Make a copy"
formFields={CopyDialogFields(props.pickerId)}
- submitLabel='Copy'
+ submitLabel="Copy"
{...props}
- />;
+ />
+);
-const CopyDialogFields = memoize((pickerId: string) =>
- () =>
- <>
- <Field
- name='name'
- component={TextField as any}
- validate={COPY_NAME_VALIDATION}
- label="Enter a new name for the copy" />
- <Field
- name="ownerUuid"
- component={ProjectTreePickerField}
- validate={COPY_FILE_VALIDATION}
- pickerId={pickerId}/>
- </>);
+const CopyDialogFields = memoize((pickerId: string) => () => (
+ <>
+ <Field
+ name="name"
+ component={TextField as any}
+ validate={COPY_NAME_VALIDATION}
+ label="Enter a new name for the copy"
+ />
+ <Field
+ name="ownerUuid"
+ component={ProjectTreePickerField}
+ validate={COPY_FILE_VALIDATION}
+ pickerId={pickerId}
+ />
+ </>
+));
import { compose } from "redux";
import { withDialog } from "store/dialog/with-dialog";
-import { reduxForm } from 'redux-form';
-import { COLLECTION_COPY_FORM_NAME } from 'store/collections/collection-copy-actions';
+import { reduxForm } from "redux-form";
+import { COLLECTION_COPY_FORM_NAME } from "store/collections/collection-copy-actions";
import { DialogCopy } from "views-components/dialog-copy/dialog-copy";
-import { copyCollection } from 'store/workbench/workbench-actions';
-import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
-import { pickerId } from 'store/tree-picker/picker-id';
+import { copyCollection } from "store/workbench/workbench-actions";
+import { CopyFormDialogData } from "store/copy-dialog/copy-dialog";
+import { pickerId } from "store/tree-picker/picker-id";
export const CopyCollectionDialog = compose(
withDialog(COLLECTION_COPY_FORM_NAME),
touchOnChange: true,
onSubmit: (data, dispatch) => {
dispatch(copyCollection(data));
- }
+ },
}),
- pickerId(COLLECTION_COPY_FORM_NAME),
-)(DialogCopy);
\ No newline at end of file
+ pickerId(COLLECTION_COPY_FORM_NAME)
+)(DialogCopy);
projects / arvados-workbench2.git / commitdiff