diff options
Diffstat (limited to 'server/sonar-web/src/main/js/app/components/search')
6 files changed, 18 insertions, 18 deletions
diff --git a/server/sonar-web/src/main/js/app/components/search/Search.tsx b/server/sonar-web/src/main/js/app/components/search/Search.tsx index 299dacc1f58..028241d51e9 100644 --- a/server/sonar-web/src/main/js/app/components/search/Search.tsx +++ b/server/sonar-web/src/main/js/app/components/search/Search.tsx @@ -18,21 +18,21 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import ClockIcon from 'sonar-ui-common/components/icons/ClockIcon'; import * as key from 'keymaster'; import { debounce, keyBy, uniqBy } from 'lodash'; import { FormattedMessage } from 'react-intl'; import { withRouter, WithRouterProps } from 'react-router'; +import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; +import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { lazyLoad } from 'sonar-ui-common/components/lazyLoad'; +import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; +import OutsideClickHandler from 'sonar-ui-common/components/controls/OutsideClickHandler'; +import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; +import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; import { sortQualifiers, More, Results, ComponentResult } from './utils'; import RecentHistory from '../RecentHistory'; -import DeferredSpinner from '../../../components/common/DeferredSpinner'; -import { DropdownOverlay } from '../../../components/controls/Dropdown'; -import ClockIcon from '../../../components/icons-components/ClockIcon'; -import OutsideClickHandler from '../../../components/controls/OutsideClickHandler'; -import SearchBox from '../../../components/controls/SearchBox'; -import { lazyLoad } from '../../../components/lazyLoad'; import { getSuggestions } from '../../../api/components'; -import { translate, translateWithParameters } from '../../../helpers/l10n'; -import { scrollToElement } from '../../../helpers/scrolling'; import { getProjectUrl, getCodeUrl } from '../../../helpers/urls'; import './Search.css'; diff --git a/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx b/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx index 20fd40ae953..9821523e093 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx +++ b/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import ClockIcon from 'sonar-ui-common/components/icons/ClockIcon'; +import FavoriteIcon from 'sonar-ui-common/components/icons/FavoriteIcon'; +import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; import { Link } from 'react-router'; +import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; import { ComponentResult } from './utils'; -import FavoriteIcon from '../../../components/icons-components/FavoriteIcon'; -import QualifierIcon from '../../../components/icons-components/QualifierIcon'; -import ClockIcon from '../../../components/icons-components/ClockIcon'; -import Tooltip from '../../../components/controls/Tooltip'; import { getProjectUrl, getCodeUrl } from '../../../helpers/urls'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx b/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx index 672560a3c69..f56bcfb5718 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx +++ b/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import { translate } from 'sonar-ui-common/helpers/l10n'; import SearchShowMore from './SearchShowMore'; import { sortQualifiers, More, ComponentResult, Results } from './utils'; -import { translate } from '../../../helpers/l10n'; export interface Props { allowMore: boolean; diff --git a/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx b/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx index d528a1a7369..964da6f4f45 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx +++ b/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx @@ -20,8 +20,8 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import * as classNames from 'classnames'; -import DeferredSpinner from '../../../components/common/DeferredSpinner'; -import { translate } from '../../../helpers/l10n'; +import { translate } from 'sonar-ui-common/helpers/l10n'; +import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; interface Props { allowMore: boolean; @@ -65,7 +65,7 @@ export default class SearchShowMore extends React.PureComponent<Props> { <div className="pull-right text-muted-2 menu-footer-note"> <FormattedMessage defaultMessage={translate('search.show_more.hint')} - id={'search.show_more.hint'} + id="search.show_more.hint" values={{ key: <span className="shortcut-button shortcut-button-small">Enter</span> }} diff --git a/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx b/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx index 1dd07758c98..7e3aecaffeb 100644 --- a/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx +++ b/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { shallow, ShallowWrapper } from 'enzyme'; +import { elementKeydown } from 'sonar-ui-common/helpers/testUtils'; import { Search } from '../Search'; -import { elementKeydown } from '../../../../helpers/testUtils'; it('selects results', () => { const form = shallowRender(); diff --git a/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx b/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx index 01f4053c3bb..469f82c967e 100644 --- a/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx +++ b/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { shallow } from 'enzyme'; +import { click } from 'sonar-ui-common/helpers/testUtils'; import SearchShowMore from '../SearchShowMore'; -import { click } from '../../../../helpers/testUtils'; it('should render', () => { expect(shallowRender()).toMatchSnapshot(); |