Skip to content

Commit

Permalink
fix: minor details changes
Browse files Browse the repository at this point in the history
- Remove some duplicate message ids in favor of using the most generic
  one (e.g. instead of 'buildDetails.compiler' we use 'global.compiler')
  this includes using 'global.config' instead of
  'buildDetails.defconfig' for the config field.
- For fields that are equal in both build details and test details and
  don't have a global message id, unified the message ids in
  commonDetails.* (e.g. 'buildDetails.gitCommit' and
  'testDetails.gitCommitHash' are not 'commonDetails.gitCommitHash')
- Moved up the files section in build details

Closes #1024
  • Loading branch information
murilx committed Mar 6, 2025
1 parent ccd79df commit 363cc7d
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 101 deletions.
71 changes: 36 additions & 35 deletions dashboard/src/components/BuildDetails/BuildDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const BuildDetails = ({
| undefined => {
return getMiscSection({
misc: data?.misc,
title: formatMessage({ id: 'globalDetails.miscData' }),
title: formatMessage({ id: 'commonDetails.miscData' }),
setSheetType: setSheetType,
setJsonContent: setJsonContent,
});
Expand All @@ -99,7 +99,7 @@ const BuildDetails = ({
return getFilesSection({
inputFiles: data?.input_files,
outputFiles: data?.output_files,
title: formatMessage({ id: 'globalDetails.artifacts' }),
title: formatMessage({ id: 'commonDetails.artifacts' }),
});
}, [data?.input_files, data?.output_files, formatMessage]);

Expand Down Expand Up @@ -128,12 +128,31 @@ const BuildDetails = ({
subsections: [
{
infos: [
{
title: 'global.status',
linkText: getBuildStatus(data.valid).toUpperCase(),
icon: <StatusIcon status={data?.valid} className="text-xl" />,
},
{
title: 'buildDetails.gitDescribe',
linkText: valueOrEmpty(data.git_commit_name),
},
{
title: 'global.tree',
linkText: valueOrEmpty(data.tree_name),
},
{
title: 'buildDetails.gitUrl',
title: 'commonDetails.gitRepositoryBranch',
linkText: valueOrEmpty(data.git_repository_branch),
},
{
title: 'commonDetails.gitCommitHash',
linkText: valueOrEmpty(data.git_commit_hash),
linkComponent: treeDetailsLink,
copyValue: valueOrEmpty(data.git_commit_hash),
},
{
title: 'commonDetails.gitRepositoryUrl',
linkText: shouldTruncate(
valueOrEmpty(data.git_repository_url),
) ? (
Expand All @@ -147,55 +166,37 @@ const BuildDetails = ({
link: data.git_repository_url,
},
{
title: 'buildDetails.gitBranch',
linkText: valueOrEmpty(data.git_repository_branch),
},
{
title: 'buildDetails.gitCommit',
linkText: valueOrEmpty(data.git_commit_hash),
copyValue: valueOrEmpty(data.git_commit_hash),
},
{
title: 'buildDetails.gitDescribe',
linkText: valueOrEmpty(data.git_commit_name),
},
{
title: 'globalDetails.gitCommitTag',
title: 'commonDetails.gitCommitTag',
linkText: valueOrEmpty(data.git_commit_tags?.[0]),
},
{
title: 'global.date',
linkText: formatDate(valueOrEmpty(data.start_time)),
},
{
title: 'buildDetails.defconfig',
linkText: valueOrEmpty(data.config_name),
},
{
title: 'global.status',
linkText: getBuildStatus(data.valid).toUpperCase(),
icon: <StatusIcon status={data?.valid} className="text-xl" />,
title: 'global.command',
linkText: valueOrEmpty(data.command),
},
{
title: 'global.architecture',
linkText: valueOrEmpty(data.architecture),
},
{
title: 'buildDetails.buildTime',
linkText: data.duration ? `${data.duration} sec` : '-',
title: 'global.compiler',
linkText: valueOrEmpty(data.compiler),
},
{
title: 'buildDetails.compiler',
linkText: valueOrEmpty(data.compiler),
title: 'global.config',
linkText: valueOrEmpty(data.config_name),
},
{
title: 'global.command',
linkText: valueOrEmpty(data.command),
title: 'global.date',
linkText: formatDate(valueOrEmpty(data.start_time)),
},
{
title: 'buildDetails.buildId',
linkText: buildId,
},
{
title: 'global.buildTime',
linkText: data.duration ? `${data.duration} sec` : '-',
},
],
},
{
Expand All @@ -222,7 +223,7 @@ const BuildDetails = ({
}, [data, buildDetailsTitle, setSheetToLog, formatMessage, buildId]);

const sectionsData: ISection[] = useMemo(() => {
return [...generalSections, miscSection, filesSection].filter(
return [...generalSections, filesSection, miscSection].filter(
section => section !== undefined,
);
}, [generalSections, miscSection, filesSection]);
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/components/Filter/CodeBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ const CodeBlock = ({
<div className="py-4 pl-3">
<span className="font-bold">
<FormattedMessage
id="buildAccordion.logExcerpt"
id="global.logExcerpt"
defaultMessage="Log Excerpt"
/>
</span>
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/components/IssueDetails/IssueDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const IssueDetails = ({
| undefined => {
return getMiscSection({
misc: data?.misc,
title: formatMessage({ id: 'globalDetails.miscData' }),
title: formatMessage({ id: 'commonDetails.miscData' }),
setJsonContent: setJsonContent,
});
}, [data?.misc, formatMessage]);
Expand Down
56 changes: 28 additions & 28 deletions dashboard/src/components/TestDetails/TestDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,30 +206,17 @@ const TestDetailsSections = ({
linkText: truncateBigText(test.status),
icon: <StatusIcon status={test.status} className="text-xl" />,
},
{
title: 'global.tree',
linkText: truncateBigText(test.tree_name),
},
{
title: 'global.path',
linkText: valueOrEmpty(test.path),
},
{
title: 'global.arch',
linkText: valueOrEmpty(test.architecture),
},
{
title: 'global.compiler',
linkText: valueOrEmpty(test.compiler),
title: 'global.tree',
linkText: truncateBigText(test.tree_name),
},
{
title: 'global.logs',
linkText: shouldTruncate(valueOrEmpty(test.log_url)) ? (
<TruncatedValueTooltip value={test.log_url} isUrl={true} />
) : (
valueOrEmpty(test.log_url)
),
link: test.log_url,
title: 'commonDetails.gitRepositoryBranch',
linkText: valueOrEmpty(test.git_repository_branch),
},
{
title: 'commonDetails.gitCommitHash',
Expand All @@ -252,22 +239,26 @@ const TestDetailsSections = ({
link: test.git_repository_url,
},
{
title: 'commonDetails.gitRepositoryBranch',
linkText: valueOrEmpty(test.git_repository_branch),
title: 'commonDetails.gitCommitTag',
linkText: valueOrEmpty(test.git_commit_tags?.[0]),
},
{
title: 'globalDetails.gitCommitTag',
linkText: valueOrEmpty(test.git_commit_tags?.[0]),
title: 'global.hardware',
linkText: hardware,
},
{
title: 'global.architecture',
linkText: valueOrEmpty(test.architecture),
},
{
title: 'global.compiler',
linkText: valueOrEmpty(test.compiler),
},
{
title: 'testDetails.buildInfo',
linkText: truncateBigText(test.build_id),
linkComponent: buildDetailsLink,
},
{
title: 'global.hardware',
linkText: hardware,
},
{
title: 'global.startTime',
linkText: (
Expand All @@ -283,6 +274,15 @@ const TestDetailsSections = ({
title: 'testDetails.testId',
linkText: test.id,
},
{
title: 'global.logs',
linkText: shouldTruncate(valueOrEmpty(test.log_url)) ? (
<TruncatedValueTooltip value={test.log_url} isUrl={true} />
) : (
valueOrEmpty(test.log_url)
),
link: test.log_url,
},
{
title: 'global.compatibles',
linkText: valueOrEmpty(test.environment_compatible?.join(' | ')),
Expand Down Expand Up @@ -318,7 +318,7 @@ const TestDetailsSections = ({
| undefined => {
return getMiscSection({
misc: test.misc,
title: formatMessage({ id: 'globalDetails.miscData' }),
title: formatMessage({ id: 'commonDetails.miscData' }),
setSheetType: setSheetType,
setJsonContent: setJsonContent,
});
Expand All @@ -329,7 +329,7 @@ const TestDetailsSections = ({
| undefined => {
return getMiscSection({
misc: test.environment_misc,
title: formatMessage({ id: 'globalDetails.environmentMiscData' }),
title: formatMessage({ id: 'commonDetails.environmentMiscData' }),
});
}, [formatMessage, test.environment_misc]);

Expand All @@ -338,7 +338,7 @@ const TestDetailsSections = ({
| undefined => {
return getFilesSection({
outputFiles: test.output_files,
title: formatMessage({ id: 'globalDetails.artifacts' }),
title: formatMessage({ id: 'commonDetails.artifacts' }),
});
}, [formatMessage, test.output_files]);

Expand Down
41 changes: 5 additions & 36 deletions dashboard/src/locales/messages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,51 +27,25 @@ export const messages = {
'Success - builds completed successfully{br}' +
'Failed - builds failed{br}' +
"Inconclusive - builds with unknown status, including ongoing builds that didn't finish yet.",
'buildAccordion.buildLogs': 'Build logs',
'buildAccordion.dtb': 'Dtb',
'buildAccordion.dtbs': 'dtbs',
'buildAccordion.kernelConfig': 'Kernel config',
'buildAccordion.kernelConfigPath': 'config/kernel.config',
'buildAccordion.kernelImage': 'Kernel image',
'buildAccordion.logExcerpt': 'Log Excerpt',
'buildAccordion.logs': 'Logs',
'buildAccordion.modules': 'Modules',
'buildAccordion.modulesZip': 'modules.tar.xz',
'buildAccordion.systemMap': 'System map',
'buildAccordion.systemMapPath': 'kernel/System.map',
'buildAccordion.testDone': 'Test done',
'buildAccordion.testError': 'Test error',
'buildAccordion.testFail': 'Test failed',
'buildAccordion.testMiss': 'Test missed',
'buildAccordion.testSkipped': 'Test skipped',
'buildAccordion.testStatus': 'Test status',
'buildAccordion.testSuccess': 'Test success',
'buildDetails.buildDetails': 'Build Details',
'buildDetails.buildId': 'Build Id',
'buildDetails.buildLogs': 'Build Logs',
'buildDetails.buildTime': 'Build time',
'buildDetails.compiler': 'Compiler',
'buildDetails.defconfig': 'Defconfig',
'buildDetails.dtb': 'Dtb',
'buildDetails.failedToFetch': 'Failed to fetch build details',
'buildDetails.gitBranch': 'Git Branch',
'buildDetails.gitCommit': 'Git Commit',
'buildDetails.gitDescribe': 'Git Describe',
'buildDetails.gitUrl': 'Git Url',
'buildDetails.kernelConfig': 'Kernel Config',
'buildDetails.kernelImage': 'Kernel Image',
'buildDetails.noTestResults': 'No test results found.',
'buildDetails.notFound': 'Build not found',
'buildDetails.startTime': 'Start Time',
'buildDetails.systemMap': 'System Map',
'buildDetails.testResults': 'Test Results',
'buildTab.buildStatus': 'Build status',
'codeBlock.highlights': 'Highlights:',
'codeBlock.highlightsTooltip': 'Counting estimated based on text output',
'commonDetails.artifacts': 'Artifacts',
'commonDetails.environmentMiscData': 'Environment Misc Data',
'commonDetails.gitCommitHash': 'Git Commit Hash',
'commonDetails.gitCommitName': 'Git Commit Name',
'commonDetails.gitCommitTag': 'Git Commit Tag',
'commonDetails.gitRepositoryBranch': 'Git Repository Branch',
'commonDetails.gitRepositoryUrl': 'Git Repository Url',
'commonDetails.miscData': 'Misc Data',
'filter.architectureSubtitle': 'Please select one or more Architectures:',
'filter.bootDuration': 'Boot duration',
'filter.bootIssue': 'Boot issue',
Expand Down Expand Up @@ -148,6 +122,7 @@ export const messages = {
'global.last': 'Last',
'global.legend': 'Legend',
'global.loading': 'Loading...',
'global.logExcerpt': 'Log Excerpt',
'global.logs': 'Logs',
'global.modules': 'Modules',
'global.name': 'Name',
Expand Down Expand Up @@ -183,10 +158,6 @@ export const messages = {
'global.viewJson': 'View Json',
'global.viewLog': 'View Log Excerpt',
'global.warning': 'Warning',
'globalDetails.artifacts': 'Artifacts',
'globalDetails.environmentMiscData': 'Environment Misc Data',
'globalDetails.gitCommitTag': 'Git Commit Tag',
'globalDetails.miscData': 'Misc Data',
'globalTable.bootStatus': 'Boot Status',
'globalTable.branch': 'Branch',
'globalTable.build': 'Build Status',
Expand Down Expand Up @@ -217,7 +188,6 @@ export const messages = {
'issueDetails.culpritHarness': 'Harness',
'issueDetails.culpritTitle': 'Culprit',
'issueDetails.culpritTool': 'Tool',
'issueDetails.failedToFetch': 'Failed to fetch issue details',
'issueDetails.firstIncidentData': 'First Incident Data',
'issueDetails.id': 'Issue Id',
'issueDetails.issueDetails': 'Issue Details',
Expand Down Expand Up @@ -265,7 +235,6 @@ export const messages = {
'Inconclusive - test concluded with inconclusive results such as infrastructure errors.{br}{br}' +
'Inconclusive groups tests with ERROR, MISS, SKIP, DONE, and unknown statuses defined by KCIDB.',
'testDetails.buildInfo': 'Build Info',
'testDetails.failedToFetch': 'Failed to fetch test details',
'testDetails.notFound': 'Test not found',
'testDetails.regressionTypeTooltip':
'The regression type of the test.\n' +
Expand Down

0 comments on commit 363cc7d

Please sign in to comment.