From 136760b101021c4c623314536eeea72dffc3200e Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 2 May 2024 21:11:12 -0600
Subject: [PATCH 1/3] Add FE token for filtering by target branch

---
 .../components/merge_requests_list_app.vue    | 28 +++++++++++++++++++
 .../merge_requests/list/constants.js          |  1 +
 2 files changed, 29 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 ec55f2cf32ae74..d36dea492bf2e8 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,6 +1,8 @@
 <script>
 import { GlFilteredSearchToken } from '@gitlab/ui';
 import { isEmpty } from 'lodash';
+import { createAlert } from '~/alert';
+import Api from '~/api';
 import * as Sentry from '~/sentry/sentry_browser_wrapper';
 import { STATUS_ALL, STATUS_CLOSED, STATUS_OPEN, STATUS_MERGED } from '~/issues/constants';
 import { fetchPolicies } from '~/lib/graphql';
@@ -17,6 +19,8 @@ import {
   TOKEN_TYPE_AUTHOR,
   TOKEN_TITLE_DRAFT,
   TOKEN_TYPE_DRAFT,
+  TOKEN_TITLE_TARGET_BRANCH,
+  TOKEN_TYPE_TARGET_BRANCH,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import {
   convertToApiParams,
@@ -44,6 +48,8 @@ import getMergeRequestsCountsQuery from '../queries/get_merge_requests_counts.qu
 import MergeRequestStatistics from './merge_request_statistics.vue';
 
 const UserToken = () => import('~/vue_shared/components/filtered_search_bar/tokens/user_token.vue');
+const BranchToken = () =>
+  import('~/vue_shared/components/filtered_search_bar/tokens/branch_token.vue');
 
 export default {
   i18n,
@@ -188,6 +194,17 @@ export default {
           ],
           unique: true,
         },
+        {
+          type: TOKEN_TYPE_TARGET_BRANCH,
+          title: TOKEN_TITLE_TARGET_BRANCH,
+          icon: 'arrow-right',
+          token: BranchToken,
+          operators: OPERATORS_IS,
+          fullPath: this.fullPath,
+          isProject: true,
+          multiselect: true,
+          fetchBranches: this.fetchBranches,
+        },
       ];
     },
     showPaginationControls() {
@@ -238,6 +255,17 @@ export default {
     this.updateData(this.initialSort);
   },
   methods: {
+    fetchBranches(search) {
+      return Api.branches(this.fullPath, search)
+        .then((response) => {
+          return response;
+        })
+        .catch(() => {
+          createAlert({
+            message: this.$options.i18n.errorFetchingBranches,
+          });
+        });
+    },
     getStatus(mergeRequest) {
       if (mergeRequest.state === STATUS_CLOSED) {
         return this.$options.i18n.closed;
diff --git a/app/assets/javascripts/merge_requests/list/constants.js b/app/assets/javascripts/merge_requests/list/constants.js
index 9dcc74c5aeecda..f0d9ca0566567d 100644
--- a/app/assets/javascripts/merge_requests/list/constants.js
+++ b/app/assets/javascripts/merge_requests/list/constants.js
@@ -5,6 +5,7 @@ export const i18n = {
   merged: __('Merged'),
   yes: __('Yes'),
   no: __('No'),
+  errorFetchingBranches: __('Failed to load branches. Please try again.'),
   errorFetchingCounts: __('An error occurred while getting merge request counts'),
   errorFetchingMergeRequests: __('An error occurred while loading merge requests'),
   upvotes: __('Upvotes'),
-- 
GitLab


From 45d3430544c86616791d3c9f09f2bc5443c55b8c Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Thu, 2 May 2024 22:40:34 -0600
Subject: [PATCH 2/3] Add target_branch to the filter tokens and GQL query

---
 app/assets/javascripts/issues/list/constants.js       | 11 +++++++++++
 .../list/queries/get_merge_requests.query.graphql     |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 2c87203ab68018..a2705932156ba4 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -24,6 +24,7 @@ import {
   TOKEN_TYPE_MY_REACTION,
   TOKEN_TYPE_ORGANIZATION,
   TOKEN_TYPE_RELEASE,
+  TOKEN_TYPE_TARGET_BRANCH,
   TOKEN_TYPE_TYPE,
   TOKEN_TYPE_WEIGHT,
   TOKEN_TYPE_SEARCH_WITHIN,
@@ -267,6 +268,16 @@ export const filtersMap = {
       },
     },
   },
+  [TOKEN_TYPE_TARGET_BRANCH]: {
+    [API_PARAM]: {
+      [NORMAL_FILTER]: 'targetBranches',
+    },
+    [URL_PARAM]: {
+      [OPERATOR_IS]: {
+        [NORMAL_FILTER]: 'target_branches[]',
+      },
+    },
+  },
   [TOKEN_TYPE_TYPE]: {
     [API_PARAM]: {
       [NORMAL_FILTER]: 'types',
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 92002134c06016..a97ca144b25e6d 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
@@ -9,6 +9,7 @@ query getMergeRequests(
   $state: MergeRequestState
   $authorUsername: String
   $draft: Boolean
+  $targetBranches: [String!]
   $beforeCursor: String
   $afterCursor: String
   $firstPageSize: Int
@@ -21,6 +22,7 @@ query getMergeRequests(
       state: $state
       authorUsername: $authorUsername
       draft: $draft
+      targetBranches: $targetBranches
       before: $beforeCursor
       after: $afterCursor
       first: $firstPageSize
-- 
GitLab


From afae449f23618cede1bb5e238fb2a51ce848935a Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 8 May 2024 18:30:46 -0600
Subject: [PATCH 3/3] Test that target branch filter token is rendered on the
 MR list

---
 .../list/components/merge_requests_list_app_spec.js         | 6 +++++-
 1 file changed, 5 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 da66dac31d12a8..b25b05cc0a1c01 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
@@ -10,6 +10,7 @@ import { convertToGraphQLId } from '~/graphql_shared/utils';
 import {
   TOKEN_TYPE_AUTHOR,
   TOKEN_TYPE_DRAFT,
+  TOKEN_TYPE_TARGET_BRANCH,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import { mergeRequestListTabs } from '~/vue_shared/issuable/list/constants';
 import { getSortOptions } from '~/issues/list/utils';
@@ -99,13 +100,14 @@ describe('Merge requests list app', () => {
         expect(findIssuableList().props('searchTokens')).toMatchObject([
           { type: TOKEN_TYPE_AUTHOR, preloadedUsers: [] },
           { type: TOKEN_TYPE_DRAFT },
+          { type: TOKEN_TYPE_TARGET_BRANCH },
         ]);
       });
     });
 
     describe('when all tokens are available', () => {
       beforeEach(async () => {
-        setWindowLocation('?draft=yes');
+        setWindowLocation('?draft=yes&target_branches[]="branch-a"');
         window.gon = {
           current_user_id: mockCurrentUser.id,
           current_user_fullname: mockCurrentUser.name,
@@ -131,12 +133,14 @@ describe('Merge requests list app', () => {
         expect(findIssuableList().props('searchTokens')).toMatchObject([
           { type: TOKEN_TYPE_AUTHOR, preloadedUsers },
           { type: TOKEN_TYPE_DRAFT },
+          { type: TOKEN_TYPE_TARGET_BRANCH },
         ]);
       });
 
       it('pre-displays tokens that are in the url search parameters', () => {
         expect(findIssuableList().props('initialFilterValue')).toMatchObject([
           { type: TOKEN_TYPE_DRAFT },
+          { type: TOKEN_TYPE_TARGET_BRANCH },
         ]);
       });
     });
-- 
GitLab