Skip to content

[7.x] Do not render page header for loading domains (#108078) #108125

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

Merged
kibanamachine merged 1 commit into from
Aug 11, 2021
Merged

[7.x] Do not render page header for loading domains (#108078) #108125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions ...e_search/public/applications/app_search/components/crawler/crawler_single_domain.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,17 @@ describe('CrawlerSingleDomain', () => {
expect(wrapper.prop('pageHeader').pageTitle).toEqual('https://elastic.co');
});

it('uses a placeholder for the page title and page chrome if a domain has not been set', () => {
it('does not render a page header and uses placeholder chrome while loading', () => {
setMockValues({
...MOCK_VALUES,
dataLoading: true,
domain: null,
});

const wrapper = shallow(<CrawlerSingleDomain />);

expect(wrapper.prop('pageHeader').pageTitle).toEqual('Loading...');
expect(wrapper.prop('pageChrome')).toContain('...');
expect(wrapper.prop('pageHeader')).toBeUndefined();
});

it('contains a crawler status banner', () => {
Expand Down
20 changes: 9 additions & 11 deletions ...rprise_search/public/applications/app_search/components/crawler/crawler_single_domain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,21 @@ export const CrawlerSingleDomain: React.FC = () => {

const { fetchDomainData } = useActions(CrawlerSingleDomainLogic);

const displayDomainUrl = domain
? domain.url
: i18n.translate('xpack.enterpriseSearch.appSearch.crawler.singleDomain.loadingTitle', {
defaultMessage: 'Loading...',
});

useEffect(() => {
fetchDomainData(domainId);
}, []);

return (
<AppSearchPageTemplate
pageChrome={getEngineBreadcrumbs([CRAWLER_TITLE, displayDomainUrl])}
pageHeader={{
pageTitle: displayDomainUrl,
rightSideItems: [<ManageCrawlsPopover />, <CrawlerStatusIndicator />],
}}
pageChrome={getEngineBreadcrumbs([CRAWLER_TITLE, domain?.url || '...'])}
pageHeader={
dataLoading
? undefined
: {
pageTitle: domain!.url,
rightSideItems: [<ManageCrawlsPopover />, <CrawlerStatusIndicator />],
}
}
isLoading={dataLoading}
>
<CrawlerStatusBanner />
Expand Down