Merge branch '6953-project-selector-use-gitlab-ui-search-input' into 'master'

Use GlSearchBoxByType in project selector

See merge request gitlab-org/gitlab!16795

app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue

 <script>
 import _ from 'underscore';
-import { GlLoadingIcon } from '@gitlab/ui';
+import { GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui';
 import ProjectListItem from './project_list_item.vue';
 
 const SEARCH_INPUT_TIMEOUT_MS = 500;
@@ -9,6 +9,7 @@ export default {
   name: 'ProjectSelector',
   components: {
     GlLoadingIcon,
+    GlSearchBoxByType,
     ProjectListItem,
   },
   props: {
@@ -53,9 +54,6 @@ export default {
     isSelected(project) {
       return Boolean(_.findWhere(this.selectedProjects, { id: project.id }));
     },
-    focusSearchInput() {
-      this.$refs.searchInput.focus();
-    },
     onInput: _.debounce(function debouncedOnInput() {
       this.$emit('searched', this.searchQuery);
     }, SEARCH_INPUT_TIMEOUT_MS),
@@ -64,12 +62,11 @@ export default {
 </script>
 <template>
   <div>
-    <input
-      ref="searchInput"
+    <gl-search-box-by-type
       v-model="searchQuery"
       :placeholder="__('Search your projects')"
       type="search"
-      class="form-control mb-3 js-project-selector-input"
+      class="mb-3"
       autofocus
       @input="onInput"
     />

changelogs/unreleased/project-selector-use-gitlab-ui-search-input.yml

+---
+title: Align project selector search box better with design system
+merge_request: 16795
+author:
+type: changed

ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue

@@ -99,9 +99,6 @@ export default {
     addProjects() {
       this.addProjectsToDashboard();
     },
-    onModalShown() {
-      this.$refs.projectSelector.focusSearchInput();
-    },
     onModalHidden() {
       this.clearSearchResults();
     },
@@ -127,7 +124,6 @@ export default {
       :ok-title="$options.addProjectsModalSubmit"
       :ok-disabled="okDisabled"
       ok-variant="success"
-      @shown="onModalShown"
       @hidden="onModalHidden"
       @ok="onOk"
     >

ee/app/assets/javascripts/operations/components/dashboard/dashboard.vue

@@ -80,9 +80,6 @@ export default {
     addProjects() {
       this.addProjectsToDashboard();
     },
-    onModalShown() {
-      this.$refs.projectSelector.focusSearchInput();
-    },
     onCancel() {
       this.clearSearchResults();
     },
@@ -110,7 +107,6 @@ export default {
       :ok-title="s__('OperationsDashboard|Add projects')"
       :ok-disabled="okDisabled"
       ok-variant="success"
-      @shown="onModalShown"
       @cancel="onCancel"
       @ok="onOk"
     >

spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js

@@ -2,7 +2,9 @@ import Vue from 'vue';
 import _ from 'underscore';
 import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue';
 import ProjectListItem from '~/vue_shared/components/project_selector/project_list_item.vue';
-import { shallowMount } from '@vue/test-utils';
+
+import { GlSearchBoxByType } from '@gitlab/ui';
+import { mount } from '@vue/test-utils';
 import { trimText } from 'spec/helpers/text_helper';
 
 describe('ProjectSelector component', () => {
@@ -14,10 +16,12 @@ describe('ProjectSelector component', () => {
   let selected = [];
   selected = selected.concat(allProjects.slice(0, 3)).concat(allProjects.slice(5, 8));
 
+  const findSearchInput = () => wrapper.find(GlSearchBoxByType).find('input');
+
   beforeEach(() => {
     jasmine.clock().install();
 
-    wrapper = shallowMount(Vue.extend(ProjectSelector), {
+    wrapper = mount(Vue.extend(ProjectSelector), {
       propsData: {
         projectSearchResults: searchResults,
         selectedProjects: selected,
@@ -26,6 +30,7 @@ describe('ProjectSelector component', () => {
         showLoadingIndicator: false,
         showSearchErrorMessage: false,
       },
+      sync: false,
       attachToDocument: true,
     });
 
@@ -44,7 +49,8 @@ describe('ProjectSelector component', () => {
   it(`triggers a (debounced) search when the search input value changes`, () => {
     spyOn(vm, '$emit');
     const query = 'my test query!';
-    const searchInput = wrapper.find('.js-project-selector-input');
+    const searchInput = findSearchInput();
+
     searchInput.setValue(query);
     searchInput.trigger('input');
 
@@ -56,7 +62,7 @@ describe('ProjectSelector component', () => {
 
   it(`debounces the search input`, () => {
     spyOn(vm, '$emit');
-    const searchInput = wrapper.find('.js-project-selector-input');
+    const searchInput = findSearchInput();
 
     const updateSearchQuery = (count = 0) => {
       if (count === 10) {
@@ -77,9 +83,9 @@ describe('ProjectSelector component', () => {
   });
 
   it(`includes a placeholder in the search box`, () => {
-    expect(wrapper.find('.js-project-selector-input').attributes('placeholder')).toBe(
-      'Search your projects',
-    );
+    const searchInput = findSearchInput();
+
+    expect(searchInput.attributes('placeholder')).toBe('Search your projects');
   });
 
   it(`triggers a "projectClicked" event when a project is clicked`, () => {
@@ -92,41 +98,35 @@ describe('ProjectSelector component', () => {
   it(`shows a "no results" message if showNoResultsMessage === true`, () => {
     wrapper.setProps({ showNoResultsMessage: true });
 
-    expect(wrapper.contains('.js-no-results-message')).toBe(true);
+    return vm.$nextTick().then(() => {
+      const noResultsEl = wrapper.find('.js-no-results-message');
 
-    const noResultsEl = wrapper.find('.js-no-results-message');
-
-    expect(trimText(noResultsEl.text())).toEqual('Sorry, no projects matched your search');
+      expect(noResultsEl.exists()).toBe(true);
+      expect(trimText(noResultsEl.text())).toEqual('Sorry, no projects matched your search');
+    });
   });
 
   it(`shows a "minimum search query" message if showMinimumSearchQueryMessage === true`, () => {
     wrapper.setProps({ showMinimumSearchQueryMessage: true });
 
-    expect(wrapper.contains('.js-minimum-search-query-message')).toBe(true);
-
-    const minimumSearchEl = wrapper.find('.js-minimum-search-query-message');
+    return vm.$nextTick().then(() => {
+      const minimumSearchEl = wrapper.find('.js-minimum-search-query-message');
 
-    expect(trimText(minimumSearchEl.text())).toEqual('Enter at least three characters to search');
+      expect(minimumSearchEl.exists()).toBe(true);
+      expect(trimText(minimumSearchEl.text())).toEqual('Enter at least three characters to search');
+    });
   });
 
   it(`shows a error message if showSearchErrorMessage === true`, () => {
     wrapper.setProps({ showSearchErrorMessage: true });
 
-    expect(wrapper.contains('.js-search-error-message')).toBe(true);
-
-    const errorMessageEl = wrapper.find('.js-search-error-message');
-
-    expect(trimText(errorMessageEl.text())).toEqual(
-      'Something went wrong, unable to search projects',
-    );
-  });
+    return vm.$nextTick().then(() => {
+      const errorMessageEl = wrapper.find('.js-search-error-message');
 
-  it(`focuses the input element when the focusSearchInput() method is called`, () => {
-    const input = wrapper.find('.js-project-selector-input');
-
-    expect(document.activeElement).not.toBe(input.element);
-    vm.focusSearchInput();
-
-    expect(document.activeElement).toBe(input.element);
+      expect(errorMessageEl.exists()).toBe(true);
+      expect(trimText(errorMessageEl.text())).toEqual(
+        'Something went wrong, unable to search projects',
+      );
+    });
   });
 });