projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17595: Fixed selection based on hash
[arvados.git]
/
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 8b03a12340386a370efd1ada6653ceea1fb62fe8..2949d07ef0aeaea7928bc3c1187b7980104c3fd2 100644
(file)
--- a/
src/views/run-process-panel/inputs/directory-array-input.tsx
+++ b/
src/views/run-process-panel/inputs/directory-array-input.tsx
@@
-30,6
+30,7
@@
import { ResourceKind } from '~/models/resource';
export interface DirectoryArrayInputProps {
input: DirectoryArrayCommandInputParameter;
export interface DirectoryArrayInputProps {
input: DirectoryArrayCommandInputParameter;
+ options?: { showOnlyOwned: boolean, showOnlyWritable: boolean };
}
export const DirectoryArrayInput = ({ input }: DirectoryArrayInputProps) =>
}
export const DirectoryArrayInput = ({ input }: DirectoryArrayInputProps) =>
@@
-93,7
+94,9
@@
const mapStateToProps = createStructuredSelector({
});
const DirectoryArrayInputComponent = connect(mapStateToProps)(
});
const DirectoryArrayInputComponent = connect(mapStateToProps)(
- class DirectoryArrayInputComponent extends React.Component<DirectoryArrayInputComponentProps & GenericInputProps & DispatchProp, DirectoryArrayInputComponentState> {
+ class DirectoryArrayInputComponent extends React.Component<DirectoryArrayInputComponentProps & GenericInputProps & DispatchProp & {
+ options?: { showOnlyOwned: boolean, showOnlyWritable: boolean };
+ }, DirectoryArrayInputComponentState> {
state: DirectoryArrayInputComponentState = {
open: false,
directories: [],
state: DirectoryArrayInputComponentState = {
open: false,
directories: [],
@@
-157,7
+160,7
@@
const DirectoryArrayInputComponent = connect(mapStateToProps)(
.reduce((directories, { value }) =>
'kind' in value &&
value.kind === ResourceKind.COLLECTION &&
.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);
? directories.concat(value)
: directories, initialDirectories);
@@
-179,7
+182,7
@@
const DirectoryArrayInputComponent = connect(mapStateToProps)(
});
const orderedDirectories = formattedDirectories.reduce((dirs, formattedDir) => {
});
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;
return dir
? [...dirs, dir]
: dirs;
@@
-241,6
+244,7
@@
const DirectoryArrayInputComponent = connect(mapStateToProps)(
<DialogActions>
<Button onClick={this.closeDialog}>Cancel</Button>
<Button
<DialogActions>
<Button onClick={this.closeDialog}>Cancel</Button>
<Button
+ data-cy='ok-button'
variant='contained'
color='primary'
onClick={this.submit}>Ok</Button>
variant='contained'
color='primary'
onClick={this.submit}>Ok</Button>
@@
-276,6
+280,7
@@
const DirectoryArrayInputComponent = connect(mapStateToProps)(
pickerId={this.props.commandInput.id}
includeCollections
showSelection
pickerId={this.props.commandInput.id}
includeCollections
showSelection
+ options={this.props.options}
toggleItemSelection={this.refreshDirectories} />
</div>
<Divider />
toggleItemSelection={this.refreshDirectories} />
</div>
<Divider />