Move schema types to shared

scottybollinger · scottybollinger · commit 2be89ce47df3 · 2020-12-02T13:28:48.000-06:00
We use the Schema types in Workplace Search as well, so moving these to shared. Also, we have a component called IndexingStatus so reverting to the prefixed IIndexingStatus interface name
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
@@ -8,7 +8,7 @@ import { kea, MakeLogicType } from 'kea';
 
 import { HttpLogic } from '../../../shared/http';
 
-import { IndexingStatus } from '../schema/types';
+import { IIndexingStatus } from '../../../shared/types';
 import { EngineDetails } from './types';
 
 interface EngineValues {
@@ -25,7 +25,7 @@ interface EngineValues {
 interface EngineActions {
   setEngineData(engine: EngineDetails): { engine: EngineDetails };
   setEngineName(engineName: string): { engineName: string };
-  setIndexingStatus(activeReindexJob: IndexingStatus): { activeReindexJob: IndexingStatus };
+  setIndexingStatus(activeReindexJob: IIndexingStatus): { activeReindexJob: IIndexingStatus };
   setEngineNotFound(notFound: boolean): { notFound: boolean };
   clearEngine(): void;
   initializeEngine(): void;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts
@@ -5,7 +5,7 @@
  */
 
 import { ApiToken } from '../credentials/types';
-import { Schema, SchemaConflicts, IndexingStatus } from '../schema/types';
+import { Schema, SchemaConflicts, IndexingStatus } from '../../../shared/types';
 
 export interface Engine {
   name: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/types.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -4,6 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export type SchemaTypes = 'text' | 'number' | 'geolocation' | 'date';
+
+export interface Schema {
+  [key: string]: SchemaTypes;
+}
+
+// this is a mapping of schema field types ("string", "number", "geolocation", "date") to the names
+// of source engines which utilize that type
+export type SchemaConflictFieldTypes = {
+  [key in SchemaTypes]: string[];
+};
+
+export interface SchemaConflict {
+  fieldTypes: SchemaConflictFieldTypes;
+  resolution?: string;
+}
+
+// For now these values are ISchemaConflictFieldTypes, but in the near future will be ISchemaConflict
+// once we implement schema conflict resolution
+export interface SchemaConflicts {
+  [key: string]: SchemaConflictFieldTypes;
+}
+
 export interface IIndexingStatus {
   percentageComplete: number;
   numDocumentsWithErrors: number;
