Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 0 deletions

diff --git a/app/assets/javascripts/boards/components/board_filtered_search.vue b/app/assets/javascripts/boards/components/board_filtered_search.vue
index fa0c798ca9d..11a5d89cc8c 100644
--- a/app/assets/javascripts/boards/components/board_filtered_search.vue
+++ b/app/assets/javascripts/boards/components/board_filtered_search.vue
@@ -8,6 +8,7 @@ import { __ } from '~/locale';
 import {
   FILTERED_SEARCH_TERM,
   FILTER_ANY,
+  TOKEN_TYPE_HEALTH,
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 import { AssigneeFilterType } from '~/boards/constants';
@@ -55,6 +56,7 @@ export default {
         myReactionEmoji,
         releaseTag,
         confidential,
+        healthStatus,
       } = this.filterParams;
       const filteredSearchValue = [];
 
@@ -154,6 +156,13 @@ export default {
         });
       }
 
+      if (healthStatus) {
+        filteredSearchValue.push({
+          type: TOKEN_TYPE_HEALTH,
+          value: { data: healthStatus, operator: '=' },
+        });
+      }
+
       if (this.filterParams['not[authorUsername]']) {
         filteredSearchValue.push({
           type: 'author',
@@ -248,6 +257,7 @@ export default {
         iterationCadenceId,
         releaseTag,
         confidential,
+        healthStatus,
       } = this.filterParams;
       let iteration = iterationId;
       let cadence = iterationCadenceId;
@@ -292,6 +302,7 @@ export default {
           my_reaction_emoji: myReactionEmoji,
           release_tag: releaseTag,
           confidential,
+          [TOKEN_TYPE_HEALTH]: healthStatus,
         },
         (value) => {
           if (value || value === false) {
@@ -390,6 +401,9 @@ export default {
           case 'filtered-search-term':
             if (filter.value.data) plainText.push(filter.value.data);
             break;
+          case TOKEN_TYPE_HEALTH:
+            filterParams.healthStatus = filter.value.data;
+            break;
           default:
             break;
         }
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index 854717ed4c4..a7003edba47 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -86,6 +86,7 @@ function mountBoardApp(el) {
       milestoneListsAvailable: parseBoolean(el.dataset.milestoneListsAvailable),
       assigneeListsAvailable: parseBoolean(el.dataset.assigneeListsAvailable),
       iterationListsAvailable: parseBoolean(el.dataset.iterationListsAvailable),
+      healthStatusFeatureAvailable: parseBoolean(el.dataset.healthStatusFeatureAvailable),
       allowScopedLabels: parseBoolean(el.dataset.scopedLabels),
       swimlanesFeatureAvailable: gon.licensed_features?.swimlanes,
       multipleIssueBoardsAvailable: parseBoolean(el.dataset.multipleBoardsAvailable),