diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/columns.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/columns.tsx index 2ab8cb4a78d86..907297cf69bfc 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/columns.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/columns.tsx @@ -66,15 +66,21 @@ export const getTaskStateBadge = ( export const progressColumn = { name: i18n.translate('xpack.ml.dataframe.analyticsList.progress', { - defaultMessage: 'Progress', + defaultMessage: 'Progress per Step', }), sortable: (item: DataFrameAnalyticsListRow) => getDataFrameAnalyticsProgress(item.stats), truncateText: true, render(item: DataFrameAnalyticsListRow) { - const progress = getDataFrameAnalyticsProgress(item.stats); + const totalSteps = item.stats.progress.length; + let step = 0; + let progress = 0; - if (progress === undefined) { - return null; + for (const progressStep of item.stats.progress) { + step++; + progress = progressStep.progress_percent; + if (progressStep.progress_percent < 100) { + break; + } } // For now all analytics jobs are batch jobs. @@ -98,6 +104,11 @@ export const progressColumn = { {`${progress}%`} + + + {step}/{totalSteps} + + )} {!isBatchTransform && ( @@ -118,7 +129,7 @@ export const progressColumn = { ); }, - width: '100px', + width: '130px', 'data-test-subj': 'mlAnalyticsTableColumnProgress', }; diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx index 43ef6b36c3972..adb6822c524ab 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx @@ -171,17 +171,35 @@ export const ExpandedRow: FC = ({ item }) => { position: 'left', }; + const totalSteps = item.stats.progress.length; + let step = 0; + for (const progressStep of item.stats.progress) { + step++; + if (progressStep.progress_percent < 100) { + break; + } + } + const progress: SectionConfig = { title: i18n.translate( 'xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.progress', { defaultMessage: 'Progress' } ), - items: item.stats.progress.map(s => { - return { - title: s.phase, - description: , - }; - }), + items: [ + { + title: i18n.translate( + 'xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.step', + { defaultMessage: 'Step' } + ), + description: `${step}/${totalSteps}`, + }, + ...item.stats.progress.map(s => { + return { + title: s.phase, + description: , + }; + }), + ], position: 'left', };