Skip to content

Commit 48f6bb8

Browse files
authored
Merge pull request #216 from Vafilor/fix/onepanelio.core.745-missing.image
fix: added missing Omitted workflow phase
2 parents 6d90b89 + 8cb6c59 commit 48f6bb8

File tree

5 files changed

+199
-195
lines changed

5 files changed

+199
-195
lines changed
Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Input, Pipe, PipeTransform } from '@angular/core';
2-
import { WorkflowPhase } from "../../workflow/workflow.service";
1+
import { Pipe, PipeTransform } from '@angular/core';
2+
import { WorkflowPhase } from '../../workflow/workflow.service';
33

44
@Pipe({
55
name: 'phaseImage'
@@ -14,17 +14,26 @@ export class PhaseImagePipe implements PipeTransform {
1414
static notRunImageSource = '/assets/images/status-icons/notrun.svg';
1515
static skippedImageSource = '/assets/images/status-icons/notrun.svg';
1616

17-
static statusMap = new Map<WorkflowPhase, string>([
18-
['Succeeded', PhaseImagePipe.completeImageSource],
19-
['Pending', PhaseImagePipe.notRunImageSource],
20-
['Running', PhaseImagePipe.runningBlueImageSource],
21-
['Failed', PhaseImagePipe.failedImageSource],
22-
['Error', PhaseImagePipe.failedImageSource],
23-
['Terminated', PhaseImagePipe.stoppedImageSource],
24-
['Skipped', PhaseImagePipe.skippedImageSource]
25-
]);
26-
2717
transform(phase: WorkflowPhase, ...args: any[]): any {
28-
return PhaseImagePipe.statusMap.get(phase);
18+
switch (phase) {
19+
case 'Pending':
20+
return PhaseImagePipe.notRunImageSource;
21+
case 'Running':
22+
return PhaseImagePipe.runningBlueImageSource;
23+
case 'Succeeded':
24+
return PhaseImagePipe.completeImageSource;
25+
case 'Skipped':
26+
return PhaseImagePipe.skippedImageSource;
27+
case 'Failed':
28+
return PhaseImagePipe.failedImageSource;
29+
case 'Error':
30+
return PhaseImagePipe.failedImageSource;
31+
case 'Omitted':
32+
return PhaseImagePipe.skippedImageSource;
33+
case 'Terminated':
34+
return PhaseImagePipe.stoppedImageSource;
35+
}
36+
37+
return null;
2938
}
3039
}
Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
import { Pipe, PipeTransform } from '@angular/core';
2-
import { WorkflowPhase } from "../../workflow/workflow.service";
2+
import { WorkflowPhase } from '../../workflow/workflow.service';
33

44
@Pipe({
5-
name: 'phaseTranslate'
5+
name: 'phaseTranslate'
66
})
77
export class PhaseTranslatePipe implements PipeTransform {
8-
static statusPhraseMap = new Map<WorkflowPhase, string>([
9-
['Succeeded', 'Completed'],
10-
['Pending', 'Pending'],
11-
['Running', 'Running'],
12-
['Failed', 'Failed'],
13-
['Error', 'Error'],
14-
['Skipped', 'Skipped'],
15-
['Terminated', 'Terminated']
16-
]);
8+
transform(phase: WorkflowPhase, ...args: any[]): any {
9+
switch (phase) {
10+
case 'Succeeded':
11+
return 'Completed';
12+
case 'Omitted':
13+
return 'Skipped';
14+
}
1715

18-
transform(phase: WorkflowPhase, ...args: any[]): any {
19-
return PhaseTranslatePipe.statusPhraseMap.get(phase);
20-
}
16+
return phase;
17+
}
2118
}

src/app/status/status.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, Input, OnInit } from '@angular/core';
2-
import { WorkflowPhase } from "../workflow/workflow.service";
2+
import { WorkflowPhase } from '../workflow/workflow.service';
33

44
@Component({
55
selector: 'app-status',

src/app/workflow-template/workflow-template.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Injectable } from '@angular/core';
22
import { HttpClient } from '@angular/common/http';
33
import { Observable } from 'rxjs';
4-
import { environment } from "../../environments/environment";
4+
import { environment } from '../../environments/environment';
55

66
export interface ContainerDefinition {
77
image: string;
@@ -59,7 +59,7 @@ export interface WorkflowTemplatesResponse {
5959
export interface ArchiveWorkflowTemplateResponse {
6060
workflowTemplate: {
6161
isArchived: boolean;
62-
}
62+
};
6363
}
6464

6565
@Injectable()

0 commit comments

Comments
 (0)