[arvados-workbench2] updated: 2.6.0-65-gca3155fa
git repository hosting
git at public.arvados.org
Mon Aug 28 15:29:17 UTC 2023
Summary of changes:
.../multiselectToolbar/MultiselectToolbar.tsx | 91 +-
src/components/select-field/select-field.tsx | 85 +-
src/store/dialog/with-dialog.ts | 25 +-
src/store/projects/project-move-actions.ts | 72 +-
src/store/tree-picker/picker-id.tsx | 15 +-
src/store/workbench/workbench-actions.ts | 1274 +++++++++-----------
.../context-menu/action-sets/project-action-set.ts | 84 +-
.../context-menu/context-menu-action-set.ts | 7 +-
8 files changed, 736 insertions(+), 917 deletions(-)
via ca3155fabcfe6dd61b2151c52861b2786e9bec40 (commit)
via 4fc63fca58814fdc6ac21b08fe7b8c2d84e2c3f7 (commit)
via 4cfc0ca7c782696ffb92337e3be9fbe3ed43a360 (commit)
from c5308511f31f9713ce961a72b29c39b7b64baaa6 (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 ca3155fabcfe6dd61b2151c52861b2786e9bec40
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Mon Aug 28 11:25:24 2023 -0400
15768: project multimove works Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/multiselectToolbar/MultiselectToolbar.tsx b/src/components/multiselectToolbar/MultiselectToolbar.tsx
index 99d15e07..880d0f49 100644
--- a/src/components/multiselectToolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselectToolbar/MultiselectToolbar.tsx
@@ -2,39 +2,38 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import React from 'react';
-import { connect } from 'react-redux';
-import { StyleRulesCallback, withStyles, WithStyles, Toolbar, Tooltip, IconButton } from '@material-ui/core';
-import { ArvadosTheme } from 'common/custom-theme';
-import { RootState } from 'store/store';
-import { Dispatch } from 'redux';
-import { TCheckedList } from 'components/data-table/data-table';
-import { ContextMenuResource } from 'store/context-menu/context-menu-actions';
-import { Resource, extractUuidKind } from 'models/resource';
-import { getResource } from 'store/resources/resources';
-import { ResourcesState } from 'store/resources/resources';
-import { ContextMenuAction, ContextMenuActionSet } from 'views-components/context-menu/context-menu-action-set';
-import { RestoreFromTrashIcon, TrashIcon } from 'components/icon/icon';
-import { multiselectActionsFilters, TMultiselectActionsFilters } from './ms-toolbar-action-filters';
-import { kindToActionSet, findActionByName } from './ms-kind-action-differentiator';
-import { toggleTrashAction } from 'views-components/context-menu/action-sets/project-action-set';
-
-type CssRules = 'root' | 'button';
+import React from "react";
+import { connect } from "react-redux";
+import { StyleRulesCallback, withStyles, WithStyles, Toolbar, Tooltip, IconButton } from "@material-ui/core";
+import { ArvadosTheme } from "common/custom-theme";
+import { RootState } from "store/store";
+import { Dispatch } from "redux";
+import { TCheckedList } from "components/data-table/data-table";
+import { ContextMenuResource } from "store/context-menu/context-menu-actions";
+import { Resource, extractUuidKind } from "models/resource";
+import { getResource } from "store/resources/resources";
+import { ResourcesState } from "store/resources/resources";
+import { ContextMenuAction, ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
+import { RestoreFromTrashIcon, TrashIcon } from "components/icon/icon";
+import { multiselectActionsFilters, TMultiselectActionsFilters } from "./ms-toolbar-action-filters";
+import { kindToActionSet, findActionByName } from "./ms-kind-action-differentiator";
+import { toggleTrashAction } from "views-components/context-menu/action-sets/project-action-set";
+
+type CssRules = "root" | "button";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
- display: 'flex',
- flexDirection: 'row',
+ display: "flex",
+ flexDirection: "row",
width: 0,
padding: 0,
- margin: '1rem auto auto 0.5rem',
- overflow: 'hidden',
- transition: 'width 150ms',
- // borderBottom: '1px solid gray',
+ margin: "1rem auto auto 0.5rem",
+ overflow: "hidden",
+ transition: "width 150ms",
},
button: {
- width: '1rem',
- margin: 'auto 5px',
+ width: "1rem",
+ margin: "auto 5px",
},
});
@@ -53,7 +52,7 @@ export const MultiselectToolbar = connect(
const { classes, checkedList } = props;
const currentResourceKinds = Array.from(selectedToKindSet(checkedList));
- const currentPathIsTrash = window.location.pathname === '/trash';
+ const currentPathIsTrash = window.location.pathname === "/trash";
const buttons =
currentPathIsTrash && selectedToKindSet(checkedList).size
? [toggleTrashAction]
@@ -65,10 +64,10 @@ export const MultiselectToolbar = connect(
style={{ width: `${buttons.length * 2.12}rem` }}>
{buttons.length ? (
buttons.map((btn, i) =>
- btn.name === 'ToggleTrashAction' ? (
+ btn.name === "ToggleTrashAction" ? (
<Tooltip
className={classes.button}
- title={currentPathIsTrash ? 'Restore' : 'Move to trash'}
+ title={currentPathIsTrash ? "Restore" : "Move to trash"}
key={i}
disableFocusListener>
<IconButton onClick={() => props.executeMulti(btn, checkedList, props.resources)}>
@@ -138,7 +137,7 @@ function selectActionsByKind(currentResourceKinds: Array<string>, filterSet: TMu
const filteredNameSet = allFiltersArray.map(filterArray => {
const resultSet = new Set();
- filterArray.forEach(action => resultSet.add(action.name || ''));
+ filterArray.forEach(action => resultSet.add(action.name || ""));
return resultSet;
});
@@ -150,8 +149,8 @@ function selectActionsByKind(currentResourceKinds: Array<string>, filterSet: TMu
});
return filteredResult.sort((a, b) => {
- const nameA = a.name || '';
- const nameB = b.name || '';
+ const nameA = a.name || "";
+ const nameB = b.name || "";
if (nameA < nameB) {
return -1;
}
diff --git a/src/store/projects/project-move-actions.ts b/src/store/projects/project-move-actions.ts
index ab46e4b5..618ce21e 100644
--- a/src/store/projects/project-move-actions.ts
+++ b/src/store/projects/project-move-actions.ts
@@ -2,34 +2,31 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { Dispatch } from 'redux';
-import { dialogActions } from 'store/dialog/dialog-actions';
-import { startSubmit, stopSubmit, initialize, FormErrors } from 'redux-form';
-import { ServiceRepository } from 'services/services';
-import { RootState } from 'store/store';
-import { getUserUuid } from 'common/getuser';
-import { getCommonResourceServiceError, CommonResourceServiceError } from 'services/common-service/common-resource-service';
-import { MoveToFormDialogData } from 'store/move-to-dialog/move-to-dialog';
-import { resetPickerProjectTree } from 'store/project-tree-picker/project-tree-picker-actions';
-import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions';
-import { projectPanelActions } from 'store/project-panel/project-panel-action';
-import { loadSidePanelTreeProjects } from '../side-panel-tree/side-panel-tree-actions';
+import { Dispatch } from "redux";
+import { dialogActions } from "store/dialog/dialog-actions";
+import { startSubmit, stopSubmit, initialize, FormErrors } from "redux-form";
+import { ServiceRepository } from "services/services";
+import { RootState } from "store/store";
+import { getUserUuid } from "common/getuser";
+import { getCommonResourceServiceError, CommonResourceServiceError } from "services/common-service/common-resource-service";
+import { MoveToFormDialogData } from "store/move-to-dialog/move-to-dialog";
+import { resetPickerProjectTree } from "store/project-tree-picker/project-tree-picker-actions";
+import { initProjectsTreePicker } from "store/tree-picker/tree-picker-actions";
+import { projectPanelActions } from "store/project-panel/project-panel-action";
+import { loadSidePanelTreeProjects } from "../side-panel-tree/side-panel-tree-actions";
-export const PROJECT_MOVE_FORM_NAME = 'projectMoveFormName';
+export const PROJECT_MOVE_FORM_NAME = "projectMoveFormName";
-// export const openMoveProjectDialog = (resource: { name: string; uuid: string }) => {
-// console.log(resource);
export const openMoveProjectDialog = (resources: Array<any>) => {
return (dispatch: Dispatch) => {
dispatch<any>(resetPickerProjectTree());
dispatch<any>(initProjectsTreePicker(PROJECT_MOVE_FORM_NAME));
- dispatch(initialize(PROJECT_MOVE_FORM_NAME, resources[0], undefined, resources)); //here
+ dispatch(initialize(PROJECT_MOVE_FORM_NAME, resources[0]));
dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_MOVE_FORM_NAME, data: {} }));
};
};
export const moveProject = (resource: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- console.log('SUCCESS?', resource);
const userUuid = getUserUuid(getState());
if (!userUuid) {
return;
@@ -45,13 +42,13 @@ export const moveProject = (resource: MoveToFormDialogData) => async (dispatch:
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
dispatch(
- stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: 'A project with the same name already exists in the target project.' } as FormErrors)
+ stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: "A project with the same name already exists in the target project." } as FormErrors)
);
} else if (error === CommonResourceServiceError.OWNERSHIP_CYCLE) {
- dispatch(stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: 'Cannot move a project into itself.' } as FormErrors));
+ dispatch(stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: "Cannot move a project into itself." } as FormErrors));
} else {
dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_MOVE_FORM_NAME }));
- throw new Error('Could not move the project.');
+ throw new Error("Could not move the project.");
}
return;
}
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index ab3041ad..6182a314 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -279,31 +279,23 @@ export const createProject = (data: projectCreateActions.ProjectCreateFormDialog
};
export const moveProject = (data: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- console.log("moveProject---");
- console.log("moveProject:", data);
- // const currentState = getState();
- // console.log('current', currentState.multiselect.checkedList);
- const projectsToMove = selectedToArray(getState().multiselect.checkedList);
- // console.log("resource?", getResource(projectsToMove[0])(getState().resources));
- const sourceUuid = getResource(projectsToMove[0])(getState().resources)?.ownerUuid;
+ const projectsToMove: string[] = selectedToArray(getState().multiselect.checkedList);
+ //if no items in checkedlist, default to normal context menu behavior
+ if (!projectsToMove.length) projectsToMove.push(data.uuid);
+ const sourceUuid = getResource(data.uuid)(getState().resources)?.ownerUuid;
const destinationUuid = data.ownerUuid;
- for (const project of projectsToMove) {
- await moveSingleProject(project);
+ for (const projectUuid of projectsToMove) {
+ await moveSingleProject(projectUuid);
}
async function moveSingleProject(projectUuid) {
try {
- // const oldProject = getResource(projectUuid)(getState().resources);
- const originalProject = getResource(projectUuid)(getState().resources) as any;
+ const originalProject = getResource(projectUuid)(getState().resources);
const oldProject = { ...originalProject, ownerUuid: data.ownerUuid } as any;
- // const { name, uuid, ownerUuid } = getResource(projectUuid)(getState().resources) as any;
- // const oldProject: MoveToFormDialogData = { name, uuid, ownerUuid };
- console.log("oldProject", oldProject, data);
const oldOwnerUuid = oldProject ? oldProject.ownerUuid : "";
const movedProject = await dispatch<any>(projectMoveActions.moveProject(oldProject));
if (movedProject) {
- console.log("movedProject", movedProject);
dispatch(
snackbarActions.OPEN_SNACKBAR({
message: "Project has been moved",
@@ -311,10 +303,6 @@ export const moveProject = (data: MoveToFormDialogData) => async (dispatch: Disp
kind: SnackbarKind.SUCCESS,
})
);
- // if (oldProject) {
- // await dispatch<any>(loadSidePanelTreeProjects(oldProject.ownerUuid));
- // await dispatch<any>(loadSidePanelTreeProjects(originalProject.ownerUuid));
- // }
await dispatch<any>(reloadProjectMatchingUuid([oldOwnerUuid, movedProject.ownerUuid, movedProject.uuid]));
}
} catch (e) {
@@ -329,33 +317,6 @@ export const moveProject = (data: MoveToFormDialogData) => async (dispatch: Disp
}
if (sourceUuid) await dispatch<any>(loadSidePanelTreeProjects(sourceUuid));
await dispatch<any>(loadSidePanelTreeProjects(destinationUuid));
-
- // try {
- // const oldProject = getResource(data.uuid)(getState().resources);
- // const oldOwnerUuid = oldProject ? oldProject.ownerUuid : '';
- // const movedProject = await dispatch<any>(projectMoveActions.moveProject(data));
- // if (movedProject) {
- // dispatch(
- // snackbarActions.OPEN_SNACKBAR({
- // message: 'Project has been moved',
- // hideDuration: 2000,
- // kind: SnackbarKind.SUCCESS,
- // })
- // );
- // if (oldProject) {
- // await dispatch<any>(loadSidePanelTreeProjects(oldProject.ownerUuid));
- // }
- // dispatch<any>(reloadProjectMatchingUuid([oldOwnerUuid, movedProject.ownerUuid, movedProject.uuid]));
- // }
- // } catch (e) {
- // dispatch(
- // snackbarActions.OPEN_SNACKBAR({
- // message: e.message,
- // hideDuration: 2000,
- // kind: SnackbarKind.ERROR,
- // })
- // );
- // }
};
export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialogData) => async (dispatch: Dispatch) => {
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 21019ce8..877c34b9 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -2,30 +2,30 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { ContextMenuActionSet } from '../context-menu-action-set';
-import { NewProjectIcon, RenameIcon, MoveToIcon, DetailsIcon, AdvancedIcon, OpenIcon, Link, FolderSharedIcon } from 'components/icon/icon';
-import { ToggleFavoriteAction } from '../actions/favorite-action';
-import { toggleFavorite } from 'store/favorites/favorites-actions';
-import { favoritePanelActions } from 'store/favorite-panel/favorite-panel-action';
-import { openMoveProjectDialog } from 'store/projects/project-move-actions';
-import { openProjectCreateDialog } from 'store/projects/project-create-actions';
-import { openProjectUpdateDialog } from 'store/projects/project-update-actions';
-import { ToggleTrashAction } from 'views-components/context-menu/actions/trash-action';
-import { toggleProjectTrashed } from 'store/trash/trash-actions';
-import { ShareIcon } from 'components/icon/icon';
-import { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions';
-import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
-import { toggleDetailsPanel } from 'store/details-panel/details-panel-action';
-import { copyToClipboardAction, openInNewTabAction } from 'store/open-in-new-tab/open-in-new-tab.actions';
-import { openWebDavS3InfoDialog } from 'store/collections/collection-info-actions';
-import { ToggleLockAction } from '../actions/lock-action';
-import { freezeProject, unfreezeProject } from 'store/projects/project-lock-actions';
+import { ContextMenuActionSet } from "../context-menu-action-set";
+import { NewProjectIcon, RenameIcon, MoveToIcon, DetailsIcon, AdvancedIcon, OpenIcon, Link, FolderSharedIcon } from "components/icon/icon";
+import { ToggleFavoriteAction } from "../actions/favorite-action";
+import { toggleFavorite } from "store/favorites/favorites-actions";
+import { favoritePanelActions } from "store/favorite-panel/favorite-panel-action";
+import { openMoveProjectDialog } from "store/projects/project-move-actions";
+import { openProjectCreateDialog } from "store/projects/project-create-actions";
+import { openProjectUpdateDialog } from "store/projects/project-update-actions";
+import { ToggleTrashAction } from "views-components/context-menu/actions/trash-action";
+import { toggleProjectTrashed } from "store/trash/trash-actions";
+import { ShareIcon } from "components/icon/icon";
+import { openSharingDialog } from "store/sharing-dialog/sharing-dialog-actions";
+import { openAdvancedTabDialog } from "store/advanced-tab/advanced-tab";
+import { toggleDetailsPanel } from "store/details-panel/details-panel-action";
+import { copyToClipboardAction, openInNewTabAction } from "store/open-in-new-tab/open-in-new-tab.actions";
+import { openWebDavS3InfoDialog } from "store/collections/collection-info-actions";
+import { ToggleLockAction } from "../actions/lock-action";
+import { freezeProject, unfreezeProject } from "store/projects/project-lock-actions";
export const toggleFavoriteAction = {
component: ToggleFavoriteAction,
- name: 'ToggleFavoriteAction',
+ name: "ToggleFavoriteAction",
execute: (dispatch, resources) => {
- resources.forEach((resource) =>
+ resources.forEach(resource =>
dispatch(toggleFavorite(resource)).then(() => {
dispatch(favoritePanelActions.REQUEST_ITEMS());
})
@@ -35,15 +35,15 @@ export const toggleFavoriteAction = {
export const openInNewTabMenuAction = {
icon: OpenIcon,
- name: 'Open in new tab',
+ name: "Open in new tab",
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch(openInNewTabAction(resource)));
+ resources.forEach(resource => dispatch(openInNewTabAction(resource)));
},
};
export const copyToClipboardMenuAction = {
icon: Link,
- name: 'Copy to clipboard',
+ name: "Copy to clipboard",
execute: (dispatch, resources) => {
dispatch(copyToClipboardAction(resources));
},
@@ -51,76 +51,65 @@ export const copyToClipboardMenuAction = {
export const viewDetailsAction = {
icon: DetailsIcon,
- name: 'View details',
- execute: (dispatch) => {
+ name: "View details",
+ execute: dispatch => {
dispatch(toggleDetailsPanel());
},
};
export const advancedAction = {
icon: AdvancedIcon,
- name: 'API Details',
+ name: "API Details",
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch(openAdvancedTabDialog(resource.uuid)));
+ resources.forEach(resource => dispatch(openAdvancedTabDialog(resource.uuid)));
},
};
export const openWith3rdPartyClientAction = {
icon: FolderSharedIcon,
- name: 'Open with 3rd party client',
+ name: "Open with 3rd party client",
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch(openWebDavS3InfoDialog(resource.uuid)));
+ resources.forEach(resource => dispatch(openWebDavS3InfoDialog(resource.uuid)));
},
};
export const editProjectAction = {
icon: RenameIcon,
- name: 'Edit project',
+ name: "Edit project",
execute: (dispatch, resources) => {
- resources.forEach((resource) => dispatch(openProjectUpdateDialog(resource)));
+ resources.forEach(resource => dispatch(openProjectUpdateDialog(resource)));
},
};
export const shareAction = {
icon: ShareIcon,
- name: 'Share',
+ name: "Share",
execute: (dispatch, processes) => {
- processes.forEach((process) => dispatch(openSharingDialog(process.uuid)));
+ processes.forEach(process => dispatch(openSharingDialog(process.uuid)));
},
};
export const moveToAction = {
icon: MoveToIcon,
- name: 'Move to',
+ name: "Move to",
execute: (dispatch, resources) => {
- // resources.length === 1
- // ? dispatch(openMoveProjectDialog(resources[0]))
- // : resources.forEach((resource) => {
dispatch(openMoveProjectDialog(resources));
- // })
},
- // execute: (dispatch, resources) => {
- // resources.forEach((resource) => {
- // dispatch(openMoveProjectDialog(resource));
- // });
- // },
};
export const toggleTrashAction = {
component: ToggleTrashAction,
- name: 'ToggleTrashAction',
+ name: "ToggleTrashAction",
execute: (dispatch, resources) => {
- resources.forEach((resource) =>
- dispatch(toggleProjectTrashed(resource.uuid, resource.ownerUuid, resource.isTrashed!!, resources.length > 1))
- );
+ resources.forEach(resource => dispatch(toggleProjectTrashed(resource.uuid, resource.ownerUuid, resource.isTrashed!!, resources.length > 1)));
},
};
export const freezeProjectAction = {
component: ToggleLockAction,
- name: 'ToggleLockAction',
+ name: "ToggleLockAction",
execute: (dispatch, resources) => {
- resources.forEach((resource) => {
+ resources.forEach(resource => {
if (resource.isFrozen) {
dispatch(unfreezeProject(resource.uuid));
} else {
@@ -132,7 +121,7 @@ export const freezeProjectAction = {
export const newProjectAction: any = {
icon: NewProjectIcon,
- name: 'New project',
+ name: "New project",
execute: (dispatch, resource): void => {
dispatch(openProjectCreateDialog(resource.uuid));
},
diff --git a/src/views-components/context-menu/context-menu-action-set.ts b/src/views-components/context-menu/context-menu-action-set.ts
index 9ee4106e..a953500b 100644
--- a/src/views-components/context-menu/context-menu-action-set.ts
+++ b/src/views-components/context-menu/context-menu-action-set.ts
@@ -2,10 +2,9 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { Dispatch } from 'redux';
-import { ContextMenuItem } from 'components/context-menu/context-menu';
-import { ContextMenuResource } from 'store/context-menu/context-menu-actions';
-import { RootState } from 'store/store';
+import { Dispatch } from "redux";
+import { ContextMenuItem } from "components/context-menu/context-menu";
+import { ContextMenuResource } from "store/context-menu/context-menu-actions";
export interface ContextMenuAction extends ContextMenuItem {
execute(dispatch: Dispatch, resources: ContextMenuResource[], state?: any): void;
commit 4fc63fca58814fdc6ac21b08fe7b8c2d84e2c3f7
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Sun Aug 27 19:43:17 2023 -0400
15768: multi-move works Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/multiselectToolbar/MultiselectToolbar.tsx b/src/components/multiselectToolbar/MultiselectToolbar.tsx
index 309d3293..99d15e07 100644
--- a/src/components/multiselectToolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselectToolbar/MultiselectToolbar.tsx
@@ -60,17 +60,27 @@ export const MultiselectToolbar = connect(
: selectActionsByKind(currentResourceKinds, multiselectActionsFilters);
return (
- <Toolbar className={classes.root} style={{ width: `${buttons.length * 2.12}rem` }}>
+ <Toolbar
+ className={classes.root}
+ style={{ width: `${buttons.length * 2.12}rem` }}>
{buttons.length ? (
buttons.map((btn, i) =>
btn.name === 'ToggleTrashAction' ? (
- <Tooltip className={classes.button} title={currentPathIsTrash ? 'Restore' : 'Move to trash'} key={i} disableFocusListener>
+ <Tooltip
+ className={classes.button}
+ title={currentPathIsTrash ? 'Restore' : 'Move to trash'}
+ key={i}
+ disableFocusListener>
<IconButton onClick={() => props.executeMulti(btn, checkedList, props.resources)}>
{currentPathIsTrash ? <RestoreFromTrashIcon /> : <TrashIcon />}
</IconButton>
</Tooltip>
) : (
- <Tooltip className={classes.button} title={btn.name} key={i} disableFocusListener>
+ <Tooltip
+ className={classes.button}
+ title={btn.name}
+ key={i}
+ disableFocusListener>
<IconButton onClick={() => props.executeMulti(btn, checkedList, props.resources)}>
{btn.icon ? btn.icon({}) : <></>}
</IconButton>
@@ -85,7 +95,7 @@ export const MultiselectToolbar = connect(
})
);
-function selectedToArray(checkedList: TCheckedList): Array<string> {
+export function selectedToArray(checkedList: TCheckedList): Array<string> {
const arrayifiedSelectedList: Array<string> = [];
for (const [key, value] of Object.entries(checkedList)) {
if (value === true) {
@@ -106,18 +116,18 @@ function selectedToKindSet(checkedList: TCheckedList): Set<string> {
}
function filterActions(actionArray: ContextMenuActionSet, filters: Set<string>): Array<ContextMenuAction> {
- return actionArray[0].filter((action) => filters.has(action.name as string));
+ return actionArray[0].filter(action => filters.has(action.name as string));
}
function selectActionsByKind(currentResourceKinds: Array<string>, filterSet: TMultiselectActionsFilters) {
const rawResult: Set<ContextMenuAction> = new Set();
const resultNames = new Set();
const allFiltersArray: ContextMenuAction[][] = [];
- currentResourceKinds.forEach((kind) => {
+ currentResourceKinds.forEach(kind => {
if (filterSet[kind]) {
const actions = filterActions(...filterSet[kind]);
allFiltersArray.push(actions);
- actions.forEach((action) => {
+ actions.forEach(action => {
if (!resultNames.has(action.name)) {
rawResult.add(action);
resultNames.add(action.name);
@@ -126,13 +136,13 @@ function selectActionsByKind(currentResourceKinds: Array<string>, filterSet: TMu
}
});
- const filteredNameSet = allFiltersArray.map((filterArray) => {
+ const filteredNameSet = allFiltersArray.map(filterArray => {
const resultSet = new Set();
- filterArray.forEach((action) => resultSet.add(action.name || ''));
+ filterArray.forEach(action => resultSet.add(action.name || ''));
return resultSet;
});
- const filteredResult = Array.from(rawResult).filter((action) => {
+ const filteredResult = Array.from(rawResult).filter(action => {
for (let i = 0; i < filteredNameSet.length; i++) {
if (!filteredNameSet[i].has(action.name)) return false;
}
@@ -180,7 +190,7 @@ function mapDispatchToProps(dispatch: Dispatch) {
function groupByKind(checkedList: TCheckedList, resources: ResourcesState): Record<string, ContextMenuResource[]> {
const result = {};
- selectedToArray(checkedList).forEach((uuid) => {
+ selectedToArray(checkedList).forEach(uuid => {
const resource = getResource(uuid)(resources) as Resource;
if (!result[resource.kind]) result[resource.kind] = [];
result[resource.kind].push(resource);
diff --git a/src/components/select-field/select-field.tsx b/src/components/select-field/select-field.tsx
index 6fa7ddea..bea06496 100644
--- a/src/components/select-field/select-field.tsx
+++ b/src/components/select-field/select-field.tsx
@@ -11,55 +11,58 @@ type CssRules = 'formControl' | 'selectWrapper' | 'select' | 'option';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
formControl: {
- width: '100%'
+ width: '100%',
},
selectWrapper: {
backgroundColor: theme.palette.common.white,
'&:before': {
- borderBottomColor: 'rgba(0, 0, 0, 0.42)'
+ borderBottomColor: 'rgba(0, 0, 0, 0.42)',
},
'&:focus': {
- outline: 'none'
- }
+ outline: 'none',
+ },
},
select: {
fontSize: '0.875rem',
'&:focus': {
- backgroundColor: 'rgba(0, 0, 0, 0.0)'
- }
+ backgroundColor: 'rgba(0, 0, 0, 0.0)',
+ },
},
option: {
fontSize: '0.875rem',
backgroundColor: theme.palette.common.white,
- height: '30px'
- }
+ height: '30px',
+ },
});
interface NativeSelectFieldProps {
disabled?: boolean;
}
-export const NativeSelectField = withStyles(styles)
- ((props: WrappedFieldProps & NativeSelectFieldProps & WithStyles<CssRules> & { items: any[] }) =>
- <FormControl className={props.classes.formControl}>
- <Select className={props.classes.selectWrapper}
- native
- value={props.input.value}
- onChange={props.input.onChange}
- disabled={props.meta.submitting || props.disabled}
- name={props.input.name}
- inputProps={{
- id: `id-${props.input.name}`,
- className: props.classes.select
- }}>
- {props.items.map(item => (
- <option key={item.key} value={item.key} className={props.classes.option}>
- {item.value}
- </option>
- ))}
- </Select>
- </FormControl>
- );
+export const NativeSelectField = withStyles(styles)((props: WrappedFieldProps & NativeSelectFieldProps & WithStyles<CssRules> & { items: any[] }) => (
+ <FormControl className={props.classes.formControl}>
+ <Select
+ className={props.classes.selectWrapper}
+ native
+ value={props.input.value}
+ onChange={props.input.onChange}
+ disabled={props.meta.submitting || props.disabled}
+ name={props.input.name}
+ inputProps={{
+ id: `id-${props.input.name}`,
+ className: props.classes.select,
+ }}>
+ {props.items.map(item => (
+ <option
+ key={item.key}
+ value={item.key}
+ className={props.classes.option}>
+ {item.value}
+ </option>
+ ))}
+ </Select>
+ </FormControl>
+));
interface SelectFieldProps {
children: React.ReactNode;
@@ -70,19 +73,15 @@ type SelectFieldCssRules = 'formControl';
const selectFieldStyles: StyleRulesCallback<SelectFieldCssRules> = (theme: ArvadosTheme) => ({
formControl: {
- marginBottom: theme.spacing.unit * 3
+ marginBottom: theme.spacing.unit * 3,
},
});
-export const SelectField = withStyles(selectFieldStyles)(
- (props: WrappedFieldProps & SelectFieldProps & WithStyles<SelectFieldCssRules>) =>
- <FormControl error={props.meta.invalid} className={props.classes.formControl}>
- <InputLabel>
- {props.label}
- </InputLabel>
- <Select
- {...props.input}>
- {props.children}
- </Select>
- <FormHelperText>{props.meta.error}</FormHelperText>
- </FormControl>
-);
+export const SelectField = withStyles(selectFieldStyles)((props: WrappedFieldProps & SelectFieldProps & WithStyles<SelectFieldCssRules>) => (
+ <FormControl
+ error={props.meta.invalid}
+ className={props.classes.formControl}>
+ <InputLabel>{props.label}</InputLabel>
+ <Select {...props.input}>{props.children}</Select>
+ <FormHelperText>{props.meta.error}</FormHelperText>
+ </FormControl>
+));
diff --git a/src/store/dialog/with-dialog.ts b/src/store/dialog/with-dialog.ts
index ea96ca0d..7a253860 100644
--- a/src/store/dialog/with-dialog.ts
+++ b/src/store/dialog/with-dialog.ts
@@ -18,7 +18,8 @@ export type WithDialogDispatchProps = {
};
export type WithDialogProps<T> = WithDialogStateProps<T> & WithDialogDispatchProps;
-export const withDialog = (id: string) =>
+export const withDialog =
+ (id: string) =>
// TODO: How to make compiler happy with & P instead of & any?
// eslint-disable-next-line
<T, P>(component: React.ComponentType<WithDialogProps<T> & any>) =>
@@ -26,13 +27,17 @@ export const withDialog = (id: string) =>
const emptyData = {};
-export const mapStateToProps = (id: string) => <T>(state: { dialog: DialogState }): WithDialogStateProps<T> => {
- const dialog = state.dialog[id];
- return dialog ? dialog : { open: false, data: emptyData };
-};
+export const mapStateToProps =
+ (id: string) =>
+ <T>(state: { dialog: DialogState }): WithDialogStateProps<T> => {
+ const dialog = state.dialog[id];
+ return dialog ? dialog : { open: false, data: emptyData };
+ };
-export const mapDispatchToProps = (id: string) => (dispatch: Dispatch): WithDialogDispatchProps => ({
- closeDialog: () => {
- dispatch(dialogActions.CLOSE_DIALOG({ id }));
- }
-});
+export const mapDispatchToProps =
+ (id: string) =>
+ (dispatch: Dispatch): WithDialogDispatchProps => ({
+ closeDialog: () => {
+ dispatch(dialogActions.CLOSE_DIALOG({ id }));
+ },
+ });
diff --git a/src/store/projects/project-move-actions.ts b/src/store/projects/project-move-actions.ts
index b7e38bc1..ab46e4b5 100644
--- a/src/store/projects/project-move-actions.ts
+++ b/src/store/projects/project-move-actions.ts
@@ -23,13 +23,13 @@ export const openMoveProjectDialog = (resources: Array<any>) => {
return (dispatch: Dispatch) => {
dispatch<any>(resetPickerProjectTree());
dispatch<any>(initProjectsTreePicker(PROJECT_MOVE_FORM_NAME));
- dispatch(initialize(PROJECT_MOVE_FORM_NAME, resources));
+ dispatch(initialize(PROJECT_MOVE_FORM_NAME, resources[0], undefined, resources)); //here
dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_MOVE_FORM_NAME, data: {} }));
};
};
export const moveProject = (resource: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- console.log(resource);
+ console.log('SUCCESS?', resource);
const userUuid = getUserUuid(getState());
if (!userUuid) {
return;
diff --git a/src/store/tree-picker/picker-id.tsx b/src/store/tree-picker/picker-id.tsx
index b0d5e353..5734ad70 100644
--- a/src/store/tree-picker/picker-id.tsx
+++ b/src/store/tree-picker/picker-id.tsx
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import React from 'react';
+import React from "react";
export interface PickerIdProp {
pickerId: string;
@@ -10,7 +10,12 @@ export interface PickerIdProp {
export const pickerId =
(id: string) =>
- <P extends PickerIdProp>(Component: React.ComponentType<P>) =>
- (props: P) =>
- <Component {...props} pickerId={id} />;
-
\ No newline at end of file
+ <P extends PickerIdProp>(Component: React.ComponentType<P>) =>
+ (props: P) => {
+ return (
+ <Component
+ {...props}
+ pickerId={id}
+ />
+ );
+ };
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index d369becb..ab3041ad 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -2,28 +2,28 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { Dispatch } from 'redux';
-import { RootState } from 'store/store';
-import { getUserUuid } from 'common/getuser';
-import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
-import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
-import { favoritePanelActions, loadFavoritePanel } from 'store/favorite-panel/favorite-panel-action';
+import { Dispatch } from "redux";
+import { RootState } from "store/store";
+import { getUserUuid } from "common/getuser";
+import { loadDetailsPanel } from "store/details-panel/details-panel-action";
+import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
+import { favoritePanelActions, loadFavoritePanel } from "store/favorite-panel/favorite-panel-action";
import {
getProjectPanelCurrentUuid,
openProjectPanel,
projectPanelActions,
setIsProjectPanelTrashed,
-} from 'store/project-panel/project-panel-action';
+} from "store/project-panel/project-panel-action";
import {
activateSidePanelTreeItem,
initSidePanelTree,
loadSidePanelTreeProjects,
SidePanelTreeCategory,
-} from 'store/side-panel-tree/side-panel-tree-actions';
-import { updateResources } from 'store/resources/resources-actions';
-import { projectPanelColumns } from 'views/project-panel/project-panel';
-import { favoritePanelColumns } from 'views/favorite-panel/favorite-panel';
-import { matchRootRoute } from 'routes/routes';
+} from "store/side-panel-tree/side-panel-tree-actions";
+import { updateResources } from "store/resources/resources-actions";
+import { projectPanelColumns } from "views/project-panel/project-panel";
+import { favoritePanelColumns } from "views/favorite-panel/favorite-panel";
+import { matchRootRoute } from "routes/routes";
import {
setBreadcrumbs,
setGroupDetailsBreadcrumbs,
@@ -35,73 +35,74 @@ import {
setUsersBreadcrumbs,
setMyAccountBreadcrumbs,
setUserProfileBreadcrumbs,
-} from 'store/breadcrumbs/breadcrumbs-actions';
-import { navigateTo, navigateToRootProject } from 'store/navigation/navigation-action';
-import { MoveToFormDialogData } from 'store/move-to-dialog/move-to-dialog';
-import { ServiceRepository } from 'services/services';
-import { getResource } from 'store/resources/resources';
-import * as projectCreateActions from 'store/projects/project-create-actions';
-import * as projectMoveActions from 'store/projects/project-move-actions';
-import * as projectUpdateActions from 'store/projects/project-update-actions';
-import * as collectionCreateActions from 'store/collections/collection-create-actions';
-import * as collectionCopyActions from 'store/collections/collection-copy-actions';
-import * as collectionMoveActions from 'store/collections/collection-move-actions';
-import * as processesActions from 'store/processes/processes-actions';
-import * as processMoveActions from 'store/processes/process-move-actions';
-import * as processUpdateActions from 'store/processes/process-update-actions';
-import * as processCopyActions from 'store/processes/process-copy-actions';
-import { trashPanelColumns } from 'views/trash-panel/trash-panel';
-import { loadTrashPanel, trashPanelActions } from 'store/trash-panel/trash-panel-action';
-import { loadProcessPanel } from 'store/process-panel/process-panel-actions';
-import { loadSharedWithMePanel, sharedWithMePanelActions } from 'store/shared-with-me-panel/shared-with-me-panel-actions';
-import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
-import { workflowPanelActions } from 'store/workflow-panel/workflow-panel-actions';
-import { loadSshKeysPanel } from 'store/auth/auth-action-ssh';
-import { loadLinkAccountPanel, linkAccountPanelActions } from 'store/link-account-panel/link-account-panel-actions';
-import { loadSiteManagerPanel } from 'store/auth/auth-action-session';
-import { workflowPanelColumns } from 'views/workflow-panel/workflow-panel-view';
-import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
-import { getProgressIndicator } from 'store/progress-indicator/progress-indicator-reducer';
-import { extractUuidKind, ResourceKind } from 'models/resource';
-import { FilterBuilder } from 'services/api/filter-builder';
-import { GroupContentsResource } from 'services/groups-service/groups-service';
-import { MatchCases, ofType, unionize, UnionOf } from 'common/unionize';
-import { loadRunProcessPanel } from 'store/run-process-panel/run-process-panel-actions';
-import { collectionPanelActions, loadCollectionPanel } from 'store/collection-panel/collection-panel-action';
-import { CollectionResource } from 'models/collection';
-import { WorkflowResource } from 'models/workflow';
-import { loadSearchResultsPanel, searchResultsPanelActions } from 'store/search-results-panel/search-results-panel-actions';
-import { searchResultsPanelColumns } from 'views/search-results-panel/search-results-panel-view';
-import { loadVirtualMachinesPanel } from 'store/virtual-machines/virtual-machines-actions';
-import { loadRepositoriesPanel } from 'store/repositories/repositories-actions';
-import { loadKeepServicesPanel } from 'store/keep-services/keep-services-actions';
-import { loadUsersPanel, userBindedActions } from 'store/users/users-actions';
-import * as userProfilePanelActions from 'store/user-profile/user-profile-actions';
-import { linkPanelActions, loadLinkPanel } from 'store/link-panel/link-panel-actions';
-import { linkPanelColumns } from 'views/link-panel/link-panel-root';
-import { userPanelColumns } from 'views/user-panel/user-panel';
-import { loadApiClientAuthorizationsPanel, apiClientAuthorizationsActions } from 'store/api-client-authorizations/api-client-authorizations-actions';
-import { apiClientAuthorizationPanelColumns } from 'views/api-client-authorization-panel/api-client-authorization-panel-root';
-import * as groupPanelActions from 'store/groups-panel/groups-panel-actions';
-import { groupsPanelColumns } from 'views/groups-panel/groups-panel';
-import * as groupDetailsPanelActions from 'store/group-details-panel/group-details-panel-actions';
-import { groupDetailsMembersPanelColumns, groupDetailsPermissionsPanelColumns } from 'views/group-details-panel/group-details-panel';
-import { DataTableFetchMode } from 'components/data-table/data-table';
-import { loadPublicFavoritePanel, publicFavoritePanelActions } from 'store/public-favorites-panel/public-favorites-action';
-import { publicFavoritePanelColumns } from 'views/public-favorites-panel/public-favorites-panel';
+} from "store/breadcrumbs/breadcrumbs-actions";
+import { navigateTo, navigateToRootProject } from "store/navigation/navigation-action";
+import { MoveToFormDialogData } from "store/move-to-dialog/move-to-dialog";
+import { ServiceRepository } from "services/services";
+import { getResource } from "store/resources/resources";
+import * as projectCreateActions from "store/projects/project-create-actions";
+import * as projectMoveActions from "store/projects/project-move-actions";
+import * as projectUpdateActions from "store/projects/project-update-actions";
+import * as collectionCreateActions from "store/collections/collection-create-actions";
+import * as collectionCopyActions from "store/collections/collection-copy-actions";
+import * as collectionMoveActions from "store/collections/collection-move-actions";
+import * as processesActions from "store/processes/processes-actions";
+import * as processMoveActions from "store/processes/process-move-actions";
+import * as processUpdateActions from "store/processes/process-update-actions";
+import * as processCopyActions from "store/processes/process-copy-actions";
+import { trashPanelColumns } from "views/trash-panel/trash-panel";
+import { loadTrashPanel, trashPanelActions } from "store/trash-panel/trash-panel-action";
+import { loadProcessPanel } from "store/process-panel/process-panel-actions";
+import { loadSharedWithMePanel, sharedWithMePanelActions } from "store/shared-with-me-panel/shared-with-me-panel-actions";
+import { CopyFormDialogData } from "store/copy-dialog/copy-dialog";
+import { workflowPanelActions } from "store/workflow-panel/workflow-panel-actions";
+import { loadSshKeysPanel } from "store/auth/auth-action-ssh";
+import { loadLinkAccountPanel, linkAccountPanelActions } from "store/link-account-panel/link-account-panel-actions";
+import { loadSiteManagerPanel } from "store/auth/auth-action-session";
+import { workflowPanelColumns } from "views/workflow-panel/workflow-panel-view";
+import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
+import { getProgressIndicator } from "store/progress-indicator/progress-indicator-reducer";
+import { extractUuidKind, ResourceKind } from "models/resource";
+import { FilterBuilder } from "services/api/filter-builder";
+import { GroupContentsResource } from "services/groups-service/groups-service";
+import { MatchCases, ofType, unionize, UnionOf } from "common/unionize";
+import { loadRunProcessPanel } from "store/run-process-panel/run-process-panel-actions";
+import { collectionPanelActions, loadCollectionPanel } from "store/collection-panel/collection-panel-action";
+import { CollectionResource } from "models/collection";
+import { WorkflowResource } from "models/workflow";
+import { loadSearchResultsPanel, searchResultsPanelActions } from "store/search-results-panel/search-results-panel-actions";
+import { searchResultsPanelColumns } from "views/search-results-panel/search-results-panel-view";
+import { loadVirtualMachinesPanel } from "store/virtual-machines/virtual-machines-actions";
+import { loadRepositoriesPanel } from "store/repositories/repositories-actions";
+import { loadKeepServicesPanel } from "store/keep-services/keep-services-actions";
+import { loadUsersPanel, userBindedActions } from "store/users/users-actions";
+import * as userProfilePanelActions from "store/user-profile/user-profile-actions";
+import { linkPanelActions, loadLinkPanel } from "store/link-panel/link-panel-actions";
+import { linkPanelColumns } from "views/link-panel/link-panel-root";
+import { userPanelColumns } from "views/user-panel/user-panel";
+import { loadApiClientAuthorizationsPanel, apiClientAuthorizationsActions } from "store/api-client-authorizations/api-client-authorizations-actions";
+import { apiClientAuthorizationPanelColumns } from "views/api-client-authorization-panel/api-client-authorization-panel-root";
+import * as groupPanelActions from "store/groups-panel/groups-panel-actions";
+import { groupsPanelColumns } from "views/groups-panel/groups-panel";
+import * as groupDetailsPanelActions from "store/group-details-panel/group-details-panel-actions";
+import { groupDetailsMembersPanelColumns, groupDetailsPermissionsPanelColumns } from "views/group-details-panel/group-details-panel";
+import { DataTableFetchMode } from "components/data-table/data-table";
+import { loadPublicFavoritePanel, publicFavoritePanelActions } from "store/public-favorites-panel/public-favorites-action";
+import { publicFavoritePanelColumns } from "views/public-favorites-panel/public-favorites-panel";
import {
loadCollectionsContentAddressPanel,
collectionsContentAddressActions,
-} from 'store/collections-content-address-panel/collections-content-address-panel-actions';
-import { collectionContentAddressPanelColumns } from 'views/collection-content-address-panel/collection-content-address-panel';
-import { subprocessPanelActions } from 'store/subprocess-panel/subprocess-panel-actions';
-import { subprocessPanelColumns } from 'views/subprocess-panel/subprocess-panel-root';
-import { loadAllProcessesPanel, allProcessesPanelActions } from '../all-processes-panel/all-processes-panel-action';
-import { allProcessesPanelColumns } from 'views/all-processes-panel/all-processes-panel';
-import { AdminMenuIcon } from 'components/icon/icon';
-import { userProfileGroupsColumns } from 'views/user-profile-panel/user-profile-panel-root';
-
-export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
+} from "store/collections-content-address-panel/collections-content-address-panel-actions";
+import { collectionContentAddressPanelColumns } from "views/collection-content-address-panel/collection-content-address-panel";
+import { subprocessPanelActions } from "store/subprocess-panel/subprocess-panel-actions";
+import { subprocessPanelColumns } from "views/subprocess-panel/subprocess-panel-root";
+import { loadAllProcessesPanel, allProcessesPanelActions } from "../all-processes-panel/all-processes-panel-action";
+import { allProcessesPanelColumns } from "views/all-processes-panel/all-processes-panel";
+import { AdminMenuIcon } from "components/icon/icon";
+import { userProfileGroupsColumns } from "views/user-profile-panel/user-profile-panel-root";
+import { selectedToArray } from "components/multiselectToolbar/MultiselectToolbar";
+
+export const WORKBENCH_LOADING_SCREEN = "workbenchLoadingScreen";
export const isWorkbenchLoading = (state: RootState) => {
const progress = getProgressIndicator(WORKBENCH_LOADING_SCREEN)(state.progressIndicator);
@@ -267,7 +268,7 @@ export const createProject = (data: projectCreateActions.ProjectCreateFormDialog
if (newProject) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Project has been successfully created.',
+ message: "Project has been successfully created.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -278,32 +279,83 @@ export const createProject = (data: projectCreateActions.ProjectCreateFormDialog
};
export const moveProject = (data: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- try {
- const oldProject = getResource(data.uuid)(getState().resources);
- const oldOwnerUuid = oldProject ? oldProject.ownerUuid : '';
- const movedProject = await dispatch<any>(projectMoveActions.moveProject(data));
- if (movedProject) {
+ console.log("moveProject---");
+ console.log("moveProject:", data);
+ // const currentState = getState();
+ // console.log('current', currentState.multiselect.checkedList);
+ const projectsToMove = selectedToArray(getState().multiselect.checkedList);
+ // console.log("resource?", getResource(projectsToMove[0])(getState().resources));
+ const sourceUuid = getResource(projectsToMove[0])(getState().resources)?.ownerUuid;
+ const destinationUuid = data.ownerUuid;
+
+ for (const project of projectsToMove) {
+ await moveSingleProject(project);
+ }
+
+ async function moveSingleProject(projectUuid) {
+ try {
+ // const oldProject = getResource(projectUuid)(getState().resources);
+ const originalProject = getResource(projectUuid)(getState().resources) as any;
+ const oldProject = { ...originalProject, ownerUuid: data.ownerUuid } as any;
+ // const { name, uuid, ownerUuid } = getResource(projectUuid)(getState().resources) as any;
+ // const oldProject: MoveToFormDialogData = { name, uuid, ownerUuid };
+ console.log("oldProject", oldProject, data);
+ const oldOwnerUuid = oldProject ? oldProject.ownerUuid : "";
+ const movedProject = await dispatch<any>(projectMoveActions.moveProject(oldProject));
+ if (movedProject) {
+ console.log("movedProject", movedProject);
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: "Project has been moved",
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ // if (oldProject) {
+ // await dispatch<any>(loadSidePanelTreeProjects(oldProject.ownerUuid));
+ // await dispatch<any>(loadSidePanelTreeProjects(originalProject.ownerUuid));
+ // }
+ await dispatch<any>(reloadProjectMatchingUuid([oldOwnerUuid, movedProject.ownerUuid, movedProject.uuid]));
+ }
+ } catch (e) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Project has been moved',
+ message: e.message,
hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
+ kind: SnackbarKind.ERROR,
})
);
- if (oldProject) {
- await dispatch<any>(loadSidePanelTreeProjects(oldProject.ownerUuid));
- }
- dispatch<any>(reloadProjectMatchingUuid([oldOwnerUuid, movedProject.ownerUuid, movedProject.uuid]));
}
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
}
+ if (sourceUuid) await dispatch<any>(loadSidePanelTreeProjects(sourceUuid));
+ await dispatch<any>(loadSidePanelTreeProjects(destinationUuid));
+
+ // try {
+ // const oldProject = getResource(data.uuid)(getState().resources);
+ // const oldOwnerUuid = oldProject ? oldProject.ownerUuid : '';
+ // const movedProject = await dispatch<any>(projectMoveActions.moveProject(data));
+ // if (movedProject) {
+ // dispatch(
+ // snackbarActions.OPEN_SNACKBAR({
+ // message: 'Project has been moved',
+ // hideDuration: 2000,
+ // kind: SnackbarKind.SUCCESS,
+ // })
+ // );
+ // if (oldProject) {
+ // await dispatch<any>(loadSidePanelTreeProjects(oldProject.ownerUuid));
+ // }
+ // dispatch<any>(reloadProjectMatchingUuid([oldOwnerUuid, movedProject.ownerUuid, movedProject.uuid]));
+ // }
+ // } catch (e) {
+ // dispatch(
+ // snackbarActions.OPEN_SNACKBAR({
+ // message: e.message,
+ // hideDuration: 2000,
+ // kind: SnackbarKind.ERROR,
+ // })
+ // );
+ // }
};
export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialogData) => async (dispatch: Dispatch) => {
@@ -311,7 +363,7 @@ export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialog
if (updatedProject) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Project has been successfully updated.',
+ message: "Project has been successfully updated.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -326,7 +378,7 @@ export const updateGroup = (data: projectUpdateActions.ProjectUpdateFormDialogDa
if (updatedGroup) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Group has been successfully updated.',
+ message: "Group has been successfully updated.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -351,20 +403,20 @@ export const loadCollection = (uuid: string) =>
| undefined;
let sidepanel: string | undefined;
match({
- OWNED: (thecollection) => {
+ OWNED: thecollection => {
collection = thecollection as CollectionResource;
sidepanel = collection.ownerUuid;
breadcrumbfunc = setSidePanelBreadcrumbs;
},
- SHARED: (thecollection) => {
+ SHARED: thecollection => {
collection = thecollection as CollectionResource;
sidepanel = collection.ownerUuid;
breadcrumbfunc = setSharedWithMeBreadcrumbs;
},
- TRASHED: (thecollection) => {
+ TRASHED: thecollection => {
collection = thecollection as CollectionResource;
sidepanel = SidePanelTreeCategory.TRASH;
- breadcrumbfunc = () => setTrashBreadcrumbs('');
+ breadcrumbfunc = () => setTrashBreadcrumbs("");
},
});
if (collection && breadcrumbfunc && sidepanel) {
@@ -383,7 +435,7 @@ export const createCollection = (data: collectionCreateActions.CollectionCreateF
if (collection) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Collection has been successfully created.',
+ message: "Collection has been successfully created.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -401,7 +453,7 @@ export const copyCollection = (data: CopyFormDialogData) => async (dispatch: Dis
dispatch<any>(reloadProjectMatchingUuid([copyToProject.uuid]));
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Collection has been copied.',
+ message: "Collection has been copied.",
hideDuration: 3000,
kind: SnackbarKind.SUCCESS,
link: collection.ownerUuid,
@@ -426,7 +478,7 @@ export const moveCollection = (data: MoveToFormDialogData) => async (dispatch: D
dispatch<any>(reloadProjectMatchingUuid([collection.ownerUuid]));
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Collection has been moved.',
+ message: "Collection has been moved.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -468,11 +520,11 @@ export const loadRegisteredWorkflow = (uuid: string) =>
| ((uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => Promise<void>)
| undefined;
match({
- OWNED: async (theworkflow) => {
+ OWNED: async theworkflow => {
workflow = theworkflow as WorkflowResource;
breadcrumbfunc = setSidePanelBreadcrumbs;
},
- SHARED: async (theworkflow) => {
+ SHARED: async theworkflow => {
workflow = theworkflow as WorkflowResource;
breadcrumbfunc = setSharedWithMeBreadcrumbs;
},
@@ -493,7 +545,7 @@ export const updateProcess = (data: processUpdateActions.ProcessUpdateFormDialog
if (process) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Process has been successfully updated.',
+ message: "Process has been successfully updated.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -519,7 +571,7 @@ export const moveProcess = (data: MoveToFormDialogData) => async (dispatch: Disp
dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Process has been moved.',
+ message: "Process has been moved.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -542,7 +594,7 @@ export const copyProcess = (data: CopyFormDialogData) => async (dispatch: Dispat
dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
dispatch(
snackbarActions.OPEN_SNACKBAR({
- message: 'Process has been copied.',
+ message: "Process has been copied.",
hideDuration: 2000,
kind: SnackbarKind.SUCCESS,
})
@@ -566,19 +618,19 @@ export const resourceIsNotLoaded = (uuid: string) =>
});
export const userIsNotAuthenticated = snackbarActions.OPEN_SNACKBAR({
- message: 'User is not authenticated',
+ message: "User is not authenticated",
kind: SnackbarKind.ERROR,
});
export const couldNotLoadUser = snackbarActions.OPEN_SNACKBAR({
- message: 'Could not load user',
+ message: "Could not load user",
kind: SnackbarKind.ERROR,
});
export const reloadProjectMatchingUuid =
(matchingUuids: string[]) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const currentProjectPanelUuid = getProjectPanelCurrentUuid(getState());
- if (currentProjectPanelUuid && matchingUuids.some((uuid) => uuid === currentProjectPanelUuid)) {
+ if (currentProjectPanelUuid && matchingUuids.some(uuid => uuid === currentProjectPanelUuid)) {
dispatch<any>(loadProject(currentProjectPanelUuid));
}
};
@@ -610,17 +662,17 @@ export const loadLinks = handleFirstTimeLoad(async (dispatch: Dispatch<any>) =>
export const loadVirtualMachines = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
await dispatch(loadVirtualMachinesPanel());
- dispatch(setBreadcrumbs([{ label: 'Virtual Machines' }]));
+ dispatch(setBreadcrumbs([{ label: "Virtual Machines" }]));
});
export const loadVirtualMachinesAdmin = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
await dispatch(loadVirtualMachinesPanel());
- dispatch(setBreadcrumbs([{ label: 'Virtual Machines Admin', icon: AdminMenuIcon }]));
+ dispatch(setBreadcrumbs([{ label: "Virtual Machines Admin", icon: AdminMenuIcon }]));
});
export const loadRepositories = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
await dispatch(loadRepositoriesPanel());
- dispatch(setBreadcrumbs([{ label: 'Repositories' }]));
+ dispatch(setBreadcrumbs([{ label: "Repositories" }]));
});
export const loadSshKeys = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
@@ -671,16 +723,16 @@ export const loadGroupDetailsPanel = (groupUuid: string) =>
});
const finishLoadingProject = (project: GroupContentsResource | string) => async (dispatch: Dispatch<any>) => {
- const uuid = typeof project === 'string' ? project : project.uuid;
+ const uuid = typeof project === "string" ? project : project.uuid;
dispatch(openProjectPanel(uuid));
dispatch(loadDetailsPanel(uuid));
- if (typeof project !== 'string') {
+ if (typeof project !== "string") {
dispatch(updateResources([project]));
}
};
const loadGroupContentsResource = async (params: { uuid: string; userUuid: string; services: ServiceRepository }) => {
- const filters = new FilterBuilder().addEqual('uuid', params.uuid).getFilters();
+ const filters = new FilterBuilder().addEqual("uuid", params.uuid).getFilters();
const { items } = await params.services.groupsService.contents(params.userUuid, {
filters,
recursive: true,
@@ -705,7 +757,7 @@ const loadGroupContentsResource = async (params: { uuid: string; userUuid: strin
} else if (kind === ResourceKind.CONTAINER_REQUEST) {
resource = await params.services.containerRequestService.get(params.uuid);
} else {
- throw new Error('loadGroupContentsResource unsupported kind ' + kind);
+ throw new Error("loadGroupContentsResource unsupported kind " + kind);
}
handler = groupContentsHandlers.SHARED(resource);
}
commit 4cfc0ca7c782696ffb92337e3be9fbe3ed43a360
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Thu Aug 24 14:59:06 2023 -0400
15768: initial Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/store/projects/project-move-actions.ts b/src/store/projects/project-move-actions.ts
index 963070ca..b7e38bc1 100644
--- a/src/store/projects/project-move-actions.ts
+++ b/src/store/projects/project-move-actions.ts
@@ -2,13 +2,13 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { Dispatch } from "redux";
-import { dialogActions } from "store/dialog/dialog-actions";
+import { Dispatch } from 'redux';
+import { dialogActions } from 'store/dialog/dialog-actions';
import { startSubmit, stopSubmit, initialize, FormErrors } from 'redux-form';
import { ServiceRepository } from 'services/services';
import { RootState } from 'store/store';
-import { getUserUuid } from "common/getuser";
-import { getCommonResourceServiceError, CommonResourceServiceError } from "services/common-service/common-resource-service";
+import { getUserUuid } from 'common/getuser';
+import { getCommonResourceServiceError, CommonResourceServiceError } from 'services/common-service/common-resource-service';
import { MoveToFormDialogData } from 'store/move-to-dialog/move-to-dialog';
import { resetPickerProjectTree } from 'store/project-tree-picker/project-tree-picker-actions';
import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions';
@@ -17,35 +17,42 @@ import { loadSidePanelTreeProjects } from '../side-panel-tree/side-panel-tree-ac
export const PROJECT_MOVE_FORM_NAME = 'projectMoveFormName';
-export const openMoveProjectDialog = (resource: { name: string, uuid: string }) =>
- (dispatch: Dispatch) => {
+// export const openMoveProjectDialog = (resource: { name: string; uuid: string }) => {
+// console.log(resource);
+export const openMoveProjectDialog = (resources: Array<any>) => {
+ return (dispatch: Dispatch) => {
dispatch<any>(resetPickerProjectTree());
dispatch<any>(initProjectsTreePicker(PROJECT_MOVE_FORM_NAME));
- dispatch(initialize(PROJECT_MOVE_FORM_NAME, resource));
+ dispatch(initialize(PROJECT_MOVE_FORM_NAME, resources));
dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_MOVE_FORM_NAME, data: {} }));
};
+};
-export const moveProject = (resource: MoveToFormDialogData) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const userUuid = getUserUuid(getState());
- if (!userUuid) { return; }
- dispatch(startSubmit(PROJECT_MOVE_FORM_NAME));
- try {
- const newProject = await services.projectService.update(resource.uuid, { ownerUuid: resource.ownerUuid });
- dispatch(projectPanelActions.REQUEST_ITEMS());
+export const moveProject = (resource: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ console.log(resource);
+ const userUuid = getUserUuid(getState());
+ if (!userUuid) {
+ return;
+ }
+ dispatch(startSubmit(PROJECT_MOVE_FORM_NAME));
+ try {
+ const newProject = await services.projectService.update(resource.uuid, { ownerUuid: resource.ownerUuid });
+ dispatch(projectPanelActions.REQUEST_ITEMS());
+ dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_MOVE_FORM_NAME }));
+ await dispatch<any>(loadSidePanelTreeProjects(userUuid));
+ return newProject;
+ } catch (e) {
+ const error = getCommonResourceServiceError(e);
+ if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
+ dispatch(
+ stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: 'A project with the same name already exists in the target project.' } as FormErrors)
+ );
+ } else if (error === CommonResourceServiceError.OWNERSHIP_CYCLE) {
+ dispatch(stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: 'Cannot move a project into itself.' } as FormErrors));
+ } else {
dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_MOVE_FORM_NAME }));
- await dispatch<any>(loadSidePanelTreeProjects(userUuid));
- return newProject;
- } catch (e) {
- const error = getCommonResourceServiceError(e);
- if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
- dispatch(stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: 'A project with the same name already exists in the target project.' } as FormErrors));
- } else if (error === CommonResourceServiceError.OWNERSHIP_CYCLE) {
- dispatch(stopSubmit(PROJECT_MOVE_FORM_NAME, { ownerUuid: 'Cannot move a project into itself.' } as FormErrors));
- } else {
- dispatch(dialogActions.CLOSE_DIALOG({ id: PROJECT_MOVE_FORM_NAME }));
- throw new Error('Could not move the project.');
- }
- return;
+ throw new Error('Could not move the project.');
}
- };
+ return;
+ }
+};
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index 52433779..d369becb 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -7,10 +7,7 @@ import { RootState } from 'store/store';
import { getUserUuid } from 'common/getuser';
import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
-import {
- favoritePanelActions,
- loadFavoritePanel,
-} from 'store/favorite-panel/favorite-panel-action';
+import { favoritePanelActions, loadFavoritePanel } from 'store/favorite-panel/favorite-panel-action';
import {
getProjectPanelCurrentUuid,
openProjectPanel,
@@ -39,10 +36,7 @@ import {
setMyAccountBreadcrumbs,
setUserProfileBreadcrumbs,
} from 'store/breadcrumbs/breadcrumbs-actions';
-import {
- navigateTo,
- navigateToRootProject,
-} from 'store/navigation/navigation-action';
+import { navigateTo, navigateToRootProject } from 'store/navigation/navigation-action';
import { MoveToFormDialogData } from 'store/move-to-dialog/move-to-dialog';
import { ServiceRepository } from 'services/services';
import { getResource } from 'store/resources/resources';
@@ -57,22 +51,13 @@ import * as processMoveActions from 'store/processes/process-move-actions';
import * as processUpdateActions from 'store/processes/process-update-actions';
import * as processCopyActions from 'store/processes/process-copy-actions';
import { trashPanelColumns } from 'views/trash-panel/trash-panel';
-import {
- loadTrashPanel,
- trashPanelActions,
-} from 'store/trash-panel/trash-panel-action';
+import { loadTrashPanel, trashPanelActions } from 'store/trash-panel/trash-panel-action';
import { loadProcessPanel } from 'store/process-panel/process-panel-actions';
-import {
- loadSharedWithMePanel,
- sharedWithMePanelActions,
-} from 'store/shared-with-me-panel/shared-with-me-panel-actions';
+import { loadSharedWithMePanel, sharedWithMePanelActions } from 'store/shared-with-me-panel/shared-with-me-panel-actions';
import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
import { workflowPanelActions } from 'store/workflow-panel/workflow-panel-actions';
import { loadSshKeysPanel } from 'store/auth/auth-action-ssh';
-import {
- loadLinkAccountPanel,
- linkAccountPanelActions,
-} from 'store/link-account-panel/link-account-panel-actions';
+import { loadLinkAccountPanel, linkAccountPanelActions } from 'store/link-account-panel/link-account-panel-actions';
import { loadSiteManagerPanel } from 'store/auth/auth-action-session';
import { workflowPanelColumns } from 'views/workflow-panel/workflow-panel-view';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
@@ -82,45 +67,27 @@ import { FilterBuilder } from 'services/api/filter-builder';
import { GroupContentsResource } from 'services/groups-service/groups-service';
import { MatchCases, ofType, unionize, UnionOf } from 'common/unionize';
import { loadRunProcessPanel } from 'store/run-process-panel/run-process-panel-actions';
-import {
- collectionPanelActions,
- loadCollectionPanel,
-} from 'store/collection-panel/collection-panel-action';
+import { collectionPanelActions, loadCollectionPanel } from 'store/collection-panel/collection-panel-action';
import { CollectionResource } from 'models/collection';
import { WorkflowResource } from 'models/workflow';
-import {
- loadSearchResultsPanel,
- searchResultsPanelActions,
-} from 'store/search-results-panel/search-results-panel-actions';
+import { loadSearchResultsPanel, searchResultsPanelActions } from 'store/search-results-panel/search-results-panel-actions';
import { searchResultsPanelColumns } from 'views/search-results-panel/search-results-panel-view';
import { loadVirtualMachinesPanel } from 'store/virtual-machines/virtual-machines-actions';
import { loadRepositoriesPanel } from 'store/repositories/repositories-actions';
import { loadKeepServicesPanel } from 'store/keep-services/keep-services-actions';
import { loadUsersPanel, userBindedActions } from 'store/users/users-actions';
import * as userProfilePanelActions from 'store/user-profile/user-profile-actions';
-import {
- linkPanelActions,
- loadLinkPanel,
-} from 'store/link-panel/link-panel-actions';
+import { linkPanelActions, loadLinkPanel } from 'store/link-panel/link-panel-actions';
import { linkPanelColumns } from 'views/link-panel/link-panel-root';
import { userPanelColumns } from 'views/user-panel/user-panel';
-import {
- loadApiClientAuthorizationsPanel,
- apiClientAuthorizationsActions,
-} from 'store/api-client-authorizations/api-client-authorizations-actions';
+import { loadApiClientAuthorizationsPanel, apiClientAuthorizationsActions } from 'store/api-client-authorizations/api-client-authorizations-actions';
import { apiClientAuthorizationPanelColumns } from 'views/api-client-authorization-panel/api-client-authorization-panel-root';
import * as groupPanelActions from 'store/groups-panel/groups-panel-actions';
import { groupsPanelColumns } from 'views/groups-panel/groups-panel';
import * as groupDetailsPanelActions from 'store/group-details-panel/group-details-panel-actions';
-import {
- groupDetailsMembersPanelColumns,
- groupDetailsPermissionsPanelColumns,
-} from 'views/group-details-panel/group-details-panel';
+import { groupDetailsMembersPanelColumns, groupDetailsPermissionsPanelColumns } from 'views/group-details-panel/group-details-panel';
import { DataTableFetchMode } from 'components/data-table/data-table';
-import {
- loadPublicFavoritePanel,
- publicFavoritePanelActions,
-} from 'store/public-favorites-panel/public-favorites-action';
+import { loadPublicFavoritePanel, publicFavoritePanelActions } from 'store/public-favorites-panel/public-favorites-action';
import { publicFavoritePanelColumns } from 'views/public-favorites-panel/public-favorites-panel';
import {
loadCollectionsContentAddressPanel,
@@ -129,10 +96,7 @@ import {
import { collectionContentAddressPanelColumns } from 'views/collection-content-address-panel/collection-content-address-panel';
import { subprocessPanelActions } from 'store/subprocess-panel/subprocess-panel-actions';
import { subprocessPanelColumns } from 'views/subprocess-panel/subprocess-panel-root';
-import {
- loadAllProcessesPanel,
- allProcessesPanelActions,
-} from '../all-processes-panel/all-processes-panel-action';
+import { loadAllProcessesPanel, allProcessesPanelActions } from '../all-processes-panel/all-processes-panel-action';
import { allProcessesPanelColumns } from 'views/all-processes-panel/all-processes-panel';
import { AdminMenuIcon } from 'components/icon/icon';
import { userProfileGroupsColumns } from 'views/user-profile-panel/user-profile-panel-root';
@@ -140,121 +104,99 @@ import { userProfileGroupsColumns } from 'views/user-profile-panel/user-profile-
export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
export const isWorkbenchLoading = (state: RootState) => {
- const progress = getProgressIndicator(WORKBENCH_LOADING_SCREEN)(
- state.progressIndicator
- );
+ const progress = getProgressIndicator(WORKBENCH_LOADING_SCREEN)(state.progressIndicator);
return progress ? progress.working : false;
};
-export const handleFirstTimeLoad =
- (action: any) =>
- async (dispatch: Dispatch<any>, getState: () => RootState) => {
- try {
- await dispatch(action);
- } finally {
- if (isWorkbenchLoading(getState())) {
- dispatch(
- progressIndicatorActions.STOP_WORKING(WORKBENCH_LOADING_SCREEN)
- );
- }
- }
- };
-
-export const loadWorkbench =
- () =>
- async (
- dispatch: Dispatch,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- dispatch(progressIndicatorActions.START_WORKING(WORKBENCH_LOADING_SCREEN));
- const { auth, router } = getState();
- const { user } = auth;
- if (user) {
- dispatch(
- projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns })
- );
- dispatch(
- favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns })
- );
- dispatch(
- allProcessesPanelActions.SET_COLUMNS({
- columns: allProcessesPanelColumns,
- })
- );
- dispatch(
- publicFavoritePanelActions.SET_COLUMNS({
- columns: publicFavoritePanelColumns,
- })
- );
- dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns }));
- dispatch(
- sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns })
- );
- dispatch(
- workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns })
- );
- dispatch(
- searchResultsPanelActions.SET_FETCH_MODE({
- fetchMode: DataTableFetchMode.INFINITE,
- })
- );
- dispatch(
- searchResultsPanelActions.SET_COLUMNS({
- columns: searchResultsPanelColumns,
- })
- );
- dispatch(userBindedActions.SET_COLUMNS({ columns: userPanelColumns }));
- dispatch(
- groupPanelActions.GroupsPanelActions.SET_COLUMNS({
- columns: groupsPanelColumns,
- })
- );
- dispatch(
- groupDetailsPanelActions.GroupMembersPanelActions.SET_COLUMNS({
- columns: groupDetailsMembersPanelColumns,
- })
- );
- dispatch(
- groupDetailsPanelActions.GroupPermissionsPanelActions.SET_COLUMNS({
- columns: groupDetailsPermissionsPanelColumns,
- })
- );
- dispatch(
- userProfilePanelActions.UserProfileGroupsActions.SET_COLUMNS({
- columns: userProfileGroupsColumns,
- })
- );
- dispatch(linkPanelActions.SET_COLUMNS({ columns: linkPanelColumns }));
- dispatch(
- apiClientAuthorizationsActions.SET_COLUMNS({
- columns: apiClientAuthorizationPanelColumns,
- })
- );
- dispatch(
- collectionsContentAddressActions.SET_COLUMNS({
- columns: collectionContentAddressPanelColumns,
- })
- );
- dispatch(
- subprocessPanelActions.SET_COLUMNS({ columns: subprocessPanelColumns })
- );
-
- if (services.linkAccountService.getAccountToLink()) {
- dispatch(linkAccountPanelActions.HAS_SESSION_DATA());
- }
-
- dispatch<any>(initSidePanelTree());
- if (router.location) {
- const match = matchRootRoute(router.location.pathname);
- if (match) {
- dispatch<any>(navigateToRootProject);
- }
- }
- } else {
- dispatch(userIsNotAuthenticated);
+export const handleFirstTimeLoad = (action: any) => async (dispatch: Dispatch<any>, getState: () => RootState) => {
+ try {
+ await dispatch(action);
+ } finally {
+ if (isWorkbenchLoading(getState())) {
+ dispatch(progressIndicatorActions.STOP_WORKING(WORKBENCH_LOADING_SCREEN));
+ }
+ }
+};
+
+export const loadWorkbench = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ dispatch(progressIndicatorActions.START_WORKING(WORKBENCH_LOADING_SCREEN));
+ const { auth, router } = getState();
+ const { user } = auth;
+ if (user) {
+ dispatch(projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns }));
+ dispatch(favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns }));
+ dispatch(
+ allProcessesPanelActions.SET_COLUMNS({
+ columns: allProcessesPanelColumns,
+ })
+ );
+ dispatch(
+ publicFavoritePanelActions.SET_COLUMNS({
+ columns: publicFavoritePanelColumns,
+ })
+ );
+ dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns }));
+ dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns }));
+ dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns }));
+ dispatch(
+ searchResultsPanelActions.SET_FETCH_MODE({
+ fetchMode: DataTableFetchMode.INFINITE,
+ })
+ );
+ dispatch(
+ searchResultsPanelActions.SET_COLUMNS({
+ columns: searchResultsPanelColumns,
+ })
+ );
+ dispatch(userBindedActions.SET_COLUMNS({ columns: userPanelColumns }));
+ dispatch(
+ groupPanelActions.GroupsPanelActions.SET_COLUMNS({
+ columns: groupsPanelColumns,
+ })
+ );
+ dispatch(
+ groupDetailsPanelActions.GroupMembersPanelActions.SET_COLUMNS({
+ columns: groupDetailsMembersPanelColumns,
+ })
+ );
+ dispatch(
+ groupDetailsPanelActions.GroupPermissionsPanelActions.SET_COLUMNS({
+ columns: groupDetailsPermissionsPanelColumns,
+ })
+ );
+ dispatch(
+ userProfilePanelActions.UserProfileGroupsActions.SET_COLUMNS({
+ columns: userProfileGroupsColumns,
+ })
+ );
+ dispatch(linkPanelActions.SET_COLUMNS({ columns: linkPanelColumns }));
+ dispatch(
+ apiClientAuthorizationsActions.SET_COLUMNS({
+ columns: apiClientAuthorizationPanelColumns,
+ })
+ );
+ dispatch(
+ collectionsContentAddressActions.SET_COLUMNS({
+ columns: collectionContentAddressPanelColumns,
+ })
+ );
+ dispatch(subprocessPanelActions.SET_COLUMNS({ columns: subprocessPanelColumns }));
+
+ if (services.linkAccountService.getAccountToLink()) {
+ dispatch(linkAccountPanelActions.HAS_SESSION_DATA());
+ }
+
+ dispatch<any>(initSidePanelTree());
+ if (router.location) {
+ const match = matchRootRoute(router.location.pathname);
+ if (match) {
+ dispatch<any>(navigateToRootProject);
}
- };
+ }
+ } else {
+ dispatch(userIsNotAuthenticated);
+ }
+};
export const loadFavorites = () =>
handleFirstTimeLoad((dispatch: Dispatch) => {
@@ -263,11 +205,9 @@ export const loadFavorites = () =>
dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.FAVORITES));
});
-export const loadCollectionContentAddress = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadCollectionsContentAddressPanel());
- }
-);
+export const loadCollectionContentAddress = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadCollectionsContentAddressPanel());
+});
export const loadTrash = () =>
handleFirstTimeLoad((dispatch: Dispatch) => {
@@ -278,296 +218,229 @@ export const loadTrash = () =>
export const loadAllProcesses = () =>
handleFirstTimeLoad((dispatch: Dispatch) => {
- dispatch<any>(
- activateSidePanelTreeItem(SidePanelTreeCategory.ALL_PROCESSES)
- );
+ dispatch<any>(activateSidePanelTreeItem(SidePanelTreeCategory.ALL_PROCESSES));
dispatch<any>(loadAllProcessesPanel());
dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.ALL_PROCESSES));
});
export const loadProject = (uuid: string) =>
- handleFirstTimeLoad(
- async (
- dispatch: Dispatch<any>,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- const userUuid = getUserUuid(getState());
- dispatch(setIsProjectPanelTrashed(false));
- if (!userUuid) {
- return;
- }
- if (extractUuidKind(uuid) === ResourceKind.USER && userUuid !== uuid) {
- // Load another users home projects
- dispatch(finishLoadingProject(uuid));
- } else if (userUuid !== uuid) {
- await dispatch(finishLoadingProject(uuid));
- const match = await loadGroupContentsResource({
- uuid,
- userUuid,
- services,
- });
- match({
- OWNED: async () => {
- await dispatch(activateSidePanelTreeItem(uuid));
- dispatch<any>(setSidePanelBreadcrumbs(uuid));
- },
- SHARED: async () => {
- await dispatch(activateSidePanelTreeItem(uuid));
- dispatch<any>(setSharedWithMeBreadcrumbs(uuid));
- },
- TRASHED: async () => {
- await dispatch(
- activateSidePanelTreeItem(SidePanelTreeCategory.TRASH)
- );
- dispatch<any>(setTrashBreadcrumbs(uuid));
- dispatch(setIsProjectPanelTrashed(true));
- },
- });
- } else {
- await dispatch(finishLoadingProject(userUuid));
- await dispatch(activateSidePanelTreeItem(userUuid));
- dispatch<any>(setSidePanelBreadcrumbs(userUuid));
- }
+ handleFirstTimeLoad(async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+ const userUuid = getUserUuid(getState());
+ dispatch(setIsProjectPanelTrashed(false));
+ if (!userUuid) {
+ return;
+ }
+ if (extractUuidKind(uuid) === ResourceKind.USER && userUuid !== uuid) {
+ // Load another users home projects
+ dispatch(finishLoadingProject(uuid));
+ } else if (userUuid !== uuid) {
+ await dispatch(finishLoadingProject(uuid));
+ const match = await loadGroupContentsResource({
+ uuid,
+ userUuid,
+ services,
+ });
+ match({
+ OWNED: async () => {
+ await dispatch(activateSidePanelTreeItem(uuid));
+ dispatch<any>(setSidePanelBreadcrumbs(uuid));
+ },
+ SHARED: async () => {
+ await dispatch(activateSidePanelTreeItem(uuid));
+ dispatch<any>(setSharedWithMeBreadcrumbs(uuid));
+ },
+ TRASHED: async () => {
+ await dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH));
+ dispatch<any>(setTrashBreadcrumbs(uuid));
+ dispatch(setIsProjectPanelTrashed(true));
+ },
+ });
+ } else {
+ await dispatch(finishLoadingProject(userUuid));
+ await dispatch(activateSidePanelTreeItem(userUuid));
+ dispatch<any>(setSidePanelBreadcrumbs(userUuid));
}
- );
+ });
-export const createProject =
- (data: projectCreateActions.ProjectCreateFormDialogData) =>
- async (dispatch: Dispatch) => {
- const newProject = await dispatch<any>(
- projectCreateActions.createProject(data)
- );
- if (newProject) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Project has been successfully created.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- await dispatch<any>(loadSidePanelTreeProjects(newProject.ownerUuid));
- dispatch<any>(navigateTo(newProject.uuid));
- }
- };
-
-export const moveProject =
- (data: MoveToFormDialogData) =>
- async (
- dispatch: Dispatch,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- try {
- const oldProject = getResource(data.uuid)(getState().resources);
- const oldOwnerUuid = oldProject ? oldProject.ownerUuid : '';
- const movedProject = await dispatch<any>(
- projectMoveActions.moveProject(data)
- );
- if (movedProject) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Project has been moved',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- if (oldProject) {
- await dispatch<any>(loadSidePanelTreeProjects(oldProject.ownerUuid));
- }
- dispatch<any>(
- reloadProjectMatchingUuid([
- oldOwnerUuid,
- movedProject.ownerUuid,
- movedProject.uuid,
- ])
- );
- }
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
- }
- };
+export const createProject = (data: projectCreateActions.ProjectCreateFormDialogData) => async (dispatch: Dispatch) => {
+ const newProject = await dispatch<any>(projectCreateActions.createProject(data));
+ if (newProject) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Project has been successfully created.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ await dispatch<any>(loadSidePanelTreeProjects(newProject.ownerUuid));
+ dispatch<any>(navigateTo(newProject.uuid));
+ }
+};
-export const updateProject =
- (data: projectUpdateActions.ProjectUpdateFormDialogData) =>
- async (dispatch: Dispatch) => {
- const updatedProject = await dispatch<any>(
- projectUpdateActions.updateProject(data)
+export const moveProject = (data: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ const oldProject = getResource(data.uuid)(getState().resources);
+ const oldOwnerUuid = oldProject ? oldProject.ownerUuid : '';
+ const movedProject = await dispatch<any>(projectMoveActions.moveProject(data));
+ if (movedProject) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Project has been moved',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
);
- if (updatedProject) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Project has been successfully updated.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- await dispatch<any>(loadSidePanelTreeProjects(updatedProject.ownerUuid));
- dispatch<any>(
- reloadProjectMatchingUuid([
- updatedProject.ownerUuid,
- updatedProject.uuid,
- ])
- );
+ if (oldProject) {
+ await dispatch<any>(loadSidePanelTreeProjects(oldProject.ownerUuid));
}
- };
+ dispatch<any>(reloadProjectMatchingUuid([oldOwnerUuid, movedProject.ownerUuid, movedProject.uuid]));
+ }
+ } catch (e) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: e.message,
+ hideDuration: 2000,
+ kind: SnackbarKind.ERROR,
+ })
+ );
+ }
+};
-export const updateGroup =
- (data: projectUpdateActions.ProjectUpdateFormDialogData) =>
- async (dispatch: Dispatch) => {
- const updatedGroup = await dispatch<any>(
- groupPanelActions.updateGroup(data)
- );
- if (updatedGroup) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Group has been successfully updated.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- await dispatch<any>(loadSidePanelTreeProjects(updatedGroup.ownerUuid));
- dispatch<any>(
- reloadProjectMatchingUuid([updatedGroup.ownerUuid, updatedGroup.uuid])
- );
- }
- };
+export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialogData) => async (dispatch: Dispatch) => {
+ const updatedProject = await dispatch<any>(projectUpdateActions.updateProject(data));
+ if (updatedProject) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Project has been successfully updated.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ await dispatch<any>(loadSidePanelTreeProjects(updatedProject.ownerUuid));
+ dispatch<any>(reloadProjectMatchingUuid([updatedProject.ownerUuid, updatedProject.uuid]));
+ }
+};
+
+export const updateGroup = (data: projectUpdateActions.ProjectUpdateFormDialogData) => async (dispatch: Dispatch) => {
+ const updatedGroup = await dispatch<any>(groupPanelActions.updateGroup(data));
+ if (updatedGroup) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Group has been successfully updated.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ await dispatch<any>(loadSidePanelTreeProjects(updatedGroup.ownerUuid));
+ dispatch<any>(reloadProjectMatchingUuid([updatedGroup.ownerUuid, updatedGroup.uuid]));
+ }
+};
export const loadCollection = (uuid: string) =>
- handleFirstTimeLoad(
- async (
- dispatch: Dispatch<any>,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- const userUuid = getUserUuid(getState());
- if (userUuid) {
- const match = await loadGroupContentsResource({
- uuid,
- userUuid,
- services,
- });
- let collection: CollectionResource | undefined;
- let breadcrumbfunc: ((uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => Promise<void>) | undefined;
- let sidepanel: string | undefined;
- match({
- OWNED: (thecollection) => {
- collection = thecollection as CollectionResource;
- sidepanel = collection.ownerUuid;
- breadcrumbfunc = setSidePanelBreadcrumbs;
- },
- SHARED: (thecollection) => {
- collection = thecollection as CollectionResource;
- sidepanel = collection.ownerUuid;
- breadcrumbfunc = setSharedWithMeBreadcrumbs;
- },
- TRASHED: (thecollection) => {
- collection = thecollection as CollectionResource;
- sidepanel = SidePanelTreeCategory.TRASH;
- breadcrumbfunc = () => setTrashBreadcrumbs('');
- },
- });
- if (collection && breadcrumbfunc && sidepanel) {
- dispatch(updateResources([collection]));
- await dispatch<any>(finishLoadingProject(collection.ownerUuid));
- dispatch(collectionPanelActions.SET_COLLECTION(collection));
- await dispatch(activateSidePanelTreeItem(sidepanel));
- dispatch(breadcrumbfunc(collection.ownerUuid));
- dispatch(loadCollectionPanel(collection.uuid));
- }
+ handleFirstTimeLoad(async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+ const userUuid = getUserUuid(getState());
+ if (userUuid) {
+ const match = await loadGroupContentsResource({
+ uuid,
+ userUuid,
+ services,
+ });
+ let collection: CollectionResource | undefined;
+ let breadcrumbfunc:
+ | ((uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => Promise<void>)
+ | undefined;
+ let sidepanel: string | undefined;
+ match({
+ OWNED: (thecollection) => {
+ collection = thecollection as CollectionResource;
+ sidepanel = collection.ownerUuid;
+ breadcrumbfunc = setSidePanelBreadcrumbs;
+ },
+ SHARED: (thecollection) => {
+ collection = thecollection as CollectionResource;
+ sidepanel = collection.ownerUuid;
+ breadcrumbfunc = setSharedWithMeBreadcrumbs;
+ },
+ TRASHED: (thecollection) => {
+ collection = thecollection as CollectionResource;
+ sidepanel = SidePanelTreeCategory.TRASH;
+ breadcrumbfunc = () => setTrashBreadcrumbs('');
+ },
+ });
+ if (collection && breadcrumbfunc && sidepanel) {
+ dispatch(updateResources([collection]));
+ await dispatch<any>(finishLoadingProject(collection.ownerUuid));
+ dispatch(collectionPanelActions.SET_COLLECTION(collection));
+ await dispatch(activateSidePanelTreeItem(sidepanel));
+ dispatch(breadcrumbfunc(collection.ownerUuid));
+ dispatch(loadCollectionPanel(collection.uuid));
}
}
- );
+ });
-export const createCollection =
- (data: collectionCreateActions.CollectionCreateFormDialogData) =>
- async (dispatch: Dispatch) => {
- const collection = await dispatch<any>(
- collectionCreateActions.createCollection(data)
+export const createCollection = (data: collectionCreateActions.CollectionCreateFormDialogData) => async (dispatch: Dispatch) => {
+ const collection = await dispatch<any>(collectionCreateActions.createCollection(data));
+ if (collection) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Collection has been successfully created.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ dispatch<any>(updateResources([collection]));
+ dispatch<any>(navigateTo(collection.uuid));
+ }
+};
+
+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]));
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Collection has been copied.',
+ hideDuration: 3000,
+ kind: SnackbarKind.SUCCESS,
+ link: collection.ownerUuid,
+ })
);
- if (collection) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Collection has been successfully created.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- dispatch<any>(updateResources([collection]));
- dispatch<any>(navigateTo(collection.uuid));
- }
- };
-
-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]));
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Collection has been copied.',
- hideDuration: 3000,
- kind: SnackbarKind.SUCCESS,
- link: collection.ownerUuid,
- })
- );
- }
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
- }
- };
-
-export const moveCollection =
- (data: MoveToFormDialogData) =>
- async (
- dispatch: Dispatch,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- try {
- const collection = await dispatch<any>(
- collectionMoveActions.moveCollection(data)
- );
- dispatch<any>(updateResources([collection]));
- dispatch<any>(reloadProjectMatchingUuid([collection.ownerUuid]));
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Collection has been moved.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
- }
- };
+ }
+ } catch (e) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: e.message,
+ hideDuration: 2000,
+ kind: SnackbarKind.ERROR,
+ })
+ );
+ }
+};
+
+export const moveCollection = (data: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ const collection = await dispatch<any>(collectionMoveActions.moveCollection(data));
+ dispatch<any>(updateResources([collection]));
+ dispatch<any>(reloadProjectMatchingUuid([collection.ownerUuid]));
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Collection has been moved.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ } catch (e) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: e.message,
+ hideDuration: 2000,
+ kind: SnackbarKind.ERROR,
+ })
+ );
+ }
+};
export const loadProcess = (uuid: string) =>
handleFirstTimeLoad(async (dispatch: Dispatch, getState: () => RootState) => {
@@ -575,19 +448,14 @@ export const loadProcess = (uuid: string) =>
const process = await dispatch<any>(processesActions.loadProcess(uuid));
if (process) {
await dispatch<any>(finishLoadingProject(process.containerRequest.ownerUuid));
- await dispatch<any>(
- activateSidePanelTreeItem(process.containerRequest.ownerUuid)
- );
+ await dispatch<any>(activateSidePanelTreeItem(process.containerRequest.ownerUuid));
dispatch<any>(setProcessBreadcrumbs(uuid));
dispatch<any>(loadDetailsPanel(uuid));
}
});
export const loadRegisteredWorkflow = (uuid: string) =>
- handleFirstTimeLoad(async (dispatch: Dispatch,
- getState: () => RootState,
- services: ServiceRepository) => {
-
+ handleFirstTimeLoad(async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const userUuid = getUserUuid(getState());
if (userUuid) {
const match = await loadGroupContentsResource({
@@ -596,7 +464,9 @@ export const loadRegisteredWorkflow = (uuid: string) =>
services,
});
let workflow: WorkflowResource | undefined;
- let breadcrumbfunc: ((uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => Promise<void>) | undefined;
+ let breadcrumbfunc:
+ | ((uuid: string) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => Promise<void>)
+ | undefined;
match({
OWNED: async (theworkflow) => {
workflow = theworkflow as WorkflowResource;
@@ -606,7 +476,7 @@ export const loadRegisteredWorkflow = (uuid: string) =>
workflow = theworkflow as WorkflowResource;
breadcrumbfunc = setSharedWithMeBreadcrumbs;
},
- TRASHED: () => { }
+ TRASHED: () => {},
});
if (workflow && breadcrumbfunc) {
dispatch(updateResources([workflow]));
@@ -617,93 +487,77 @@ export const loadRegisteredWorkflow = (uuid: string) =>
}
});
-export const updateProcess =
- (data: processUpdateActions.ProcessUpdateFormDialogData) =>
- async (dispatch: Dispatch) => {
- try {
- const process = await dispatch<any>(
- processUpdateActions.updateProcess(data)
- );
- if (process) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Process has been successfully updated.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- dispatch<any>(updateResources([process]));
- dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
- }
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
- }
- };
-
-export const moveProcess =
- (data: MoveToFormDialogData) =>
- async (
- dispatch: Dispatch,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- try {
- const process = await dispatch<any>(processMoveActions.moveProcess(data));
- dispatch<any>(updateResources([process]));
- dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Process has been moved.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
- }
- };
-
-export const copyProcess =
- (data: CopyFormDialogData) =>
- async (
- dispatch: Dispatch,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- try {
- const process = await dispatch<any>(processCopyActions.copyProcess(data));
- dispatch<any>(updateResources([process]));
- dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: 'Process has been copied.',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS,
- })
- );
- dispatch<any>(navigateTo(process.uuid));
- } catch (e) {
- dispatch(
- snackbarActions.OPEN_SNACKBAR({
- message: e.message,
- hideDuration: 2000,
- kind: SnackbarKind.ERROR,
- })
- );
- }
- };
+export const updateProcess = (data: processUpdateActions.ProcessUpdateFormDialogData) => async (dispatch: Dispatch) => {
+ try {
+ const process = await dispatch<any>(processUpdateActions.updateProcess(data));
+ if (process) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Process has been successfully updated.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ dispatch<any>(updateResources([process]));
+ dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
+ }
+ } catch (e) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: e.message,
+ hideDuration: 2000,
+ kind: SnackbarKind.ERROR,
+ })
+ );
+ }
+};
+
+export const moveProcess = (data: MoveToFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ const process = await dispatch<any>(processMoveActions.moveProcess(data));
+ dispatch<any>(updateResources([process]));
+ dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Process has been moved.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ } catch (e) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: e.message,
+ hideDuration: 2000,
+ kind: SnackbarKind.ERROR,
+ })
+ );
+ }
+};
+
+export const copyProcess = (data: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ const process = await dispatch<any>(processCopyActions.copyProcess(data));
+ dispatch<any>(updateResources([process]));
+ dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Process has been copied.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ })
+ );
+ dispatch<any>(navigateTo(process.uuid));
+ } catch (e) {
+ dispatch(
+ snackbarActions.OPEN_SNACKBAR({
+ message: e.message,
+ hideDuration: 2000,
+ kind: SnackbarKind.ERROR,
+ })
+ );
+ }
+};
export const resourceIsNotLoaded = (uuid: string) =>
snackbarActions.OPEN_SNACKBAR({
@@ -722,96 +576,60 @@ export const couldNotLoadUser = snackbarActions.OPEN_SNACKBAR({
});
export const reloadProjectMatchingUuid =
- (matchingUuids: string[]) =>
- async (
- dispatch: Dispatch,
- getState: () => RootState,
- services: ServiceRepository
- ) => {
- const currentProjectPanelUuid = getProjectPanelCurrentUuid(getState());
- if (
- currentProjectPanelUuid &&
- matchingUuids.some((uuid) => uuid === currentProjectPanelUuid)
- ) {
- dispatch<any>(loadProject(currentProjectPanelUuid));
- }
- };
+ (matchingUuids: string[]) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const currentProjectPanelUuid = getProjectPanelCurrentUuid(getState());
+ if (currentProjectPanelUuid && matchingUuids.some((uuid) => uuid === currentProjectPanelUuid)) {
+ dispatch<any>(loadProject(currentProjectPanelUuid));
+ }
+ };
-export const loadSharedWithMe = handleFirstTimeLoad(
- async (dispatch: Dispatch) => {
- dispatch<any>(loadSharedWithMePanel());
- await dispatch<any>(
- activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME)
- );
- await dispatch<any>(
- setSidePanelBreadcrumbs(SidePanelTreeCategory.SHARED_WITH_ME)
- );
- }
-);
+export const loadSharedWithMe = handleFirstTimeLoad(async (dispatch: Dispatch) => {
+ dispatch<any>(loadSharedWithMePanel());
+ await dispatch<any>(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME));
+ await dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.SHARED_WITH_ME));
+});
-export const loadRunProcess = handleFirstTimeLoad(
- async (dispatch: Dispatch) => {
- await dispatch<any>(loadRunProcessPanel());
- }
-);
+export const loadRunProcess = handleFirstTimeLoad(async (dispatch: Dispatch) => {
+ await dispatch<any>(loadRunProcessPanel());
+});
export const loadPublicFavorites = () =>
handleFirstTimeLoad((dispatch: Dispatch) => {
- dispatch<any>(
- activateSidePanelTreeItem(SidePanelTreeCategory.PUBLIC_FAVORITES)
- );
+ dispatch<any>(activateSidePanelTreeItem(SidePanelTreeCategory.PUBLIC_FAVORITES));
dispatch<any>(loadPublicFavoritePanel());
- dispatch<any>(
- setSidePanelBreadcrumbs(SidePanelTreeCategory.PUBLIC_FAVORITES)
- );
+ dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.PUBLIC_FAVORITES));
});
-export const loadSearchResults = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadSearchResultsPanel());
- }
-);
+export const loadSearchResults = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadSearchResultsPanel());
+});
-export const loadLinks = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadLinkPanel());
- }
-);
+export const loadLinks = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadLinkPanel());
+});
-export const loadVirtualMachines = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadVirtualMachinesPanel());
- dispatch(setBreadcrumbs([{ label: 'Virtual Machines' }]));
- }
-);
+export const loadVirtualMachines = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadVirtualMachinesPanel());
+ dispatch(setBreadcrumbs([{ label: 'Virtual Machines' }]));
+});
-export const loadVirtualMachinesAdmin = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadVirtualMachinesPanel());
- dispatch(
- setBreadcrumbs([{ label: 'Virtual Machines Admin', icon: AdminMenuIcon }])
- );
- }
-);
+export const loadVirtualMachinesAdmin = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadVirtualMachinesPanel());
+ dispatch(setBreadcrumbs([{ label: 'Virtual Machines Admin', icon: AdminMenuIcon }]));
+});
-export const loadRepositories = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadRepositoriesPanel());
- dispatch(setBreadcrumbs([{ label: 'Repositories' }]));
- }
-);
+export const loadRepositories = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadRepositoriesPanel());
+ dispatch(setBreadcrumbs([{ label: 'Repositories' }]));
+});
-export const loadSshKeys = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadSshKeysPanel());
- }
-);
+export const loadSshKeys = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadSshKeysPanel());
+});
-export const loadSiteManager = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadSiteManagerPanel());
- }
-);
+export const loadSiteManager = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadSiteManagerPanel());
+});
export const loadUserProfile = (userUuid?: string) =>
handleFirstTimeLoad((dispatch: Dispatch<any>) => {
@@ -824,37 +642,27 @@ export const loadUserProfile = (userUuid?: string) =>
}
});
-export const loadLinkAccount = handleFirstTimeLoad(
- (dispatch: Dispatch<any>) => {
- dispatch(loadLinkAccountPanel());
- }
-);
+export const loadLinkAccount = handleFirstTimeLoad((dispatch: Dispatch<any>) => {
+ dispatch(loadLinkAccountPanel());
+});
-export const loadKeepServices = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadKeepServicesPanel());
- }
-);
+export const loadKeepServices = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadKeepServicesPanel());
+});
-export const loadUsers = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadUsersPanel());
- dispatch(setUsersBreadcrumbs());
- }
-);
+export const loadUsers = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadUsersPanel());
+ dispatch(setUsersBreadcrumbs());
+});
-export const loadApiClientAuthorizations = handleFirstTimeLoad(
- async (dispatch: Dispatch<any>) => {
- await dispatch(loadApiClientAuthorizationsPanel());
- }
-);
+export const loadApiClientAuthorizations = handleFirstTimeLoad(async (dispatch: Dispatch<any>) => {
+ await dispatch(loadApiClientAuthorizationsPanel());
+});
-export const loadGroupsPanel = handleFirstTimeLoad(
- (dispatch: Dispatch<any>) => {
- dispatch(setGroupsBreadcrumbs());
- dispatch(groupPanelActions.loadGroupsPanel());
- }
-);
+export const loadGroupsPanel = handleFirstTimeLoad((dispatch: Dispatch<any>) => {
+ dispatch(setGroupsBreadcrumbs());
+ dispatch(groupPanelActions.loadGroupsPanel());
+});
export const loadGroupDetailsPanel = (groupUuid: string) =>
handleFirstTimeLoad((dispatch: Dispatch<any>) => {
@@ -862,40 +670,27 @@ export const loadGroupDetailsPanel = (groupUuid: string) =>
dispatch(groupDetailsPanelActions.loadGroupDetailsPanel(groupUuid));
});
-const finishLoadingProject =
- (project: GroupContentsResource | string) =>
- async (dispatch: Dispatch<any>) => {
- const uuid = typeof project === 'string' ? project : project.uuid;
- dispatch(openProjectPanel(uuid));
- dispatch(loadDetailsPanel(uuid));
- if (typeof project !== 'string') {
- dispatch(updateResources([project]));
- }
- };
-
-const loadGroupContentsResource = async (params: {
- uuid: string;
- userUuid: string;
- services: ServiceRepository;
-}) => {
- const filters = new FilterBuilder()
- .addEqual('uuid', params.uuid)
- .getFilters();
- const { items } = await params.services.groupsService.contents(
- params.userUuid,
- {
- filters,
- recursive: true,
- includeTrash: true,
- }
- );
+const finishLoadingProject = (project: GroupContentsResource | string) => async (dispatch: Dispatch<any>) => {
+ const uuid = typeof project === 'string' ? project : project.uuid;
+ dispatch(openProjectPanel(uuid));
+ dispatch(loadDetailsPanel(uuid));
+ if (typeof project !== 'string') {
+ dispatch(updateResources([project]));
+ }
+};
+
+const loadGroupContentsResource = async (params: { uuid: string; userUuid: string; services: ServiceRepository }) => {
+ const filters = new FilterBuilder().addEqual('uuid', params.uuid).getFilters();
+ const { items } = await params.services.groupsService.contents(params.userUuid, {
+ filters,
+ recursive: true,
+ includeTrash: true,
+ });
const resource = items.shift();
let handler: GroupContentsHandler;
if (resource) {
handler =
- (resource.kind === ResourceKind.COLLECTION ||
- resource.kind === ResourceKind.PROJECT) &&
- resource.isTrashed
+ (resource.kind === ResourceKind.COLLECTION || resource.kind === ResourceKind.PROJECT) && resource.isTrashed
? groupContentsHandlers.TRASHED(resource)
: groupContentsHandlers.OWNED(resource);
} else {
@@ -910,17 +705,11 @@ const loadGroupContentsResource = async (params: {
} else if (kind === ResourceKind.CONTAINER_REQUEST) {
resource = await params.services.containerRequestService.get(params.uuid);
} else {
- throw new Error("loadGroupContentsResource unsupported kind " + kind)
+ throw new Error('loadGroupContentsResource unsupported kind ' + kind);
}
handler = groupContentsHandlers.SHARED(resource);
}
- return (
- cases: MatchCases<
- typeof groupContentsHandlersRecord,
- GroupContentsHandler,
- void
- >
- ) => groupContentsHandlers.match(handler, cases);
+ return (cases: MatchCases<typeof groupContentsHandlersRecord, GroupContentsHandler, void>) => groupContentsHandlers.match(handler, cases);
};
const groupContentsHandlersRecord = {
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index b24283dd..21019ce8 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -93,10 +93,17 @@ export const moveToAction = {
icon: MoveToIcon,
name: 'Move to',
execute: (dispatch, resources) => {
- resources.forEach((resource) => {
- dispatch(openMoveProjectDialog(resource));
- });
+ // resources.length === 1
+ // ? dispatch(openMoveProjectDialog(resources[0]))
+ // : resources.forEach((resource) => {
+ dispatch(openMoveProjectDialog(resources));
+ // })
},
+ // execute: (dispatch, resources) => {
+ // resources.forEach((resource) => {
+ // dispatch(openMoveProjectDialog(resource));
+ // });
+ // },
};
export const toggleTrashAction = {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list