Merge branch 'nl-wi-action-order' into 'master'

Move close action first in work items action menu

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149757



Merged-by: Coung Ngo <cngo@gitlab.com>
Approved-by: Coung Ngo <cngo@gitlab.com>
Co-authored-by: Nick Leonard <nleonard@gitlab.com>

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"

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',