Commit 398921b6 authored by Jarka Košanová's avatar Jarka Košanová

Bacport FE changes from Closing Epics

Backport of js and vue files from closing epics
parent f4c861db
...@@ -293,6 +293,7 @@ ...@@ -293,6 +293,7 @@
:show-delete-button="showDeleteButton" :show-delete-button="showDeleteButton"
:can-attach-file="canAttachFile" :can-attach-file="canAttachFile"
:enable-autocomplete="enableAutocomplete" :enable-autocomplete="enableAutocomplete"
:issuable-type="issuableType"
/> />
<recaptcha-modal <recaptcha-modal
......
<script> <script>
import { __, sprintf } from '~/locale';
import updateMixin from '../mixins/update'; import updateMixin from '../mixins/update';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
const issuableTypes = {
issue: __('Issue'),
epic: __('Epic'),
};
export default { export default {
mixins: [updateMixin], mixins: [updateMixin],
props: { props: {
...@@ -18,6 +24,10 @@ ...@@ -18,6 +24,10 @@
required: false, required: false,
default: true, default: true,
}, },
issuableType: {
type: String,
required: true,
},
}, },
data() { data() {
return { return {
...@@ -37,8 +47,11 @@ ...@@ -37,8 +47,11 @@
eventHub.$emit('close.form'); eventHub.$emit('close.form');
}, },
deleteIssuable() { deleteIssuable() {
const confirmMessage = sprintf(__('%{issuableType} will be removed! Are you sure?'), {
issuableType: issuableTypes[this.issuableType],
});
// eslint-disable-next-line no-alert // eslint-disable-next-line no-alert
if (window.confirm('Issue will be removed! Are you sure?')) { if (window.confirm(confirmMessage)) {
this.deleteLoading = true; this.deleteLoading = true;
eventHub.$emit('delete.issuable'); eventHub.$emit('delete.issuable');
......
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
required: false, required: false,
default: () => [], default: () => [],
}, },
issuableType: {
type: String,
required: true,
},
markdownPreviewPath: { markdownPreviewPath: {
type: String, type: String,
required: true, required: true,
...@@ -110,6 +114,7 @@ ...@@ -110,6 +114,7 @@
:form-state="formState" :form-state="formState"
:can-destroy="canDestroy" :can-destroy="canDestroy"
:show-delete-button="showDeleteButton" :show-delete-button="showDeleteButton"
:issuable-type="issuableType"
/> />
</form> </form>
</template> </template>
...@@ -107,6 +107,9 @@ msgstr "" ...@@ -107,6 +107,9 @@ msgstr ""
msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects." msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects."
msgstr "" msgstr ""
msgid "%{issuableType} will be removed! Are you sure?"
msgstr ""
msgid "%{loadingIcon} Started" msgid "%{loadingIcon} Started"
msgstr "" msgstr ""
...@@ -2553,6 +2556,9 @@ msgstr "" ...@@ -2553,6 +2556,9 @@ msgstr ""
msgid "Environments|You don't have any environments right now." msgid "Environments|You don't have any environments right now."
msgstr "" msgstr ""
msgid "Epic"
msgstr ""
msgid "Error" msgid "Error"
msgstr "" msgstr ""
...@@ -3293,6 +3299,9 @@ msgstr "" ...@@ -3293,6 +3299,9 @@ msgstr ""
msgid "Invite" msgid "Invite"
msgstr "" msgstr ""
msgid "Issue"
msgstr ""
msgid "Issue Boards" msgid "Issue Boards"
msgstr "" msgstr ""
......
...@@ -21,6 +21,7 @@ describe('Edit Actions components', () => { ...@@ -21,6 +21,7 @@ describe('Edit Actions components', () => {
propsData: { propsData: {
canDestroy: true, canDestroy: true,
formState: store.formState, formState: store.formState,
issuableType: 'issue',
}, },
}).$mount(); }).$mount();
......
...@@ -15,6 +15,7 @@ describe('Inline edit form component', () => { ...@@ -15,6 +15,7 @@ describe('Inline edit form component', () => {
description: 'a', description: 'a',
lockedWarningVisible: false, lockedWarningVisible: false,
}, },
issuableType: 'issue',
markdownPreviewPath: '/', markdownPreviewPath: '/',
markdownDocsPath: '/', markdownDocsPath: '/',
projectPath: '/', projectPath: '/',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment