1 files changed, 18 insertions, 68 deletions

diff --git a/app/assets/javascripts/issues/show/components/edit_actions.vue b/app/assets/javascripts/issues/show/components/edit_actions.vue
index 358b53bd131..120034b8d67 100644
--- a/app/assets/javascripts/issues/show/components/edit_actions.vue
+++ b/app/assets/javascripts/issues/show/components/edit_actions.vue
@@ -1,12 +1,10 @@
 <script>
-import { GlButton, GlModalDirective } from '@gitlab/ui';
-import { uniqueId } from 'lodash';
-import { __, sprintf } from '~/locale';
+import { GlButton } from '@gitlab/ui';
+import { __ } from '~/locale';
 import Tracking from '~/tracking';
 import eventHub from '../event_hub';
 import updateMixin from '../mixins/update';
 import getIssueStateQuery from '../queries/get_issue_state.query.graphql';
-import DeleteIssueModal from './delete_issue_modal.vue';
 
 const issuableTypes = {
   issue: __('Issue'),
@@ -18,18 +16,10 @@ const trackingMixin = Tracking.mixin({ label: 'delete_issue' });
 
 export default {
   components: {
-    DeleteIssueModal,
     GlButton,
   },
-  directives: {
-    GlModal: GlModalDirective,
-  },
   mixins: [trackingMixin, updateMixin],
   props: {
-    canDestroy: {
-      type: Boolean,
-      required: true,
-    },
     endpoint: {
       required: true,
       type: String,
@@ -38,11 +28,6 @@ export default {
       type: Object,
       required: true,
     },
-    showDeleteButton: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
     issuableType: {
       type: String,
       required: true,
@@ -53,7 +38,6 @@ export default {
       deleteLoading: false,
       skipApollo: false,
       issueState: {},
-      modalId: uniqueId('delete-issuable-modal-'),
     };
   },
   apollo: {
@@ -68,17 +52,9 @@ export default {
     },
   },
   computed: {
-    deleteIssuableButtonText() {
-      return sprintf(__('Delete %{issuableType}'), {
-        issuableType: this.typeToShow.toLowerCase(),
-      });
-    },
     isSubmitEnabled() {
       return this.formState.title.trim() !== '';
     },
-    shouldShowDeleteButton() {
-      return this.canDestroy && this.showDeleteButton && this.typeToShow;
-    },
     typeToShow() {
       const { issueState, issuableType } = this;
       const type = issueState.issueType ?? issuableType;
@@ -89,52 +65,26 @@ export default {
     closeForm() {
       eventHub.$emit('close.form');
     },
-    deleteIssuable() {
-      this.deleteLoading = true;
-      eventHub.$emit('delete.issuable');
-    },
   },
 };
 </script>
 
 <template>
-  <div class="gl-mt-3 gl-mb-3 gl-display-flex gl-justify-content-space-between">
-    <div>
-      <gl-button
-        :loading="formState.updateLoading"
-        :disabled="formState.updateLoading || !isSubmitEnabled"
-        category="primary"
-        variant="confirm"
-        class="gl-mr-3"
-        data-testid="issuable-save-button"
-        type="submit"
-        @click.prevent="updateIssuable"
-      >
-        {{ __('Save changes') }}
-      </gl-button>
-      <gl-button data-testid="issuable-cancel-button" @click="closeForm">
-        {{ __('Cancel') }}
-      </gl-button>
-    </div>
-    <div v-if="shouldShowDeleteButton">
-      <gl-button
-        v-gl-modal="modalId"
-        :loading="deleteLoading"
-        :disabled="deleteLoading"
-        category="secondary"
-        variant="danger"
-        data-testid="issuable-delete-button"
-        @click="track('click_button')"
-      >
-        {{ deleteIssuableButtonText }}
-      </gl-button>
-      <delete-issue-modal
-        :issue-path="endpoint"
-        :issue-type="typeToShow"
-        :modal-id="modalId"
-        :title="deleteIssuableButtonText"
-        @delete="deleteIssuable"
-      />
-    </div>
+  <div class="gl-mt-3 gl-mb-3 gl-display-flex">
+    <gl-button
+      :loading="formState.updateLoading"
+      :disabled="formState.updateLoading || !isSubmitEnabled"
+      category="primary"
+      variant="confirm"
+      class="gl-mr-3"
+      data-testid="issuable-save-button"
+      type="submit"
+      @click.prevent="updateIssuable"
+    >
+      {{ __('Save changes') }}
+    </gl-button>
+    <gl-button data-testid="issuable-cancel-button" @click="closeForm">
+      {{ __('Cancel') }}
+    </gl-button>
   </div>
 </template>