Skip to content

Commit c3f1e0d

Browse files
authored
[FieldFormats] Remove SerializedFieldFormat copy from expressions plugin (#114245)
1 parent e1133e1 commit c3f1e0d

File tree

17 files changed

+29
-40
lines changed

17 files changed

+29
-40
lines changed

src/plugins/data/common/search/aggs/agg_config.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ import type { SerializableRecord } from '@kbn/utility-types';
1313
import { Assign, Ensure } from '@kbn/utility-types';
1414

1515
import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
16-
import {
17-
ExpressionAstExpression,
18-
ExpressionAstArgument,
19-
SerializedFieldFormat,
20-
} from 'src/plugins/expressions/common';
16+
import { ExpressionAstExpression, ExpressionAstArgument } from 'src/plugins/expressions/common';
17+
import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
2118

2219
import { IAggType } from './agg_type';
2320
import { writeParams } from './agg_params';

src/plugins/data/common/search/aggs/agg_type.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import { constant, noop, identity } from 'lodash';
1010
import { i18n } from '@kbn/i18n';
1111

1212
import { ISearchSource } from 'src/plugins/data/public';
13-
import { DatatableColumnType, SerializedFieldFormat } from 'src/plugins/expressions/common';
13+
import { DatatableColumnType } from 'src/plugins/expressions/common';
1414
import type { RequestAdapter } from 'src/plugins/inspector/common';
15+
import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
1516

1617
import { estypes } from '@elastic/elasticsearch';
1718
import { initParams } from './agg_params';

src/plugins/data/common/search/aggs/utils/get_aggs_formats.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
/* eslint-disable max-classes-per-file */
1010
import { i18n } from '@kbn/i18n';
1111

12-
import { SerializedFieldFormat } from 'src/plugins/expressions/common/types';
1312
import {
1413
FieldFormat,
1514
FieldFormatInstanceType,
1615
FieldFormatsContentType,
1716
IFieldFormat,
17+
SerializedFieldFormat,
1818
} from '../../../../../field_formats/common';
1919
import { DateRange } from '../../expressions';
2020
import { convertDateRangeToString } from '../buckets/lib/date_range';

src/plugins/data_views/common/data_views/data_view.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ import { IIndexPattern, IFieldType } from '../../common';
1919
import { DataViewField, IIndexPatternFieldList, fieldList } from '../fields';
2020
import { formatHitProvider } from './format_hit';
2121
import { flattenHitWrapper } from './flatten_hit';
22-
import { FieldFormatsStartCommon, FieldFormat } from '../../../field_formats/common';
22+
import {
23+
FieldFormatsStartCommon,
24+
FieldFormat,
25+
SerializedFieldFormat,
26+
} from '../../../field_formats/common';
2327
import { DataViewSpec, TypeMeta, SourceFilter, DataViewFieldMap } from '../types';
24-
import { SerializedFieldFormat } from '../../../expressions/common';
2528

2629
interface DataViewDeps {
2730
spec?: DataViewSpec;

src/plugins/data_views/common/types.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import type { SavedObject } from 'src/core/server';
1313
import { KBN_FIELD_TYPES } from '@kbn/field-types';
1414
import { IFieldType } from './fields';
1515
import { RUNTIME_FIELD_TYPES } from './constants';
16-
import { SerializedFieldFormat } from '../../expressions/common';
1716
import { DataViewField } from './fields';
18-
import { FieldFormat } from '../../field_formats/common';
17+
import { FieldFormat, SerializedFieldFormat } from '../../field_formats/common';
1918

2019
export type FieldFormatMap = Record<string, SerializedFieldFormat>;
2120

src/plugins/discover/public/application/apps/main/components/chart/point_series.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import { uniq } from 'lodash';
1010
import { Duration, Moment } from 'moment';
1111
import { Unit } from '@elastic/datemath';
12-
import { SerializedFieldFormat } from '../../../../../../../expressions/common';
12+
import type { SerializedFieldFormat } from '../../../../../../../field_formats/common';
1313

1414
export interface Column {
1515
id: string;

src/plugins/expressions/common/expression_types/specs/datatable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
import type { SerializableRecord } from '@kbn/utility-types';
1010
import { map, pick, zipObject } from 'lodash';
11+
import type { SerializedFieldFormat } from 'src/plugins/field_formats/common';
1112

1213
import { ExpressionTypeDefinition, ExpressionValueBoxed } from '../types';
1314
import { PointSeries, PointSeriesColumn } from './pointseries';
1415
import { ExpressionValueRender } from './render';
15-
import { SerializedFieldFormat } from '../../types';
1616

1717
const name = 'datatable';
1818

src/plugins/expressions/common/types/common.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,3 @@ export type TypeString<T> = KnownTypeToString<
4646
* `date` is typed as a number or string, and represents a date
4747
*/
4848
export type UnmappedTypeStrings = 'date' | 'filter';
49-
50-
/**
51-
* JSON representation of a field formatter configuration.
52-
* Is used to carry information about how to format data in
53-
* a data table as part of the column definition.
54-
*/
55-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
56-
export interface SerializedFieldFormat<TParams = Record<string, any>> {
57-
id?: string;
58-
params?: TParams;
59-
}

src/plugins/expressions/common/types/index.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@
66
* Side Public License, v 1.
77
*/
88

9-
export {
10-
TypeToString,
11-
KnownTypeToString,
12-
TypeString,
13-
UnmappedTypeStrings,
14-
SerializedFieldFormat,
15-
} from './common';
9+
export { TypeToString, KnownTypeToString, TypeString, UnmappedTypeStrings } from './common';
1610

1711
export * from './style';
1812
export * from './registry';

src/plugins/expressions/public/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ export {
9797
PointSeriesRow,
9898
Range,
9999
SerializedDatatable,
100-
SerializedFieldFormat,
101100
Style,
102101
TextAlignment,
103102
TextDecoration,

0 commit comments

Comments
 (0)