Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 15 deletions

diff --git a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
index 08d24344ffc..10bfcdc2294 100644
--- a/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
+++ b/app/assets/javascripts/pages/projects/graphs/components/code_coverage.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlAlert, GlButton, GlDropdown, GlDropdownItem, GlSprintf } from '@gitlab/ui';
+import { GlAlert, GlButton, GlListbox, GlSprintf } from '@gitlab/ui';
 import { GlAreaChart } from '@gitlab/ui/dist/charts';
 import { get } from 'lodash';
 import { formatDate } from '~/lib/utils/datetime_utility';
@@ -12,8 +12,7 @@ export default {
     GlAlert,
     GlAreaChart,
     GlButton,
-    GlDropdown,
-    GlDropdownItem,
+    GlListbox,
     GlSprintf,
   },
   props: {
@@ -96,6 +95,14 @@ export default {
     formattedData() {
       return this.sortedData.map((value) => [value.date, value.coverage]);
     },
+    mappedCoverages() {
+      return this.dailyCoverageData?.map((item, index) => ({
+        // A numerical index makes an item into a group header, so
+        // convert these to strings to get non-header GlListbox items
+        value: index.toString(),
+        text: item.group_name,
+      }));
+    },
     chartData() {
       return [
         {
@@ -175,18 +182,13 @@ export default {
           {{ __('It seems that there is currently no available data for code coverage') }}
         </span>
       </gl-alert>
-      <gl-dropdown v-if="canShowData" :text="selectedDailyCoverageName">
-        <gl-dropdown-item
-          v-for="({ group_name }, index) in dailyCoverageData"
-          :key="index"
-          :value="group_name"
-          is-check-item
-          :is-checked="index === selectedCoverageIndex"
-          @click="setSelectedCoverage(index)"
-        >
-          {{ group_name }}
-        </gl-dropdown-item>
-      </gl-dropdown>
+      <gl-listbox
+        v-if="canShowData"
+        :items="mappedCoverages"
+        :selected="selectedCoverageIndex.toString()"
+        :toggle-text="selectedDailyCoverageName"
+        @select="setSelectedCoverage"
+      />
     </div>
     <gl-area-chart
       v-if="!isLoading"
diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
index 42fa306d226..a4e3ddfc506 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js
@@ -2,6 +2,7 @@
 
 import $ from 'jquery';
 import IssuableForm from 'ee_else_ce/issuable/issuable_form';
+import IssuableLabelSelector from '~/issuable/issuable_label_selector';
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
 import Diff from '~/diff';
 import GLForm from '~/gl_form';
@@ -14,6 +15,7 @@ export default () => {
   new ShortcutsNavigation();
   new GLForm($('.merge-request-form'));
   new IssuableForm($('.merge-request-form'));
+  IssuableLabelSelector();
   new LabelsSelect();
   new IssuableTemplateSelectors({
     warnTemplateOverride: true,