Skip to content
Snippets Groups Projects

Move work item dev widget to main body and create MR and branch

All threads resolved!
Compare and Show latest version
1 file
+ 26
0
Compare changes
  • Side-by-side
  • Inline
@@ -17,6 +17,7 @@ import Tracking from '~/tracking';
@@ -17,6 +17,7 @@ import Tracking from '~/tracking';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import toast from '~/vue_shared/plugins/global_toast';
import toast from '~/vue_shared/plugins/global_toast';
import { isLoggedIn } from '~/lib/utils/common_utils';
import { isLoggedIn } from '~/lib/utils/common_utils';
 
import WorkItemCreateBranchMergeRequestModal from '~/work_items/components/work_item_development/work_item_create_branch_merge_request_modal.vue';
import {
import {
sprintfWorkItem,
sprintfWorkItem,
@@ -76,6 +77,7 @@ export default {
@@ -76,6 +77,7 @@ export default {
GlToggle,
GlToggle,
WorkItemStateToggle,
WorkItemStateToggle,
CreateWorkItemModal,
CreateWorkItemModal,
 
WorkItemCreateBranchMergeRequestModal,
},
},
directives: {
directives: {
GlModal: GlModalDirective,
GlModal: GlModalDirective,
@@ -93,6 +95,7 @@ export default {
@@ -93,6 +95,7 @@ export default {
stateToggleTestId: TEST_ID_TOGGLE_ACTION,
stateToggleTestId: TEST_ID_TOGGLE_ACTION,
reportAbuseActionTestId: TEST_ID_REPORT_ABUSE,
reportAbuseActionTestId: TEST_ID_REPORT_ABUSE,
newRelatedItemTestId: TEST_ID_NEW_RELATED_WORK_ITEM,
newRelatedItemTestId: TEST_ID_NEW_RELATED_WORK_ITEM,
 
createMergeRequestActionTestId: 'create-merge-request-action-test-id',
props: {
props: {
fullPath: {
fullPath: {
type: String,
type: String,
@@ -194,6 +197,7 @@ export default {
@@ -194,6 +197,7 @@ export default {
isLockDiscussionUpdating: false,
isLockDiscussionUpdating: false,
isDropdownVisible: false,
isDropdownVisible: false,
isCreateWorkItemModalVisible: false,
isCreateWorkItemModalVisible: false,
 
isCreateMergeRequestModalVisible: false,
};
};
},
},
apollo: {
apollo: {
@@ -395,6 +399,10 @@ export default {
@@ -395,6 +399,10 @@ export default {
this.closeDropdown();
this.closeDropdown();
}
}
},
},
 
createMergeRequestAction() {
 
this.isCreateMergeRequestModalVisible = true;
 
this.closeDropdown();
 
},
showDropdown() {
showDropdown() {
this.isDropdownVisible = true;
this.isDropdownVisible = true;
},
},
@@ -475,6 +483,13 @@ export default {
@@ -475,6 +483,13 @@ export default {
<template #list-item>{{ __('Promote to objective') }}</template>
<template #list-item>{{ __('Promote to objective') }}</template>
</gl-disclosure-dropdown-item>
</gl-disclosure-dropdown-item>
 
<gl-disclosure-dropdown-item
 
:data-testid="$options.createMergeRequestActionTestId"
 
@action="createMergeRequestAction"
 
>
 
<template #list-item>{{ __('Create merge request') }}</template>
 
</gl-disclosure-dropdown-item>
 
<gl-disclosure-dropdown-item
<gl-disclosure-dropdown-item
v-if="canLockWorkItem"
v-if="canLockWorkItem"
:data-testid="$options.lockDiscussionTestId"
:data-testid="$options.lockDiscussionTestId"
@@ -555,5 +570,16 @@ export default {
@@ -555,5 +570,16 @@ export default {
@workItemCreated="$emit('workItemCreated')"
@workItemCreated="$emit('workItemCreated')"
@hideModal="isCreateWorkItemModalVisible = false"
@hideModal="isCreateWorkItemModalVisible = false"
/>
/>
 
 
<work-item-create-branch-merge-request-modal
 
:show-modal="isCreateMergeRequestModalVisible"
 
:branch-flow="false"
 
:merge-request-flow="true"
 
:work-item-iid="workItemIid"
 
:work-item-id="workItemId"
 
:work-item-type="workItemType"
 
:work-item-full-path="fullPath"
 
@hideModal="isCreateMergeRequestModalVisible = false"
 
/>
</div>
</div>
</template>
</template>
Loading