[Enterprise Search] Remove external_id from UI code (#120143) (#120256

) * [Enterprise Search] Remove `external_id` from UI code Ports https://github.com/elastic/ent-search/pull/5441 to Kibana. `external_id` was an alias for regular `id` was removed in the Enterprise Search API. * Add path to logic file Not really related to this PR, but needed for debugging in the Redux dev tools * Rename missed argument name Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Kibana Machine <[email protected]>
elastic · Dec 2, 2021 · ba7f9b9 · ba7f9b9
1 parent b07e557
commit ba7f9b9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/...ch/public/applications/app_search/components/schema/reindex_job/reindex_job_logic.test.ts b/...ch/public/applications/app_search/components/schema/reindex_job/reindex_job_logic.test.ts
@@ -25,13 +25,13 @@ describe('ReindexJobLogic', () => {
     fieldCoercionErrors: {
       some_erroring_field: [
         {
-          external_id: 'document-1',
+          id: 'document-1',
           error: "Value 'some text' cannot be parsed as a number",
         },
       ],
       another_erroring_field: [
         {
-          external_id: 'document-2',
+          id: 'document-2',
           error: "Value '123' cannot be parsed as a date",
         },
       ],

diff --git a/...ugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx b/...ugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.test.tsx
@@ -22,11 +22,11 @@ describe('SchemaErrorsAccordion', () => {
     fieldCoercionErrors: {
       id: [
         {
-          external_id: 'foo',
+          id: 'foo',
           error: 'this is an error',
         },
         {
-          external_id: 'bar',
+          id: 'bar',
           error: 'this is another error',
         },
       ],

diff --git a/...ck/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.tsx b/...ck/plugins/enterprise_search/public/applications/shared/schema/errors_accordion/index.tsx
@@ -36,7 +36,7 @@ import './schema_errors_accordion.scss';
 interface Props {
   fieldCoercionErrors: FieldCoercionErrors;
   schema: Schema;
-  generateViewPath?(externalId: string): string;
+  generateViewPath?(id: string): string;
 }
 
 export const SchemaErrorsAccordion: React.FC<Props> = ({
@@ -89,7 +89,7 @@ export const SchemaErrorsAccordion: React.FC<Props> = ({
             </EuiTableHeader>
             <EuiTableBody>
               {errors.map((error) => {
-                const { external_id: id, error: errorMessage } = error;
+                const { id, error: errorMessage } = error;
                 return (
                   <EuiTableRow key={`schemaErrorDocument-${fieldName}-${id}`}>
                     <EuiTableRowCell truncateText>

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/schema/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/schema/types.ts
@@ -58,7 +58,7 @@ export interface IndexJob extends IIndexingStatus {
 }
 
 export interface FieldCoercionError {
-  external_id: string;
+  id: string;
   error: string;
 }
 export type FieldCoercionErrors = Record<string, FieldCoercionError[]>;
diff --git a/.../enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts b/.../enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
@@ -370,7 +370,7 @@ export const exampleResult = {
       myLink: 'http://foo',
       otherTitle: 'foo',
       content_source_id: '60e85e7ea2564c265a88a4f0',
-      external_id: 'doc-60e85eb7a2564c937a88a4f3',
+      id: 'doc-60e85eb7a2564c937a88a4f3',
       last_updated: '2021-07-09T14:35:35+00:00',
       updated_at: '2021-07-09T14:35:35+00:00',
       source: 'custom',

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
@@ -257,7 +257,7 @@ export type CustomAPIFieldValue =
 export interface Result {
   content_source_id: string;
   last_updated: string;
-  external_id: string;
+  id: string;
   updated_at: string;
   source: string;
   [key: string]: CustomAPIFieldValue;

diff --git a/...kplace_search/views/content_sources/components/display_settings/display_settings_logic.ts b/...kplace_search/views/content_sources/components/display_settings/display_settings_logic.ts
@@ -123,6 +123,7 @@ export const defaultSearchResultConfig = {
 export const DisplaySettingsLogic = kea<
   MakeLogicType<DisplaySettingsValues, DisplaySettingsActions>
 >({
+  path: ['enterprise_search', 'workplace_search', 'display_settings_logic'],
   actions: {
     onInitializeDisplaySettings: (displaySettingsProps: DisplaySettingsInitialData) =>
       displaySettingsProps,

diff --git a/...pplications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts b/...pplications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts
@@ -67,7 +67,7 @@ describe('SchemaLogic', () => {
 
   const fieldCoercionErrors = [
     {
-      external_id: '123',
+      id: '123',
       error: 'error',
     },
   ] as any;