From 8dfa0d075d26915f0a5fbc2716cfec9a905de999 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 26 Apr 2024 16:16:23 -0600
Subject: [PATCH 1/7] Add MR Draft to the issues list utils & constants

---
 app/assets/javascripts/issues/list/constants.js | 11 +++++++++++
 app/assets/javascripts/issues/list/utils.js     |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 2a9f1dfc1c9930..00c2ee0863dc23 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -15,6 +15,7 @@ import {
   TOKEN_TYPE_AUTHOR,
   TOKEN_TYPE_CONFIDENTIAL,
   TOKEN_TYPE_CONTACT,
+  TOKEN_TYPE_DRAFT,
   TOKEN_TYPE_EPIC,
   TOKEN_TYPE_HEALTH,
   TOKEN_TYPE_ITERATION,
@@ -347,6 +348,16 @@ export const filtersMap = {
       },
     },
   },
+  [TOKEN_TYPE_DRAFT]: {
+    [API_PARAM]: {
+      [NORMAL_FILTER]: 'draft',
+    },
+    [URL_PARAM]: {
+      [OPERATOR_IS]: {
+        [NORMAL_FILTER]: 'draft',
+      },
+    },
+  },
   [TOKEN_TYPE_ITERATION]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'iterationId',
diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js
index bdb31123686d6c..9629bef0eff29f 100644
--- a/app/assets/javascripts/issues/list/utils.js
+++ b/app/assets/javascripts/issues/list/utils.js
@@ -10,6 +10,7 @@ import {
   OPERATORS_TO_GROUP,
   TOKEN_TYPE_ASSIGNEE,
   TOKEN_TYPE_AUTHOR,
+  TOKEN_TYPE_DRAFT,
   TOKEN_TYPE_CONFIDENTIAL,
   TOKEN_TYPE_ITERATION,
   TOKEN_TYPE_MILESTONE,
@@ -321,9 +322,10 @@ const formatData = (token) => {
   if (requiresUpperCaseValue(token.type, token.value.data)) {
     return token.value.data.toUpperCase();
   }
-  if (token.type === TOKEN_TYPE_CONFIDENTIAL) {
+  if ([TOKEN_TYPE_CONFIDENTIAL, TOKEN_TYPE_DRAFT].includes(token.type)) {
     return token.value.data === 'yes';
   }
+
   return token.value.data;
 };
 
-- 
GitLab


From 3278d2c86f733c05d3576fbe1e318d3d52ab2c51 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 26 Apr 2024 16:17:17 -0600
Subject: [PATCH 2/7] Add draft token to the Vue MR List filtered search

---
 .../components/merge_requests_list_app.vue     | 18 ++++++++++++++++++
 .../merge_requests/list/constants.js           |  2 ++
 .../queries/get_merge_requests.query.graphql   |  2 ++
 .../filtered_search_bar/constants.js           |  2 ++
 4 files changed, 24 insertions(+)

diff --git a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
index 5d9136718719d4..41bc24fdbea097 100644
--- a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
+++ b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
@@ -1,4 +1,5 @@
 <script>
+import { GlFilteredSearchToken } from '@gitlab/ui';
 import { isEmpty } from 'lodash';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import { STATUS_ALL, STATUS_CLOSED, STATUS_OPEN, STATUS_MERGED } from '~/issues/constants';
@@ -14,6 +15,8 @@ import {
   OPERATORS_IS,
   TOKEN_TITLE_AUTHOR,
   TOKEN_TYPE_AUTHOR,
+  TOKEN_TITLE_DRAFT,
+  TOKEN_TYPE_DRAFT,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import {
   convertToApiParams,
@@ -170,6 +173,21 @@ export default {
           preloadedUsers,
           multiselect: false,
         },
+        {
+          fullPath: this.fullPath,
+          icon: 'pencil-square',
+          isProject: true,
+          multiselect: false,
+          operators: OPERATORS_IS,
+          options: [
+            { value: 'yes', title: this.$options.i18n.yes },
+            { value: 'no', title: this.$options.i18n.no },
+          ],
+          title: TOKEN_TITLE_DRAFT,
+          token: GlFilteredSearchToken,
+          type: TOKEN_TYPE_DRAFT,
+          unique: true,
+        },
       ];
     },
     showPaginationControls() {
diff --git a/app/assets/javascripts/merge_requests/list/constants.js b/app/assets/javascripts/merge_requests/list/constants.js
index e45939a12a3199..c37d342883a8a0 100644
--- a/app/assets/javascripts/merge_requests/list/constants.js
+++ b/app/assets/javascripts/merge_requests/list/constants.js
@@ -3,6 +3,8 @@ import { __ } from '~/locale';
 export const i18n = {
   closed: __('Closed'),
   merged: __('Merged'),
+  yes: __('Yes'),
+  no: __('No'),
   errorFetchingCounts: __('An error occurred while getting merge request counts'),
   errorFetchingMergeRequests: __('An error occurred while loading merge requests'),
   upvotes: __('Upvotes'),
diff --git a/app/assets/javascripts/merge_requests/list/queries/get_merge_requests.query.graphql b/app/assets/javascripts/merge_requests/list/queries/get_merge_requests.query.graphql
index eac3f870e7bf2a..92002134c06016 100644
--- a/app/assets/javascripts/merge_requests/list/queries/get_merge_requests.query.graphql
+++ b/app/assets/javascripts/merge_requests/list/queries/get_merge_requests.query.graphql
@@ -8,6 +8,7 @@ query getMergeRequests(
   $sort: MergeRequestSort
   $state: MergeRequestState
   $authorUsername: String
+  $draft: Boolean
   $beforeCursor: String
   $afterCursor: String
   $firstPageSize: Int
@@ -19,6 +20,7 @@ query getMergeRequests(
       sort: $sort
       state: $state
       authorUsername: $authorUsername
+      draft: $draft
       before: $beforeCursor
       after: $afterCursor
       first: $firstPageSize
diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
index 2879dcbdf0bb24..aeebe312e9d08a 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js
@@ -67,6 +67,7 @@ export const TOKEN_TITLE_ASSIGNEE = s__('SearchToken|Assignee');
 export const TOKEN_TITLE_AUTHOR = __('Author');
 export const TOKEN_TITLE_CONFIDENTIAL = __('Confidential');
 export const TOKEN_TITLE_CONTACT = s__('Crm|Contact');
+export const TOKEN_TITLE_DRAFT = s__('MergeRequests|Draft');
 export const TOKEN_TITLE_GROUP = __('Group');
 export const TOKEN_TITLE_GROUP_INVITE = __('Group invite');
 export const TOKEN_TITLE_LABEL = __('Label');
@@ -92,6 +93,7 @@ export const TOKEN_TYPE_ASSIGNEE = 'assignee';
 export const TOKEN_TYPE_AUTHOR = 'author';
 export const TOKEN_TYPE_CONFIDENTIAL = 'confidential';
 export const TOKEN_TYPE_CONTACT = 'contact';
+export const TOKEN_TYPE_DRAFT = 'draft';
 export const TOKEN_TYPE_GROUP = 'group';
 export const TOKEN_TYPE_GROUP_INVITE = 'group-invite';
 export const TOKEN_TYPE_EPIC = 'epic';
-- 
GitLab


From f8a8c8b2ea4512407d44c31efc67d256ccecf939 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 26 Apr 2024 16:18:08 -0600
Subject: [PATCH 3/7] Fix "downvots" typo

As far as I can tell, this isn't used anywhere, but
there are plenty of references to downvotes and upvotes
so I don't feel comfortable simply deleting it.
---
 app/assets/javascripts/merge_requests/list/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/merge_requests/list/constants.js b/app/assets/javascripts/merge_requests/list/constants.js
index c37d342883a8a0..9dcc74c5aeecda 100644
--- a/app/assets/javascripts/merge_requests/list/constants.js
+++ b/app/assets/javascripts/merge_requests/list/constants.js
@@ -8,5 +8,5 @@ export const i18n = {
   errorFetchingCounts: __('An error occurred while getting merge request counts'),
   errorFetchingMergeRequests: __('An error occurred while loading merge requests'),
   upvotes: __('Upvotes'),
-  downvots: __('Downvotes'),
+  downvotes: __('Downvotes'),
 };
-- 
GitLab


From 979bc90a4720431ed3043e35240b7141cfd1ad86 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 26 Apr 2024 16:42:37 -0600
Subject: [PATCH 4/7] Update localization file

---
 locale/gitlab.pot | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index b73f5d2771a107..fd4a294d87fe79 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -32153,6 +32153,9 @@ msgstr ""
 msgid "MergeRequests|Create issue to resolve thread"
 msgstr ""
 
+msgid "MergeRequests|Draft"
+msgstr ""
+
 msgid "MergeRequests|Drafts cannot be merged until marked ready."
 msgstr ""
 
-- 
GitLab


From 2c1571792cc175c87bc2d1b0bb925539cf2c2a7b Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Fri, 26 Apr 2024 17:16:22 -0600
Subject: [PATCH 5/7] Test that the draft token is used by the MR list app

---
 .../list/components/merge_requests_list_app_spec.js    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
index e8787b5b4eadf7..d192c9e322a98c 100644
--- a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
+++ b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
@@ -3,10 +3,14 @@ import VueApollo from 'vue-apollo';
 import { shallowMount } from '@vue/test-utils';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
+import setWindowLocation from 'helpers/set_window_location_helper';
 import { getCountsQueryResponse, getQueryResponse } from 'jest/merge_requests/list/mock_data';
 import { TYPENAME_USER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
-import { TOKEN_TYPE_AUTHOR } from '~/vue_shared/components/filtered_search_bar/constants';
+import {
+  TOKEN_TYPE_AUTHOR,
+  TOKEN_TYPE_DRAFT,
+} from '~/vue_shared/components/filtered_search_bar/constants';
 import { mergeRequestListTabs } from '~/vue_shared/issuable/list/constants';
 import { getSortOptions } from '~/issues/list/utils';
 import MergeRequestsListApp from '~/merge_requests/list/components/merge_requests_list_app.vue';
@@ -94,12 +98,14 @@ describe('Merge requests list app', () => {
       it('does not have preloaded users when gon.current_user_id does not exist', () => {
         expect(findIssuableList().props('searchTokens')).toMatchObject([
           { type: TOKEN_TYPE_AUTHOR, preloadedUsers: [] },
+          { type: TOKEN_TYPE_DRAFT },
         ]);
       });
     });
 
     describe('when all tokens are available', () => {
       beforeEach(async () => {
+        setWindowLocation('?draft=yes');
         window.gon = {
           current_user_id: mockCurrentUser.id,
           current_user_fullname: mockCurrentUser.name,
@@ -114,6 +120,7 @@ describe('Merge requests list app', () => {
 
       afterEach(() => {
         window.gon = {};
+        setWindowLocation('?');
       });
 
       it('renders all tokens', () => {
@@ -123,6 +130,7 @@ describe('Merge requests list app', () => {
 
         expect(findIssuableList().props('searchTokens')).toMatchObject([
           { type: TOKEN_TYPE_AUTHOR, preloadedUsers },
+          { type: TOKEN_TYPE_DRAFT },
         ]);
       });
     });
-- 
GitLab


From e1161a536e2c477b41465c30ca722553274dbd7d Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 30 Apr 2024 19:52:54 -0600
Subject: [PATCH 6/7] Switch to non-alphabetic (arbitrary) key ordering

---
 .../list/components/merge_requests_list_app.vue        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
index 41bc24fdbea097..ec55f2cf32ae74 100644
--- a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
+++ b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue
@@ -174,18 +174,18 @@ export default {
           multiselect: false,
         },
         {
-          fullPath: this.fullPath,
+          type: TOKEN_TYPE_DRAFT,
+          title: TOKEN_TITLE_DRAFT,
           icon: 'pencil-square',
+          token: GlFilteredSearchToken,
+          operators: OPERATORS_IS,
+          fullPath: this.fullPath,
           isProject: true,
           multiselect: false,
-          operators: OPERATORS_IS,
           options: [
             { value: 'yes', title: this.$options.i18n.yes },
             { value: 'no', title: this.$options.i18n.no },
           ],
-          title: TOKEN_TITLE_DRAFT,
-          token: GlFilteredSearchToken,
-          type: TOKEN_TYPE_DRAFT,
           unique: true,
         },
       ];
-- 
GitLab


From 7a9419a3947f9ced49ec8a653e385e9907aa59f6 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Tue, 30 Apr 2024 20:12:36 -0600
Subject: [PATCH 7/7] Add test for search param filters

---
 .../list/components/merge_requests_list_app_spec.js         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
index d192c9e322a98c..da66dac31d12a8 100644
--- a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
+++ b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
@@ -133,6 +133,12 @@ describe('Merge requests list app', () => {
           { type: TOKEN_TYPE_DRAFT },
         ]);
       });
+
+      it('pre-displays tokens that are in the url search parameters', () => {
+        expect(findIssuableList().props('initialFilterValue')).toMatchObject([
+          { type: TOKEN_TYPE_DRAFT },
+        ]);
+      });
     });
   });
 });
-- 
GitLab