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] Decouple data_visualizer from MapEmbeddable #181928

Merged
merged 13 commits into from
May 1, 2024
Merged

[ML] Decouple data_visualizer from MapEmbeddable #181928

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db8035f
decouple data_visualizer from MapEmbeddable
nreese Apr 26, 2024
9c4a245
export Map from maps start api
nreese Apr 28, 2024
d2fcfba
update getLayerList to layerList prop
nreese Apr 28, 2024
8f34442
eslint
nreese Apr 28, 2024
b753723
Map
nreese Apr 29, 2024
3e51dc1
merge with main
nreese Apr 29, 2024
c640304
remove EmbeddedMap
nreese Apr 29, 2024
a7bc666
tslint
nreese Apr 29, 2024
2cd24d7
[CI] Auto-commit changed files from 'node scripts/lint_ts_projects --…
kibanamachine Apr 29, 2024
3c3b53c
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Apr 29, 2024
a526688
open legend for region and tile map
nreese Apr 29, 2024
ef81e02
Merge branch 'main' into data_visualizer_map
kibanamachine Apr 29, 2024
5833915
Merge branch 'main' into data_visualizer_map
kibanamachine May 1, 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
8 changes: 0 additions & 8 deletions ...gins/data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_index.scss
View file
Open in desktop

This file was deleted.

148 changes: 0 additions & 148 deletions ...lugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/index.ts
View file
Open in desktop

This file was deleted.

16 changes: 9 additions & 7 deletions ...public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,19 @@ import React, { useMemo } from 'react';
import type { Feature, Point } from 'geojson';
import type { FieldDataRowProps } from '../../stats_table/types/field_data_row';
import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats';
import { EmbeddedMapComponent } from '../../embedded_map';
import { convertWKTGeoToLonLat, getGeoPointsLayer } from './format_utils';
import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content';
import { ExamplesList } from '../../examples_list';
import { ExpandedRowPanel } from '../../stats_table/components/field_data_expanded_row/expanded_row_panel';
import { useDataVisualizerKibana } from '../../../../kibana_context';

export const DEFAULT_GEO_REGEX = RegExp('(?<lat>.+) (?<lon>.+)');

export const GeoPointContent: FC<FieldDataRowProps> = ({ config }) => {
const {
services: { maps: mapsService },
} = useDataVisualizerKibana();

const formattedResults = useMemo(() => {
const { stats } = config;

Expand Down Expand Up @@ -54,20 +58,18 @@ export const GeoPointContent: FC<FieldDataRowProps> = ({ config }) => {
if (geoPointsFeatures.length > 0) {
return {
examples: formattedExamples,
layerList: [getGeoPointsLayer(geoPointsFeatures)],
pointsLayer: getGeoPointsLayer(geoPointsFeatures),
};
}
}
}, [config]);
return (
<ExpandedRowContent dataTestSubj={'dataVisualizerGeoPointContent'}>
<DocumentStatsTable config={config} />
{formattedResults && Array.isArray(formattedResults.examples) && (
<ExamplesList examples={formattedResults.examples} />
)}
{formattedResults && Array.isArray(formattedResults.layerList) && (
{formattedResults?.examples && <ExamplesList examples={formattedResults.examples} />}
{mapsService && formattedResults?.pointsLayer && (
<ExpandedRowPanel className={'dvPanel__wrapper dvMap__wrapper'} grow={true}>
<EmbeddedMapComponent layerList={formattedResults.layerList} />
<mapsService.PassiveMap passiveLayer={formattedResults.pointsLayer} />
</ExpandedRowPanel>
)}
</ExpandedRowContent>
Expand Down