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

)
elastic · Nov 15, 2022 · aef304e · aef304e
1 parent 2e7b789
commit aef304e
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 21 deletions.
diff --git a/x-pack/plugins/enterprise_search/common/types/connectors.ts b/x-pack/plugins/enterprise_search/common/types/connectors.ts
@@ -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;

diff --git a/...nterprise_search/public/applications/enterprise_search_content/__mocks__/sync_job.mock.ts b/...nterprise_search/public/applications/enterprise_search_content/__mocks__/sync_job.mock.ts
@@ -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',
 };
 

diff --git a/...lications/enterprise_search_content/components/search_index/sync_jobs/sync_job_flyout.tsx b/...lications/enterprise_search_content/components/search_index/sync_jobs/sync_job_flyout.tsx
@@ -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>

diff --git a/.../enterprise_search_content/components/search_index/sync_jobs/sync_jobs_view_logic.test.ts b/.../enterprise_search_content/components/search_index/sync_jobs/sync_jobs_view_logic.test.ts
@@ -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,

diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_sync_jobs.test.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_sync_jobs.test.ts
@@ -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,

diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_sync_jobs.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/fetch_sync_jobs.ts
@@ -39,7 +39,7 @@ export const fetchSyncJobsByConnectorId = async (
       index: CONNECTORS_JOBS_INDEX,
       query: {
         term: {
-          connector_id: connectorId,
+          'connector.id': connectorId,
         },
       },
       size,