diff options
| author | Phil Hughes <me@iamphill.com> | 2018-05-29 10:35:13 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-05-29 10:35:13 +0100 |
| commit | 782c31a494faeda9e30ed453953b2be2f80cd5c0 (patch) | |
| tree | 46a58ed8105fa76c4cda0a09be8b9b2990f399f5 /app/assets/javascripts/ide/stores/modules | |
| parent | b4ef2aad0239a493d6b0e3dde89cb36c5b4bb5e0 (diff) | |
| download | gitlab-ce-782c31a494faeda9e30ed453953b2be2f80cd5c0.tar.gz | |
added empty state & YAML error state
Diffstat (limited to 'app/assets/javascripts/ide/stores/modules')
3 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js index 71e9a1b0751..bb72a180f0d 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js @@ -19,12 +19,14 @@ export const receiveLatestPipelineError = ({ commit, dispatch }) => { dispatch('stopPipelinePolling'); }; export const receiveLatestPipelineSuccess = ({ rootGetters, commit }, { pipelines }) => { + let lastCommitPipeline = false; + if (pipelines && pipelines.length) { const lastCommitHash = rootGetters.lastCommit && rootGetters.lastCommit.id; - const lastCommitPipeline = pipelines.find(pipeline => pipeline.commit.id === lastCommitHash); - - commit(types.RECEIVE_LASTEST_PIPELINE_SUCCESS, lastCommitPipeline); + lastCommitPipeline = pipelines.find(pipeline => pipeline.commit.id === lastCommitHash); } + + commit(types.RECEIVE_LASTEST_PIPELINE_SUCCESS, lastCommitPipeline); }; export const fetchLatestPipeline = ({ dispatch, rootGetters }) => { diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js b/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js index b4944cae551..419be989901 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js @@ -19,6 +19,7 @@ export default { details: { status: pipeline.details.status, }, + yamlError: pipeline.yaml_errors, }; state.stages = pipeline.details.stages.map((stage, i) => { const foundStage = state.stages.find(s => s.id === i); @@ -32,6 +33,8 @@ export default { jobs: foundStage ? foundStage.jobs : [], }; }); + } else { + state.latestPipeline = false; } }, [types.REQUEST_JOBS](state, id) { diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/state.js b/app/assets/javascripts/ide/stores/modules/pipelines/state.js index 6f22542aaea..0f83b315fff 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/state.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/state.js @@ -1,5 +1,5 @@ export default () => ({ - isLoadingPipeline: false, + isLoadingPipeline: true, isLoadingJobs: false, latestPipeline: null, stages: [], |