X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f6daa8a9318d5d7bec1cb173d8897cfcb9826157..618af1a3106c399765788be4583463ab35d97cd5:/src/views/run-process-panel/inputs/directory-array-input.tsx
diff --git a/src/views/run-process-panel/inputs/directory-array-input.tsx b/src/views/run-process-panel/inputs/directory-array-input.tsx
index a7d83dae..1b04718d 100644
--- a/src/views/run-process-panel/inputs/directory-array-input.tsx
+++ b/src/views/run-process-panel/inputs/directory-array-input.tsx
@@ -2,41 +2,42 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import * as React from 'react';
+import React from 'react';
import {
isRequiredInput,
DirectoryArrayCommandInputParameter,
Directory,
CWLType
-} from '~/models/workflow';
+} from 'models/workflow';
import { Field } from 'redux-form';
-import { ERROR_MESSAGE } from '~/validators/require';
-import { Input, Dialog, DialogTitle, DialogContent, DialogActions, Button, Divider, Grid, WithStyles, Typography } from '@material-ui/core';
+import { ERROR_MESSAGE } from 'validators/require';
+import { Input, Dialog, DialogTitle, DialogContent, DialogActions, Button, Divider, WithStyles, Typography } from '@material-ui/core';
import { GenericInputProps, GenericInput } from './generic-input';
-import { ProjectsTreePicker } from '~/views-components/projects-tree-picker/projects-tree-picker';
+import { ProjectsTreePicker } from 'views-components/projects-tree-picker/projects-tree-picker';
import { connect, DispatchProp } from 'react-redux';
-import { initProjectsTreePicker, getSelectedNodes, treePickerActions, getProjectsTreePickerIds, getAllNodes } from '~/store/tree-picker/tree-picker-actions';
-import { ProjectsTreePickerItem } from '~/views-components/projects-tree-picker/generic-projects-tree-picker';
+import { initProjectsTreePicker, getSelectedNodes, treePickerActions, getProjectsTreePickerIds, getAllNodes } from 'store/tree-picker/tree-picker-actions';
+import { ProjectsTreePickerItem } from 'views-components/projects-tree-picker/generic-projects-tree-picker';
import { createSelector, createStructuredSelector } from 'reselect';
-import { ChipsInput } from '~/components/chips-input/chips-input';
+import { ChipsInput } from 'components/chips-input/chips-input';
import { identity, values, noop } from 'lodash';
import { InputProps } from '@material-ui/core/Input';
-import { TreePicker } from '~/store/tree-picker/tree-picker';
-import { RootState } from '~/store/store';
-import { Chips } from '~/components/chips/chips';
+import { TreePicker } from 'store/tree-picker/tree-picker';
+import { RootState } from 'store/store';
+import { Chips } from 'components/chips/chips';
import withStyles, { StyleRulesCallback } from '@material-ui/core/styles/withStyles';
-import { CollectionResource } from '~/models/collection';
-import { ResourceKind } from '~/models/resource';
+import { CollectionResource } from 'models/collection';
+import { ResourceKind } from 'models/resource';
export interface DirectoryArrayInputProps {
input: DirectoryArrayCommandInputParameter;
+ options?: { showOnlyOwned: boolean, showOnlyWritable: boolean };
}
export const DirectoryArrayInput = ({ input }: DirectoryArrayInputProps) =>
;
@@ -58,7 +59,7 @@ const parse = (directory: CollectionResource): Directory => ({
});
const formatDirectories = (directories: Directory[] = []) =>
- directories.map(format);
+ directories ? directories.map(format) : [];
const format = ({ location = '', basename = '' }: Directory): FormattedDirectory => ({
portableDataHash: location.replace('keep:', ''),
@@ -93,7 +94,9 @@ const mapStateToProps = createStructuredSelector({
});
const DirectoryArrayInputComponent = connect(mapStateToProps)(
- class DirectoryArrayInputComponent extends React.Component {
+ class DirectoryArrayInputComponent extends React.Component {
state: DirectoryArrayInputComponentState = {
open: false,
directories: [],
@@ -157,7 +160,7 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
.reduce((directories, { value }) =>
'kind' in value &&
value.kind === ResourceKind.COLLECTION &&
- formattedDirectories.find(({ portableDataHash }) => value.portableDataHash === portableDataHash)
+ formattedDirectories.find(({ portableDataHash, name }) => value.portableDataHash === portableDataHash && value.name === name)
? directories.concat(value)
: directories, initialDirectories);
@@ -179,7 +182,7 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
});
const orderedDirectories = formattedDirectories.reduce((dirs, formattedDir) => {
- const dir = directories.find(({ portableDataHash }) => portableDataHash === formattedDir.portableDataHash);
+ const dir = directories.find(({ portableDataHash, name }) => portableDataHash === formattedDir.portableDataHash && name === formattedDir.name);
return dir
? [...dirs, dir]
: dirs;
@@ -191,7 +194,7 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
refreshDirectories = () => {
clearTimeout(this.directoryRefreshTimeout);
- this.directoryRefreshTimeout = setTimeout(this.setSelectedFiles);
+ this.directoryRefreshTimeout = window.setTimeout(this.setSelectedFiles);
}
setSelectedFiles = () => {
@@ -211,7 +214,7 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
chipsInput = () =>
@@ -276,6 +280,7 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
pickerId={this.props.commandInput.id}
includeCollections
showSelection
+ options={this.props.options}
toggleItemSelection={this.refreshDirectories} />
@@ -294,6 +299,3 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
});
type DialogContentCssRules = 'root' | 'tree' | 'divider' | 'chips';
-
-
-