From b50a849b37ac7832f5ebd7e402d1e44f2b11eb20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Mon, 13 Aug 2018 16:26:11 +0200 Subject: [PATCH] SONAR-11150 Display all results when searching in projects page language facet --- .../apps/projects/filters/LanguagesFilter.tsx | 15 ++- .../filters/SearchableFilterFooter.tsx | 12 +-- .../__tests__/LanguagesFilter-test.tsx | 25 ----- .../LanguagesFilter-test.tsx.snap | 102 ------------------ 4 files changed, 12 insertions(+), 142 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx index 2481e0b6986..ada03f39f0a 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx @@ -36,20 +36,17 @@ interface Props { organization?: { key: string }; property?: string; query: { [x: string]: any }; - value?: Array; + value?: string[]; } -const LIST_SIZE = 10; - export default class LanguagesFilter extends React.Component { getSearchOptions = () => { - let languageKeys = Object.keys(this.props.languages); - if (this.props.facet) { - languageKeys = difference(languageKeys, Object.keys(this.props.facet)); + const { facet, languages } = this.props; + let languageKeys = Object.keys(languages); + if (facet) { + languageKeys = difference(languageKeys, Object.keys(facet)); } - return languageKeys - .slice(0, LIST_SIZE) - .map(key => ({ label: this.props.languages[key].name, value: key })); + return languageKeys.map(key => ({ label: languages[key].name, value: key })); }; getSortedOptions = (facet: Facet = {}) => diff --git a/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx index 952aabbe5e8..3ec19461c42 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx @@ -23,15 +23,15 @@ import { translate } from '../../../helpers/l10n'; import { RawQuery } from '../../../helpers/query'; interface Props { - onQueryChange: (change: RawQuery) => void; - property: string; - query: { [x: string]: any }; - options: Array<{ label: string; value: string }>; + isFavorite?: boolean; + isLoading?: boolean; onInputChange?: (query: string) => void; onOpen?: () => void; - isLoading?: boolean; - isFavorite?: boolean; + onQueryChange: (change: RawQuery) => void; + options: Array<{ label: string; value: string }>; organization?: { key: string }; + property: string; + query: { [x: string]: any }; } export default class SearchableFilterFooter extends React.PureComponent { diff --git a/server/sonar-web/src/main/js/apps/projects/filters/__tests__/LanguagesFilter-test.tsx b/server/sonar-web/src/main/js/apps/projects/filters/__tests__/LanguagesFilter-test.tsx index 6a9d33acb95..5ca361d02d7 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/__tests__/LanguagesFilter-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/__tests__/LanguagesFilter-test.tsx @@ -57,28 +57,3 @@ it('should render the languages facet with the selected languages', () => { expect(wrapper).toMatchSnapshot(); expect(wrapper.find('Filter').shallow()).toMatchSnapshot(); }); - -it('should render maximum 10 languages in the searchbox results', () => { - const manyLanguages = { - ...languages, - c: { key: 'c', name: 'c' }, - d: { key: 'd', name: 'd' }, - e: { key: 'e', name: 'e' }, - f: { key: 'f', name: 'f' }, - g: { key: 'g', name: 'g' }, - h: { key: 'h', name: 'h' }, - i: { key: 'i', name: 'i' }, - k: { key: 'k', name: 'k' }, - l: { key: 'l', name: 'l' } - }; - const wrapper = shallow( - - ); - expect(wrapper).toMatchSnapshot(); -}); diff --git a/server/sonar-web/src/main/js/apps/projects/filters/__tests__/__snapshots__/LanguagesFilter-test.tsx.snap b/server/sonar-web/src/main/js/apps/projects/filters/__tests__/__snapshots__/LanguagesFilter-test.tsx.snap index 2ee2995300e..1f40db190ca 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/__tests__/__snapshots__/LanguagesFilter-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/projects/filters/__tests__/__snapshots__/LanguagesFilter-test.tsx.snap @@ -1,107 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`should render maximum 10 languages in the searchbox results 1`] = ` - - } - getFacetValueForOption={[Function]} - header={ - - } - onQueryChange={[MockFunction]} - options={ - Array [ - "java", - "cs", - "g", - "js", - ] - } - property="languages" - query={ - Object { - "languages": Array [ - "java", - "g", - ], - } - } - renderOption={[Function]} - value={ - Array [ - "java", - "g", - ] - } -/> -`; - exports[`should render the languages facet with the selected languages 1`] = `