Skip to content

Commit 1c59a0d

Browse files
Split CrawlerLogic from CrawlerOverviewLogic (#110850) (#110984)
Co-authored-by: Byron Hulcher <byronhulcher@gmail.com>
1 parent 2102ff5 commit 1c59a0d

File tree

15 files changed

+676
-620
lines changed

15 files changed

+676
-620
lines changed

x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/add_domain/add_domain_logic.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import {
1313
} from '../../../../../__mocks__/kea_logic';
1414
import '../../../../__mocks__/engine_logic.mock';
1515

16-
jest.mock('../../crawler_overview_logic', () => ({
17-
CrawlerOverviewLogic: {
16+
jest.mock('../../crawler_logic', () => ({
17+
CrawlerLogic: {
1818
actions: {
1919
onReceiveCrawlerData: jest.fn(),
2020
},
@@ -28,7 +28,7 @@ jest.mock('./utils', () => ({
2828

2929
import { nextTick } from '@kbn/test/jest';
3030

31-
import { CrawlerOverviewLogic } from '../../crawler_overview_logic';
31+
import { CrawlerLogic } from '../../crawler_logic';
3232
import { CrawlerDomain } from '../../types';
3333

3434
import { AddDomainLogic, AddDomainLogicValues } from './add_domain_logic';
@@ -310,7 +310,7 @@ describe('AddDomainLogic', () => {
310310
AddDomainLogic.actions.submitNewDomain();
311311
await nextTick();
312312

313-
expect(CrawlerOverviewLogic.actions.onReceiveCrawlerData).toHaveBeenCalledWith({
313+
expect(CrawlerLogic.actions.onReceiveCrawlerData).toHaveBeenCalledWith({
314314
domains: [],
315315
});
316316
});

x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/add_domain/add_domain_logic.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { KibanaLogic } from '../../../../../shared/kibana';
1717
import { ENGINE_CRAWLER_DOMAIN_PATH } from '../../../../routes';
1818
import { EngineLogic, generateEnginePath } from '../../../engine';
1919

20-
import { CrawlerOverviewLogic } from '../../crawler_overview_logic';
20+
import { CrawlerLogic } from '../../crawler_logic';
2121
import {
2222
CrawlerDataFromServer,
2323
CrawlerDomain,
@@ -262,7 +262,7 @@ export const AddDomainLogic = kea<MakeLogicType<AddDomainLogicValues, AddDomainL
262262
});
263263

264264
const crawlerData = crawlerDataServerToClient(response as CrawlerDataFromServer);
265-
CrawlerOverviewLogic.actions.onReceiveCrawlerData(crawlerData);
265+
CrawlerLogic.actions.onReceiveCrawlerData(crawlerData);
266266
const newDomain = crawlerData.domains[crawlerData.domains.length - 1];
267267
if (newDomain) {
268268
actions.onSubmitNewDomainSuccess(newDomain);

x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawl_requests_table.test.tsx

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,12 @@ import { EuiBasicTable, EuiEmptyPrompt } from '@elastic/eui';
1616

1717
import { mountWithIntl } from '../../../../test_helpers';
1818

19-
import {
20-
CrawlerDomain,
21-
CrawlerPolicies,
22-
CrawlerRules,
23-
CrawlerStatus,
24-
CrawlRequest,
25-
} from '../types';
19+
import { CrawlerStatus, CrawlRequest } from '../types';
2620

2721
import { CrawlRequestsTable } from './crawl_requests_table';
2822

29-
const values: { domains: CrawlerDomain[]; crawlRequests: CrawlRequest[] } = {
30-
// CrawlerOverviewLogic
31-
domains: [
32-
{
33-
id: '507f1f77bcf86cd799439011',
34-
createdOn: 'Mon, 31 Aug 2020 17:00:00 +0000',
35-
url: 'elastic.co',
36-
documentCount: 13,
37-
sitemaps: [],
38-
entryPoints: [],
39-
crawlRules: [],
40-
defaultCrawlRule: {
41-
id: '-',
42-
policy: CrawlerPolicies.allow,
43-
rule: CrawlerRules.regex,
44-
pattern: '.*',
45-
},
46-
deduplicationEnabled: false,
47-
deduplicationFields: ['title'],
48-
availableDeduplicationFields: ['title', 'description'],
49-
},
50-
],
23+
const values: { crawlRequests: CrawlRequest[] } = {
24+
// CrawlerLogic
5125
crawlRequests: [
5226
{
5327
id: '618d0e66abe97bc688328900',

x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawl_requests_table.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { EuiBasicTable, EuiEmptyPrompt, EuiTableFieldDataColumnType } from '@ela
1313

1414
import { i18n } from '@kbn/i18n';
1515

16-
import { CrawlerOverviewLogic } from '../crawler_overview_logic';
16+
import { CrawlerLogic } from '../crawler_logic';
1717
import { CrawlRequest, readableCrawlerStatuses } from '../types';
1818

1919
import { CustomFormattedTimestamp } from './custom_formatted_timestamp';
@@ -53,7 +53,7 @@ const columns: Array<EuiTableFieldDataColumnType<CrawlRequest>> = [
5353
];
5454

5555
export const CrawlRequestsTable: React.FC = () => {
56-
const { crawlRequests } = useValues(CrawlerOverviewLogic);
56+
const { crawlRequests } = useValues(CrawlerLogic);
5757

5858
return (
5959
<EuiBasicTable

x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawler_status_banner.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import { EuiCallOut } from '@elastic/eui';
1313

1414
import { i18n } from '@kbn/i18n';
1515

16-
import { CrawlerOverviewLogic } from '../crawler_overview_logic';
16+
import { CrawlerLogic } from '../crawler_logic';
1717
import { CrawlerStatus } from '../types';
1818

1919
export const CrawlerStatusBanner: React.FC = () => {
20-
const { mostRecentCrawlRequestStatus } = useValues(CrawlerOverviewLogic);
20+
const { mostRecentCrawlRequestStatus } = useValues(CrawlerLogic);
2121
if (
2222
mostRecentCrawlRequestStatus === CrawlerStatus.Running ||
2323
mostRecentCrawlRequestStatus === CrawlerStatus.Starting ||

x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/crawler_status_indicator/crawler_status_indicator.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import { EuiButton } from '@elastic/eui';
1313

1414
import { i18n } from '@kbn/i18n';
1515

16-
import { CrawlerOverviewLogic } from '../../crawler_overview_logic';
16+
import { CrawlerLogic } from '../../crawler_logic';
1717
import { CrawlerStatus } from '../../types';
1818

1919
import { StopCrawlPopoverContextMenu } from './stop_crawl_popover_context_menu';
2020

2121
export const CrawlerStatusIndicator: React.FC = () => {
22-
const { domains, mostRecentCrawlRequestStatus } = useValues(CrawlerOverviewLogic);
23-
const { startCrawl, stopCrawl } = useActions(CrawlerOverviewLogic);
22+
const { domains, mostRecentCrawlRequestStatus } = useValues(CrawlerLogic);
23+
const { startCrawl, stopCrawl } = useActions(CrawlerLogic);
2424

2525
const disabledButton = (
2626
<EuiButton disabled>

x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/components/domains_table.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { KibanaLogic } from '../../../../shared/kibana';
2020
import { AppLogic } from '../../../app_logic';
2121
import { ENGINE_CRAWLER_DOMAIN_PATH } from '../../../routes';
2222
import { generateEnginePath } from '../../engine';
23+
import { CrawlerLogic } from '../crawler_logic';
2324
import { CrawlerOverviewLogic } from '../crawler_overview_logic';
2425
import { CrawlerDomain } from '../types';
2526

@@ -28,7 +29,7 @@ import { getDeleteDomainConfirmationMessage } from '../utils';
2829
import { CustomFormattedTimestamp } from './custom_formatted_timestamp';
2930

3031
export const DomainsTable: React.FC = () => {
31-
const { domains } = useValues(CrawlerOverviewLogic);
32+
const { domains } = useValues(CrawlerLogic);
3233

3334
const { deleteDomain } = useActions(CrawlerOverviewLogic);
3435

0 commit comments

Comments
 (0)