Skip to content

Revert "Add support for runtime field types to mappings editor" #79611

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
merged 1 commit into from
Oct 6, 2020
Merged

Revert "Add support for runtime field types to mappings editor" #79611

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
3 changes: 1 addition & 2 deletions x-pack/plugins/index_management/public/application/app_context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React, { createContext, useContext } from 'react';
import { ScopedHistory } from 'kibana/public';
import { ManagementAppMountParams } from 'src/plugins/management/public';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
import { CoreSetup, CoreStart } from '../../../../../src/core/public';
import { CoreStart } from '../../../../../src/core/public';

import { IngestManagerSetup } from '../../../ingest_manager/public';
import { IndexMgmtMetricsType } from '../types';
Expand All @@ -34,7 +34,6 @@ export interface AppDependencies {
};
history: ScopedHistory;
setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs'];
uiSettings: CoreSetup['uiSettings'];
}

export const AppContextProvider = ({
Expand Down
4 changes: 0 additions & 4 deletions ...plication/components/mappings_editor/components/document_fields/field_parameters/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ export * from './meta_parameter';

export * from './ignore_above_parameter';

export { RuntimeTypeParameter } from './runtime_type_parameter';

export { PainlessScriptParameter } from './painless_script_parameter';

export const PARAMETER_SERIALIZERS = [relationsSerializer, dynamicSerializer];

export const PARAMETER_DESERIALIZERS = [relationsDeserializer, dynamicDeserializer];
80 changes: 0 additions & 80 deletions ...mappings_editor/components/document_fields/field_parameters/painless_script_parameter.tsx
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions ...components/mappings_editor/components/document_fields/field_parameters/path_parameter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@ export const PathParameter = ({ field, allFields }: Props) => {
<>
{!Boolean(suggestedFields.length) && (
<>
<EuiCallOut
size="s"
color="warning"
title={i18n.translate(
'xpack.idxMgmt.mappingsEditor.aliasType.noFieldsAddedWarningMessage',
{
defaultMessage:
'You need to add at least one field before creating an alias.',
}
)}
/>
<EuiCallOut color="warning">
<p>
{i18n.translate(
'xpack.idxMgmt.mappingsEditor.aliasType.noFieldsAddedWarningMessage',
{
defaultMessage:
'You need to add at least one field before creating an alias.',
}
)}
</p>
</EuiCallOut>
<EuiSpacer />
</>
)}
Expand Down
96 changes: 0 additions & 96 deletions ...ts/mappings_editor/components/document_fields/field_parameters/runtime_type_parameter.tsx
View file
Open in desktop

This file was deleted.

15 changes: 6 additions & 9 deletions ...nts/mappings_editor/components/document_fields/field_parameters/term_vector_parameter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,14 @@ export const TermVectorParameter = ({ field, defaultToggleValue }: Props) => {
{formData.term_vector === 'with_positions_offsets' && (
<>
<EuiSpacer size="s" />
<EuiCallOut
size="s"
color="warning"
title={i18n.translate(
'xpack.idxMgmt.mappingsEditor.termVectorFieldWarningMessage',
{
<EuiCallOut color="warning">
<p>
{i18n.translate('xpack.idxMgmt.mappingsEditor.termVectorFieldWarningMessage', {
defaultMessage:
'Setting "With positions and offsets" will double the size of a field’s index.',
}
)}
/>
})}
</p>
</EuiCallOut>
</>
)}
</>
Expand Down
23 changes: 6 additions & 17 deletions ...omponents/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@ import {
EuiFlexGroup,
EuiFlexItem,
EuiOutsideClickDetector,
EuiSpacer,
} from '@elastic/eui';

import { useForm, Form, FormDataProvider } from '../../../../shared_imports';
import { EUI_SIZE, TYPE_DEFINITION } from '../../../../constants';
import { EUI_SIZE } from '../../../../constants';
import { useDispatch } from '../../../../mappings_state_context';
import { fieldSerializer } from '../../../../lib';
import { Field, NormalizedFields, MainType } from '../../../../types';
import { Field, NormalizedFields } from '../../../../types';
import { NameParameter, TypeParameter, SubTypeParameter } from '../../field_parameters';
import { FieldBetaBadge } from '../field_beta_badge';
import { getRequiredParametersFormForType } from './required_parameters_forms';
import { getParametersFormForType } from './required_parameters_forms';

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

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

<FormDataProvider pathsToWatch={['type', 'subType']}>
{({ type, subType }) => {
const RequiredParametersForm = getRequiredParametersFormForType(
const ParametersForm = getParametersFormForType(
type?.[0].value,
subType?.[0].value
);

if (!RequiredParametersForm) {
if (!ParametersForm) {
return null;
}

const typeDefinition = TYPE_DEFINITION[type?.[0].value as MainType];

return (
<div className="mappingsEditor__createFieldRequiredProps">
{typeDefinition.isBeta ? (
<>
<FieldBetaBadge />
<EuiSpacer size="m" />
</>
) : null}

<RequiredParametersForm key={subType ?? type} allFields={allFields} />
<ParametersForm key={subType ?? type} allFields={allFields} />
</div>
);
}}
Expand Down
4 changes: 1 addition & 3 deletions ..._editor/components/document_fields/fields/create_field/required_parameters_forms/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { AliasTypeRequiredParameters } from './alias_type';
import { TokenCountTypeRequiredParameters } from './token_count_type';
import { ScaledFloatTypeRequiredParameters } from './scaled_float_type';
import { DenseVectorRequiredParameters } from './dense_vector_type';
import { RuntimeTypeRequiredParameters } from './runtime_type';

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

export const getRequiredParametersFormForType = (
export const getParametersFormForType = (
Copy link
Contributor

@sebelga sebelga Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why you had changed the name of the handler. 🤔 It correctly stated that it would return only the required parameters for a field type.

Copy link
Contributor

@sebelga sebelga Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or am I reading this the other way around?? 😄

Copy link
Contributor Author

@cjcenizal cjcenizal Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I clarified the name in my original PR and this revert reintroduces the original, slightly more ambiguous name.

Copy link
Contributor

@sebelga sebelga Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, yes your change was indeed clearer 👍

type: MainType,
subType?: SubType
): ComponentType<ComponentProps> | undefined =>
Expand Down
18 changes: 0 additions & 18 deletions ...components/document_fields/fields/create_field/required_parameters_forms/runtime_type.tsx
View file
Open in desktop

This file was deleted.

Loading