diff --git a/app/assets/javascripts/work_items/components/work_item_actions.vue b/app/assets/javascripts/work_items/components/work_item_actions.vue index 56da0d7599df7aee3fe13ddc950a9f13b38e864f..d56e08f5899c1da562329307293494300b7bdddf 100644 --- a/app/assets/javascripts/work_items/components/work_item_actions.vue +++ b/app/assets/javascripts/work_items/components/work_item_actions.vue @@ -383,6 +383,18 @@ export default { <gl-dropdown-divider /> </template> + <work-item-state-toggle + v-if="canUpdate" + :data-testid="$options.stateToggleTestId" + :work-item-id="workItemId" + :work-item-iid="workItemIid" + :work-item-state="workItemState" + :work-item-type="workItemType" + :full-path="fullPath" + show-as-dropdown-item + @error="emitStateToggleError" + /> + <gl-disclosure-dropdown-item v-if="canPromoteToObjective" :data-testid="$options.promoteActionTestId" @@ -410,18 +422,6 @@ export default { <template #list-item>{{ confidentialItemText }}</template> </gl-disclosure-dropdown-item> - <work-item-state-toggle - v-if="canUpdate" - :data-testid="$options.stateToggleTestId" - :work-item-id="workItemId" - :work-item-iid="workItemIid" - :work-item-state="workItemState" - :work-item-type="workItemType" - :full-path="fullPath" - show-as-dropdown-item - @error="emitStateToggleError" - /> - <gl-disclosure-dropdown-item :data-testid="$options.copyReferenceTestId" :data-clipboard-text="workItemReference" diff --git a/spec/frontend/work_items/components/work_item_actions_spec.js b/spec/frontend/work_items/components/work_item_actions_spec.js index 4d016fa5ae67cc39e7697b9bb660531fa9bae731..2757189904bd0f8873c2a72eef48c0fc97387a02 100644 --- a/spec/frontend/work_items/components/work_item_actions_spec.js +++ b/spec/frontend/work_items/components/work_item_actions_spec.js @@ -190,6 +190,10 @@ describe('WorkItemActions component', () => { { divider: true, }, + { + testId: TEST_ID_TOGGLE_ACTION, + text: '', + }, { testId: TEST_ID_LOCK_ACTION, text: 'Lock discussion', @@ -198,10 +202,6 @@ describe('WorkItemActions component', () => { testId: TEST_ID_CONFIDENTIALITY_TOGGLE_ACTION, text: 'Turn on confidentiality', }, - { - testId: TEST_ID_TOGGLE_ACTION, - text: '', - }, { testId: TEST_ID_COPY_REFERENCE_ACTION, text: 'Copy reference',