Dedupe common shared types

x-pack/plugins/security_solution/common/search_strategy/common/index.ts

@@ -4,22 +4,19 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { estypes } from '@elastic/elasticsearch';
 import { IEsSearchResponse } from '../../../../../../src/plugins/data/common';
-
-export type Maybe<T> = T | null;
+export type {
+  Inspect,
+  SortField,
+  TimerangeInput,
+  PaginationInputPaginated,
+  DocValueFields,
+  Maybe,
+} from '../../../../timelines/common';
+export { Direction } from '../../../../timelines/common';
 
 export type SearchHit = IEsSearchResponse<object>['rawResponse']['hits']['hits'][0];
 
-export interface TotalValue {
-  value: number;
-  relation: string;
-}
-
-export interface Inspect {
-  dsl: string[];
-}
-
 export interface PageInfoPaginated {
   activePage: number;
   fakeTotalCount: number;
@@ -31,25 +28,6 @@ export interface CursorType {
   tiebreaker?: Maybe<string>;
 }
 
-export enum Direction {
-  asc = 'asc',
-  desc = 'desc',
-}
-
-export interface SortField<Field = string> {
-  field: Field;
-  direction: Direction;
-}
-
-export interface TimerangeInput {
-  /** The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan. */
-  interval: string;
-  /** The end of the timerange */
-  to: string;
-  /** The beginning of the timerange */
-  from: string;
-}
-
 export interface PaginationInput {
   /** The limit parameter allows you to configure the maximum amount of items to be returned */
   limit: number;
@@ -59,19 +37,6 @@ export interface PaginationInput {
   tiebreaker?: Maybe<string>;
 }
 
-export interface PaginationInputPaginated {
-  /** The activePage parameter defines the page of results you want to fetch */
-  activePage: number;
-  /** The cursorStart parameter defines the start of the results to be displayed */
-  cursorStart: number;
-  /** The fakePossibleCount parameter determines the total count in order to show 5 additional pages */
-  fakePossibleCount: number;
-  /** The querySize parameter is the number of items to be returned */
-  querySize: number;
-}
-
-export type DocValueFields = estypes.SearchDocValueField;
-
 export interface Explanation {
   value: number;
   description: string;
@@ -111,13 +76,3 @@ export interface GenericBuckets {
 }
 
 export type StringOrNumber = string | number;
-
-export interface TimerangeFilter {
-  range: {
-    [timestamp: string]: {
-      gte: string;
-      lte: string;
-      format: string;
-    };
-  };
-}

x-pack/plugins/timelines/common/search_strategy/common/index.ts

@@ -5,12 +5,9 @@
  * 2.0.
  */
 import type { estypes } from '@elastic/elasticsearch';
-import { IEsSearchResponse } from '../../../../../../src/plugins/data/common';
 
 export type Maybe<T> = T | null;
 
-export type SearchHit = IEsSearchResponse<object>['rawResponse']['hits']['hits'][0];
-
 export interface TotalValue {
   value: number;
   relation: string;
@@ -20,17 +17,6 @@ export interface Inspect {
   dsl: string[];
 }
 
-export interface PageInfoPaginated {
-  activePage: number;
-  fakeTotalCount: number;
-  showMorePagesIndicator: boolean;
-}
-
-export interface CursorType {
-  value?: Maybe<string>;
-  tiebreaker?: Maybe<string>;
-}
-
 export enum Direction {
   asc = 'asc',
   desc = 'desc',
@@ -50,15 +36,6 @@ export interface TimerangeInput {
   from: string;
 }
 
-export interface PaginationInput {
-  /** The limit parameter allows you to configure the maximum amount of items to be returned */
-  limit: number;
-  /** The cursor parameter defines the next result you want to fetch */
-  cursor?: Maybe<string>;
-  /** The tiebreaker parameter allow to be more precise to fetch the next item */
-  tiebreaker?: Maybe<string>;
-}
-
 export interface PaginationInputPaginated {
   /** The activePage parameter defines the page of results you want to fetch */
   activePage: number;
@@ -72,14 +49,6 @@ export interface PaginationInputPaginated {
 
 export type DocValueFields = estypes.SearchDocValueField;
 
-export interface Explanation {
-  value: number;
-  description: string;
-  details: Explanation[];
-}
-
-export type StringOrNumber = string | number;
-
 export interface TimerangeFilter {
   range: {
     [timestamp: string]: {

x-pack/plugins/timelines/kibana.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "timelines"],
+  "extraPublicDirs": ["common"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["data", "dataEnhanced", "kibanaReact", "kibanaUtils"],

x-pack/plugins/timelines/public/index.ts

@@ -10,6 +10,15 @@ import { PluginInitializerContext } from '../../../../src/core/public';
 import { TimelinesPlugin } from './plugin';
 export * as tGridActions from './store/t_grid/actions';
 export * as tGridSelectors from './store/t_grid/selectors';
+export type {
+  Inspect,
+  SortField,
+  TimerangeInput,
+  PaginationInputPaginated,
+  DocValueFields,
+  Maybe,
+} from '../common/search_strategy/common';
+export { Direction } from '../common/search_strategy/common';
 export { tGridReducer } from './store/t_grid/reducer';
 export type { TGridModelForTimeline, TimelineState, TimelinesUIStart } from './types';
 export {