-
- {sectionName}
-
+
+
+ {sectionName}
+
+ {isAggregation && aggregationToolTip(tooltipIcon)}
+
{isArray(list) &&
list.map((obj: ConfigListEntry, index: number) => (
@@ -46,17 +81,10 @@ export const DataConfigPanelFields = ({
tabIndex={0}
onClick={() => handleServiceEdit(false, index, sectionName)}
>
- {obj[CUSTOM_LABEL] ||
- `${sectionName === AGGREGATIONS ? obj.aggregation : ''} ${obj.label}`}
+ {obj[CUSTOM_LABEL] || `${isAggregation ? obj.aggregation : ''} ${obj.label}`}
-
handleServiceRemove(index, sectionName)}
- />
+ {isAggregation ? aggregationToolTip(crossIcon(index)) : crossIcon(index)}
@@ -69,7 +97,10 @@ export const DataConfigPanelFields = ({
aria-label="add-field"
iconSize="s"
color="primary"
- disabled={sectionName === GROUPBY && visType === VIS_CHART_TYPES.Line}
+ disabled={
+ (sectionName === GROUPBY && visType === VIS_CHART_TYPES.Line) ||
+ visType === VIS_CHART_TYPES.Scatter
+ }
onClick={() => handleServiceAdd(sectionName)}
/>
diff --git a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx
index 43c389f0c..7dcaa36cf 100644
--- a/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx
+++ b/dashboards-observability/public/components/event_analytics/explorer/visualizations/config_panel/config_panes/config_controls/data_configurations_panel.tsx
@@ -62,15 +62,7 @@ export const DataConfigPanelItem = ({
queryManager,
}: DataConfigPanelProps) => {
const dispatch = useDispatch();
- const {
- tabId,
- handleQuerySearch,
- handleQueryChange,
- setTempQuery,
- fetchData,
- changeVisualizationConfig,
- curVisId,
- } = useContext(TabContext);
+ const { tabId, handleQueryChange, fetchData, curVisId } = useContext(TabContext);
const { data } = visualizations;
const { data: vizData = {}, metadata: { fields = [] } = {} } = data?.rawVizData;
const {
@@ -89,43 +81,6 @@ export const DataConfigPanelItem = ({
setConfigList({
...userConfigs.dataConfig,
});
- } else if (some(SPECIAL_RENDERING_VIZS, (visType) => visType === visualizations.vis.name)) {
- // any vis that doesn't conform normal metrics/dimensions data confiurations
- setConfigList({
- ...DEFAULT_DATA_CONFIGS[visualizations.vis.name],
- });
- } else {
- // default
- const statsTokens = queryManager.queryParser().parse(data.query.rawQuery).getStats();
- if (!statsTokens) {
- setConfigList({
- metrics: [],
- dimensions: [],
- });
- } else {
- const fieldInfo = statsTokens.groupby?.span?.span_expression?.field;
- setConfigList({
- metrics: statsTokens.aggregations.map((agg) => ({
- alias: agg.alias,
- label: agg.function?.value_expression,
- name: agg.function?.value_expression,
- aggregation: agg.function?.name,
- })),
- dimensions: statsTokens.groupby?.group_fields?.map((agg) => ({
- label: agg.name ?? '',
- name: agg.name ?? '',
- })),
- span: {
- time_field: statsTokens.groupby?.span?.span_expression?.field
- ? [getStandardedOuiField(fieldInfo, 'timestamp')]
- : [],
- interval: statsTokens.groupby?.span?.span_expression?.literal_value ?? '0',
- unit: statsTokens.groupby?.span?.span_expression?.time_unit
- ? [getStandardedOuiField(statsTokens.groupby?.span?.span_expression?.time_unit)]
- : [],
- },
- });
- }
}
}, [userConfigs?.dataConfig, visualizations.vis.name]);
@@ -386,7 +341,7 @@ export const DataConfigPanelItem = ({
[configList[GROUPBY]]
);
- const Breakdowns = useMemo(() => {
+ const Breakdowns = () => {
return (
<>
@@ -414,7 +369,7 @@ export const DataConfigPanelItem = ({
>
);
- }, [configList[GROUPBY], configList.breakdowns]);
+ };
const DateHistogram = useMemo(() => {
return (