Commit 88e6c92c authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch 'Remove-'Show-0-projects'-from-project-selector-on-initial-load' into 'master'

Remove "Showing 0 projects" from project selector on initial load

See merge request gitlab-org/gitlab!51136
parents 8e886c89 8ed78ef1
...@@ -48,10 +48,14 @@ export default { ...@@ -48,10 +48,14 @@ export default {
data() { data() {
return { return {
searchQuery: '', searchQuery: '',
hasSearched: false,
}; };
}, },
computed: { computed: {
legendText() { legendText() {
if (!this.hasSearched) {
return '';
}
const count = this.projectSearchResults.length; const count = this.projectSearchResults.length;
const total = this.totalResults; const total = this.totalResults;
...@@ -75,6 +79,9 @@ export default { ...@@ -75,6 +79,9 @@ export default {
return this.selectedProjects.some(({ id }) => project.id === id); return this.selectedProjects.some(({ id }) => project.id === id);
}, },
onInput: debounce(function debouncedOnInput() { onInput: debounce(function debouncedOnInput() {
if (!this.hasSearched) {
this.hasSearched = true;
}
this.$emit('searched', this.searchQuery); this.$emit('searched', this.searchQuery);
}, SEARCH_INPUT_TIMEOUT_MS), }, SEARCH_INPUT_TIMEOUT_MS),
}, },
...@@ -115,7 +122,7 @@ export default { ...@@ -115,7 +122,7 @@ export default {
</template> </template>
<template #default> <template #default>
{{ legendText }} <span data-testid="legend-text">{{ legendText }}</span>
</template> </template>
</gl-infinite-scroll> </gl-infinite-scroll>
<div v-if="showNoResultsMessage" class="text-muted ml-2 js-no-results-message"> <div v-if="showNoResultsMessage" class="text-muted ml-2 js-no-results-message">
......
---
title: Remove "Showing 0 projects" from project selector on initial load
merge_request: 51136
author: Kev @KevSlashNull
type: changed
...@@ -18,6 +18,13 @@ describe('ProjectSelector component', () => { ...@@ -18,6 +18,13 @@ describe('ProjectSelector component', () => {
selected = selected.concat(allProjects.slice(0, 3)).concat(allProjects.slice(5, 8)); selected = selected.concat(allProjects.slice(0, 3)).concat(allProjects.slice(5, 8));
const findSearchInput = () => wrapper.find(GlSearchBoxByType).find('input'); const findSearchInput = () => wrapper.find(GlSearchBoxByType).find('input');
const findLegendText = () => wrapper.find('[data-testid="legend-text"]').text();
const search = (query) => {
const searchInput = findSearchInput();
searchInput.setValue(query);
searchInput.trigger('input');
};
beforeEach(() => { beforeEach(() => {
wrapper = mount(Vue.extend(ProjectSelector), { wrapper = mount(Vue.extend(ProjectSelector), {
...@@ -48,10 +55,7 @@ describe('ProjectSelector component', () => { ...@@ -48,10 +55,7 @@ describe('ProjectSelector component', () => {
it(`triggers a search when the search input value changes`, () => { it(`triggers a search when the search input value changes`, () => {
jest.spyOn(vm, '$emit').mockImplementation(() => {}); jest.spyOn(vm, '$emit').mockImplementation(() => {});
const query = 'my test query!'; const query = 'my test query!';
const searchInput = findSearchInput(); search(query);
searchInput.setValue(query);
searchInput.trigger('input');
expect(vm.$emit).toHaveBeenCalledWith('searched', query); expect(vm.$emit).toHaveBeenCalledWith('searched', query);
}); });
...@@ -121,15 +125,21 @@ describe('ProjectSelector component', () => { ...@@ -121,15 +125,21 @@ describe('ProjectSelector component', () => {
`( `(
'is "$expected" given $count results are showing out of $total', 'is "$expected" given $count results are showing out of $total',
({ count, total, expected }) => { ({ count, total, expected }) => {
search('gitlab ui');
wrapper.setProps({ wrapper.setProps({
projectSearchResults: searchResults.slice(0, count), projectSearchResults: searchResults.slice(0, count),
totalResults: total, totalResults: total,
}); });
return wrapper.vm.$nextTick().then(() => { return wrapper.vm.$nextTick().then(() => {
expect(wrapper.text()).toContain(expected); expect(findLegendText()).toBe(expected);
}); });
}, },
); );
it('is not rendered without searching', () => {
expect(findLegendText()).toBe('');
});
}); });
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment