@spinnaker/core 0.20.0 → 0.20.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinnaker/core",
|
|
3
3
|
"license": "Apache-2.0",
|
|
4
|
-
"version": "0.20.
|
|
4
|
+
"version": "0.20.1",
|
|
5
5
|
"module": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
7
7
|
"scripts": {
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
"shx": "0.3.3",
|
|
121
121
|
"typescript": "4.3.5"
|
|
122
122
|
},
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "d54989b80af2ae88d41b110bed090cd99a602608"
|
|
124
124
|
}
|
|
@@ -7,7 +7,7 @@ import { OrchestratedItemRunningTime } from './OrchestratedItemRunningTime';
|
|
|
7
7
|
import type { Application } from '../../../application/application.model';
|
|
8
8
|
import { SETTINGS } from '../../../config/settings';
|
|
9
9
|
import { ExecutionBarLabel } from '../../config/stages/common/ExecutionBarLabel';
|
|
10
|
-
import type { IExecution, IExecutionStageSummary } from '../../../domain';
|
|
10
|
+
import type { IExecution, IExecutionStageSummary, IStage } from '../../../domain';
|
|
11
11
|
import { logger } from '../../../utils';
|
|
12
12
|
import { duration } from '../../../utils/timeFormatters';
|
|
13
13
|
|
|
@@ -94,7 +94,19 @@ export class ExecutionMarker extends React.Component<IExecutionMarkerProps, IExe
|
|
|
94
94
|
|
|
95
95
|
public render() {
|
|
96
96
|
const { stage, application, execution, active, previousStageActive, width } = this.props;
|
|
97
|
-
|
|
97
|
+
let stageType = (stage.activeStageType || stage.type).toLowerCase(); // support groups
|
|
98
|
+
stage.stages.forEach((childStage: IStage) => {
|
|
99
|
+
if (childStage.type == 'pipeline') {
|
|
100
|
+
const childPipeline = application.executions.data.find((p: any) => p.id === childStage.context.executionId);
|
|
101
|
+
if (childPipeline != undefined) {
|
|
102
|
+
childPipeline.stages.forEach((stageToCheck: IStage) => {
|
|
103
|
+
if (stageToCheck.type == 'manualJudgment' && stageToCheck.status == 'RUNNING') {
|
|
104
|
+
stageType = 'manualjudgment';
|
|
105
|
+
}
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
});
|
|
98
110
|
const pipelineStatus = this.stageStatus(stage.status.toLowerCase());
|
|
99
111
|
const markerClassName = [
|
|
100
112
|
stage.type !== 'group' ? 'clickable' : '',
|