diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-05 12:09:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-05 12:09:47 +0300 |
commit | c6050cf3204ebd5f554870881952aa8e24324269 (patch) | |
tree | 7238096b98de427c4285a8e5dab18aaebeb34894 /app/assets/javascripts/pipeline_editor | |
parent | 71701f2da53ca7aa93d5e96764cddb2224266174 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipeline_editor')
3 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue b/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue index e85dfc4df07..9b5287afae9 100644 --- a/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue +++ b/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue @@ -10,8 +10,8 @@ import { import commitCIFile from '../../graphql/mutations/commit_ci_file.mutation.graphql'; import updateCurrentBranchMutation from '../../graphql/mutations/update_current_branch.mutation.graphql'; import updateLastCommitBranchMutation from '../../graphql/mutations/update_last_commit_branch.mutation.graphql'; +import updatePipelineEtag from '../../graphql/mutations/update_pipeline_etag.mutation.graphql'; import getCurrentBranch from '../../graphql/queries/client/current_branch.graphql'; -import getPipelineEtag from '../../graphql/queries/client/pipeline_etag.graphql'; import CommitForm from './commit_form.vue'; @@ -96,10 +96,10 @@ export default { content: this.ciFileContent, lastCommitId: this.commitSha, }, - update(store, { data }) { + update(_, { data }) { const pipelineEtag = data?.commitCreate?.commit?.commitPipelinePath; if (pipelineEtag) { - store.writeQuery({ query: getPipelineEtag, data: { pipelineEtag } }); + this.$apollo.mutate({ mutation: updatePipelineEtag, variables: pipelineEtag }); } }, }); diff --git a/app/assets/javascripts/pipeline_editor/graphql/mutations/update_pipeline_etag.mutation.graphql b/app/assets/javascripts/pipeline_editor/graphql/mutations/update_pipeline_etag.mutation.graphql new file mode 100644 index 00000000000..9025f00b343 --- /dev/null +++ b/app/assets/javascripts/pipeline_editor/graphql/mutations/update_pipeline_etag.mutation.graphql @@ -0,0 +1,3 @@ +mutation updatePipelineEtag($pipelineEtag: String) { + updatePipelineEtag(pipelineEtag: $pipelineEtag) @client +} diff --git a/app/assets/javascripts/pipeline_editor/graphql/resolvers.js b/app/assets/javascripts/pipeline_editor/graphql/resolvers.js index ab908c234d2..e4965e00af3 100644 --- a/app/assets/javascripts/pipeline_editor/graphql/resolvers.js +++ b/app/assets/javascripts/pipeline_editor/graphql/resolvers.js @@ -2,6 +2,7 @@ import axios from '~/lib/utils/axios_utils'; import getAppStatus from './queries/client/app_status.graphql'; import getCurrentBranchQuery from './queries/client/current_branch.graphql'; import getLastCommitBranchQuery from './queries/client/last_commit_branch.query.graphql'; +import getPipelineEtag from './queries/client/pipeline_etag.graphql'; export const resolvers = { Mutation: { @@ -49,5 +50,11 @@ export const resolvers = { data: { lastCommitBranch }, }); }, + updatePipelineEtag: (_, { pipelineEtag }, { cache }) => { + cache.writeQuery({ + query: getPipelineEtag, + data: { pipelineEtag }, + }); + }, }, }; |