From d380c29385052d889b866e615ae40c27687b36e2 Mon Sep 17 00:00:00 2001 From: David An Date: Fri, 21 Feb 2025 11:42:30 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"Revert=20"CORE-310:=20add=20'Esti?= =?UTF-8?q?mated'=20or=20'Final=20cost'=20to=20workflow=20costs"=20?= =?UTF-8?q?=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 423b39b1a1f74341b09d8689866b97acd3ce5313. --- .../submissionHistory/SubmissionDetails.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js b/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js index d2a513160b..219110d029 100644 --- a/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js +++ b/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js @@ -154,7 +154,7 @@ const SubmissionWorkflowsTable = ({ workspace, submission }) => { headerRenderer: () => h(Sortable, { sort, field: 'status', onSort: setSort }, ['Status']), cellRenderer: ({ rowIndex }) => { const { status } = filteredWorkflows[rowIndex]; - return div({ style: { display: 'flex' } }, [collapseStatus(status).icon({ marginRight: '0.5rem' }), status]); + return div({ style: { display: 'flex', alignItems: 'center' } }, [collapseStatus(status).icon({ marginRight: '0.5rem' }), status]); }, }, { @@ -163,7 +163,16 @@ const SubmissionWorkflowsTable = ({ workspace, submission }) => { headerRenderer: () => h(Sortable, { sort, field: 'cost', onSort: setSort }, ['Run Cost']), cellRenderer: ({ rowIndex }) => { const cost = filteredWorkflows[rowIndex].cost; - return typeof cost === 'number' ? h(TextCell, [Utils.formatUSD(cost || 0)]) : cost; + const costElement = typeof cost === 'number' ? h(TextCell, [Utils.formatUSD(cost || 0)]) : cost; + + const costTypeElement = + cost === 'n/a' || cost === 'N/A' + ? undefined + : div({ style: { fontSize: 10, display: 'block', marginTop: '2px' } }, [ + filteredWorkflows[rowIndex].costType === 'Estimated' ? 'Estimated' : 'Final cost', + ]); + + return div({ style: { alignItems: 'center', height: '16px' } }, [costElement, costTypeElement]); }, }, { From 2dda4822c8dce35e7d6b1b80794c074ba1ca06fb Mon Sep 17 00:00:00 2001 From: David An Date: Fri, 21 Feb 2025 11:44:23 -0500 Subject: [PATCH 2/2] change 'Final' to 'Actual' --- .../workspaces/workspace/submissionHistory/SubmissionDetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js b/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js index 219110d029..9c4119135e 100644 --- a/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js +++ b/src/pages/workspaces/workspace/submissionHistory/SubmissionDetails.js @@ -169,7 +169,7 @@ const SubmissionWorkflowsTable = ({ workspace, submission }) => { cost === 'n/a' || cost === 'N/A' ? undefined : div({ style: { fontSize: 10, display: 'block', marginTop: '2px' } }, [ - filteredWorkflows[rowIndex].costType === 'Estimated' ? 'Estimated' : 'Final cost', + filteredWorkflows[rowIndex].costType === 'Estimated' ? 'Estimated' : 'Actual cost', ]); return div({ style: { alignItems: 'center', height: '16px' } }, [costElement, costTypeElement]);