"@types/react-copy-to-clipboard": "4.2.6",
"@types/react-dropzone": "4.2.2",
"@types/redux-form": "7.4.5",
+ "@types/shell-quote": "1.6.0",
"axios": "0.18.0",
"classnames": "2.2.6",
"lodash": "4.17.10",
"react-transition-group": "2.4.0",
"redux": "4.0.0",
"redux-thunk": "2.3.0",
+ "shell-quote": "1.6.1",
"unionize": "2.1.2",
"uuid": "3.3.2"
},
+++ /dev/null
-.dropzone-border-left {
- left: -1px;
- top: -1px;
- bottom: -1px;
- width: 2px;
- content: "";
- position: absolute;
- transform: scaleY(0);
- transition: transform 200ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;
- pointer-events: none;
- background-color: #6a1b9a;
-}
-
-.dropzone-border-right {
- right: -1px;
- top: -1px;
- bottom: -1px;
- width: 2px;
- content: "";
- position: absolute;
- transform: scaleY(0);
- transition: transform 200ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;
- pointer-events: none;
- background-color: #6a1b9a;
-}
-
-.dropzone-border-top {
- left: 0;
- right: 0;
- top: -1px;
- height: 2px;
- content: "";
- position: absolute;
- transform: scaleX(0);
- transition: transform 200ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;
- pointer-events: none;
- background-color: #6a1b9a;
-}
-
-.dropzone-border-bottom {
- left: 0;
- right: 0;
- bottom: -1px;
- height: 2px;
- content: "";
- position: absolute;
- transform: scaleX(0);
- transition: transform 200ms cubic-bezier(0.0, 0, 0.2, 1) 0ms;
- pointer-events: none;
- background-color: #6a1b9a;
-}
-
-.dropzone-border-left-active {
- transform: scaleY(1);
-}
-
-.dropzone-border-right-active {
- transform: scaleY(1);
-}
-
-.dropzone-border-top-active {
- transform: scaleX(1);
-}
-
-.dropzone-border-bottom-active {
- transform: scaleX(1);
-}
import { formatFileSize, formatProgress, formatUploadSpeed } from "~/common/formatters";
import { UploadFile } from '~/store/file-uploader/file-uploader-actions';
-type CssRules = "root" | "dropzone" | "dropzoneWrapper" | "container" | "uploadIcon";
-
-import './file-upload.css';
-import { DOMElement, RefObject } from "react";
+type CssRules = "root" | "dropzone" | "dropzoneWrapper" | "container" | "uploadIcon"
+ | "dropzoneBorder" | "dropzoneBorderLeft" | "dropzoneBorderRight" | "dropzoneBorderTop" | "dropzoneBorderBottom"
+ | "dropzoneBorderHorzActive" | "dropzoneBorderVertActive";
const styles: StyleRulesCallback<CssRules> = theme => ({
root: {
position: "relative",
border: "1px solid rgba(0, 0, 0, 0.42)"
},
+ dropzoneBorder: {
+ content: "",
+ position: "absolute",
+ transition: "transform 200ms cubic-bezier(0.0, 0, 0.2, 1) 0ms",
+ pointerEvents: "none",
+ backgroundColor: "#6a1b9a"
+ },
+ dropzoneBorderLeft: {
+ left: -1,
+ top: -1,
+ bottom: -1,
+ width: 2,
+ transform: "scaleY(0)",
+ },
+ dropzoneBorderRight: {
+ right: -1,
+ top: -1,
+ bottom: -1,
+ width: 2,
+ transform: "scaleY(0)",
+ },
+ dropzoneBorderTop: {
+ left: 0,
+ right: 0,
+ top: -1,
+ height: 2,
+ transform: "scaleX(0)",
+ },
+ dropzoneBorderBottom: {
+ left: 0,
+ right: 0,
+ bottom: -1,
+ height: 2,
+ transform: "scaleX(0)",
+ },
+ dropzoneBorderHorzActive: {
+ transform: "scaleY(1)"
+ },
+ dropzoneBorderVertActive: {
+ transform: "scaleX(1)"
+ },
container: {
height: "100%"
},
render() {
const { classes, onDrop, disabled, files } = this.props;
return <div className={"file-upload-dropzone " + classes.dropzoneWrapper}>
- <div className={classnames("dropzone-border-left", { "dropzone-border-left-active": this.state.focused })}/>
- <div className={classnames("dropzone-border-right", { "dropzone-border-right-active": this.state.focused })}/>
- <div className={classnames("dropzone-border-top", { "dropzone-border-top-active": this.state.focused })}/>
- <div className={classnames("dropzone-border-bottom", { "dropzone-border-bottom-active": this.state.focused })}/>
+ <div className={classnames(classes.dropzoneBorder, classes.dropzoneBorderLeft, { [classes.dropzoneBorderHorzActive]: this.state.focused })}/>
+ <div className={classnames(classes.dropzoneBorder, classes.dropzoneBorderRight, { [classes.dropzoneBorderHorzActive]: this.state.focused })}/>
+ <div className={classnames(classes.dropzoneBorder, classes.dropzoneBorderTop, { [classes.dropzoneBorderVertActive]: this.state.focused })}/>
+ <div className={classnames(classes.dropzoneBorder, classes.dropzoneBorderBottom, { [classes.dropzoneBorderVertActive]: this.state.focused })}/>
<Dropzone className={classes.dropzone}
onDrop={files => onDrop(files)}
- onClick={(e) => {
+ onClick={() => {
const el = document.getElementsByClassName("file-upload-dropzone")[0];
const inputs = el.getElementsByTagName("input");
if (inputs.length > 0) {
import { MuiThemeProvider } from '@material-ui/core/styles';
import { CustomTheme } from './common/custom-theme';
import { fetchConfig } from './common/config';
-import { addMenuActionSet, ContextMenuKind } from "./views-components/context-menu/context-menu";
+import { addMenuActionSet, ContextMenuKind } from './views-components/context-menu/context-menu';
import { rootProjectActionSet } from "./views-components/context-menu/action-sets/root-project-action-set";
import { projectActionSet } from "./views-components/context-menu/action-sets/project-action-set";
import { resourceActionSet } from './views-components/context-menu/action-sets/resource-action-set';
import { Config } from '~/common/config';
import { addRouteChangeHandlers } from './routes/route-change-handlers';
import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions';
-import { processResourceActionSet } from './views-components/context-menu/action-sets/process-resource-action-set';
+import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
+import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet);
addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet);
addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet);
+addMenuActionSet(ContextMenuKind.TRASHED_COLLECTION, trashedCollectionActionSet);
addMenuActionSet(ContextMenuKind.PROCESS, processActionSet);
addMenuActionSet(ContextMenuKind.PROCESS_RESOURCE, processResourceActionSet);
addMenuActionSet(ContextMenuKind.TRASH, trashActionSet);
};
export const setSharedWithMeBreadcrumbs = (uuid: string) =>
+ setCategoryBreadcrumbs(uuid, SidePanelTreeCategory.SHARED_WITH_ME);
+
+export const setTrashBreadcrumbs = (uuid: string) =>
+ setCategoryBreadcrumbs(uuid, SidePanelTreeCategory.TRASH);
+
+export const setCategoryBreadcrumbs = (uuid: string, category: SidePanelTreeCategory) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const ancestors = await services.ancestorsService.ancestors(uuid, '');
dispatch(updateResources(ancestors));
const initialBreadcrumbs: ResourceBreadcrumb[] = [
- { label: SidePanelTreeCategory.SHARED_WITH_ME, uuid: SidePanelTreeCategory.SHARED_WITH_ME }
+ { label: category, uuid: category }
];
const breadrumbs = ancestors.reduce((breadcrumbs, ancestor) =>
ancestor.kind === ResourceKind.GROUP
(dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
const ancestors = getSidePanelTreeNodeAncestorsIds(uuid)(getState().treePicker);
const rootUuid = services.authService.getUuid();
- if (uuid === rootUuid ||ancestors.find(uuid => uuid === rootUuid)) {
+ if (uuid === rootUuid || ancestors.find(uuid => uuid === rootUuid)) {
dispatch(setSidePanelBreadcrumbs(uuid));
} else {
dispatch(setSharedWithMeBreadcrumbs(uuid));
menuKind: ContextMenuKind;
isTrashed?: boolean;
};
-
+export const isKeyboardClick = (event: React.MouseEvent<HTMLElement>) =>
+ event.nativeEvent.detail === 0;
export const openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: ContextMenuResource) =>
(dispatch: Dispatch) => {
event.preventDefault();
+ const { left, top } = event.currentTarget.getBoundingClientRect();
dispatch(
contextMenuActions.OPEN_CONTEXT_MENU({
- position: { x: event.clientX, y: event.clientY },
+ position: {
+ x: event.clientX || left,
+ y: event.clientY || top,
+ },
resource
})
);
}
if (uuid === SidePanelTreeCategory.FAVORITES) {
dispatch<any>(navigateToFavorites);
- } else if(uuid === SidePanelTreeCategory.SHARED_WITH_ME){
+ } else if (uuid === SidePanelTreeCategory.SHARED_WITH_ME) {
dispatch(navigateToSharedWithMe);
+ } else if (uuid === SidePanelTreeCategory.TRASH) {
+ dispatch(navigateToTrash);
}
};
import { RootState } from '../store';
import { Dispatch } from 'redux';
import { getProcess } from '~/store/processes/process';
+import { quote } from 'shell-quote';
export const PROCESS_COMMAND_DIALOG_NAME = 'processCommandDialog';
const process = getProcess(processUuid)(getState().resources);
if (process) {
const data: ProcessCommandDialogData = {
- command: process.containerRequest.command.join(' '),
+ command: quote(process.containerRequest.command),
processName: process.containerRequest.name,
};
dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_COMMAND_DIALOG_NAME, data }));
const initialState: ProgressIndicatorState = [];
export const progressIndicatorReducer = (state: ProgressIndicatorState = initialState, action: ProgressIndicatorAction) => {
- const startWorking = (id: string) => state.find(p => p.id === id) ? state : state.concat({ id, working: true });
const stopWorking = (id: string) => state.filter(p => p.id !== id);
return progressIndicatorActions.match(action, {
- START_WORKING: id => startWorking(id),
+ START_WORKING: id => startWorking(id, state),
STOP_WORKING: id => stopWorking(id),
PERSIST_STOP_WORKING: id => state.map(p => ({
...p,
working: p.id === id ? false : p.working
})),
- TOGGLE_WORKING: ({ id, working }) => working ? startWorking(id) : stopWorking(id),
+ TOGGLE_WORKING: ({ id, working }) => working ? startWorking(id, state) : stopWorking(id),
default: () => state,
});
};
+const startWorking = (id: string, state: ProgressIndicatorState) => {
+ return getProgressIndicator(id)(state)
+ ? state.map(indicator => indicator.id === id
+ ? { ...indicator, working: true }
+ : indicator)
+ : state.concat({ id, working: true });
+};
+
export function isSystemWorking(state: ProgressIndicatorState): boolean {
return state.length > 0 && state.reduce((working, p) => working ? true : p.working, false);
}
import { getNodeAncestors, getNodeValue, getNodeAncestorsIds, getNode } from '~/models/tree';
import { ProjectResource } from '~/models/project';
import { progressIndicatorActions } from '../progress-indicator/progress-indicator-actions';
+import { OrderBuilder } from '../../services/api/order-builder';
export enum SidePanelTreeCategory {
PROJECTS = 'Projects',
const params = {
filters: new FilterBuilder()
.addEqual('ownerUuid', projectUuid)
- .getFilters()
+ .getFilters(),
+ order: new OrderBuilder<ProjectResource>()
+ .addAsc('name')
+ .getOrder()
};
const { items } = await services.projectService.list(params);
dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
import { activateSidePanelTreeItem, loadSidePanelTreeProjects } from "~/store/side-panel-tree/side-panel-tree-actions";
import { projectPanelActions } from "~/store/project-panel/project-panel-action";
import { ResourceKind } from "~/models/resource";
+import { navigateToTrash } from '../navigation/navigation-action';
+import { matchTrashRoute, matchCollectionRoute } from '../../routes/routes';
export const toggleProjectTrashed = (uuid: string, ownerUuid: string, isTrashed: boolean) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
try {
if (isTrashed) {
+ const { location } = getState().router;
dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Restoring from trash..." }));
await services.collectionService.untrash(uuid);
+ if (matchCollectionRoute(location ? location.pathname : '')) {
+ dispatch(navigateToTrash);
+ }
dispatch(trashPanelActions.REQUEST_ITEMS());
dispatch(snackbarActions.OPEN_SNACKBAR({
message: "Restored from trash",
//
// SPDX-License-Identifier: AGPL-3.0
-import { Dispatch, AnyAction } from 'redux';
+import { Dispatch } from 'redux';
import { RootState } from "../store";
import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
-import { loadCollectionPanel } from '~/store/collection-panel/collection-panel-action';
import { snackbarActions } from '../snackbar/snackbar-actions';
import { loadFavoritePanel } from '../favorite-panel/favorite-panel-action';
import { openProjectPanel, projectPanelActions } from '~/store/project-panel/project-panel-action';
-import { activateSidePanelTreeItem, initSidePanelTree, SidePanelTreeCategory, loadSidePanelTreeProjects, getSidePanelTreeNodeAncestorsIds } from '../side-panel-tree/side-panel-tree-actions';
+import { activateSidePanelTreeItem, initSidePanelTree, SidePanelTreeCategory, loadSidePanelTreeProjects } from '../side-panel-tree/side-panel-tree-actions';
import { loadResource, updateResources } from '../resources/resources-actions';
import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-action';
import { projectPanelColumns } from '~/views/project-panel/project-panel';
import { favoritePanelColumns } from '~/views/favorite-panel/favorite-panel';
import { matchRootRoute } from '~/routes/routes';
-import { setCollectionBreadcrumbs, setProjectBreadcrumbs, setSidePanelBreadcrumbs, setProcessBreadcrumbs, setSharedWithMeBreadcrumbs } from '../breadcrumbs/breadcrumbs-actions';
+import { setSidePanelBreadcrumbs, setProcessBreadcrumbs, setSharedWithMeBreadcrumbs, setTrashBreadcrumbs } from '../breadcrumbs/breadcrumbs-actions';
import { navigateToProject } from '../navigation/navigation-action';
import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
import { ServiceRepository } from '~/services/services';
import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
import { getProgressIndicator } from '../progress-indicator/progress-indicator-reducer';
+import { ResourceKind, extractUuidKind } from '~/models/resource';
+import { FilterBuilder } from '~/services/api/filter-builder';
+import { GroupContentsResource } from '~/services/groups-service/groups-service';
+import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize';
export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
export const loadProject = (uuid: string) =>
handleFirstTimeLoad(
async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
- dispatch(openProjectPanel(uuid));
- await dispatch(activateSidePanelTreeItem(uuid));
- dispatch(setProjectBreadcrumbs(uuid));
- dispatch(loadDetailsPanel(uuid));
+ const userUuid = services.authService.getUuid();
+ if (userUuid) {
+ if (userUuid !== uuid) {
+ const match = await loadGroupContentsResource({ uuid, userUuid, services });
+ match({
+ OWNED: async project => {
+ await dispatch(activateSidePanelTreeItem(uuid));
+ dispatch<any>(setSidePanelBreadcrumbs(uuid));
+ dispatch(finishLoadingProject(project));
+ },
+ SHARED: project => {
+ dispatch<any>(setSharedWithMeBreadcrumbs(uuid));
+ dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME));
+ dispatch(finishLoadingProject(project));
+ },
+ TRASHED: project => {
+ dispatch<any>(setTrashBreadcrumbs(uuid));
+ dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH));
+ dispatch(finishLoadingProject(project));
+ }
+ });
+ } else {
+ await dispatch(activateSidePanelTreeItem(userUuid));
+ dispatch<any>(setSidePanelBreadcrumbs(userUuid));
+ dispatch(finishLoadingProject(userUuid));
+ }
+ }
});
export const createProject = (data: projectCreateActions.ProjectCreateFormDialogData) =>
};
export const updateProject = (data: projectUpdateActions.ProjectUpdateFormDialogData) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ async (dispatch: Dispatch) => {
const updatedProject = await dispatch<any>(projectUpdateActions.updateProject(data));
if (updatedProject) {
dispatch(snackbarActions.OPEN_SNACKBAR({
export const loadCollection = (uuid: string) =>
handleFirstTimeLoad(
- async (dispatch: Dispatch) => {
- const collection = await dispatch<any>(loadCollectionPanel(uuid));
- await dispatch<any>(activateSidePanelTreeItem(collection.ownerUuid));
- dispatch<any>(setCollectionBreadcrumbs(collection.uuid));
- dispatch(loadDetailsPanel(uuid));
+ async (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+ const userUuid = services.authService.getUuid();
+ if (userUuid) {
+ const match = await loadGroupContentsResource({ uuid, userUuid, services });
+ match({
+ OWNED: async collection => {
+ dispatch(updateResources([collection]));
+ await dispatch(activateSidePanelTreeItem(collection.ownerUuid));
+ dispatch(setSidePanelBreadcrumbs(collection.ownerUuid));
+ },
+ SHARED: collection => {
+ dispatch(updateResources([collection]));
+ dispatch<any>(setSharedWithMeBreadcrumbs(collection.ownerUuid));
+ dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME));
+ },
+ TRASHED: collection => {
+ dispatch(updateResources([collection]));
+ dispatch(setTrashBreadcrumbs(''));
+ dispatch(activateSidePanelTreeItem(SidePanelTreeCategory.TRASH));
+ },
+
+ });
+ }
});
export const createCollection = (data: collectionCreateActions.CollectionCreateFormDialogData) =>
await dispatch<any>(activateSidePanelTreeItem(SidePanelTreeCategory.SHARED_WITH_ME));
await dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.SHARED_WITH_ME));
});
+
+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
+ ? groupContentsHandlers.TRASHED(resource)
+ : groupContentsHandlers.OWNED(resource);
+ } else {
+ const kind = extractUuidKind(params.uuid);
+ let resource: GroupContentsResource;
+ if (kind === ResourceKind.COLLECTION) {
+ resource = await params.services.collectionService.get(params.uuid);
+ } else if (kind === ResourceKind.PROJECT) {
+ resource = await params.services.projectService.get(params.uuid);
+ } else {
+ resource = await params.services.containerRequestService.get(params.uuid);
+ }
+ handler = groupContentsHandlers.SHARED(resource);
+ }
+ return (cases: MatchCases<typeof groupContentsHandlersRecord, GroupContentsHandler, void>) =>
+ groupContentsHandlers.match(handler, cases);
+
+};
+
+const groupContentsHandlersRecord = {
+ TRASHED: ofType<GroupContentsResource>(),
+ SHARED: ofType<GroupContentsResource>(),
+ OWNED: ofType<GroupContentsResource>(),
+};
+
+const groupContentsHandlers = unionize(groupContentsHandlersRecord);
+
+type GroupContentsHandler = UnionOf<typeof groupContentsHandlers>;
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { ContextMenuActionSet } from "../context-menu-action-set";
+import { DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RestoreFromTrashIcon } from '~/components/icon/icon';
+import { toggleCollectionTrashed } from "~/store/trash/trash-actions";
+
+export const trashedCollectionActionSet: ContextMenuActionSet = [[
+ {
+ icon: DetailsIcon,
+ name: "View details",
+ execute: (dispatch, resource) => {
+ // add code
+ }
+ },
+ {
+ icon: ProvenanceGraphIcon,
+ name: "Provenance graph",
+ execute: (dispatch, resource) => {
+ // add code
+ }
+ },
+ {
+ icon: AdvancedIcon,
+ name: "Advanced",
+ execute: (dispatch, resource) => {
+ // add code
+ }
+ },
+ {
+ icon: RestoreFromTrashIcon,
+ name: "Restore",
+ execute: (dispatch, resource) => {
+ dispatch<any>(toggleCollectionTrashed(resource.uuid, true));
+ }
+ },
+]];
COLLECTION_FILES_ITEM = "CollectionFilesItem",
COLLECTION = 'Collection',
COLLECTION_RESOURCE = 'CollectionResource',
+ TRASHED_COLLECTION = 'TrashedCollection',
PROCESS = "Process",
PROCESS_RESOURCE = 'ProcessResource',
PROCESS_LOGS = "ProcessLogs"
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
-import { Dialog, DialogTitle, DialogActions, Button, StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { Dialog, DialogTitle, DialogActions, Button, StyleRulesCallback, WithStyles, withStyles, Tooltip, IconButton, Grid, CardHeader } from '@material-ui/core';
import { withDialog } from "~/store/dialog/with-dialog";
import { PROCESS_COMMAND_DIALOG_NAME } from '~/store/processes/process-command-actions';
import { WithDialogProps } from '~/store/dialog/with-dialog';
import { ProcessCommandDialogData } from '~/store/processes/process-command-actions';
import { DefaultCodeSnippet } from "~/components/default-code-snippet/default-code-snippet";
import { compose } from 'redux';
+import * as CopyToClipboard from "react-copy-to-clipboard";
+import { CopyIcon } from '~/components/icon/icon';
-type CssRules = 'codeSnippet';
+type CssRules = 'codeSnippet' | 'copyToClipboard';
const styles: StyleRulesCallback<CssRules> = theme => ({
codeSnippet: {
marginLeft: theme.spacing.unit * 3,
marginRight: theme.spacing.unit * 3,
+ },
+ copyToClipboard: {
+ marginRight: theme.spacing.unit,
}
});
maxWidth="md"
onClose={props.closeDialog}
style={{ alignSelf: 'stretch' }}>
- <DialogTitle>{`Command - ${props.data.processName}`}</DialogTitle>
+ <CardHeader
+ title={`Command - ${props.data.processName}`}
+ action={
+ <Tooltip title="Copy to clipboard">
+ <CopyToClipboard text={props.data.command}>
+ <IconButton className={props.classes.copyToClipboard}>
+ <CopyIcon />
+ </IconButton>
+ </CopyToClipboard>
+ </Tooltip>
+ } />
<DefaultCodeSnippet
className={props.classes.codeSnippet}
lines={[props.data.command]} />
+++ /dev/null
-// // Copyright (C) The Arvados Authors. All rights reserved.
-// //
-// // SPDX-License-Identifier: AGPL-3.0
-//
-// import * as React from 'react';
-// import { CircularProgress } from '@material-ui/core';
-// import { withProgress } from '~/store/progress-indicator/with-progress';
-// import { WithProgressStateProps } from '~/store/progress-indicator/with-progress';
-// import { ProgressIndicatorData } from '~/store/progress-indicator/progress-indicator-reducer';
-//
-// export const ContentProgress = withProgress(ProgressIndicatorData.CONTENT_PROGRESS)((props: WithProgressStateProps) =>
-// props.started ? <CircularProgress /> : null
-// );
+++ /dev/null
-// // Copyright (C) The Arvados Authors. All rights reserved.
-// //
-// // SPDX-License-Identifier: AGPL-3.0
-//
-// import * as React from 'react';
-// import { CircularProgress } from '@material-ui/core';
-// import { withProgress } from '~/store/progress-indicator/with-progress';
-// import { WithProgressStateProps } from '~/store/progress-indicator/with-progress';
-// import { ProgressIndicatorData } from '~/store/progress-indicator/progress-indicator-reducer';
-//
-// export const SidePanelProgress = withProgress(ProgressIndicatorData.SIDE_PANEL_PROGRESS)((props: WithProgressStateProps) =>
-// props.started ? <span style={{ display: 'flex', justifyContent: 'center', marginTop: "40px" }}><CircularProgress /></span> : null
-// );
+++ /dev/null
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-// import * as React from 'react';
-// import { LinearProgress } from '@material-ui/core';
-// import { withProgress } from '~/store/progress-indicator/with-progress';
-// import { WithProgressStateProps } from '~/store/progress-indicator/with-progress';
-// import { ProgressIndicatorData } from '~/store/progress-indicator/progress-indicator-reducer';
-
-// export const WorkbenchProgress = withProgress(ProgressIndicatorData.WORKBENCH_PROGRESS)(
-// (props: WithProgressStateProps) =>
-// props.started ? <LinearProgress color="secondary" /> : null
-// );
import * as React from "react";
import { connect } from "react-redux";
import { RootState } from "~/store/store";
-import MaterialSnackbar, { SnackbarProps } from "@material-ui/core/Snackbar";
+import MaterialSnackbar, { SnackbarOrigin } from "@material-ui/core/Snackbar";
import { Dispatch } from "redux";
import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
import IconButton from '@material-ui/core/IconButton';
import { amber, green } from "@material-ui/core/colors";
import * as classNames from 'classnames';
-const mapStateToProps = (state: RootState): SnackbarProps & ArvadosSnackbarProps => {
+interface SnackbarDataProps {
+ anchorOrigin?: SnackbarOrigin;
+ autoHideDuration?: number;
+ open: boolean;
+ message?: React.ReactElement<any>;
+ kind: SnackbarKind;
+}
+
+interface SnackbarEventProps {
+ onClose?: (event: React.SyntheticEvent<any>, reason: string) => void;
+ onExited: () => void;
+}
+
+const mapStateToProps = (state: RootState): SnackbarDataProps => {
const messages = state.snackbar.messages;
return {
anchorOrigin: { vertical: "bottom", horizontal: "right" },
};
};
-const mapDispatchToProps = (dispatch: Dispatch) => ({
+const mapDispatchToProps = (dispatch: Dispatch): SnackbarEventProps => ({
onClose: (event: any, reason: string) => {
if (reason !== "clickaway") {
dispatch(snackbarActions.CLOSE_SNACKBAR());
}
});
-const ArvadosSnackbar = (props: any) => <MaterialSnackbar {...props}>
- <ArvadosSnackbarContent {...props}/>
-</MaterialSnackbar>;
-
type CssRules = "success" | "error" | "info" | "warning" | "icon" | "iconVariant" | "message";
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
},
});
-interface ArvadosSnackbarProps {
- kind: SnackbarKind;
-}
+export const Snackbar = withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(
+ (props: SnackbarDataProps & SnackbarEventProps & WithStyles<CssRules>) => {
+ const { classes } = props;
-const ArvadosSnackbarContent = (props: SnackbarProps & ArvadosSnackbarProps & WithStyles<CssRules>) => {
- const { classes, className, message, onClose, kind } = props;
+ const variants = {
+ [SnackbarKind.INFO]: [InfoIcon, classes.info],
+ [SnackbarKind.WARNING]: [WarningIcon, classes.warning],
+ [SnackbarKind.SUCCESS]: [CheckCircleIcon, classes.success],
+ [SnackbarKind.ERROR]: [ErrorIcon, classes.error]
+ };
- let Icon = InfoIcon;
- let cssClass = classes.info;
+ const [Icon, cssClass] = variants[props.kind];
- switch (kind) {
- case SnackbarKind.INFO:
- Icon = InfoIcon;
- cssClass = classes.info;
- break;
- case SnackbarKind.WARNING:
- Icon = WarningIcon;
- cssClass = classes.warning;
- break;
- case SnackbarKind.SUCCESS:
- Icon = CheckCircleIcon;
- cssClass = classes.success;
- break;
- case SnackbarKind.ERROR:
- Icon = ErrorIcon;
- cssClass = classes.error;
- break;
+ return (
+ <MaterialSnackbar
+ open={props.open}
+ message={props.message}
+ onClose={props.onClose}
+ onExited={props.onExited}
+ anchorOrigin={props.anchorOrigin}
+ autoHideDuration={props.autoHideDuration}>
+ <SnackbarContent
+ className={classNames(cssClass)}
+ aria-describedby="client-snackbar"
+ message={
+ <span id="client-snackbar" className={classes.message}>
+ <Icon className={classNames(classes.icon, classes.iconVariant)}/>
+ {props.message}
+ </span>
+ }
+ action={
+ <IconButton
+ key="close"
+ aria-label="Close"
+ color="inherit"
+ onClick={e => props.onClose && props.onClose(e, '')}>
+ <CloseIcon className={classes.icon}/>
+ </IconButton>
+ }
+ />
+ </MaterialSnackbar>
+ );
}
-
- return (
- <SnackbarContent
- className={classNames(cssClass, className)}
- aria-describedby="client-snackbar"
- message={
- <span id="client-snackbar" className={classes.message}>
- <Icon className={classNames(classes.icon, classes.iconVariant)}/>
- {message}
- </span>
- }
- action={
- <IconButton
- key="close"
- aria-label="Close"
- color="inherit"
- onClick={e => {
- if (onClose) {
- onClose(e, '');
- }
- }}>
- <CloseIcon className={classes.icon}/>
- </IconButton>
- }
- />
- );
-};
-
-export const Snackbar = connect(mapStateToProps, mapDispatchToProps)(
- withStyles(styles)(ArvadosSnackbar)
-);
+));
class extends React.Component<CollectionPanelProps> {
render() {
const { classes, item } = this.props;
- return <div>
- <Card className={classes.card}>
- <CardHeader
- avatar={<CollectionIcon className={classes.iconHeader} />}
- action={
- <Tooltip title="More options">
- <IconButton
- aria-label="More options"
- onClick={this.handleContextMenu}>
- <MoreOptionsIcon />
- </IconButton>
- </Tooltip>
- }
- title={item && item.name}
- subheader={item && item.description} />
- <CardContent>
- <Grid container direction="column">
- <Grid item xs={6}>
- <DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Collection UUID'
- value={item && item.uuid}>
- <Tooltip title="Copy uuid">
- <CopyToClipboard text={item && item.uuid} onCopy={() => this.onCopy()}>
- <CopyIcon className={classes.copyIcon} />
- </CopyToClipboard>
- </Tooltip>
- </DetailsAttribute>
- <DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Number of files' value='14' />
- <DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Content size' value='54 MB' />
- <DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='Owner' value={item && item.ownerUuid} />
+ return item
+ ? <>
+ <Card className={classes.card}>
+ <CardHeader
+ avatar={<CollectionIcon className={classes.iconHeader} />}
+ action={
+ <Tooltip title="More options">
+ <IconButton
+ aria-label="More options"
+ onClick={this.handleContextMenu}>
+ <MoreOptionsIcon />
+ </IconButton>
+ </Tooltip>
+ }
+ title={item && item.name}
+ subheader={item && item.description} />
+ <CardContent>
+ <Grid container direction="column">
+ <Grid item xs={6}>
+ <DetailsAttribute classLabel={classes.label} classValue={classes.value}
+ label='Collection UUID'
+ value={item && item.uuid}>
+ <Tooltip title="Copy uuid">
+ <CopyToClipboard text={item && item.uuid} onCopy={() => this.onCopy()}>
+ <CopyIcon className={classes.copyIcon} />
+ </CopyToClipboard>
+ </Tooltip>
+ </DetailsAttribute>
+ <DetailsAttribute classLabel={classes.label} classValue={classes.value}
+ label='Number of files' value='14' />
+ <DetailsAttribute classLabel={classes.label} classValue={classes.value}
+ label='Content size' value='54 MB' />
+ <DetailsAttribute classLabel={classes.label} classValue={classes.value}
+ label='Owner' value={item && item.ownerUuid} />
+ </Grid>
</Grid>
- </Grid>
- </CardContent>
- </Card>
+ </CardContent>
+ </Card>
- <Card className={classes.card}>
- <CardHeader title="Properties" />
- <CardContent>
- <Grid container direction="column">
- <Grid item xs={12}><CollectionTagForm /></Grid>
- <Grid item xs={12}>
- {
- Object.keys(item.properties).map( key => {
- return <Chip key={key} className={classes.tag}
- onDelete={this.handleDelete(key)}
- label={`${key}: ${item.properties[key]}`} />;
- })
- }
+ <Card className={classes.card}>
+ <CardHeader title="Properties" />
+ <CardContent>
+ <Grid container direction="column">
+ <Grid item xs={12}><CollectionTagForm /></Grid>
+ <Grid item xs={12}>
+ {
+ Object.keys(item.properties).map(key => {
+ return <Chip key={key} className={classes.tag}
+ onDelete={this.handleDelete(key)}
+ label={`${key}: ${item.properties[key]}`} />;
+ })
+ }
+ </Grid>
</Grid>
- </Grid>
- </CardContent>
- </Card>
- <div className={classes.card}>
- <CollectionPanelFiles />
- </div>
- </div>;
+ </CardContent>
+ </Card>
+ <div className={classes.card}>
+ <CollectionPanelFiles />
+ </div>
+ </>
+ : null;
}
handleContextMenu = (event: React.MouseEvent<any>) => {
- const { uuid, ownerUuid, name, description, kind } = this.props.item;
+ const { uuid, ownerUuid, name, description, kind, isTrashed } = this.props.item;
const resource = {
uuid,
ownerUuid,
name,
description,
kind,
- menuKind: ContextMenuKind.COLLECTION
+ menuKind: isTrashed
+ ? ContextMenuKind.TRASHED_COLLECTION
+ : ContextMenuKind.COLLECTION
};
this.props.dispatch<any>(openContextMenu(event, resource));
}
"@types/react" "*"
redux "^3.6.0 || ^4.0.0"
+"@types/shell-quote@1.6.0":
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/@types/shell-quote/-/shell-quote-1.6.0.tgz#537b2949a2ebdcb0d353e448fee45b081021963f"
+
"@types/uuid@3.4.4":
version "3.4.4"
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.4.tgz#7af69360fa65ef0decb41fd150bf4ca5c0cefdf5"
projects / arvados-workbench2.git / commitdiff