Skip to content

Commit

Permalink
fix(executions): Clarify why executions are NOT_STARTED (#7183)
Browse files Browse the repository at this point in the history
  • Loading branch information
alanmquach committed Jul 3, 2019
1 parent 1f3882b commit c93b4d0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/scripts/modules/core/src/domain/IExecution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export interface IExecution extends IOrchestratedItem {
id: string;
isComplete?: boolean;
isStrategy?: boolean;
limitConcurrent?: boolean;
name?: string;
pipelineConfigId?: string;
pipelineConfig?: IPipeline;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import * as ReactGA from 'react-ga';
import { UISref } from '@uirouter/react';
import { isEqual } from 'lodash';
import { $location } from 'ngimport';
import { Subscription } from 'rxjs';
Expand Down Expand Up @@ -294,6 +295,7 @@ export class Execution extends React.PureComponent<IExecutionProps, IExecutionSt
pipelineConfig,
} = this.props;
const { pipelinesUrl, restartDetails, showingDetails, sortFilter, viewState } = this.state;
const { $state } = ReactInjector;

const accountLabels = this.props.execution.deploymentTargets.map(account => (
<AccountTag key={account} account={account} />
Expand Down Expand Up @@ -348,6 +350,19 @@ export class Execution extends React.PureComponent<IExecutionProps, IExecutionSt
Status:{' '}
<span className={`status execution-status execution-status-${execution.status.toLowerCase()}`}>
{execution.status}
{execution.status === 'NOT_STARTED' && execution.limitConcurrent && (
<>
{' ('}
waiting on{' '}
<UISref
to={`${$state.current.name.endsWith('.execution') ? '^' : ''}.^.executions`}
params={{ pipeline: execution.name, status: 'RUNNING' }}
>
<a>RUNNING</a>
</UISref>{' '}
executions)
</>
)}
</span>
{execution.cancellationReason && (
<Tooltip value={execution.cancellationReason}>
Expand Down

0 comments on commit c93b4d0

Please sign in to comment.