-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
[ML] DF Analytics: Collapsable sections on results pages #76641
Changes from 1 commit
7fb7183
13872ee
cdd66b4
fddf9c9
d5d692b
583aef1
f6da6ed
7cc2ead
819cf7d
486511a
b228018
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
.mlSectionPanel { | ||
.mlExpandableSection { | ||
padding: 0 $euiSizeS $euiSizeS $euiSizeS; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import './expandable_section.scss'; | ||
|
||
import React, { useState, FC, ReactNode } from 'react'; | ||
|
||
import { EuiButtonEmpty, EuiPanel } from '@elastic/eui'; | ||
|
||
interface ExpandableSectionProps { | ||
content: ReactNode; | ||
headerContent: ReactNode; | ||
isExpanded?: boolean; | ||
title: ReactNode; | ||
} | ||
|
||
export const ExpandableSection: FC<ExpandableSectionProps> = ({ | ||
headerContent, | ||
// For now we don't have a need for complete external control | ||
// and just want to pass in a default value. If we wanted | ||
// full external control we'd also need to add a onToggleExpanded() | ||
// callback. | ||
isExpanded: isExpandedDefault = true, | ||
content, | ||
title, | ||
}) => { | ||
const [isExpanded, setIsExpanded] = useState(isExpandedDefault); | ||
const toggleExpanded = () => { | ||
setIsExpanded(!isExpanded); | ||
}; | ||
|
||
return ( | ||
<EuiPanel paddingSize="none" data-test-subj="mlDFAnalyticsOutlierExplorationTablePanel"> | ||
<div className="mlExpandableSection"> | ||
<EuiButtonEmpty | ||
onClick={toggleExpanded} | ||
iconType={isExpanded ? 'arrowUp' : 'arrowDown'} | ||
size="l" | ||
iconSide="right" | ||
flush="left" | ||
> | ||
{title} | ||
</EuiButtonEmpty> | ||
{headerContent} | ||
</div> | ||
{isExpanded && content} | ||
</EuiPanel> | ||
); | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
export { ExpandableSection } from './expandable_section'; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,22 +4,18 @@ | |
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import './outlier_exploration.scss'; | ||
|
||
import React, { useEffect, useState, FC } from 'react'; | ||
|
||
import { i18n } from '@kbn/i18n'; | ||
import { FormattedMessage } from '@kbn/i18n/react'; | ||
|
||
import { | ||
EuiBadge, | ||
EuiButtonEmpty, | ||
EuiFlexGroup, | ||
EuiFlexItem, | ||
EuiHorizontalRule, | ||
EuiLoadingContent, | ||
EuiLoadingSpinner, | ||
EuiPanel, | ||
EuiSpacer, | ||
EuiText, | ||
} from '@elastic/eui'; | ||
|
@@ -47,6 +43,7 @@ import { | |
} from '../../../analytics_management/components/analytics_list/common'; | ||
import { ExpandedRow } from '../../../analytics_management/components/analytics_list/expanded_row'; | ||
|
||
import { ExpandableSection } from '../expandable_section'; | ||
import { ExplorationQueryBar } from '../exploration_query_bar'; | ||
import { IndexPatternPrompt } from '../index_pattern_prompt'; | ||
|
||
|
@@ -106,16 +103,6 @@ export const OutlierExploration: FC<ExplorationProps> = React.memo(({ jobId }) = | |
fetchStats(); | ||
}, [jobConfig?.id]); | ||
|
||
const [isExpandedAnalysisDetails, setIsExpandedAnalysisDetails] = useState(false); | ||
const toggleExpandedAnalysisDetails = () => { | ||
setIsExpandedAnalysisDetails(!isExpandedAnalysisDetails); | ||
}; | ||
|
||
const [isExpandedResultsTable, setIsExpandedResultsTable] = useState(true); | ||
const toggleExpandedResultsTable = () => { | ||
setIsExpandedResultsTable(!isExpandedResultsTable); | ||
}; | ||
|
||
return ( | ||
<> | ||
{(columnsWithCharts.length > 0 || searchQuery !== defaultSearchQuery) && | ||
|
@@ -126,60 +113,8 @@ export const OutlierExploration: FC<ExplorationProps> = React.memo(({ jobId }) = | |
</> | ||
)} | ||
|
||
<EuiPanel paddingSize="none"> | ||
<div className="mlSectionPanel"> | ||
<EuiButtonEmpty | ||
onClick={toggleExpandedAnalysisDetails} | ||
iconType={isExpandedAnalysisDetails ? 'arrowUp' : 'arrowDown'} | ||
size="l" | ||
iconSide="right" | ||
flush="left" | ||
> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisSectionTitle" | ||
defaultMessage="Analysis" | ||
/> | ||
</EuiButtonEmpty> | ||
{expandedRowItem === undefined && <EuiLoadingContent lines={1} />} | ||
{expandedRowItem !== undefined && ( | ||
<EuiFlexGroup> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisTypeLabel" | ||
defaultMessage="Type" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{expandedRowItem.job_type}</EuiBadge> | ||
</EuiFlexItem> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisSourceIndexLabel" | ||
defaultMessage="Source index" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{expandedRowItem.config.source.index}</EuiBadge> | ||
</EuiFlexItem> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisDestinationIndexLabel" | ||
defaultMessage="Destination index" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{expandedRowItem.config.dest.index}</EuiBadge> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
)} | ||
</div> | ||
{isExpandedAnalysisDetails && ( | ||
<ExpandableSection | ||
content={ | ||
<> | ||
<EuiHorizontalRule size="full" margin="none" /> | ||
{expandedRowItem === undefined && ( | ||
|
@@ -196,54 +131,60 @@ export const OutlierExploration: FC<ExplorationProps> = React.memo(({ jobId }) = | |
tableItems.length > 0 && | ||
expandedRowItem !== undefined && <ExpandedRow item={expandedRowItem} />} | ||
</> | ||
)} | ||
</EuiPanel> | ||
} | ||
headerContent={ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might be worth adding description into the collapsed header (if it is non-blank), especially as there is normally a lot of available space in this section. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good suggestion, I revisit it in the follow up that will also add the same section to regression and classification results pages. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: Might be worth breaking out the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good suggestion, refactored in 819cf7d. |
||
<> | ||
{expandedRowItem === undefined && <EuiLoadingContent lines={1} />} | ||
{expandedRowItem !== undefined && ( | ||
<EuiFlexGroup> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisTypeLabel" | ||
defaultMessage="Type" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{expandedRowItem.job_type}</EuiBadge> | ||
</EuiFlexItem> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisSourceIndexLabel" | ||
defaultMessage="Source index" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{expandedRowItem.config.source.index}</EuiBadge> | ||
</EuiFlexItem> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisDestinationIndexLabel" | ||
defaultMessage="Destination index" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{expandedRowItem.config.dest.index}</EuiBadge> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
)} | ||
</> | ||
} | ||
isExpanded={false} | ||
title={ | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.analysisSectionTitle" | ||
defaultMessage="Analysis" | ||
/> | ||
} | ||
/> | ||
<EuiSpacer size="m" /> | ||
<EuiPanel paddingSize="none" data-test-subj="mlDFAnalyticsOutlierExplorationTablePanel"> | ||
<div style={{ padding: '10px' }}> | ||
<EuiButtonEmpty | ||
onClick={toggleExpandedResultsTable} | ||
iconType={isExpandedResultsTable ? 'arrowUp' : 'arrowDown'} | ||
size="l" | ||
iconSide="right" | ||
flush="left" | ||
> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.explorationTableTitle" | ||
defaultMessage="Results" | ||
/> | ||
</EuiButtonEmpty> | ||
{(columnsWithCharts.length === 0 || tableItems.length === 0) && ( | ||
<EuiLoadingContent lines={1} /> | ||
)} | ||
{columnsWithCharts.length > 0 && tableItems.length > 0 && ( | ||
<EuiFlexGroup> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.explorationTableTotalDocsLabel" | ||
defaultMessage="Total docs" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{outlierData.rowCount}</EuiBadge> | ||
</EuiFlexItem> | ||
<EuiFlexItem> | ||
<ColorRangeLegend | ||
colorRange={colorRange} | ||
title={i18n.translate( | ||
'xpack.ml.dataframe.analytics.exploration.colorRangeLegendTitle', | ||
{ | ||
defaultMessage: 'Feature influence score', | ||
} | ||
)} | ||
/> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
)} | ||
</div> | ||
{isExpandedResultsTable && ( | ||
<ExpandableSection | ||
content={ | ||
<> | ||
{jobConfig !== undefined && needsDestIndexPattern && ( | ||
<IndexPatternPrompt destIndex={jobConfig.dest.index} /> | ||
|
@@ -262,8 +203,47 @@ export const OutlierExploration: FC<ExplorationProps> = React.memo(({ jobId }) = | |
</> | ||
)} | ||
</> | ||
)} | ||
</EuiPanel> | ||
} | ||
headerContent={ | ||
<> | ||
{(columnsWithCharts.length === 0 || tableItems.length === 0) && ( | ||
<EuiLoadingContent lines={1} /> | ||
)} | ||
{columnsWithCharts.length > 0 && tableItems.length > 0 && ( | ||
<EuiFlexGroup> | ||
<EuiFlexItem grow={false}> | ||
<EuiText size="xs" color="subdued"> | ||
<p> | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.explorationTableTotalDocsLabel" | ||
defaultMessage="Total docs" | ||
/> | ||
</p> | ||
</EuiText> | ||
<EuiBadge>{outlierData.rowCount}</EuiBadge> | ||
</EuiFlexItem> | ||
<EuiFlexItem> | ||
<ColorRangeLegend | ||
colorRange={colorRange} | ||
title={i18n.translate( | ||
'xpack.ml.dataframe.analytics.exploration.colorRangeLegendTitle', | ||
{ | ||
defaultMessage: 'Feature influence score', | ||
} | ||
)} | ||
/> | ||
</EuiFlexItem> | ||
</EuiFlexGroup> | ||
)} | ||
</> | ||
} | ||
title={ | ||
<FormattedMessage | ||
id="xpack.ml.dataframe.analytics.exploration.explorationTableTitle" | ||
defaultMessage="Results" | ||
/> | ||
} | ||
/> | ||
<EuiSpacer size="m" /> | ||
</> | ||
); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this data-test-subject accurate?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch! Fixed in 486511a.
ExpandableSection
now takes in an ID to create a dynamicdata-test-subj
.