Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 4 deletions

diff --git a/app/assets/javascripts/issues/show/components/description.vue b/app/assets/javascripts/issues/show/components/description.vue
index 90f01603f96..acbba216601 100644
--- a/app/assets/javascripts/issues/show/components/description.vue
+++ b/app/assets/javascripts/issues/show/components/description.vue
@@ -307,7 +307,8 @@ export default {
       );
 
       taskListItems?.forEach((item) => {
-        const dropdown = this.createTaskListItemActions({ canUpdate: this.canUpdate });
+        const provide = { canUpdate: this.canUpdate, issuableType: this.issuableType };
+        const dropdown = this.createTaskListItemActions(provide);
         this.insertNextToTaskListItemText(dropdown, item);
         this.addPointerEventListeners(item, '.task-list-item-actions');
         this.hasTaskListItemActions = true;
diff --git a/app/assets/javascripts/issues/show/components/task_list_item_actions.vue b/app/assets/javascripts/issues/show/components/task_list_item_actions.vue
index 64b916caddb..55e2e857050 100644
--- a/app/assets/javascripts/issues/show/components/task_list_item_actions.vue
+++ b/app/assets/javascripts/issues/show/components/task_list_item_actions.vue
@@ -1,5 +1,6 @@
 <script>
 import { GlDisclosureDropdown, GlDisclosureDropdownItem } from '@gitlab/ui';
+import { TYPE_INCIDENT, TYPE_ISSUE } from '~/issues/constants';
 import { __, s__ } from '~/locale';
 import eventHub from '../event_hub';
 
@@ -13,7 +14,12 @@ export default {
     GlDisclosureDropdown,
     GlDisclosureDropdownItem,
   },
-  inject: ['canUpdate'],
+  inject: ['canUpdate', 'issuableType'],
+  computed: {
+    showConvertToTaskItem() {
+      return [TYPE_INCIDENT, TYPE_ISSUE].includes(this.issuableType);
+    },
+  },
   methods: {
     convertToTask() {
       eventHub.$emit('convert-task-list-item', this.$el.closest('li').dataset.sourcepos);
@@ -37,12 +43,17 @@ export default {
     text-sr-only
     toggle-class="task-list-item-actions gl-opacity-0 gl-p-2! "
   >
-    <gl-disclosure-dropdown-item class="gl-ml-2!" @action="convertToTask">
+    <gl-disclosure-dropdown-item
+      v-if="showConvertToTaskItem"
+      class="gl-ml-2!"
+      data-testid="convert"
+      @action="convertToTask"
+    >
       <template #list-item>
         {{ $options.i18n.convertToTask }}
       </template>
     </gl-disclosure-dropdown-item>
-    <gl-disclosure-dropdown-item class="gl-ml-2!" @action="deleteTaskListItem">
+    <gl-disclosure-dropdown-item class="gl-ml-2!" data-testid="delete" @action="deleteTaskListItem">
       <template #list-item>
         <span class="gl-text-red-500!">{{ $options.i18n.delete }}</span>
       </template>