Add latest changes from gitlab-org/gitlab@master

3 files changed, 42 insertions, 95 deletions

diff --git a/app/assets/javascripts/projects/commit/components/branches_dropdown.vue b/app/assets/javascripts/projects/commit/components/branches_dropdown.vue
index a037e721677..a1fc3f1a731 100644
--- a/app/assets/javascripts/projects/commit/components/branches_dropdown.vue
+++ b/app/assets/javascripts/projects/commit/components/branches_dropdown.vue
@@ -1,11 +1,5 @@
 <script>
-import {
-  GlDropdown,
-  GlSearchBoxByType,
-  GlDropdownItem,
-  GlDropdownText,
-  GlLoadingIcon,
-} from '@gitlab/ui';
+import { GlCollapsibleListbox } from '@gitlab/ui';
 import { mapActions, mapGetters, mapState } from 'vuex';
 import {
   I18N_NO_RESULTS_MESSAGE,
@@ -16,11 +10,7 @@ import {
 export default {
   name: 'BranchesDropdown',
   components: {
-    GlDropdown,
-    GlSearchBoxByType,
-    GlDropdownItem,
-    GlDropdownText,
-    GlLoadingIcon,
+    GlCollapsibleListbox,
   },
   props: {
     value: {
@@ -46,13 +36,16 @@ export default {
   },
   computed: {
     ...mapGetters(['joinedBranches']),
-    ...mapState(['isFetching', 'branch', 'branches']),
+    ...mapState(['isFetching']),
     filteredResults() {
       const lowerCasedSearchTerm = this.searchTerm.toLowerCase();
       return this.joinedBranches.filter((resultString) =>
         resultString.toLowerCase().includes(lowerCasedSearchTerm),
       );
     },
+    listboxItems() {
+      return this.filteredResults.map((value) => ({ value, text: value }));
+    },
   },
   watch: {
     // Parent component can set the branch value (e.g. when the user selects a different project)
@@ -68,10 +61,6 @@ export default {
     ...mapActions(['fetchBranches']),
     selectBranch(branch) {
       this.$emit('selectBranch', branch);
-      this.searchTerm = branch; // enables isSelected to work as expected
-    },
-    isSelected(selectedBranch) {
-      return selectedBranch === this.branch;
     },
     searchTermChanged(value) {
       this.searchTerm = value;
@@ -81,36 +70,16 @@ export default {
 };
 </script>
 <template>
-  <gl-dropdown :text="value" :header-text="$options.i18n.branchHeaderTitle">
-    <gl-search-box-by-type
-      :value="searchTerm"
-      trim
-      autocomplete="off"
-      :debounce="250"
-      :placeholder="$options.i18n.branchSearchPlaceholder"
-      data-testid="dropdown-search-box"
-      @input="searchTermChanged"
-    />
-    <gl-dropdown-item
-      v-for="branch in filteredResults"
-      v-show="!isFetching"
-      :key="branch"
-      :name="branch"
-      :is-checked="isSelected(branch)"
-      is-check-item
-      data-testid="dropdown-item"
-      @click="selectBranch(branch)"
-    >
-      {{ branch }}
-    </gl-dropdown-item>
-    <gl-dropdown-text v-show="isFetching" data-testid="dropdown-text-loading-icon">
-      <gl-loading-icon size="sm" class="gl-mx-auto" />
-    </gl-dropdown-text>
-    <gl-dropdown-text
-      v-if="!filteredResults.length && !isFetching"
-      data-testid="empty-result-message"
-    >
-      <span class="gl-text-gray-500">{{ $options.i18n.noResultsMessage }}</span>
-    </gl-dropdown-text>
-  </gl-dropdown>
+  <gl-collapsible-listbox
+    :header-text="$options.i18n.branchHeaderTitle"
+    :toggle-text="value"
+    :items="listboxItems"
+    searchable
+    :search-placeholder="$options.i18n.branchSearchPlaceholder"
+    :searching="isFetching"
+    :selected="value"
+    :no-results-text="$options.i18n.noResultsMessage"
+    @search="searchTermChanged"
+    @select="selectBranch"
+  />
 </template>
diff --git a/app/assets/javascripts/projects/commit/components/form_modal.vue b/app/assets/javascripts/projects/commit/components/form_modal.vue
index 1febe8ceaab..b31ba4a100c 100644
--- a/app/assets/javascripts/projects/commit/components/form_modal.vue
+++ b/app/assets/javascripts/projects/commit/components/form_modal.vue
@@ -141,11 +141,7 @@ export default {
           :value="targetProjectId"
         />
 
-        <projects-dropdown
-          class="gl-w-half"
-          :value="targetProjectName"
-          @selectProject="setSelectedProject"
-        />
+        <projects-dropdown :value="targetProjectName" @selectProject="setSelectedProject" />
       </gl-form-group>
 
       <gl-form-group
@@ -155,12 +151,7 @@ export default {
       >
         <input id="start_branch" type="hidden" name="start_branch" :value="branch" />
 
-        <branches-dropdown
-          class="gl-w-half"
-          :value="branch"
-          :blanked="isRevert"
-          @selectBranch="setBranch"
-        />
+        <branches-dropdown :value="branch" :blanked="isRevert" @selectBranch="setBranch" />
       </gl-form-group>
 
       <gl-form-checkbox
diff --git a/app/assets/javascripts/projects/commit/components/projects_dropdown.vue b/app/assets/javascripts/projects/commit/components/projects_dropdown.vue
index 6288bcdaad0..d43f5b99e2c 100644
--- a/app/assets/javascripts/projects/commit/components/projects_dropdown.vue
+++ b/app/assets/javascripts/projects/commit/components/projects_dropdown.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlDropdown, GlSearchBoxByType, GlDropdownItem, GlDropdownText } from '@gitlab/ui';
+import { GlCollapsibleListbox } from '@gitlab/ui';
 import { mapGetters, mapState } from 'vuex';
 import {
   I18N_NO_RESULTS_MESSAGE,
@@ -10,10 +10,7 @@ import {
 export default {
   name: 'ProjectsDropdown',
   components: {
-    GlDropdown,
-    GlSearchBoxByType,
-    GlDropdownItem,
-    GlDropdownText,
+    GlCollapsibleListbox,
   },
   props: {
     value: {
@@ -41,17 +38,20 @@ export default {
         project.name.toLowerCase().includes(lowerCasedFilterTerm),
       );
     },
+    listboxItems() {
+      return this.filteredResults.map(({ id, name }) => ({ value: id, text: name }));
+    },
     selectedProject() {
       return this.sortedProjects.find((project) => project.id === this.targetProjectId) || {};
     },
   },
   methods: {
-    selectProject(project) {
-      this.$emit('selectProject', project.id);
-      this.filterTerm = project.name; // when we select a project, we want the dropdown to filter to the selected project
-    },
-    isSelected(selectedProject) {
-      return selectedProject === this.selectedProject;
+    selectProject(value) {
+      this.$emit('selectProject', value);
+
+      // when we select a project, we want the dropdown to filter to the selected project
+      const project = this.listboxItems.find((x) => x.value === value);
+      this.filterTerm = project?.text || '';
     },
     filterTermChanged(value) {
       this.filterTerm = value;
@@ -60,28 +60,15 @@ export default {
 };
 </script>
 <template>
-  <gl-dropdown :text="selectedProject.name" :header-text="$options.i18n.projectHeaderTitle">
-    <gl-search-box-by-type
-      :value="filterTerm"
-      trim
-      autocomplete="off"
-      :placeholder="$options.i18n.projectSearchPlaceholder"
-      data-testid="dropdown-search-box"
-      @input="filterTermChanged"
-    />
-    <gl-dropdown-item
-      v-for="project in filteredResults"
-      :key="project.name"
-      :name="project.name"
-      :is-checked="isSelected(project)"
-      is-check-item
-      data-testid="dropdown-item"
-      @click="selectProject(project)"
-    >
-      {{ project.name }}
-    </gl-dropdown-item>
-    <gl-dropdown-text v-if="!filteredResults.length" data-testid="empty-result-message">
-      <span class="gl-text-gray-500">{{ $options.i18n.noResultsMessage }}</span>
-    </gl-dropdown-text>
-  </gl-dropdown>
+  <gl-collapsible-listbox
+    :header-text="$options.i18n.projectHeaderTitle"
+    :items="listboxItems"
+    searchable
+    :search-placeholder="$options.i18n.projectSearchPlaceholder"
+    :selected="selectedProject.id"
+    :toggle-text="selectedProject.name"
+    :no-results-text="$options.i18n.noResultsMessage"
+    @search="filterTermChanged"
+    @select="selectProject"
+  />
 </template>