diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/assets/javascripts/issue_show/components/form.vue | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/assets/javascripts/issue_show/components/form.vue')
-rw-r--r-- | app/assets/javascripts/issue_show/components/form.vue | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue index b37a911a669..bdaa8a4dd6b 100644 --- a/app/assets/javascripts/issue_show/components/form.vue +++ b/app/assets/javascripts/issue_show/components/form.vue @@ -2,21 +2,24 @@ import { GlAlert } from '@gitlab/ui'; import $ from 'jquery'; import Autosave from '~/autosave'; +import { IssuableType } from '~/issue_show/constants'; import eventHub from '../event_hub'; -import editActions from './edit_actions.vue'; -import descriptionField from './fields/description.vue'; -import descriptionTemplate from './fields/description_template.vue'; -import titleField from './fields/title.vue'; -import lockedWarning from './locked_warning.vue'; +import EditActions from './edit_actions.vue'; +import DescriptionField from './fields/description.vue'; +import DescriptionTemplateField from './fields/description_template.vue'; +import IssuableTitleField from './fields/title.vue'; +import IssuableTypeField from './fields/type.vue'; +import LockedWarning from './locked_warning.vue'; export default { components: { - lockedWarning, - titleField, - descriptionField, - descriptionTemplate, - editActions, + DescriptionField, + DescriptionTemplateField, + EditActions, GlAlert, + IssuableTitleField, + IssuableTypeField, + LockedWarning, }, props: { canDestroy: { @@ -89,6 +92,9 @@ export default { showLockedWarning() { return this.formState.lockedWarningVisible && !this.formState.updateLoading; }, + isIssueType() { + return this.issuableType === IssuableType.Issue; + }, }, created() { eventHub.$on('delete.issuable', this.resetAutosave); @@ -162,7 +168,7 @@ export default { </script> <template> - <form> + <form data-testid="issuable-form"> <locked-warning v-if="showLockedWarning" /> <gl-alert v-if="showOutdatedDescriptionWarning" @@ -179,9 +185,17 @@ export default { ) }}</gl-alert > + <div class="row gl-mb-3"> + <div class="col-12"> + <issuable-title-field ref="title" :form-state="formState" /> + </div> + </div> <div class="row"> - <div v-if="hasIssuableTemplates" class="col-sm-4 col-lg-3"> - <description-template + <div v-if="isIssueType" class="col-12 col-md-4 pr-md-0"> + <issuable-type-field ref="issue-type" /> + </div> + <div v-if="hasIssuableTemplates" class="col-12 col-md-4 pl-md-2"> + <description-template-field :form-state="formState" :issuable-templates="issuableTemplates" :project-path="projectPath" @@ -189,14 +203,6 @@ export default { :project-namespace="projectNamespace" /> </div> - <div - :class="{ - 'col-sm-8 col-lg-9': hasIssuableTemplates, - 'col-12': !hasIssuableTemplates, - }" - > - <title-field ref="title" :form-state="formState" :issuable-templates="issuableTemplates" /> - </div> </div> <description-field ref="description" |