Skip to content

Commit

Permalink
prompt population of inputs and outputs upon navigation up or down [W…
Browse files Browse the repository at this point in the history
…A-72] (#687)
  • Loading branch information
rsasch authored Nov 21, 2019
1 parent b19186b commit fbb7af8
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Job Manager Change Log

## v1.5.4 Release Notes

### Fixed a bug where workflow inputs/outputs were not always displayed correctly without browser reload.

## v1.5.3 Release Notes

### Fixed a bug where workflow-level errors are not displayed correctly in the Errors Card on the Job Details page.
Expand Down
6 changes: 6 additions & 0 deletions ui/src/app/job-details/job-details.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,11 @@ export class JobDetailsComponent implements OnInit {
if (this.job.extensions.tasks) {
this.taskTabs.timingDiagram.buildTimelineData(this.job.extensions.tasks);
}
if (objectNotEmpty(this.job.inputs)) {
this.taskTabs.inputsTab.populateEntryKeys(this.job.inputs);
}
if (objectNotEmpty(this.job.outputs)) {
this.taskTabs.outputsTab.populateEntryKeys(this.job.outputs);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class JobResourcesTableComponent implements OnInit {
constructor(private authService: AuthService) {}

ngOnInit() {
this.entryKeys = Object.keys(this.entries || {}).sort();
this.populateEntryKeys(this.entries);
}

getResourceURL(key: string): string {
Expand All @@ -30,4 +30,8 @@ export class JobResourcesTableComponent implements OnInit {
isResourceURL(key: string): boolean {
return ResourceUtils.isResourceURL(this.entries[key]);
}

populateEntryKeys(entries) {
this.entryKeys = Object.keys(entries || {}).sort();
}
}
4 changes: 2 additions & 2 deletions ui/src/app/job-details/tabs/tabs.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@
</mat-tab>
<!-- Task inputs tab -->
<mat-tab *ngIf="hasInputs(job)" label="Inputs">
<jm-resources-table [entries]="job.inputs"></jm-resources-table>
<jm-resources-table #inputsTab [entries]="job.inputs"></jm-resources-table>
</mat-tab>
<!-- Task outputs tab -->
<mat-tab *ngIf="hasOutputs(job)" label="Outputs">
<jm-resources-table [entries]="job.outputs"></jm-resources-table>
<jm-resources-table #outputsTab [entries]="job.outputs"></jm-resources-table>
</mat-tab>
<!-- Secondary Labels tab -->
<mat-tab *ngIf="job.labels" label="Labels">
Expand Down
2 changes: 2 additions & 0 deletions ui/src/app/job-details/tabs/tabs.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export class JobTabsComponent implements OnInit, OnChanges {
@ViewChild(JobFailuresTableComponent) failuresTable: JobFailuresTableComponent;
@ViewChild(JobTimingDiagramComponent) timingDiagram: JobTimingDiagramComponent;
@ViewChild('tabsPanel') tabsPanel;
@ViewChild('inputsTab') inputsTab;
@ViewChild('outputsTab') outputsTab;

database = new TasksDatabase(this.tasks);
dataSource: TasksDataSource | null;
Expand Down

0 comments on commit fbb7af8

Please sign in to comment.