Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"common.dismiss.label" : "Close",
"common.error.label" : "Error",
"testBatteryResView.Table.Output.Title" : "Output",
"testBatteryResView.Table.Output.Summary" : "Summary",
"testBatteryResView.Table.Output.DataSource" : "DataSource"
Expand Down
40 changes: 31 additions & 9 deletions webviews/pq-test-result-view/src/views/TestBatteryResultView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,24 @@ export const TestBatteryResultView: React.FC<TestBatteryResult> = React.memo<Tes
const OutputLabel = useI18n("testBatteryResView.Table.Output.Title");
const SummaryLabel = useI18n("testBatteryResView.Table.Output.Summary");
const DataSourceLabel = useI18n("testBatteryResView.Table.Output.DataSource");
const ErrorLabel = useI18n("common.error.label");

const hasOutput = useMemo(
() => Array.isArray(testRunExecution.Output) && testRunExecution.Output.length,
[testRunExecution],
);

const errorDetailsString = useMemo<string | null>(
() =>
testRunExecution.Status !== "Passed" &&
testRunExecution.Details &&
typeof testRunExecution.Details === "string"
? testRunExecution.Details
: null,
[testRunExecution],
);
const errorDetailsString = useMemo<string | null>(() => {
if (testRunExecution.Status !== "Passed") {
if (testRunExecution.Error?.Message && typeof testRunExecution.Error?.Message === "string") {
return testRunExecution.Error?.Message;
}
if (testRunExecution.Details && typeof testRunExecution.Details === "string") {
return testRunExecution.Details;
}
}
return null;
}, [testRunExecution]);

const hasDataSource = useMemo(
() => Array.isArray(testRunExecution.DataSourceAnalysis) && testRunExecution.DataSourceAnalysis.length,
Expand Down Expand Up @@ -90,6 +93,19 @@ export const TestBatteryResultView: React.FC<TestBatteryResult> = React.memo<Tes
return result;
}, [testRunExecution, hasDataSource]);

const mashupErrorArr = useMemo(() => {
const result: GeneralDetailItem[] = [];
const theFlattenError = flattenJSON(testRunExecution.Error);
Object.keys(theFlattenError).forEach(key => {
result.push({
Item: key,
Value: theFlattenError[key],
});
});

return result;
}, [testRunExecution.Error]);

return (
<>
{errorDetailsString ? (
Expand All @@ -115,6 +131,12 @@ export const TestBatteryResultView: React.FC<TestBatteryResult> = React.memo<Tes
<TestBatteryGeneralGrid items={dataSourceArr} />
</PivotItem>
) : null}

{mashupErrorArr.length ? (
<PivotItem key="mashupError" headerText={ErrorLabel}>
<TestBatteryGeneralGrid items={mashupErrorArr} />
</PivotItem>
) : null}
</Pivot>
</>
);
Expand Down