Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[App Search] Migrate Source Engines & Crawler pages to new page template #102848

Merged
merged 7 commits into from
Jun 23, 2021
Merged

[App Search] Migrate Source Engines & Crawler pages to new page template #102848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
660c3de
Convert meta engines Source Engines view to new page template
cee-chen Jun 22, 2021
1b642ec
Convert CrawlerLanding to new page template
cee-chen Jun 22, 2021
fb69fbf
Convert CrawlerOverview to new page template
cee-chen Jun 22, 2021
5fcf040
Update routers
cee-chen Jun 22, 2021
3463dde
Misc Source Engines UI polish
cee-chen Jun 22, 2021
c5309d1
Merge branch 'master' into kibana-page-template-as-11
constancecchen Jun 22, 2021
6620860
Fix bad merge conflict
constancecchen Jun 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions ...s/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,25 @@

import React from 'react';

import {
EuiButton,
EuiLink,
EuiPageHeader,
EuiPanel,
EuiSpacer,
EuiText,
EuiTitle,
} from '@elastic/eui';
import { EuiButton, EuiLink, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
import { i18n } from '@kbn/i18n';

import { getAppSearchUrl } from '../../../shared/enterprise_search_url';
import { DOCS_PREFIX, ENGINE_CRAWLER_PATH } from '../../routes';
import { generateEnginePath } from '../engine';
import { generateEnginePath, getEngineBreadcrumbs } from '../engine';
import { AppSearchPageTemplate } from '../layout';

import './crawler_landing.scss';
import { CRAWLER_TITLE } from '.';

export const CrawlerLanding: React.FC = () => (
<div data-test-subj="CrawlerLanding" className="crawlerLanding">
<EuiPageHeader pageTitle={CRAWLER_TITLE} />
<EuiSpacer />
<EuiPanel grow paddingSize="l" className="crawlerLanding__panel">
<AppSearchPageTemplate
pageChrome={getEngineBreadcrumbs([CRAWLER_TITLE])}
pageHeader={{ pageTitle: CRAWLER_TITLE }}
className="crawlerLanding"
data-test-subj="CrawlerLanding"
>
<EuiPanel hasBorder paddingSize="l" className="crawlerLanding__panel">
<div className="crawlerLanding__wrapper">
<EuiTitle size="s">
<h2>
Expand Down Expand Up @@ -81,5 +77,5 @@ export const CrawlerLanding: React.FC = () => (
<EuiSpacer size="xl" />
</div>
</EuiPanel>
</div>
</AppSearchPageTemplate>
);
11 changes: 1 addition & 10 deletions ...rprise_search/public/applications/app_search/components/crawler/crawler_overview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@

import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
import '../../../__mocks__/shallow_useeffect.mock';
import '../../__mocks__/engine_logic.mock';

import React from 'react';

import { shallow, ShallowWrapper } from 'enzyme';

import { Loading } from '../../../shared/loading';
import { rerender } from '../../../test_helpers';

import { DomainsTable } from './components/domains_table';
import { CrawlerOverview } from './crawler_overview';

Expand Down Expand Up @@ -50,11 +48,4 @@ describe('CrawlerOverview', () => {

// TODO test for empty state after it is built in a future PR
});

it('shows a loading state when data is loading', () => {
setMockValues({ dataLoading: true });
rerender(wrapper);

expect(wrapper.find(Loading)).toHaveLength(1);
});
});
20 changes: 8 additions & 12 deletions .../enterprise_search/public/applications/app_search/components/crawler/crawler_overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ import React, { useEffect } from 'react';

import { useActions, useValues } from 'kea';

import { EuiPageHeader } from '@elastic/eui';

import { FlashMessages } from '../../../shared/flash_messages';
import { Loading } from '../../../shared/loading';
import { getEngineBreadcrumbs } from '../engine';
import { AppSearchPageTemplate } from '../layout';

import { DomainsTable } from './components/domains_table';
import { CRAWLER_TITLE } from './constants';
Expand All @@ -27,15 +25,13 @@ export const CrawlerOverview: React.FC = () => {
fetchCrawlerData();
}, []);

if (dataLoading) {
return <Loading />;
}

return (
<>
<EuiPageHeader pageTitle={CRAWLER_TITLE} />
<FlashMessages />
<AppSearchPageTemplate
pageChrome={getEngineBreadcrumbs([CRAWLER_TITLE])}
pageHeader={{ pageTitle: CRAWLER_TITLE }}
isLoading={dataLoading}
>
<DomainsTable />
</>
</AppSearchPageTemplate>
);
};
4 changes: 0 additions & 4 deletions ...terprise_search/public/applications/app_search/components/crawler/crawler_router.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
* 2.0.
*/

import { setMockValues } from '../../../__mocks__/kea_logic';
import { mockEngineValues } from '../../__mocks__';

import React from 'react';
import { Switch } from 'react-router-dom';

Expand All @@ -22,7 +19,6 @@ describe('CrawlerRouter', () => {

beforeEach(() => {
jest.clearAllMocks();
setMockValues({ ...mockEngineValues });
});

afterEach(() => {
Expand Down
6 changes: 0 additions & 6 deletions ...ns/enterprise_search/public/applications/app_search/components/crawler/crawler_router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,13 @@
import React from 'react';
import { Route, Switch } from 'react-router-dom';

import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';

import { getEngineBreadcrumbs } from '../engine';

import { CRAWLER_TITLE } from './constants';
import { CrawlerLanding } from './crawler_landing';
import { CrawlerOverview } from './crawler_overview';

export const CrawlerRouter: React.FC = () => {
return (
<Switch>
<Route>
<SetPageChrome trail={getEngineBreadcrumbs([CRAWLER_TITLE])} />
{process.env.NODE_ENV === 'development' ? <CrawlerOverview /> : <CrawlerLanding />}
</Route>
</Switch>
Expand Down
20 changes: 10 additions & 10 deletions ...gins/enterprise_search/public/applications/app_search/components/engine/engine_router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,16 @@ export const EngineRouter: React.FC = () => {
<SchemaRouter />
</Route>
)}
{canViewMetaEngineSourceEngines && (
<Route path={META_ENGINE_SOURCE_ENGINES_PATH}>
<SourceEngines />
</Route>
)}
{canViewEngineCrawler && (
<Route path={ENGINE_CRAWLER_PATH}>
<CrawlerRouter />
</Route>
)}
{canManageEngineRelevanceTuning && (
<Route path={ENGINE_RELEVANCE_TUNING_PATH}>
<RelevanceTuning />
Expand Down Expand Up @@ -146,16 +156,6 @@ export const EngineRouter: React.FC = () => {
<Synonyms />
</Route>
)}
{canViewMetaEngineSourceEngines && (
<Route path={META_ENGINE_SOURCE_ENGINES_PATH}>
<SourceEngines />
</Route>
)}
{canViewEngineCrawler && (
<Route path={ENGINE_CRAWLER_PATH}>
<CrawlerRouter />
</Route>
)}
</Layout>
</Switch>
);
Expand Down
2 changes: 1 addition & 1 deletion ...pplications/app_search/components/source_engines/components/add_source_engines_button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const AddSourceEnginesButton: React.FC = () => {
const { openModal } = useActions(SourceEnginesLogic);

return (
<EuiButton color="secondary" fill onClick={openModal}>
<EuiButton fill iconType="plusInCircle" onClick={openModal}>
{ADD_SOURCE_ENGINES_BUTTON_LABEL}
</EuiButton>
);
Expand Down
20 changes: 4 additions & 16 deletions ...e_search/public/applications/app_search/components/source_engines/source_engines.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ import '../../__mocks__/engine_logic.mock';

import React from 'react';

import { shallow, ShallowWrapper } from 'enzyme';
import { shallow } from 'enzyme';

import { EuiPageHeader } from '@elastic/eui';

import { Loading } from '../../../shared/loading';
import { getPageHeaderActions } from '../../../test_helpers';

import { AddSourceEnginesButton, AddSourceEnginesModal, SourceEnginesTable } from './components';

Expand Down Expand Up @@ -61,20 +59,10 @@ describe('SourceEngines', () => {
expect(wrapper.find(AddSourceEnginesModal)).toHaveLength(1);
});

it('renders a loading component before data has loaded', () => {
setMockValues({ ...MOCK_VALUES, dataLoading: true });
const wrapper = shallow(<SourceEngines />);

expect(wrapper.find(Loading)).toHaveLength(1);
});

describe('page actions', () => {
const getPageHeader = (wrapper: ShallowWrapper) =>
wrapper.find(EuiPageHeader).dive().children().dive();

it('contains a button to add source engines', () => {
const wrapper = shallow(<SourceEngines />);
expect(getPageHeader(wrapper).find(AddSourceEnginesButton)).toHaveLength(1);
expect(getPageHeaderActions(wrapper).find(AddSourceEnginesButton)).toHaveLength(1);
});

it('hides the add source engines button if the user does not have permissions', () => {
Expand All @@ -86,7 +74,7 @@ describe('SourceEngines', () => {
});
const wrapper = shallow(<SourceEngines />);

expect(getPageHeader(wrapper).find(AddSourceEnginesButton)).toHaveLength(0);
expect(getPageHeaderActions(wrapper).find(AddSourceEnginesButton)).toHaveLength(0);
});
});
});
29 changes: 13 additions & 16 deletions ...rprise_search/public/applications/app_search/components/source_engines/source_engines.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@ import React, { useEffect } from 'react';

import { useActions, useValues } from 'kea';

import { EuiPageHeader, EuiPageContent } from '@elastic/eui';
import { EuiPanel } from '@elastic/eui';

import { FlashMessages } from '../../../shared/flash_messages';
import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
import { Loading } from '../../../shared/loading';
import { AppLogic } from '../../app_logic';
import { getEngineBreadcrumbs } from '../engine';
import { AppSearchPageTemplate } from '../layout';

import { AddSourceEnginesButton, AddSourceEnginesModal, SourceEnginesTable } from './components';
import { SOURCE_ENGINES_TITLE } from './i18n';
Expand All @@ -33,20 +31,19 @@ export const SourceEngines: React.FC = () => {
fetchSourceEngines();
}, []);

if (dataLoading) return <Loading />;

return (
<>
<SetPageChrome trail={getEngineBreadcrumbs([SOURCE_ENGINES_TITLE])} />
<EuiPageHeader
pageTitle={SOURCE_ENGINES_TITLE}
rightSideItems={canManageMetaEngineSourceEngines ? [<AddSourceEnginesButton />] : []}
/>
<FlashMessages />
<EuiPageContent hasBorder>
<AppSearchPageTemplate
pageChrome={getEngineBreadcrumbs([SOURCE_ENGINES_TITLE])}
pageHeader={{
pageTitle: SOURCE_ENGINES_TITLE,
rightSideItems: canManageMetaEngineSourceEngines ? [<AddSourceEnginesButton />] : [],
}}
isLoading={dataLoading}
>
<EuiPanel hasBorder>
<SourceEnginesTable />
{isModalOpen && <AddSourceEnginesModal />}
</EuiPageContent>
</>
</EuiPanel>
</AppSearchPageTemplate>
);
};