Skip to content

[7.x] [Enterprise Search] Move schema types to shared (#84822) #84838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scottybollinger merged 1 commit into from
Dec 2, 2020
Merged

[7.x] [Enterprise Search] Move schema types to shared (#84822) #84838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...lugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { ApiToken } from '../credentials/types';
import { Schema, SchemaConflicts, IndexingStatus } from '../schema/types';
import { Schema, SchemaConflicts, IIndexingStatus } from '../../../shared/types';

export interface Engine {
name: string;
Expand All @@ -26,7 +26,7 @@ export interface EngineDetails extends Engine {
schema: Schema;
schemaConflicts?: SchemaConflicts;
unconfirmedFields?: string[];
activeReindexJob?: IndexingStatus;
activeReindexJob?: IIndexingStatus;
invalidBoosts: boolean;
sample?: boolean;
isMeta: boolean;
Expand Down
34 changes: 0 additions & 34 deletions x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/types.ts
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions x-pack/plugins/enterprise_search/public/applications/shared/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down