Skip to content

Commit e01d538

Browse files
authored
Revert "Add support for runtime field types to mappings editor. (elastic#77420)" (elastic#79611)
This reverts commit 0dc89cb.
1 parent 1ad68fd commit e01d538

27 files changed

+74
-552
lines changed

x-pack/plugins/index_management/public/application/app_context.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import React, { createContext, useContext } from 'react';
88
import { ScopedHistory } from 'kibana/public';
99
import { ManagementAppMountParams } from 'src/plugins/management/public';
1010
import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
11-
import { CoreSetup, CoreStart } from '../../../../../src/core/public';
11+
import { CoreStart } from '../../../../../src/core/public';
1212

1313
import { IngestManagerSetup } from '../../../ingest_manager/public';
1414
import { IndexMgmtMetricsType } from '../types';
@@ -34,7 +34,6 @@ export interface AppDependencies {
3434
};
3535
history: ScopedHistory;
3636
setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs'];
37-
uiSettings: CoreSetup['uiSettings'];
3837
}
3938

4039
export const AppContextProvider = ({

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/index.ts

-4
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ export * from './meta_parameter';
7373

7474
export * from './ignore_above_parameter';
7575

76-
export { RuntimeTypeParameter } from './runtime_type_parameter';
77-
78-
export { PainlessScriptParameter } from './painless_script_parameter';
79-
8076
export const PARAMETER_SERIALIZERS = [relationsSerializer, dynamicSerializer];
8177

8278
export const PARAMETER_DESERIALIZERS = [relationsDeserializer, dynamicDeserializer];

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/painless_script_parameter.tsx

-80
This file was deleted.

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/path_parameter.tsx

+11-11
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ export const PathParameter = ({ field, allFields }: Props) => {
9393
<>
9494
{!Boolean(suggestedFields.length) && (
9595
<>
96-
<EuiCallOut
97-
size="s"
98-
color="warning"
99-
title={i18n.translate(
100-
'xpack.idxMgmt.mappingsEditor.aliasType.noFieldsAddedWarningMessage',
101-
{
102-
defaultMessage:
103-
'You need to add at least one field before creating an alias.',
104-
}
105-
)}
106-
/>
96+
<EuiCallOut color="warning">
97+
<p>
98+
{i18n.translate(
99+
'xpack.idxMgmt.mappingsEditor.aliasType.noFieldsAddedWarningMessage',
100+
{
101+
defaultMessage:
102+
'You need to add at least one field before creating an alias.',
103+
}
104+
)}
105+
</p>
106+
</EuiCallOut>
107107
<EuiSpacer />
108108
</>
109109
)}

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/runtime_type_parameter.tsx

-96
This file was deleted.

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/term_vector_parameter.tsx

+6-9
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,14 @@ export const TermVectorParameter = ({ field, defaultToggleValue }: Props) => {
5656
{formData.term_vector === 'with_positions_offsets' && (
5757
<>
5858
<EuiSpacer size="s" />
59-
<EuiCallOut
60-
size="s"
61-
color="warning"
62-
title={i18n.translate(
63-
'xpack.idxMgmt.mappingsEditor.termVectorFieldWarningMessage',
64-
{
59+
<EuiCallOut color="warning">
60+
<p>
61+
{i18n.translate('xpack.idxMgmt.mappingsEditor.termVectorFieldWarningMessage', {
6562
defaultMessage:
6663
'Setting "With positions and offsets" will double the size of a field’s index.',
67-
}
68-
)}
69-
/>
64+
})}
65+
</p>
66+
</EuiCallOut>
7067
</>
7168
)}
7269
</>

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx

+6-17
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ import {
1414
EuiFlexGroup,
1515
EuiFlexItem,
1616
EuiOutsideClickDetector,
17-
EuiSpacer,
1817
} from '@elastic/eui';
1918

2019
import { useForm, Form, FormDataProvider } from '../../../../shared_imports';
21-
import { EUI_SIZE, TYPE_DEFINITION } from '../../../../constants';
20+
import { EUI_SIZE } from '../../../../constants';
2221
import { useDispatch } from '../../../../mappings_state_context';
2322
import { fieldSerializer } from '../../../../lib';
24-
import { Field, NormalizedFields, MainType } from '../../../../types';
23+
import { Field, NormalizedFields } from '../../../../types';
2524
import { NameParameter, TypeParameter, SubTypeParameter } from '../../field_parameters';
26-
import { FieldBetaBadge } from '../field_beta_badge';
27-
import { getRequiredParametersFormForType } from './required_parameters_forms';
25+
import { getParametersFormForType } from './required_parameters_forms';
2826

2927
const formWrapper = (props: any) => <form {...props} />;
3028

@@ -197,27 +195,18 @@ export const CreateField = React.memo(function CreateFieldComponent({
197195

198196
<FormDataProvider pathsToWatch={['type', 'subType']}>
199197
{({ type, subType }) => {
200-
const RequiredParametersForm = getRequiredParametersFormForType(
198+
const ParametersForm = getParametersFormForType(
201199
type?.[0].value,
202200
subType?.[0].value
203201
);
204202

205-
if (!RequiredParametersForm) {
203+
if (!ParametersForm) {
206204
return null;
207205
}
208206

209-
const typeDefinition = TYPE_DEFINITION[type?.[0].value as MainType];
210-
211207
return (
212208
<div className="mappingsEditor__createFieldRequiredProps">
213-
{typeDefinition.isBeta ? (
214-
<>
215-
<FieldBetaBadge />
216-
<EuiSpacer size="m" />
217-
</>
218-
) : null}
219-
220-
<RequiredParametersForm key={subType ?? type} allFields={allFields} />
209+
<ParametersForm key={subType ?? type} allFields={allFields} />
221210
</div>
222211
);
223212
}}

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/index.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { AliasTypeRequiredParameters } from './alias_type';
1111
import { TokenCountTypeRequiredParameters } from './token_count_type';
1212
import { ScaledFloatTypeRequiredParameters } from './scaled_float_type';
1313
import { DenseVectorRequiredParameters } from './dense_vector_type';
14-
import { RuntimeTypeRequiredParameters } from './runtime_type';
1514

1615
export interface ComponentProps {
1716
allFields: NormalizedFields['byId'];
@@ -22,10 +21,9 @@ const typeToParametersFormMap: { [key in DataType]?: ComponentType<any> } = {
2221
token_count: TokenCountTypeRequiredParameters,
2322
scaled_float: ScaledFloatTypeRequiredParameters,
2423
dense_vector: DenseVectorRequiredParameters,
25-
runtime: RuntimeTypeRequiredParameters,
2624
};
2725

28-
export const getRequiredParametersFormForType = (
26+
export const getParametersFormForType = (
2927
type: MainType,
3028
subType?: SubType
3129
): ComponentType<ComponentProps> | undefined =>

x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/required_parameters_forms/runtime_type.tsx

-18
This file was deleted.

0 commit comments

Comments
 (0)