Skip to content

Commit

Permalink
resultsField: check for only spaces string in editor and form
Browse files Browse the repository at this point in the history
  • Loading branch information
alvarezmelissa87 committed Jul 7, 2020
1 parent 4128e0c commit ba0dede
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {
import { State } from '../../../analytics_management/hooks/use_create_analytics_form/state';
import { ANALYTICS_STEPS } from '../../page';

const DEFAULT_RESULTS_FIELD = 'ml';

export interface ListItems {
title: string;
description: string | JSX.Element;
Expand All @@ -26,7 +28,7 @@ export const DetailsStepDetails: FC<{ setCurrentStep: any; state: State }> = ({
state,
}) => {
const { form, isJobCreated } = state;
const { description, jobId, destinationIndex } = form;
const { description, jobId, destinationIndex, resultsField } = form;

const detailsFirstCol: ListItems[] = [
{
Expand All @@ -37,6 +39,19 @@ export const DetailsStepDetails: FC<{ setCurrentStep: any; state: State }> = ({
},
];

if (
resultsField !== undefined &&
typeof resultsField === 'string' &&
resultsField.trim() !== ''
) {
detailsFirstCol.push({
title: i18n.translate('xpack.ml.dataframe.analytics.create.configDetails.resultsField', {
defaultMessage: 'Results field',
}),
description: resultsField,
});
}

const detailsSecondCol: ListItems[] = [
{
title: i18n.translate('xpack.ml.dataframe.analytics.create.configDetails.jobDescription', {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ const statDescriptions = {
<EuiLink
href="https://en.wikipedia.org/wiki/Huber_loss#Pseudo-Huber_loss_function"
target="_blank"
external
>
Pseudo Huber loss function
{i18n.translate('xpack.ml.dataframe.analytics.regressionExploration.huberLinkText', {
defaultMessage: 'Pseudo Huber loss function',
})}
</EuiLink>
),
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ export const validateAdvancedEditor = (state: State): State => {
const destinationIndexPatternTitleExists =
state.indexPatternsMap[destinationIndexName] !== undefined;

const resultsFieldEmptyString = jobConfig?.dest?.results_field === '';
const resultsFieldEmptyString =
typeof jobConfig?.dest?.results_field === 'string' &&
jobConfig?.dest?.results_field.trim() === '';

const mml = jobConfig.model_memory_limit;
const modelMemoryLimitEmpty = mml === '' || mml === undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ export const getJobConfigFromFormState = (
model_memory_limit: formState.modelMemoryLimit,
};

if (jobConfig.dest && (formState.resultsField !== undefined || formState.resultsField !== '')) {
const resultsFieldEmpty =
typeof formState?.resultsField === 'string' && formState?.resultsField.trim() === '';

if (jobConfig.dest && !resultsFieldEmpty) {
jobConfig.dest.results_field = formState.resultsField;
}

Expand Down

0 comments on commit ba0dede

Please sign in to comment.