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

GUI detached configurations (#3413): select pipeline - latest version… #3416

Merged
merged 3 commits into from
Dec 22, 2023
Merged

GUI detached configurations (#3413): select pipeline - latest version… #3416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dce3bd0
GUI detached configurations (#3413): select pipeline - latest version…
AleksandrGorodetskii Dec 22, 2023
d4ab3f5
GUI, Pipeline selection modal, latestVersionPlaceholder -> allowSelec…
rodichenko Dec 22, 2023
b4bf3aa
GUI, Pipeline selection modal, hide actions button if no actions spec…
rodichenko Dec 22, 2023
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
80 changes: 55 additions & 25 deletions client/src/components/pipelines/browser/Pipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ import HiddenObjects from '../../../utils/hidden-objects';
import CloneForm from './forms/CloneForm';
import styles from './Browser.css';

const LATEST_VERSION_PLACEHOLDER = {
id: 'latest',
key: 'latest',
name: 'latest',
commitId: 'latest',
type: ItemTypes.version
};

@connect({
pipelinesLibrary,
folders,
Expand Down Expand Up @@ -91,7 +99,8 @@ export default class Pipeline extends localization.LocalizedReactComponent {
onReloadTree: PropTypes.func,
selectedVersion: PropTypes.string,
selectedConfiguration: PropTypes.string,
configurationSelectionMode: PropTypes.bool
configurationSelectionMode: PropTypes.bool,
allowSelectLatestVersion: PropTypes.bool
};

state = {
Expand Down Expand Up @@ -152,6 +161,9 @@ export default class Pipeline extends localization.LocalizedReactComponent {
key: 'createdDate',
className: `${styles.treeItemName}`,
render: (text, item) => {
if (item.id === LATEST_VERSION_PLACEHOLDER.id) {
return null;
}
return this.renderTreeItemText(
<span>
Last updated: {
Expand Down Expand Up @@ -218,6 +230,9 @@ export default class Pipeline extends localization.LocalizedReactComponent {
key: 'createdDate',
className: styles.treeItemName,
render: (text, item) => {
if (item.id === LATEST_VERSION_PLACEHOLDER.id) {
return null;
}
return this.renderTreeItemText(
<span>
Last updated: {item.author && 'by '}
Expand Down Expand Up @@ -296,7 +311,7 @@ export default class Pipeline extends localization.LocalizedReactComponent {
const configurations = this.state.configurations[item.id].list;
return (
<Select
style={{width: '100%'}}
style={{width: '100%', minWidth: '70px'}}
value={this.state.configurations[item.id].selected}
onSelect={this.onSelectConfiguration(item)}>
{
Expand Down Expand Up @@ -708,28 +723,31 @@ export default class Pipeline extends localization.LocalizedReactComponent {
</MenuItem>
);
}
return (
<Dropdown
placement="bottomRight"
overlay={
<Menu
selectedKeys={[]}
onClick={onClick}
style={{width: 100}}
>
{actions}
</Menu>
}
key="edit">
<Button
key="edit"
id="edit-pipeline-menu-button"
style={{lineHeight: 1}}
size="small">
<Icon type="setting" />
</Button>
</Dropdown>
);
if (actions.length > 0) {
return (
<Dropdown
placement="bottomRight"
overlay={
<Menu
selectedKeys={[]}
onClick={onClick}
style={{width: 100}}
>
{actions}
</Menu>
}
key="edit">
<Button
key="edit"
id="edit-pipeline-menu-button"
style={{lineHeight: 1}}
size="small">
<Icon type="setting"/>
</Button>
</Dropdown>
);
}
return null;
};

render () {
Expand All @@ -755,6 +773,12 @@ export default class Pipeline extends localization.LocalizedReactComponent {
filter: this.props.hiddenObjectsTreeFilter()
}
);
if (this.props.allowSelectLatestVersion) {
this._versions = [
LATEST_VERSION_PLACEHOLDER,
...this._versions
];
}
versionsContent = (
<Table
key={CONTENT_PANEL_KEY}
Expand Down Expand Up @@ -885,7 +909,13 @@ export default class Pipeline extends localization.LocalizedReactComponent {
}

loadConfigurations = async () => {
const versions = this.props.versions.value.map(v => v);
let versions = this.props.versions.value.map(v => v);
if (this.props.allowSelectLatestVersion) {
versions = [
LATEST_VERSION_PLACEHOLDER,
...versions
];
}
const configurations = {};
for (let i = 0; i < versions.length; i++) {
const version = versions[i];
Expand Down
6 changes: 4 additions & 2 deletions client/src/components/pipelines/launch/dialogs/PipelineBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ export default class PipelineBrowser extends localization.LocalizedReactComponen
fireCloudMethodConfigurationSnapshot: PropTypes.string,
visible: PropTypes.bool,
onSelect: PropTypes.func,
onCancel: PropTypes.func
onCancel: PropTypes.func,
allowSelectLatestVersion: PropTypes.bool
};

rootItems = [];
Expand Down Expand Up @@ -211,7 +212,7 @@ export default class PipelineBrowser extends localization.LocalizedReactComponen
className={`pipelines-library-tree-node-${item.key}`}
title={this.renderItemTitle(item)}
key={item.key}
isLeaf={item.isLeaf}/>
isLeaf={item.isLeaf} />
);
} else {
return (
Expand Down Expand Up @@ -477,6 +478,7 @@ export default class PipelineBrowser extends localization.LocalizedReactComponen
listingMode
configurationSelectionMode
readOnly
allowSelectLatestVersion={!!this.props.allowSelectLatestVersion}
/>
);
} else {
Expand Down
85 changes: 42 additions & 43 deletions client/src/components/pipelines/launch/form/LaunchPipelineForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2396,57 +2396,55 @@ class LaunchPipelineForm extends localization.LocalizedReactComponent {
}
});
}
} else {
if (pipeline) {
const [existedPipeline] = this.props.pipelines.filter(p => p.id === pipeline.id);
if (existedPipeline) {
this.addedParameters = {};
this.rebuildParameters = {
[PARAMETERS]: true,
[SYSTEM_PARAMETERS]: true
};
this.setState({
pipeline: existedPipeline,
version: pipeline.version,
pipelineConfiguration: pipeline.configuration,
fireCloudMethodName: null,
fireCloudMethodNamespace: null,
fireCloudMethodSnapshot: null,
fireCloudMethodConfiguration: null,
fireCloudMethodConfigurationSnapshot: null,
fireCloudInputs: {},
fireCloudOutputs: {},
fireCloudInputsErrors: {},
fireCloudOutputsErrors: {},
fireCloudDefaultInputs: [],
fireCloudDefaultOutputs: []
}, () => {
if (this.props.onSelectPipeline) {
this.props.onSelectPipeline({
pipeline: existedPipeline,
version: pipeline.version,
configuration: pipeline.configuration
}, () => {
this.prevParameters = this.props.form.getFieldsValue().parameters;
this.reset(true);
this.evaluateEstimatedPrice({});
});
}
});
}
} else {
} else if (pipeline) {
const [existedPipeline] = this.props.pipelines.filter(p => p.id === pipeline.id);
if (existedPipeline) {
this.addedParameters = {};
this.rebuildParameters = {
[PARAMETERS]: true,
[SYSTEM_PARAMETERS]: true
};
this.setState({
pipeline: null,
version: null,
configuration: null
pipeline: existedPipeline,
version: pipeline.version,
pipelineConfiguration: pipeline.configuration,
fireCloudMethodName: null,
fireCloudMethodNamespace: null,
fireCloudMethodSnapshot: null,
fireCloudMethodConfiguration: null,
fireCloudMethodConfigurationSnapshot: null,
fireCloudInputs: {},
fireCloudOutputs: {},
fireCloudInputsErrors: {},
fireCloudOutputsErrors: {},
fireCloudDefaultInputs: [],
fireCloudDefaultOutputs: []
}, () => {
if (this.props.onSelectPipeline) {
this.props.onSelectPipeline(null, () => {
this.props.onSelectPipeline({
pipeline: existedPipeline,
version: pipeline.version,
configuration: pipeline.configuration
}, () => {
this.prevParameters = this.props.form.getFieldsValue().parameters;
this.reset(true);
this.evaluateEstimatedPrice({});
});
}
});
}
} else {
this.setState({
pipeline: null,
version: null,
configuration: null
}, () => {
if (this.props.onSelectPipeline) {
this.props.onSelectPipeline(null, () => {
this.reset(true);
});
}
});
}
this.closePipelineBrowser();
this.formFieldsChanged();
Expand Down Expand Up @@ -5793,6 +5791,7 @@ class LaunchPipelineForm extends localization.LocalizedReactComponent {
pipelineId={this.state.pipeline ? this.state.pipeline.id : undefined}
version={this.state.version}
pipelineConfiguration={this.state.pipelineConfiguration}
allowSelectLatestVersion={!!this.props.isDetachedConfiguration}
fireCloudMethod={this.state.fireCloudMethodName}
fireCloudNamespace={this.state.fireCloudMethodNamespace}
fireCloudMethodSnapshot={this.state.fireCloudMethodSnapshot}
Expand Down
Loading