diff options
Diffstat (limited to 'app/assets/javascripts/issuable/components')
5 files changed, 30 insertions, 20 deletions
diff --git a/app/assets/javascripts/issuable/components/csv_export_modal.vue b/app/assets/javascripts/issuable/components/csv_export_modal.vue index b0af3612e05..736da92fa9f 100644 --- a/app/assets/javascripts/issuable/components/csv_export_modal.vue +++ b/app/assets/javascripts/issuable/components/csv_export_modal.vue @@ -1,16 +1,18 @@ <script> -import { GlButton, GlModal, GlSprintf, GlIcon } from '@gitlab/ui'; +import { GlModal, GlSprintf, GlIcon } from '@gitlab/ui'; import { __, n__ } from '~/locale'; import { ISSUABLE_TYPE } from '../constants'; export default { + actionCancel: { + text: __('Cancel'), + }, i18n: { exportText: __( 'The CSV export will be created in the background. Once finished, it will be sent to %{email} in an attachment.', ), }, components: { - GlButton, GlModal, GlSprintf, GlIcon, @@ -38,6 +40,19 @@ export default { }, }, computed: { + actionPrimary() { + return { + text: this.exportText, + attributes: { + href: this.exportCsvPath, + variant: 'confirm', + 'data-method': 'post', + 'data-qa-selector': `export_${this.issuableType}_button`, + 'data-track-action': 'click_button', + 'data-track-label': `export_${this.issuableType}_csv`, + }, + }; + }, isIssue() { return this.issuableType === ISSUABLE_TYPE.issues; }, @@ -56,6 +71,8 @@ export default { <template> <gl-modal :modal-id="modalId" + :action-primary="actionPrimary" + :action-cancel="$options.actionCancel" body-class="gl-p-0!" :title="exportText" data-qa-selector="export_issuable_modal" @@ -73,18 +90,5 @@ export default { </template> </gl-sprintf> </div> - <template #modal-footer> - <gl-button - category="primary" - variant="confirm" - :href="exportCsvPath" - data-method="post" - :data-qa-selector="`export_${issuableType}_button`" - data-track-action="click_button" - :data-track-label="`export_${issuableType}_csv`" - > - {{ exportText }} - </gl-button> - </template> </gl-modal> </template> diff --git a/app/assets/javascripts/issuable/components/csv_import_modal.vue b/app/assets/javascripts/issuable/components/csv_import_modal.vue index 7e2cbf03801..72293343c48 100644 --- a/app/assets/javascripts/issuable/components/csv_import_modal.vue +++ b/app/assets/javascripts/issuable/components/csv_import_modal.vue @@ -18,6 +18,9 @@ export default { actionPrimary: { text: __('Import issues'), }, + actionCancel: { + text: __('Cancel'), + }, components: { GlModal, GlFormGroup, @@ -55,6 +58,7 @@ export default { :modal-id="modalId" :title="$options.i18n.importIssuesText" :action-primary="$options.actionPrimary" + :action-cancel="$options.actionCancel" @primary="submitForm" > <form ref="form" :action="importCsvIssuesPath" enctype="multipart/form-data" method="post"> diff --git a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue index 06d1a2ee233..543dca0afe1 100644 --- a/app/assets/javascripts/issuable/components/issuable_header_warnings.vue +++ b/app/assets/javascripts/issuable/components/issuable_header_warnings.vue @@ -27,7 +27,7 @@ export default { return this.getNoteableData.confidential; }, isMergeRequest() { - return this.getNoteableData.targetType === 'merge_request' && this.glFeatures.updatedMrHeader; + return this.getNoteableData.targetType === 'merge_request'; }, warningIconsMeta() { return [ diff --git a/app/assets/javascripts/issuable/components/related_issuable_item.vue b/app/assets/javascripts/issuable/components/related_issuable_item.vue index dfe18567608..e6379b35f7a 100644 --- a/app/assets/javascripts/issuable/components/related_issuable_item.vue +++ b/app/assets/javascripts/issuable/components/related_issuable_item.vue @@ -71,8 +71,9 @@ export default { :class="{ 'issuable-info-container': !canReorder, 'card-body': canReorder, + 'gl-pr-2': canRemove, }" - class="item-body d-flex align-items-center py-2 px-3" + class="item-body d-flex align-items-center gl-py-3 gl-px-5" > <div class="item-contents gl-display-flex gl-align-items-center gl-flex-wrap gl-flex-grow-1 flex-xl-nowrap gl-min-h-7" @@ -170,7 +171,7 @@ export default { <issue-assignees v-if="assignees.length !== 0" :assignees="assignees" - class="item-assignees d-flex align-items-center align-self-end flex-shrink-0 d-md-none ml-2" + class="item-assignees d-flex align-items-center align-self-end flex-shrink-0 d-md-none gl-ml-3" /> </div> </div> diff --git a/app/assets/javascripts/issuable/components/status_box.vue b/app/assets/javascripts/issuable/components/status_box.vue index 498dc859186..d72ee5c6757 100644 --- a/app/assets/javascripts/issuable/components/status_box.vue +++ b/app/assets/javascripts/issuable/components/status_box.vue @@ -63,6 +63,8 @@ export default { }, }, data() { + if (!this.iid) return { state: this.initialState }; + if (this.initialState) { badgeState.state = this.initialState; } @@ -74,8 +76,7 @@ export default { return [ CLASSES[this.state], { - 'gl-vertical-align-bottom': - this.issuableType === IssuableType.MergeRequest && this.glFeatures.updatedMrHeader, + 'gl-vertical-align-bottom': this.issuableType === IssuableType.MergeRequest, }, ]; }, |