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

Task launch versions #2000

Closed
wants to merge 4 commits into from
Closed

Task launch versions #2000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e52c77c
Fix selected boot version
claudiahub Sep 26, 2023
43e1327
Up lint
claudiahub Sep 26, 2023
d112985
Enable latest launched version when not available
claudiahub Oct 10, 2023
869d246
Merge branch 'main' of github.com:spring-cloud/spring-cloud-dataflow-…
oodamien May 14, 2024
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
5 changes: 4 additions & 1 deletion ui/src/app/streams/streams/deploy/builder/builder.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,10 @@ export class BuilderComponent implements OnInit, OnDestroy {
* @param app
*/
openApp(builder: any, app: any): void {
const version = builder.formGroup.get('appsVersion').get(app.name).value || app.version;
const version =
builder.formGroup.get('appsVersion').get(app.name).value ||
builder.builderAppsProperties[app.name]?.version ||
app.version;
const options = builder.builderAppsProperties[app.name] ? builder.builderAppsProperties[app.name] : app.options;
const appPropertiesSource = new AppPropertiesSource(
Object.assign(
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@
<div class="cell">
<clr-select-container style="margin-top: 0">
<select tabindex="{{ 300 }}" [formControlName]="app.name" clrSelect>
<option value="">{{ getLabelAppVersion(builder.taskLaunchConfig, app) }}</option>
<option value="">{{ getLabelAppVersion(builder.taskLaunchConfig, app, app.version) }}</option>
<option *ngFor="let version of app.versions" [value]="version.version">
{{ version.version }}
</option>
Expand Down
6 changes: 4 additions & 2 deletions ui/src/app/tasks-jobs/tasks/launch/builder/builder.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,8 +1131,10 @@ export class BuilderComponent implements OnInit, OnDestroy {
}
}

getLabelAppVersion(taskLaunchConfig, app) {
const lastVersion = get(taskLaunchConfig?.lastExecution?.deploymentProperties, `version.${app.name}`);
getLabelAppVersion(taskLaunchConfig, app, latestLaunchedVersion) {
const lastVersion = taskLaunchConfig
? get(taskLaunchConfig?.lastExecution?.deploymentProperties, `version.${app.name}`)
: latestLaunchedVersion;
if (lastVersion && app.version !== lastVersion) {
return this.translate.instant('tasks.launch.builder.lastVersionLabel', {version: lastVersion});
}
Expand Down
Loading