Skip to content

Commit b5ebbd9

Browse files
committed
[ML] Styles cleanup.
1 parent 5dd76c8 commit b5ebbd9

File tree

4 files changed

+22
-31
lines changed

4 files changed

+22
-31
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import 'pages/analytics_exploration/components/regression_exploration/index';
2-
@import 'pages/analytics_exploration/components/classification_exploration/index';
32
@import 'pages/analytics_management/components/analytics_list/index';
43
@import 'pages/analytics_management/components/create_analytics_form/index';
54
@import 'pages/analytics_management/components/create_analytics_flyout/index';

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/_classification_exploration.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1+
/* Workaround for EuiDataGrid within a Flex Layout */
2+
.mlDataFrameAnalyticsClassification {
3+
width: calc(100% - 0px);
4+
}
5+
6+
.mlDataFrameAnalyticsClassification__confusionMatrix {
7+
padding: 0 5%;
8+
}
9+
110
.mlDataFrameAnalyticsClassification__actualLabel {
11+
min-width: 70px;
212
padding-top: $euiSize * 4.2;
313
}
414

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/_index.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/classification_exploration/evaluate_panel.tsx

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7+
import './_classification_exploration.scss';
8+
79
import React, { FC, useState, useEffect, Fragment } from 'react';
810
import { i18n } from '@kbn/i18n';
911
import { FormattedMessage } from '@kbn/i18n/react';
@@ -45,8 +47,6 @@ import {
4547
getTrailingControlColumns,
4648
} from './column_data';
4749

48-
const defaultPanelWidth = 500;
49-
5050
interface Props {
5151
jobConfig: DataFrameAnalyticsConfig;
5252
jobStatus?: DATA_FRAME_TASK_STATE;
@@ -103,7 +103,6 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
103103
const [docsCount, setDocsCount] = useState<null | number>(null);
104104
const [error, setError] = useState<null | string>(null);
105105
const [dataSubsetTitle, setDataSubsetTitle] = useState<SUBSET_TITLE>(SUBSET_TITLE.ENTIRE);
106-
const [panelWidth, setPanelWidth] = useState<number>(defaultPanelWidth);
107106
// Column visibility
108107
const [visibleColumns, setVisibleColumns] = useState(() =>
109108
columns.map(({ id }: { id: string }) => id)
@@ -167,24 +166,6 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
167166
}
168167
};
169168

170-
const resizeHandler = () => {
171-
const tablePanelWidth: number =
172-
document.getElementById('mlDataFrameAnalyticsTableResultsPanel')?.clientWidth ||
173-
defaultPanelWidth;
174-
// Keep the evaluate panel width slightly smaller than the results table
175-
// to ensure results table can resize correctly. Temporary workaround DataGrid issue with flex
176-
const newWidth = tablePanelWidth - 8;
177-
setPanelWidth(newWidth);
178-
};
179-
180-
useEffect(() => {
181-
window.addEventListener('resize', resizeHandler);
182-
resizeHandler();
183-
return () => {
184-
window.removeEventListener('resize', resizeHandler);
185-
};
186-
}, []);
187-
188169
useEffect(() => {
189170
if (confusionMatrixData.length > 0) {
190171
const { columns: derivedColumns, columnData } = getColumnData(confusionMatrixData);
@@ -309,7 +290,7 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
309290
return (
310291
<EuiPanel
311292
data-test-subj="mlDFAnalyticsClassificationExplorationEvaluatePanel"
312-
style={{ width: `${panelWidth}px` }}
293+
className="mlDataFrameAnalyticsClassification"
313294
>
314295
<EuiFlexGroup direction="column" gutterSize="s">
315296
<EuiFlexItem>
@@ -392,13 +373,15 @@ export const EvaluatePanel: FC<Props> = ({ jobConfig, jobStatus, searchQuery })
392373
)}
393374
{/* BEGIN TABLE ELEMENTS */}
394375
<EuiFlexItem grow={false}>
395-
<EuiFlexGroup gutterSize="s" style={{ paddingLeft: '5%', paddingRight: '5%' }}>
396-
<EuiFlexItem grow={false} style={{ minWidth: '70px' }}>
397-
<EuiText
398-
size="xs"
399-
color="subdued"
400-
className="mlDataFrameAnalyticsClassification__actualLabel"
401-
>
376+
<EuiFlexGroup
377+
gutterSize="s"
378+
className="mlDataFrameAnalyticsClassification__confusionMatrix"
379+
>
380+
<EuiFlexItem
381+
grow={false}
382+
className="mlDataFrameAnalyticsClassification__actualLabel"
383+
>
384+
<EuiText size="xs" color="subdued">
402385
<FormattedMessage
403386
id="xpack.ml.dataframe.analytics.classificationExploration.confusionMatrixActualLabel"
404387
defaultMessage="Actual label"

0 commit comments

Comments
 (0)