diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-22 21:09:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-22 21:09:22 +0300 |
commit | eab22d334fd451ce793fde56f73568b0f7948ed2 (patch) | |
tree | 069fdd7e7e223e3a69e0192ee11de163d25f51c8 /app/assets/javascripts/jobs | |
parent | 4136fdda4ca0ec8de51c17efe48425ac35dee590 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/jobs')
-rw-r--r-- | app/assets/javascripts/jobs/store/getters.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/store/getters.js b/app/assets/javascripts/jobs/store/getters.js index 9d255822250..5849a31e9e6 100644 --- a/app/assets/javascripts/jobs/store/getters.js +++ b/app/assets/javascripts/jobs/store/getters.js @@ -1,7 +1,7 @@ -import { isEmpty, isString } from 'lodash'; +import { isEmpty } from 'lodash'; import { isScrolledToBottom } from '~/lib/utils/scroll_utils'; -export const headerTime = (state) => (state.job.started ? state.job.started : state.job.created_at); +export const headerTime = (state) => state.job.started_at || state.job.created_at; export const hasForwardDeploymentFailure = (state) => state?.job?.failure_reason === 'forward_deployment_failure'; @@ -13,10 +13,10 @@ export const shouldRenderCalloutMessage = (state) => !isEmpty(state.job.status) && !isEmpty(state.job.callout_message); /** - * When job has not started the key will be null - * When job started the key will be a string with a date. + * When the job has not started the value of job.started_at will be null + * When job has started the value of job.started_at will be a string with a date. */ -export const shouldRenderTriggeredLabel = (state) => isString(state.job.started); +export const shouldRenderTriggeredLabel = (state) => Boolean(state.job.started_at); export const hasEnvironment = (state) => !isEmpty(state.job.deployment_status); |