Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Allow setting workflow input parameters in UI. Fixes #4234 #5319

Merged
merged 2 commits into from
Jun 14, 2021
Merged

fix: Allow setting workflow input parameters in UI. Fixes #4234 #5319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f1d965
fix: Allow setting workflow input parameters in UI. Fixes #4234
kennytrytek Mar 7, 2021
e1e45ab
fix: Allow setting workflow input parameters in UI. Fixes #4234
kennytrytek Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...plates/components/cluster-workflow-template-details/cluster-workflow-template-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ export const ClusterWorkflowTemplateDetails = ({history, location, match}: Route
namespace={namespace}
name={template.metadata.name}
entrypoint={template.spec.entrypoint}
entrypoints={(template.spec.templates || []).map(t => t.name)}
parameters={template.spec.arguments.parameters || []}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we still need these - otherwise how do you submit the workflow template specifying the spec arguments?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we still need these - otherwise how do you submit the workflow template specifying the spec arguments?

templates={template.spec.templates || []}
workflowParameters={template.spec.arguments.parameters || []}
/>
</SlidingPanel>
)}
Expand Down
4 changes: 2 additions & 2 deletions ...app/workflow-templates/components/workflow-template-details/workflow-template-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ export const WorkflowTemplateDetails = ({history, location, match}: RouteCompone
namespace={namespace}
name={name}
entrypoint={template.spec.entrypoint}
entrypoints={(template.spec.templates || []).map(t => t.name)}
parameters={template.spec.arguments.parameters || []}
templates={template.spec.templates || []}
workflowParameters={template.spec.arguments.parameters || []}
/>
)}
{sidePanel === 'share' && <WidgetGallery namespace={namespace} label={'workflows.argoproj.io/workflow-template=' + name} />}
Expand Down
53 changes: 42 additions & 11 deletions ui/src/app/workflows/components/submit-workflow-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import {Parameter, Workflow} from '../../../models';
import {Parameter, Template, Workflow} from '../../../models';
import {uiUrl} from '../../shared/base';
import {ErrorNotice} from '../../shared/components/error-notice';
import {services} from '../../shared/services';
Expand All @@ -12,25 +12,40 @@ interface Props {
namespace: string;
name: string;
entrypoint: string;
entrypoints: string[];
parameters: Parameter[];
templates: Template[];
workflowParameters: Parameter[];
}

interface State {
entrypoint: string;
entrypoints: string[];
parameters: Parameter[];
selectedTemplate: Template;
templates: Template[];
labels: string[];
error?: Error;
}

const workflowEntrypoint = '<default>';

export class SubmitWorkflowPanel extends React.Component<Props, State> {
constructor(props: any) {
super(props);
this.state = {
entrypoint: this.props.entrypoint || (this.props.entrypoints.length > 0 && this.props.entrypoints[0]),
parameters: this.props.parameters || [],
const defaultTemplate: Template = {
name: workflowEntrypoint,
inputs: {
parameters: this.props.workflowParameters
}
};
const state = {
entrypoint: workflowEntrypoint,
entrypoints: this.props.templates.map(t => t.name),
selectedTemplate: defaultTemplate,
parameters: this.props.workflowParameters || [],
templates: [defaultTemplate].concat(this.props.templates),
labels: ['submit-from-ui=true']
};
this.state = state;
}

public render() {
Expand All @@ -46,11 +61,18 @@ export class SubmitWorkflowPanel extends React.Component<Props, State> {
<label>Entrypoint</label>
<Select
value={this.state.entrypoint}
options={this.props.entrypoints.map((value, index) => ({
value,
title: value
options={this.state.templates.map(t => ({
value: t.name,
title: t.name
}))}
onChange={selected => this.setState({entrypoint: selected.value})}
onChange={selected => {
const selectedTemplate = this.getSelectedTemplate(selected.value);
this.setState({
entrypoint: selected.value,
selectedTemplate,
parameters: (selectedTemplate && selectedTemplate.inputs.parameters) || []
});
}}
/>
</div>
<div key='parameters' style={{marginBottom: 25}}>
Expand Down Expand Up @@ -85,6 +107,15 @@ export class SubmitWorkflowPanel extends React.Component<Props, State> {
);
}

private getSelectedTemplate(entrypoint: string): Template {
for (const t of this.state.templates) {
if (t.name === entrypoint) {
return t;
}
}
return null;
}

private displaySelectFieldForEnumValues(parameter: Parameter) {
return (
<Select
Expand Down Expand Up @@ -128,7 +159,7 @@ export class SubmitWorkflowPanel extends React.Component<Props, State> {
private submit() {
services.workflows
.submit(this.props.kind, this.props.name, this.props.namespace, {
entryPoint: this.state.entrypoint,
entryPoint: this.state.entrypoint === workflowEntrypoint ? null : this.state.entrypoint,
parameters: this.state.parameters.map(p => p.name + '=' + p.value),
labels: this.state.labels.join(',')
})
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/workflows/components/workflow-creator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ export const WorkflowCreator = ({namespace, onCreate}: {namespace: string; onCre
namespace={workflowTemplate.metadata.namespace}
name={workflowTemplate.metadata.name}
entrypoint={workflowTemplate.spec.entrypoint}
entrypoints={(workflowTemplate.spec.templates || []).map(t => t.name)}
parameters={workflowTemplate.spec.arguments.parameters || []}
templates={workflowTemplate.spec.templates || []}
workflowParameters={workflowTemplate.spec.arguments.parameters || []}
/>
<a onClick={() => setStage('full-editor')}>
Edit using full workflow options <i className='fa fa-caret-right' />
Expand Down