Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
} from '../../../../../__mocks__/kea_logic';
import '../../../../__mocks__/engine_logic.mock';

jest.mock('../../crawler_overview_logic', () => ({
CrawlerOverviewLogic: {
jest.mock('../../crawler_logic', () => ({
CrawlerLogic: {
actions: {
onReceiveCrawlerData: jest.fn(),
},
Expand All @@ -28,7 +28,7 @@ jest.mock('./utils', () => ({

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

import { CrawlerOverviewLogic } from '../../crawler_overview_logic';
import { CrawlerLogic } from '../../crawler_logic';
import { CrawlerDomain } from '../../types';

import { AddDomainLogic, AddDomainLogicValues } from './add_domain_logic';
Expand Down Expand Up @@ -310,7 +310,7 @@ describe('AddDomainLogic', () => {
AddDomainLogic.actions.submitNewDomain();
await nextTick();

expect(CrawlerOverviewLogic.actions.onReceiveCrawlerData).toHaveBeenCalledWith({
expect(CrawlerLogic.actions.onReceiveCrawlerData).toHaveBeenCalledWith({
domains: [],
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { KibanaLogic } from '../../../../../shared/kibana';
import { ENGINE_CRAWLER_DOMAIN_PATH } from '../../../../routes';
import { EngineLogic, generateEnginePath } from '../../../engine';

import { CrawlerOverviewLogic } from '../../crawler_overview_logic';
import { CrawlerLogic } from '../../crawler_logic';
import {
CrawlerDataFromServer,
CrawlerDomain,
Expand Down Expand Up @@ -262,7 +262,7 @@ export const AddDomainLogic = kea<MakeLogicType<AddDomainLogicValues, AddDomainL
});

const crawlerData = crawlerDataServerToClient(response as CrawlerDataFromServer);
CrawlerOverviewLogic.actions.onReceiveCrawlerData(crawlerData);
CrawlerLogic.actions.onReceiveCrawlerData(crawlerData);
const newDomain = crawlerData.domains[crawlerData.domains.length - 1];
if (newDomain) {
actions.onSubmitNewDomainSuccess(newDomain);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,12 @@ import { EuiBasicTable, EuiEmptyPrompt } from '@elastic/eui';

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

import {
CrawlerDomain,
CrawlerPolicies,
CrawlerRules,
CrawlerStatus,
CrawlRequest,
} from '../types';
import { CrawlerStatus, CrawlRequest } from '../types';

import { CrawlRequestsTable } from './crawl_requests_table';

const values: { domains: CrawlerDomain[]; crawlRequests: CrawlRequest[] } = {
// CrawlerOverviewLogic
domains: [
{
id: '507f1f77bcf86cd799439011',
createdOn: 'Mon, 31 Aug 2020 17:00:00 +0000',
url: 'elastic.co',
documentCount: 13,
sitemaps: [],
entryPoints: [],
crawlRules: [],
defaultCrawlRule: {
id: '-',
policy: CrawlerPolicies.allow,
rule: CrawlerRules.regex,
pattern: '.*',
},
deduplicationEnabled: false,
deduplicationFields: ['title'],
availableDeduplicationFields: ['title', 'description'],
},
],
const values: { crawlRequests: CrawlRequest[] } = {
// CrawlerLogic
crawlRequests: [
{
id: '618d0e66abe97bc688328900',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { EuiBasicTable, EuiEmptyPrompt, EuiTableFieldDataColumnType } from '@ela

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

import { CrawlerOverviewLogic } from '../crawler_overview_logic';
import { CrawlerLogic } from '../crawler_logic';
import { CrawlRequest, readableCrawlerStatuses } from '../types';

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

export const CrawlRequestsTable: React.FC = () => {
const { crawlRequests } = useValues(CrawlerOverviewLogic);
const { crawlRequests } = useValues(CrawlerLogic);

return (
<EuiBasicTable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import { EuiCallOut } from '@elastic/eui';

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

import { CrawlerOverviewLogic } from '../crawler_overview_logic';
import { CrawlerLogic } from '../crawler_logic';
import { CrawlerStatus } from '../types';

export const CrawlerStatusBanner: React.FC = () => {
const { mostRecentCrawlRequestStatus } = useValues(CrawlerOverviewLogic);
const { mostRecentCrawlRequestStatus } = useValues(CrawlerLogic);
if (
mostRecentCrawlRequestStatus === CrawlerStatus.Running ||
mostRecentCrawlRequestStatus === CrawlerStatus.Starting ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import { EuiButton } from '@elastic/eui';

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

import { CrawlerOverviewLogic } from '../../crawler_overview_logic';
import { CrawlerLogic } from '../../crawler_logic';
import { CrawlerStatus } from '../../types';

import { StopCrawlPopoverContextMenu } from './stop_crawl_popover_context_menu';

export const CrawlerStatusIndicator: React.FC = () => {
const { domains, mostRecentCrawlRequestStatus } = useValues(CrawlerOverviewLogic);
const { startCrawl, stopCrawl } = useActions(CrawlerOverviewLogic);
const { domains, mostRecentCrawlRequestStatus } = useValues(CrawlerLogic);
const { startCrawl, stopCrawl } = useActions(CrawlerLogic);

const disabledButton = (
<EuiButton disabled>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { KibanaLogic } from '../../../../shared/kibana';
import { AppLogic } from '../../../app_logic';
import { ENGINE_CRAWLER_DOMAIN_PATH } from '../../../routes';
import { generateEnginePath } from '../../engine';
import { CrawlerLogic } from '../crawler_logic';
import { CrawlerOverviewLogic } from '../crawler_overview_logic';
import { CrawlerDomain } from '../types';

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

export const DomainsTable: React.FC = () => {
const { domains } = useValues(CrawlerOverviewLogic);
const { domains } = useValues(CrawlerLogic);

const { deleteDomain } = useActions(CrawlerOverviewLogic);

Expand Down
Loading