19143: Picker opens, needs to be hooked in

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/src/store/processes/processes-actions.ts b/src/store/processes/processes-actions.ts
index 6bd2976c1182e508720e8947847bd7087e253736..11106e49c7b039e78390014e5dd7563dff62a76b 100644 (file)
--- a/src/store/processes/processes-actions.ts
+++ b/src/store/processes/processes-actions.ts
@@ -60,7 +60,7 @@ export const reRunProcess = (processUuid: string, workflowUuid: string) =>
             const stringifiedDefinition = JSON.stringify(process.mounts[MOUNT_PATH_CWL_WORKFLOW].content);
             const newWorkflow = { ...workflow, definition: stringifiedDefinition };
 
-            const basicInitialData: RunProcessBasicFormData = { name: `Copy of: ${process.name}`, description: process.description };
+            const basicInitialData: RunProcessBasicFormData = { name: `Copy of: ${process.name}`, description: process.description, ownerUuid: workflow.ownerUuid };
             dispatch<any>(initialize(RUN_PROCESS_BASIC_FORM, basicInitialData));
 
             const advancedInitialData: RunProcessAdvancedFormData = {

diff --git a/src/views/run-process-panel/inputs/project-input.tsx b/src/views/run-process-panel/inputs/project-input.tsx
new file mode 100644 (file)
index 0000000..03e0292
--- /dev/null
+++ b/src/views/run-process-panel/inputs/project-input.tsx
@@ -0,0 +1,125 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import React from 'react';
+import { connect, DispatchProp } from 'react-redux';
+import { Field } from 'redux-form';
+import { Input, Dialog, DialogTitle, DialogContent, DialogActions, Button } from '@material-ui/core';
+import {
+    GenericCommandInputParameter
+} from 'models/workflow';
+import { GenericInputProps, GenericInput } from './generic-input';
+import { ProjectsTreePicker } from 'views-components/projects-tree-picker/projects-tree-picker';
+import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions';
+import { TreeItem } from 'components/tree/tree';
+import { ProjectsTreePickerItem } from 'views-components/projects-tree-picker/generic-projects-tree-picker';
+import { ProjectResource } from 'models/project';
+import { ResourceKind } from 'models/resource';
+
+const WORKFLOW_OWNER_PROJECT = "WORKFLOW_OWNER_PROJECT";
+
+export interface ProjectInputProps {
+    options?: { showOnlyOwned: boolean, showOnlyWritable: boolean };
+}
+export const ProjectInput = ({ options }: ProjectInputProps) =>
+    <Field
+        name={WORKFLOW_OWNER_PROJECT}
+        commandInput={{
+            label: "Owner project"
+        }}
+        component={ProjectInputComponent as any}
+        format={format}
+        {...{
+            options
+        }} />;
+
+const format = (value?: ProjectResource) => value ? value.name : '';
+
+interface ProjectInputComponentState {
+    open: boolean;
+    project?: ProjectResource;
+}
+
+const ProjectInputComponent = connect()(
+    class ProjectInputComponent extends React.Component<GenericInputProps & DispatchProp & {
+        options?: { showOnlyOwned: boolean, showOnlyWritable: boolean };
+    }, ProjectInputComponentState> {
+        state: ProjectInputComponentState = {
+            open: false,
+        };
+
+        componentDidMount() {
+            this.props.dispatch<any>(
+                initProjectsTreePicker(WORKFLOW_OWNER_PROJECT));
+        }
+
+        render() {
+            return <>
+                {this.renderInput()}
+                {this.renderDialog()}
+            </>;
+        }
+
+        openDialog = () => {
+            this.setState({ open: true });
+        }
+
+        closeDialog = () => {
+            this.setState({ open: false });
+        }
+
+        submit = () => {
+            this.closeDialog();
+            this.props.input.onChange(this.state.project);
+        }
+
+        setProject = (_: {}, { data }: TreeItem<ProjectsTreePickerItem>) => {
+            if ('kind' in data && data.kind === ResourceKind.PROJECT) {
+                this.setState({ project: data });
+            } else {
+                this.setState({ project: undefined });
+            }
+        }
+
+        renderInput() {
+            return <GenericInput
+                component={props =>
+                    <Input
+                        readOnly
+                        fullWidth
+                        value={props.input.value}
+                        error={props.meta.touched && !!props.meta.error}
+                        disabled={props.commandInput.disabled}
+                        onClick={!this.props.commandInput.disabled ? this.openDialog : undefined}
+                        onKeyPress={!this.props.commandInput.disabled ? this.openDialog : undefined} />}
+                {...this.props} />;
+        }
+
+        renderDialog() {
+            return <Dialog
+                open={this.state.open}
+                onClose={this.closeDialog}
+                fullWidth
+                data-cy="choose-a-project-dialog"
+                maxWidth='md'>
+                <DialogTitle>Choose a project</DialogTitle>
+                <DialogContent>
+                    <ProjectsTreePicker
+                        pickerId={WORKFLOW_OWNER_PROJECT}
+                        includeCollections
+                        options={this.props.options}
+                        toggleItemActive={this.setProject} />
+                </DialogContent>
+                <DialogActions>
+                    <Button onClick={this.closeDialog}>Cancel</Button>
+                    <Button
+                        disabled={!this.state.project}
+                        variant='contained'
+                        color='primary'
+                        onClick={this.submit}>Ok</Button>
+                </DialogActions>
+            </Dialog>;
+        }
+
+    });

diff --git a/src/views/run-process-panel/run-process-basic-form.tsx b/src/views/run-process-panel/run-process-basic-form.tsx
index 13d882ba3ca874ea63df48735c2e6504a29f95d6..1417c074c0937164fe2d9be5e28b3c1a8f6ac577 100644 (file)
--- a/src/views/run-process-panel/run-process-basic-form.tsx
+++ b/src/views/run-process-panel/run-process-basic-form.tsx
@@ -6,6 +6,7 @@ import React from 'react';
 import { reduxForm, Field } from 'redux-form';
 import { Grid } from '@material-ui/core';
 import { TextField } from 'components/text-field/text-field';
+import { ProjectInput } from 'views/run-process-panel/inputs/project-input';
 import { PROCESS_NAME_VALIDATION } from 'validators/validators';
 
 export const RUN_PROCESS_BASIC_FORM = 'runProcessBasicForm';
@@ -13,6 +14,7 @@ export const RUN_PROCESS_BASIC_FORM = 'runProcessBasicForm';
 export interface RunProcessBasicFormData {
     name: string;
     description: string;
+    ownerUuid?: string;
 }
 export const RunProcessBasicForm =
     reduxForm<RunProcessBasicFormData>({
@@ -34,5 +36,11 @@ export const RunProcessBasicForm =
                         component={TextField as any}
                         label="Enter a description for run process" />
                 </Grid>
+                <Grid item xs={12} md={6}>
+                    <Field
+                        name='ownerUuid'
+                        component={ProjectInput as any}
+                        label="Project to run the process in" />
+                </Grid>
             </Grid>
         </form>);

diff --git a/src/views/workflow-panel/workflow-description-card.tsx b/src/views/workflow-panel/workflow-description-card.tsx
index f25a8e648c6f0e1e221ef120445d22c6dc7078b4..df1b28112a067185254e5f50659d65a334ccfa8d 100644 (file)
--- a/src/views/workflow-panel/workflow-description-card.tsx
+++ b/src/views/workflow-panel/workflow-description-card.tsx
@@ -21,10 +21,6 @@ import { WorkflowIcon } from 'components/icon/icon';
 import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view';
 import { parseWorkflowDefinition, getWorkflowInputs, getInputLabel, stringifyInputType } from 'models/workflow';
 import { WorkflowDetailsCardDataProps, WorkflowDetailsAttributes } from 'views-components/details-panel/workflow-details';
-import { WorkflowResource, parseWorkflowDefinition, getWorkflowInputs, getInputLabel, stringifyInputType } from 'models/workflow';
-import { DetailsAttribute } from 'components/details-attribute/details-attribute';
-import { ResourceOwnerWithName } from 'views-components/data-explorer/renderers';
-import { formatDate } from "common/formatters";
 
 export type CssRules = 'root' | 'tab' | 'inputTab' | 'graphTab' | 'graphTabWithChosenWorkflow' | 'descriptionTab' | 'inputsTable';