Skip to content
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

Jump to bottom

[ML][data visualizer]: Fix choropleth map disappears when time range is changed #181933

Merged
merged 3 commits into from
Apr 29, 2024
Merged

[ML][data visualizer]: Fix choropleth map disappears when time range is changed #181933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f6d0ed
[data visualizer] fix choropleth map disappears when time range is ch…
nreese Apr 27, 2024
c4bda7f
revert name change
nreese Apr 27, 2024
388a384
Merge branch 'main' into issue_181932
kibanamachine Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...ation/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const getChoroplethTopValuesLayer = (
};

interface Props {
stats: FieldVisStats | undefined;
stats: FieldVisStats;
suggestion: EMSTermJoinConfig;
}

Expand All @@ -106,15 +106,13 @@ export const ChoroplethMap: FC<Props> = ({ stats, suggestion }) => {
},
} = useDataVisualizerKibana();

const { fieldName, isTopValuesSampled, topValues, sampleCount } = stats!;
const { fieldName, isTopValuesSampled, topValues, sampleCount } = stats;

const layerList: VectorLayerDescriptor[] = useMemo(
() => [getChoroplethTopValuesLayer(fieldName || '', topValues || [], suggestion)],
[suggestion, fieldName, topValues]
);

if (!stats) return null;

const totalDocuments = stats.totalDocuments ?? sampleCount ?? 0;

const countsElement = totalDocuments ? (
Expand Down
48 changes: 29 additions & 19 deletions ...tion/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import type { FC } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import React, { useEffect, useState } from 'react';
import type { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
import type { FieldDataRowProps } from '../../types/field_data_row';
import { TopValues } from '../../../top_values';
Expand All @@ -17,31 +17,41 @@ import { ChoroplethMap } from './choropleth_map';
import { ErrorMessageContent } from './error_message';

export const KeywordContent: FC<FieldDataRowProps> = ({ config, onAddFilter }) => {
const [EMSSuggestion, setEMSSuggestion] = useState<EMSTermJoinConfig | null | undefined>();
const [suggestion, setSuggestion] = useState<EMSTermJoinConfig | null>(null);
const { stats, fieldName } = config;
const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
const {
services: { maps: mapsPlugin },
} = useDataVisualizerKibana();

const loadEMSTermSuggestions = useCallback(async () => {
useEffect(() => {
if (!mapsPlugin) return;
const suggestion: EMSTermJoinConfig | null = await mapsPlugin.suggestEMSTermJoinConfig({
sampleValues: Array.isArray(stats?.topValues)
? stats?.topValues.map((value) => value.key)
: [],
sampleValuesColumnName: fieldName || '',
});
setEMSSuggestion(suggestion);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [fieldName]);
if (!stats?.topValues) {
setSuggestion(null);
return;
}

useEffect(
function getInitialEMSTermSuggestion() {
loadEMSTermSuggestions();
},
[loadEMSTermSuggestions]
);
let ignore = false;
mapsPlugin
.suggestEMSTermJoinConfig({
sampleValues: stats.topValues.map((value) => value.key),
sampleValuesColumnName: fieldName || '',
})
.then((nextSuggestion) => {
if (!ignore) {
setSuggestion(nextSuggestion);
}
})
.catch(() => {
if (!ignore) {
setSuggestion(null);
}
});

return () => {
ignore = true;
};
}, [fieldName, mapsPlugin, stats?.topValues]);

return (
<ExpandedRowContent dataTestSubj={'dataVisualizerKeywordContent'}>
Expand All @@ -65,7 +75,7 @@ export const KeywordContent: FC<FieldDataRowProps> = ({ config, onAddFilter }) =
/>
) : null}

{EMSSuggestion && stats && <ChoroplethMap stats={stats} suggestion={EMSSuggestion} />}
{suggestion && stats && <ChoroplethMap stats={stats} suggestion={suggestion} />}
</ExpandedRowContent>
);
};