Import common components directly in PageErrorOverview and IconButton…

… to avoid eslint-disable for dependency cycles
Graylog2 · May 11, 2020 · 9936dc7 · 9936dc7
1 parent c825174
commit 9936dc7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/graylog2-web-interface/src/components/common/IconButton.jsx b/graylog2-web-interface/src/components/common/IconButton.jsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import styled, { type StyledComponent } from 'styled-components';
 
 import { type ThemeInterface } from 'theme';
-import { Icon } from 'components/common';
+import Icon from 'components/common/Icon';
 
 const Wrapper: StyledComponent<{}, ThemeInterface, HTMLButtonElement> = styled.button(({ theme }) => `
   display: inline-flex;

diff --git a/graylog2-web-interface/src/components/common/index.jsx b/graylog2-web-interface/src/components/common/index.jsx
@@ -20,7 +20,6 @@ export { default as ExpandableListItem } from './ExpandableListItem';
 export { default as ExternalLink } from './ExternalLink';
 export { default as ExternalLinkButton } from './ExternalLinkButton';
 export { default as Icon } from './Icon';
-// eslint-disable-next-line import/no-cycle
 export { default as IconButton } from './IconButton';
 export { default as IfPermitted } from './IfPermitted';
 export { default as InteractableModal } from './InteractableModal';
@@ -31,7 +30,6 @@ export { default as LocaleSelect } from './LocaleSelect';
 export { default as KeyValueTable } from './KeyValueTable';
 export { default as MultiSelect } from './MultiSelect';
 export { default as OverlayElement } from './OverlayElement';
-// eslint-disable-next-line import/no-cycle
 export { default as PageErrorOverview } from './PageErrorOverview';
 export { default as PageHeader } from './PageHeader';
 export { default as PaginatedList } from './PaginatedList';

diff --git a/graylog2-web-interface/src/components/errors/ErrorPage.jsx b/graylog2-web-interface/src/components/errors/ErrorPage.jsx
@@ -6,7 +6,7 @@ import styled, { createGlobalStyle } from 'styled-components';
 import NotFoundBackgroundImage from 'assets/not-found-bg.jpg';
 
 import AppContentGrid from 'components/layout/AppContentGrid';
-import { DocumentTitle } from 'components/common';
+import DocumentTitle from 'components/common/DocumentTitle';
 import ErrorJumbotron from 'components/errors/ErrorJumbotron';
 
 const GlobalStyle = createGlobalStyle`