diff --git a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx index 2ca4409c3a98a..3cd99f7bfdebd 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx @@ -155,9 +155,23 @@ export const ExpandedRow: FC = ({ item }) => { defaultMessage: 'Overall', }), items: [ - { title: 'badge', description: stateValues.state }, { - title: 'Create time', + title: i18n.translate( + 'xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.status', + { + defaultMessage: 'Status', + } + ), + type: 'badge', + description: stateValues.state, + }, + { + title: i18n.translate( + 'xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.createTime', + { + defaultMessage: 'Create time', + } + ), description: formatHumanReadableDateTimeSeconds( moment(item.config.create_time).unix() * 1000 ), diff --git a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_details_pane.tsx b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_details_pane.tsx index a2d759d21e77f..8c63f3bbc2894 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_details_pane.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row_details_pane.tsx @@ -10,8 +10,8 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; import { + EuiBadge, EuiBasicTable, - EuiBetaBadge, EuiDescriptionListDescription, EuiDescriptionListTitle, EuiFlexGroup, @@ -25,6 +25,7 @@ import { export interface SectionItem { title: string; + type?: 'plain' | 'badge'; description: string | ReactElement; } export interface SectionConfig { @@ -41,35 +42,28 @@ export const OverallDetails: FC<{ overallDetails: SectionConfig; }> = ({ overallDetails }) => ( - {overallDetails.items.map((item) => { - const key = item.title; - if (item.title === 'badge') { - return ( - - + {overallDetails.items.map((item) => ( + + + + + {item.title} + - ); - } - - return ( - - - - - {item.title} - - - - + + + {item.type === 'badge' ? ( + {item.description} + ) : (
{item.description}
-
-
-
-
- ); - })} + )} + +
+
+ + ))} ); diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts index 11333741acf48..8ee2e23e2be84 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts @@ -123,7 +123,8 @@ export default function ({ getService }: FtrProviderContext) { section: 'state', // Don't include the 'Create time' value entry as it's not stable. expectedEntries: [ - 'STOPPED', + 'Status', + 'stopped', 'Create time', 'Model memory limit', '25mb', diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts index b3789ceeac28b..a76d0fb27d92c 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation_saved_search.ts @@ -119,7 +119,8 @@ export default function ({ getService }: FtrProviderContext) { section: 'state', // Don't include the 'Create time' value entry as it's not stable. expectedEntries: [ - 'STOPPED', + 'Status', + 'stopped', 'Create time', 'Model memory limit', '20mb', @@ -219,7 +220,8 @@ export default function ({ getService }: FtrProviderContext) { section: 'state', // Don't include the 'Create time' value entry as it's not stable. expectedEntries: [ - 'STOPPED', + 'Status', + 'stopped', 'Create time', 'Model memory limit', '20mb', @@ -317,7 +319,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '7mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '7mb', + 'Version', + ], }, { section: 'stats', @@ -407,7 +416,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '6mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '6mb', + 'Version', + ], }, { section: 'stats', diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts index 52d81d2663cc5..d706cb4ec9468 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts @@ -135,7 +135,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '2mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '2mb', + 'Version', + ], }, { section: 'stats', diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation_saved_search.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation_saved_search.ts index ddfc9e540bee1..98e8e45c241d2 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation_saved_search.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation_saved_search.ts @@ -83,7 +83,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '1mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '1mb', + 'Version', + ], }, { section: 'stats', @@ -160,7 +167,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '1mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '1mb', + 'Version', + ], }, { section: 'stats', @@ -237,7 +251,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '1mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '1mb', + 'Version', + ], }, { section: 'stats', @@ -315,7 +336,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '1mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '1mb', + 'Version', + ], }, { section: 'stats', diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts index 6978452afdc32..07126c69a250c 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts @@ -119,7 +119,8 @@ export default function ({ getService }: FtrProviderContext) { section: 'state', // Don't include the 'Create time' value entry as it's not stable. expectedEntries: [ - 'STOPPED', + 'Status', + 'stopped', 'Create time', 'Model memory limit', '16mb', diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation_saved_search.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation_saved_search.ts index fb5702e98ac1d..b9553fd69be71 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation_saved_search.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation_saved_search.ts @@ -89,7 +89,8 @@ export default function ({ getService }: FtrProviderContext) { section: 'state', // Don't include the 'Create time' value entry as it's not stable. expectedEntries: [ - 'STOPPED', + 'Status', + 'stopped', 'Create time', 'Model memory limit', '10mb', @@ -177,7 +178,8 @@ export default function ({ getService }: FtrProviderContext) { section: 'state', // Don't include the 'Create time' value entry as it's not stable. expectedEntries: [ - 'STOPPED', + 'Status', + 'stopped', 'Create time', 'Model memory limit', '10mb', @@ -264,7 +266,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '5mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '5mb', + 'Version', + ], }, { section: 'stats', @@ -346,7 +355,14 @@ export default function ({ getService }: FtrProviderContext) { { section: 'state', // Don't include the 'Create time' value entry as it's not stable. - expectedEntries: ['STOPPED', 'Create time', 'Model memory limit', '5mb', 'Version'], + expectedEntries: [ + 'Status', + 'stopped', + 'Create time', + 'Model memory limit', + '5mb', + 'Version', + ], }, { section: 'stats',