diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-21 03:08:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-21 03:08:01 +0300 |
commit | 5e396cd53ef1686fbc02b446a6a44d8a69ce8755 (patch) | |
tree | 81f60b948fa91d230b3494a549c81a1a2e8b7d7e /app/assets/javascripts/issues | |
parent | 61a1cd3b8389a7f5553bae90655710ed9b39ddff (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issues')
-rw-r--r-- | app/assets/javascripts/issues/show/components/app.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/issues/show/components/description.vue | 15 | ||||
-rw-r--r-- | app/assets/javascripts/issues/show/index.js | 1 |
3 files changed, 6 insertions, 16 deletions
diff --git a/app/assets/javascripts/issues/show/components/app.vue b/app/assets/javascripts/issues/show/components/app.vue index decb559ee81..ba1ffaf874d 100644 --- a/app/assets/javascripts/issues/show/components/app.vue +++ b/app/assets/javascripts/issues/show/components/app.vue @@ -191,11 +191,6 @@ export default { required: false, default: null, }, - issueIid: { - type: Number, - required: false, - default: null, - }, }, data() { const store = new Store({ @@ -570,7 +565,6 @@ export default { <component :is="descriptionComponent" :issue-id="issueId" - :issue-iid="issueIid" :can-update="canUpdate" :description-html="state.descriptionHtml" :description-text="state.descriptionText" diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue index bca895bf764..5682f85bc97 100644 --- a/app/assets/javascripts/issues/show/components/description.vue +++ b/app/assets/javascripts/issues/show/components/description.vue @@ -7,7 +7,7 @@ import Vue from 'vue'; import getIssueDetailsQuery from 'ee_else_ce/work_items/graphql/get_issue_details.query.graphql'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { getIdFromGraphQLId, convertToGraphQLId } from '~/graphql_shared/utils'; -import { TYPENAME_WORK_ITEM } from '~/graphql_shared/constants'; +import { TYPENAME_ISSUE, TYPENAME_WORK_ITEM } from '~/graphql_shared/constants'; import { createAlert } from '~/flash'; import { TYPE_ISSUE } from '~/issues/constants'; import { isMetaKey } from '~/lib/utils/common_utils'; @@ -97,11 +97,6 @@ export default { required: false, default: null, }, - issueIid: { - type: Number, - required: false, - default: null, - }, isUpdating: { type: Boolean, required: false, @@ -129,11 +124,13 @@ export default { query: getIssueDetailsQuery, variables() { return { - fullPath: this.fullPath, - iid: String(this.issueIid), + id: convertToGraphQLId(TYPENAME_ISSUE, this.issueId), }; }, - update: (data) => data.workspace?.issuable, + update: (data) => data.issue, + skip() { + return !this.issueId; + }, }, workItem: { query: workItemQuery, diff --git a/app/assets/javascripts/issues/show/index.js b/app/assets/javascripts/issues/show/index.js index 1793ce66ad4..c4a5c882097 100644 --- a/app/assets/javascripts/issues/show/index.js +++ b/app/assets/javascripts/issues/show/index.js @@ -125,7 +125,6 @@ export function initIssueApp(issueData, store) { isLocked: this.getNoteableData?.discussion_locked, issuableStatus: this.getNoteableData?.state, issueId: this.getNoteableData?.id, - issueIid: this.getNoteableData?.iid, }, }); }, |