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

[Workplace Search] Don't submit empty seed_urls or sitemap_urls for partial crawl request #126972

Merged
merged 2 commits into from
Mar 7, 2022
Merged

[Workplace Search] Don't submit empty seed_urls or sitemap_urls for partial crawl request #126972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf469f
Don't submit empty seed_urls or sitemap_urls when making a partial cr…
Mar 4, 2022
d5fc05b
Merge branch 'main' into flyout-no-seed-urls
kibanamachine Mar 7, 2022
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
20 changes: 19 additions & 1 deletion ...rawler/components/crawl_custom_settings_flyout/crawl_custom_settings_flyout_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,25 @@ describe('CrawlCustomSettingsFlyoutLogic', () => {
});

describe('startCustomCrawl', () => {
it('starts a custom crawl with the user set values', async () => {
it('can start a custom crawl for selected domains', async () => {
mount({
includeSitemapsInRobotsTxt: true,
maxCrawlDepth: 5,
selectedDomainUrls: ['https://www.elastic.co', 'https://swiftype.com'],
});
jest.spyOn(CrawlerLogic.actions, 'startCrawl');

CrawlCustomSettingsFlyoutLogic.actions.startCustomCrawl();
await nextTick();

expect(CrawlerLogic.actions.startCrawl).toHaveBeenCalledWith({
domain_allowlist: ['https://www.elastic.co', 'https://swiftype.com'],
max_crawl_depth: 5,
sitemap_discovery_disabled: false,
});
});

it('can start a custom crawl selected domains, sitemaps, and seed urls', async () => {
mount({
includeSitemapsInRobotsTxt: true,
maxCrawlDepth: 5,
Expand Down
24 changes: 17 additions & 7 deletions ...nts/crawler/components/crawl_custom_settings_flyout/crawl_custom_settings_flyout_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { flashAPIErrors } from '../../../../../shared/flash_messages';
import { HttpLogic } from '../../../../../shared/http';
import { EngineLogic } from '../../../engine';

import { CrawlerLogic } from '../../crawler_logic';
import { CrawlerLogic, CrawlRequestOverrides } from '../../crawler_logic';
import { DomainConfig, DomainConfigFromServer } from '../../types';
import { domainConfigServerToClient } from '../../utils';
import { extractDomainAndEntryPointFromUrl } from '../add_domain/utils';
Expand Down Expand Up @@ -213,13 +213,23 @@ export const CrawlCustomSettingsFlyoutLogic = kea<
actions.fetchDomainConfigData();
},
startCustomCrawl: () => {
CrawlerLogic.actions.startCrawl({
domain_allowlist: values.selectedDomainUrls,
max_crawl_depth: values.maxCrawlDepth,
seed_urls: [...values.selectedEntryPointUrls, ...values.customEntryPointUrls],
sitemap_urls: [...values.selectedSitemapUrls, ...values.customSitemapUrls],
const overrides: CrawlRequestOverrides = {
sitemap_discovery_disabled: !values.includeSitemapsInRobotsTxt,
});
max_crawl_depth: values.maxCrawlDepth,
domain_allowlist: values.selectedDomainUrls,
};

const seedUrls = [...values.selectedEntryPointUrls, ...values.customEntryPointUrls];
if (seedUrls.length > 0) {
overrides.seed_urls = seedUrls;
}

const sitemapUrls = [...values.selectedSitemapUrls, ...values.customSitemapUrls];
if (sitemapUrls.length > 0) {
overrides.sitemap_urls = sitemapUrls;
}

CrawlerLogic.actions.startCrawl(overrides);
},
}),
});
2 changes: 1 addition & 1 deletion ...gins/enterprise_search/public/applications/app_search/components/crawler/crawler_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const ACTIVE_STATUSES = [
CrawlerStatus.Canceling,
];

interface CrawlRequestOverrides {
export interface CrawlRequestOverrides {
domain_allowlist?: string[];
max_crawl_depth?: number;
seed_urls?: string[];
Expand Down