github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Enterprise Search] Update connector jobs with nested connector (#145251)

Browse source
This commit is contained in:
Sander Philipse 2022-11-15 17:58:14 +01:00 • committed by GitHub
parent 2e7b789a30
commit aef304e147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

13
x-pack/plugins/enterprise_search/common/types/connectors.ts
View file

@ -140,18 +140,23 @@ export interface ConnectorSyncJob {
cancelation_requested_at: string | null;
canceled_at: string | null;
completed_at: string | null;
connector_id: string;
connector: {
configuration: ConnectorConfiguration;
filtering: FilteringRules | null;
id: string;
index_name: string;
language: string;
pipeline: IngestPipelineParams | null;
service_type: string;
};
created_at: string;
deleted_document_count: number;
error: string | null;
filtering: FilteringRules | null;
id: string;
index_name: string;
indexed_document_count: number;
indexed_document_volume: number;
last_seen: string;
metadata: Record<string, unknown>;
pipeline: IngestPipelineParams | null;
started_at: string;
status: SyncStatus;
trigger_method: TriggerMethod;

15
x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/sync_job.mock.ts
View file

@ -14,21 +14,26 @@ export const syncJob: ConnectorSyncJob = {
cancelation_requested_at: null,
canceled_at: null,
completed_at: '2022-09-05T15:59:39.816+00:00',
connector_id: 'we2284IBjobuR2-lAuXh',
connector: {
configuration: {},
filtering: null,
id: 'we2284IBjobuR2-lAuXh',
index_name: 'indexName',
language: '',
pipeline: null,
service_type: '',
},
created_at: '2022-09-05T14:59:39.816+00:00',
deleted_document_count: 20,
error: null,
filtering: null,
id: 'id',
index_name: 'indexName',
indexed_document_count: 50,
indexed_document_volume: 40,
last_seen: '2022-09-05T15:59:39.816+00:00',
metadata: {},
pipeline: null,
trigger_method: TriggerMethod.ON_DEMAND,
started_at: '2022-09-05T14:59:39.816+00:00',
status: SyncStatus.COMPLETED,
trigger_method: TriggerMethod.ON_DEMAND,
worker_hostname: 'hostname_fake',
};

8
x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/sync_jobs/sync_job_flyout.tsx
View file

@ -88,13 +88,13 @@ export const SyncJobFlyout: React.FC<SyncJobFlyoutProps> = ({ onClose, syncJob }
</EuiFlexItem>
<EuiFlexItem>
<FilteringPanel
advancedSnippet={syncJob.filtering?.advanced_snippet}
filteringRules={syncJob.filtering?.rules ?? []}
advancedSnippet={syncJob.connector?.filtering?.advanced_snippet}
filteringRules={syncJob.connector?.filtering?.rules ?? []}
/>
</EuiFlexItem>
{syncJob.pipeline && (
{syncJob.connector?.pipeline && (
<EuiFlexItem>
<PipelinePanel pipeline={syncJob.pipeline} />
<PipelinePanel pipeline={syncJob.connector.pipeline} />
</EuiFlexItem>
)}
</EuiFlexGroup>

13
x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/sync_jobs/sync_jobs_view_logic.test.ts
View file

@ -63,18 +63,23 @@ describe('SyncJobsViewLogic', () => {
cancelation_requested_at: null,
canceled_at: null,
completed_at: '2022-09-05T15:59:39.816+00:00',
connector_id: 'we2284IBjobuR2-lAuXh',
connector: {
configuration: {},
filtering: null,
id: 'we2284IBjobuR2-lAuXh',
index_name: 'indexName',
language: 'something',
pipeline: null,
service_type: '',
},
created_at: '2022-09-05T14:59:39.816+00:00',
deleted_document_count: 20,
error: null,
filtering: null,
id: 'id',
index_name: 'indexName',
indexed_document_count: 50,
indexed_document_volume: 40,
last_seen: '2022-09-05T15:59:39.816+00:00',
metadata: {},
pipeline: null,
started_at: '2022-09-05T14:59:39.816+00:00',
status: SyncStatus.COMPLETED,
trigger_method: TriggerMethod.ON_DEMAND,

6
x-pack/plugins/enterprise_search/server/lib/connectors/fetch_sync_jobs.test.ts
View file

@ -43,7 +43,7 @@ describe('fetchSyncJobs lib', () => {
index: '.elastic-connectors-sync-jobs',
query: {
term: {
connector_id: 'id',
'connector.id': 'id',
},
},
size: 10,
@ -90,7 +90,7 @@ describe('fetchSyncJobs lib', () => {
index: '.elastic-connectors-sync-jobs',
query: {
term: {
connector_id: 'id',
'connector.id': 'id',
},
},
size: 10,
@ -127,7 +127,7 @@ describe('fetchSyncJobs lib', () => {
index: '.elastic-connectors-sync-jobs',
query: {
term: {
connector_id: 'id',
'connector.id': 'id',
},
},
size: 10,

2
x-pack/plugins/enterprise_search/server/lib/connectors/fetch_sync_jobs.ts
View file

@ -39,7 +39,7 @@ export const fetchSyncJobsByConnectorId = async (
index: CONNECTORS_JOBS_INDEX,
query: {
term: {
connector_id: connectorId,
'connector.id': connectorId,
},
},
size,