}
- configStatusCounts={data.bootConfigs}
+ configStatusCounts={data.summary.boots.configs}
diffFilter={diffFilter}
/>
}
- archCompilerErrors={data.bootArchSummary}
+ archCompilerErrors={data.summary.boots.architectures}
diffFilter={diffFilter}
/>
}
- issues={data.bootIssues}
- failedWithUnknownIssues={data.failedBootsWithUnknownIssues}
+ issues={data.summary.boots.issues}
+ failedWithUnknownIssues={data.summary.boots.unknown_issues}
diffFilter={diffFilter}
issueFilterSection="bootIssue"
detailsId={treeId}
@@ -212,7 +215,7 @@ const BootsTab = ({ reqFilter }: BootsTabProps): JSX.Element => {
tableKey="treeDetailsBoots"
filter={tableFilter.bootsTable}
onClickFilter={onClickFilter}
- testHistory={data.bootHistory}
+ testHistory={data.boots}
getRowLink={getRowLink}
updatePathFilter={updatePathFilter}
currentPathFilter={currentPathFilter}
diff --git a/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx b/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx
index 1244ad44..4801ffc3 100644
--- a/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx
+++ b/dashboard/src/pages/TreeDetails/Tabs/Tests/TestsTab.tsx
@@ -101,10 +101,13 @@ const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
const hardwareData = useMemo(() => {
return {
- ...data?.testEnvironmentCompatible,
- ...data?.testEnvironmentMisc,
+ ...data?.summary.tests.enviroment_compatible,
+ ...data?.summary.tests.enviroment_misc,
};
- }, [data?.testEnvironmentCompatible, data?.testEnvironmentMisc]);
+ }, [
+ data?.summary.tests.enviroment_compatible,
+ data?.summary.tests.enviroment_misc,
+ ]);
if (error || !treeId) {
return (
@@ -123,7 +126,7 @@ const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
if (!data) return
;
- if (data.testHistory.length < 1) {
+ if (data.tests.length < 1) {
return (
}
@@ -142,22 +145,22 @@ const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
}
- statusCounts={data.testStatusSummary}
+ statusCounts={data.summary.tests.status}
/>
}
- configStatusCounts={data.testConfigs}
+ configStatusCounts={data.summary.tests.configs}
diffFilter={diffFilter}
/>
}
- archCompilerErrors={data.testArchSummary}
+ archCompilerErrors={data.summary.tests.architectures}
diffFilter={diffFilter}
/>
}
- issues={data.testIssues}
- failedWithUnknownIssues={data.failedTestsWithUnknownIssues}
+ issues={data.summary.tests.issues}
+ failedWithUnknownIssues={data.summary.tests.unknown_issues}
diffFilter={diffFilter}
issueFilterSection="testIssue"
detailsId={treeId}
@@ -176,25 +179,25 @@ const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
}
- statusCounts={data.testStatusSummary}
+ statusCounts={data.summary.tests.status}
/>
}
- configStatusCounts={data.testConfigs}
+ configStatusCounts={data.summary.tests.configs}
diffFilter={diffFilter}
/>
}
- archCompilerErrors={data.testArchSummary}
+ archCompilerErrors={data.summary.tests.architectures}
diffFilter={diffFilter}
/>
}
- issues={data.testIssues}
- failedWithUnknownIssues={data.failedTestsWithUnknownIssues}
+ issues={data.summary.tests.issues}
+ failedWithUnknownIssues={data.summary.tests.unknown_issues}
diffFilter={diffFilter}
issueFilterSection="testIssue"
detailsId={treeId}
@@ -213,7 +216,7 @@ const TestsTab = ({ reqFilter }: TestsTabProps): JSX.Element => {
{
- const { valid, invalid } = data?.buildsSummary.builds ?? {};
- const { testStatusSummary } = data ?? {};
+ const { valid, invalid } = data?.summary.builds.status ?? {};
+ const { status: testStatusSummary } = data?.summary.tests ?? {};
- const { bootStatusSummary } = data ?? {};
+ const { status: bootStatusSummary } = data?.summary.boots ?? {};
return {
'global.tests': testStatusSummary ? (
@@ -226,12 +226,12 @@ function TreeDetails(): JSX.Element {
const treeDetailsData: ITreeDetails = useMemo(
() => ({
- architectures: sanitizeArchs(data?.buildsSummary.architectures),
- configs: sanitizeConfigs(data?.buildsSummary.configs),
+ architectures: sanitizeArchs(data?.summary.builds.architectures),
+ configs: sanitizeConfigs(data?.summary.builds.configs),
builds: sanitizeBuilds(data?.builds),
- buildsSummary: sanitizeBuildsSummary(data?.buildsSummary.builds),
- buildsIssues: data?.buildsIssues || [],
- failedBuildsWithUnknownIssues: data?.failedBuildsWithUnknownIssues,
+ buildsSummary: sanitizeBuildsSummary(data?.summary.builds.status),
+ buildsIssues: data?.summary.builds.issues || [],
+ failedBuildsWithUnknownIssues: data?.summary.builds.unknown_issues,
}),
[data],
);
@@ -279,7 +279,7 @@ function TreeDetails(): JSX.Element {
gitUrl={treeInfo?.gitUrl}
commitHash={treeId}
commitName={treeInfo?.commitName}
- commitTags={data?.git_commit_tags}
+ commitTags={data?.summary.git_commit_tags}
/>
}
- hardwareUsed={data?.hardwareUsed}
+ hardwareUsed={data?.summary.hardware}
diffFilter={diffFilter}
/>
- {data?.treeUrl && (
+ {data?.summary.tree_url && (
diff --git a/dashboard/src/pages/TreeDetails/TreeDetailsFilter.tsx b/dashboard/src/pages/TreeDetails/TreeDetailsFilter.tsx
index 558f8178..b055d3bb 100644
--- a/dashboard/src/pages/TreeDetails/TreeDetailsFilter.tsx
+++ b/dashboard/src/pages/TreeDetails/TreeDetailsFilter.tsx
@@ -55,11 +55,11 @@ export const createFilter = (data: TTreeTestsFullData | undefined): TFilter => {
compilers[b.compiler ?? 'Unknown'] = false;
});
- data.hardwareUsed.forEach(h => (hardware[h] = false));
+ data.summary.hardware.forEach(h => (hardware[h] = false));
- data.buildsIssues.forEach(i => (buildIssue[i.id] = false));
- data.bootIssues.forEach(i => (bootIssue[i.id] = false));
- data.testIssues.forEach(i => (testIssue[i.id] = false));
+ data.summary.builds.issues.forEach(i => (buildIssue[i.id] = false));
+ data.summary.boots.issues.forEach(i => (bootIssue[i.id] = false));
+ data.summary.tests.issues.forEach(i => (testIssue[i.id] = false));
}
return {
diff --git a/dashboard/src/types/tree/TreeDetails.tsx b/dashboard/src/types/tree/TreeDetails.tsx
index 0a105d68..b6c5167b 100644
--- a/dashboard/src/types/tree/TreeDetails.tsx
+++ b/dashboard/src/types/tree/TreeDetails.tsx
@@ -63,38 +63,40 @@ export type TTreeTestsData = {
environmentCompatible: PropertyStatusCounts;
};
+type TestSummary = {
+ status: StatusCounts;
+ architectures: ArchCompilerStatus[];
+ configs: PropertyStatusCounts;
+ issues: TIssue[];
+ unknown_issues: number;
+ enviroment_compatible: PropertyStatusCounts;
+ enviroment_misc: PropertyStatusCounts;
+ fail_reasons: Record
;
+ failed_platforms: string[];
+};
+
+type BuildSummary = {
+ status: BuildStatus;
+ architectures: Architecture;
+ configs: Record;
+ issues: TIssue[];
+ unknown_issues: number;
+};
+
+type Summary = {
+ boots: TestSummary;
+ builds: BuildSummary;
+ tests: TestSummary;
+ hardware: string[];
+ tree_url: string;
+ git_commit_tags: string[];
+};
+
export type TTreeTestsFullData = {
- bootArchSummary: ArchCompilerStatus[];
- testArchSummary: ArchCompilerStatus[];
- bootFailReasons: ErrorMessageCounts;
- testFailReasons: ErrorMessageCounts;
- testPlatformsWithErrors: string[];
- bootPlatformsFailing: string[];
- testConfigs: PropertyStatusCounts;
- bootConfigs: PropertyStatusCounts;
- testStatusSummary: StatusCounts;
- bootStatusSummary: StatusCounts;
- bootHistory: TestHistory[];
- testHistory: TestHistory[];
- bootIssues: TIssue[];
- testIssues: TIssue[];
- testEnvironmentCompatible: PropertyStatusCounts;
- bootEnvironmentCompatible: PropertyStatusCounts;
- testEnvironmentMisc: PropertyStatusCounts;
- bootEnvironmentMisc: PropertyStatusCounts;
- hardwareUsed: string[];
- failedTestsWithUnknownIssues: number;
- failedBootsWithUnknownIssues: number;
builds: BuildsTabBuild[];
- buildsSummary: {
- builds: BuildStatus;
- configs: Record;
- architectures: Architecture;
- };
- buildsIssues: TIssue[];
- failedBuildsWithUnknownIssues: number;
- treeUrl: string;
- git_commit_tags: string[];
+ boots: TestHistory[];
+ tests: TestHistory[];
+ summary: Summary;
};
export const possibleTabs = [