diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-11 15:39:20 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-11 16:29:35 +0300 |
| commit | 0073be9bf70f79ece094a28ed4d897636ba8ddc8 (patch) | |
| tree | 47d17742a3a1959b37454986e9f605906af65dec | |
| parent | c230b5d16fcbb9e93647642c5aaa6f884cb6bfe9 (diff) | |
Adds `.json` to the end of pipelines endpoint
When the job page is rendered we fetch the pipeline
endpoint to render the stages in the sidebar.
Without `.json` the response is cached, and when the
user goes back to the pipeline's page it renders the
json output instead of the Vue app
| -rw-r--r-- | app/assets/javascripts/jobs/store/actions.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/52472-pipeline-endpoint-json.yml | 5 | ||||
| -rw-r--r-- | spec/javascripts/jobs/store/actions_spec.js | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/store/actions.js b/app/assets/javascripts/jobs/store/actions.js index 298367c9342..c8e1090bcc5 100644 --- a/app/assets/javascripts/jobs/store/actions.js +++ b/app/assets/javascripts/jobs/store/actions.js @@ -139,7 +139,7 @@ export const fetchStages = ({ state, dispatch }) => { dispatch('requestStages'); axios - .get(state.job.pipeline.path) + .get(`${state.job.pipeline.path}.json`) .then(({ data }) => { dispatch('receiveStagesSuccess', data.details.stages); dispatch('fetchJobsForStage', data.details.stages[0]); diff --git a/changelogs/unreleased/52472-pipeline-endpoint-json.yml b/changelogs/unreleased/52472-pipeline-endpoint-json.yml new file mode 100644 index 00000000000..6819a0f7b5f --- /dev/null +++ b/changelogs/unreleased/52472-pipeline-endpoint-json.yml @@ -0,0 +1,5 @@ +--- +title: Fix caching issue with pipelines URL +merge_request: +author: +type: fixed diff --git a/spec/javascripts/jobs/store/actions_spec.js b/spec/javascripts/jobs/store/actions_spec.js index 5ab1f75d0d6..ce07effba9e 100644 --- a/spec/javascripts/jobs/store/actions_spec.js +++ b/spec/javascripts/jobs/store/actions_spec.js @@ -422,7 +422,7 @@ describe('Job State actions', () => { beforeEach(() => { mockedState.job.pipeline = { - path: `${TEST_HOST}/endpoint.json/stages`, + path: `${TEST_HOST}/endpoint`, }; mock = new MockAdapter(axios); }); @@ -434,7 +434,7 @@ describe('Job State actions', () => { describe('success', () => { it('dispatches requestStages and receiveStagesSuccess, fetchJobsForStage ', done => { mock - .onGet(`${TEST_HOST}/endpoint.json/stages`) + .onGet(`${TEST_HOST}/endpoint.json`) .replyOnce(200, { details: { stages: [{ id: 121212, name: 'build' }] } }); testAction( |