From 7536d93bd121118a06803d06fe9da305c5c1ab55 Mon Sep 17 00:00:00 2001 From: Mrunal Zambre Date: Wed, 8 Jun 2022 14:38:11 +0000 Subject: [PATCH] Fixed default selection for treemap Signed-off-by: Mrunal Zambre --- .../__tests__/__snapshots__/config_panel.test.tsx.snap | 6 ++++++ .../explorer/visualizations/config_panel/config_panel.tsx | 2 +- .../config_panes/config_controls/config_panel_item.tsx | 5 ++++- .../components/visualizations/charts/maps/treemap_type.ts | 6 ++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap index 3affb05fb..a6d447094 100644 --- a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap +++ b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap @@ -989,6 +989,9 @@ exports[`Config panel component Renders config panel with visualization data 1`] "isSingleSelection": true, "mapTo": "parentField", "name": "Parent Field", + "props": Object { + "isInvalid": false, + }, }, Object { "component": null, @@ -1042,6 +1045,9 @@ exports[`Config panel component Renders config panel with visualization data 1`] "value": "dice-slice", }, ], + "props": Object { + "isClearable": false, + }, }, ], }, diff --git a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx index d1e8d25a8..c0e9f83e1 100644 --- a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx @@ -92,7 +92,7 @@ export const ConfigPanel = ({ visualizations, setCurVisId, callback, changeIsVal useEffect(() => { setVizConfigs({ ...userConfigs, - dataConfig: { ...vizConfigs.dataConfig, ...(userConfigs?.dataConfig ? userConfigs.dataConfig : getDefaultAxisSelected()) }, + dataConfig: { ...(userConfigs?.dataConfig ? userConfigs.dataConfig : getDefaultAxisSelected()) }, layoutConfig: userConfigs?.layoutConfig ? hjson.stringify({ ...userConfigs.layoutConfig }, HJSON_STRINGIFY_OPTIONS) : getDefaultSpec(), diff --git a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/config_panel_item.tsx b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/config_panel_item.tsx index 681096a63..0ab6fc7f2 100644 --- a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/config_panel_item.tsx +++ b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/config_panel_item.tsx @@ -12,7 +12,9 @@ export const PanelItem = ({ selectedAxis, dropdownList, onSelectChange, + isInvalid, isSingleSelection = false, + isClearable = true, }: any) => { const options = dropdownList.map((item) => { return { @@ -32,7 +34,8 @@ export const PanelItem = ({ placeholder="Select a field" options={options} selectedOptions={selectedAxis} - isInvalid={isEmpty(selectedAxis)} + isInvalid={isInvalid ?? isEmpty(selectedAxis)} + isClearable={isClearable} singleSelection={isSingleSelection} onChange={onSelectChange} aria-label="Use aria labels when no actual label is in use" diff --git a/dashboards-observability/public/components/visualizations/charts/maps/treemap_type.ts b/dashboards-observability/public/components/visualizations/charts/maps/treemap_type.ts index 87761eb38..5eefda629 100644 --- a/dashboards-observability/public/components/visualizations/charts/maps/treemap_type.ts +++ b/dashboards-observability/public/components/visualizations/charts/maps/treemap_type.ts @@ -61,6 +61,9 @@ export const createTreeMapDefinition = (params: BarTypeParams = {}) => ({ isSingleSelection: true, component: null, mapTo: 'parentField', + props: { + isInvalid: false, + } }, { name: 'Value Field', @@ -90,6 +93,9 @@ export const createTreeMapDefinition = (params: BarTypeParams = {}) => ({ { name: 'Dice Slice', value: 'dice-slice' }, ], defaultState: [{ name: 'Squarify', label: 'Squarify', value: 'squarify' }], + props: { + isClearable: false, + } }, ], },