From cd062da9aefbc09ecc565b15e481711408c56862 Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Mon, 30 Oct 2023 17:37:51 -0400 Subject: [PATCH] Add message/icon to show TRSS status (#830) Signed-off-by: Lan Xia --- .../src/Build/ReleaseSummary.jsx | 7 +- .../src/Build/Summary/BuildStatus.jsx | 69 ++++++++++--------- .../src/Build/Summary/BuildStatusIcon.jsx | 16 +++-- .../src/Build/Summary/Overview.jsx | 8 ++- .../src/Build/Summary/ResultSummary.jsx | 4 +- 5 files changed, 62 insertions(+), 42 deletions(-) diff --git a/test-result-summary-client/src/Build/ReleaseSummary.jsx b/test-result-summary-client/src/Build/ReleaseSummary.jsx index c8dcb308..9469ffc1 100644 --- a/test-result-summary-client/src/Build/ReleaseSummary.jsx +++ b/test-result-summary-client/src/Build/ReleaseSummary.jsx @@ -14,7 +14,7 @@ const ReleaseSummary = () => { useEffect(() => { const updateData = async () => { - const { parentId } = getParams(location.search); + const { parentId, childBuildsResult } = getParams(location.search); const originUrl = window.location.origin; const build = await fetchData(`/api/getParents?id=${parentId}`); @@ -23,8 +23,13 @@ const ReleaseSummary = () => { const nl = `\n`; if (build && build[0]) { const { buildName, buildUrl, timestamp, startBy } = build[0]; + let buildsResultOutput = ''; + if (childBuildsResult === 'PROGRESSING') { + buildsResultOutput = `**Warning:** The release summary report is not yet complete. Currently, it only contains partial results. ${nl}${nl}`; + } report = `#### Release Summary Report for ${buildName} ${nl}` + + buildsResultOutput + `**Report generated at:** ${new Date().toUTCString()} ${nl} ${nl}` + `TRSS [Build](${originUrl}/buildDetail?parentId=${parentId}&testSummaryResult=failed&buildNameRegex=%5ETest) ` + `and TRSS [Grid View](${originUrl}/resultSummary?parentId=${parentId}) ${nl}` + diff --git a/test-result-summary-client/src/Build/Summary/BuildStatus.jsx b/test-result-summary-client/src/Build/Summary/BuildStatus.jsx index bf7db50b..174585dd 100644 --- a/test-result-summary-client/src/Build/Summary/BuildStatus.jsx +++ b/test-result-summary-client/src/Build/Summary/BuildStatus.jsx @@ -6,40 +6,41 @@ import { Tooltip } from 'antd'; import BuildStatusIcon from './BuildStatusIcon.jsx'; const BuildStatus = ({ status, id, buildNum }) => { - if (status && id && buildNum) { - return ( -
- - - - - - - {' '} - Build #{buildNum} - -
- ); - } - return null; + if (status && id && buildNum) { + return ( +
+ + + + + + + {' '} + Build #{buildNum} + + +
+ ); + } + return null; }; export default BuildStatus; diff --git a/test-result-summary-client/src/Build/Summary/BuildStatusIcon.jsx b/test-result-summary-client/src/Build/Summary/BuildStatusIcon.jsx index 69aac522..59e794d2 100644 --- a/test-result-summary-client/src/Build/Summary/BuildStatusIcon.jsx +++ b/test-result-summary-client/src/Build/Summary/BuildStatusIcon.jsx @@ -15,19 +15,27 @@ export default class BuildStatusIcon extends Component { if (status === 'PROGRESSING') { icon = ( ); } else if (status === 'SUCCESS') { icon = ( - + ); } else if (status === 'FAILURE') { icon = ( - + ); } else { - icon = ; + icon = ( + + ); } return {icon}; } diff --git a/test-result-summary-client/src/Build/Summary/Overview.jsx b/test-result-summary-client/src/Build/Summary/Overview.jsx index 017d544a..0c23f808 100644 --- a/test-result-summary-client/src/Build/Summary/Overview.jsx +++ b/test-result-summary-client/src/Build/Summary/Overview.jsx @@ -6,6 +6,7 @@ import moment from 'moment'; import BuildLink from '../BuildLink'; import renderDuration from '../Duration'; import BuildStatus from './BuildStatus'; +import BuildStatusIcon from './BuildStatusIcon.jsx'; import './Overview.css'; const DAY_FORMAT = 'MMM DD YYYY, hh:mm a'; @@ -65,13 +66,18 @@ export default class Overview extends Component {
+
diff --git a/test-result-summary-client/src/Build/Summary/ResultSummary.jsx b/test-result-summary-client/src/Build/Summary/ResultSummary.jsx index fb12e4d4..bf9e0f07 100644 --- a/test-result-summary-client/src/Build/Summary/ResultSummary.jsx +++ b/test-result-summary-client/src/Build/Summary/ResultSummary.jsx @@ -39,7 +39,7 @@ export default function ResultSummary() { buildMap: {}, summary: {}, parentBuildInfo: {}, - childBuildsResult: 'SUCCESS', + childBuildsResult: 'UNDEFINED', javaVersion: null, }); @@ -74,7 +74,7 @@ export default function ResultSummary() { parentId, })}` ); - let childBuildsResult = 'SUCCESS'; + let childBuildsResult = 'UNSTABLE'; let javaVersion = null; const buildMap = {}; let jdkVersionOpts = [];