Skip to content

Commit

Permalink
Fix default assertion pane message (#1040)
Browse files Browse the repository at this point in the history
* Fixed the default assertion pane message in the case of no child entries.

* Fix failing snapshots.
  • Loading branch information
M6AI authored Jan 3, 2024
1 parent be1fbcf commit 430e6e2
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
1 change: 1 addition & 0 deletions doc/newsfragments/2675_changed.assertion_pane_default.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Selecting entries on the navigation with no child entries will display a message about no entries.
Original file line number Diff line number Diff line change
Expand Up @@ -23208,12 +23208,12 @@ ZeroDivisionError: integer division or modulo by zero
</Nav>
<ErrorBoundary>
<Message
message="Please select an entry."
message="No entries to be displayed."
>
<h1
className="message_1s94nt7"
>
Please select an entry.
No entries to be displayed.
</h1>
</Message>
</ErrorBoundary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ exports[`InteractiveReport Handles environment being started 1`] = `
>
<ErrorBoundary>
<Message
message="Please select an entry."
message="No entries to be displayed."
/>
</ErrorBoundary>
</ContextProvider>
Expand Down Expand Up @@ -168,7 +168,7 @@ exports[`InteractiveReport Parially refreshes the report on update. 1`] = `
>
<ErrorBoundary>
<Message
message="Please select an entry."
message="No entries to be displayed."
/>
</ErrorBoundary>
</ContextProvider>
Expand Down Expand Up @@ -739,7 +739,7 @@ exports[`InteractiveReport handles individual parametrizations being run 1`] = `
>
<ErrorBoundary>
<Message
message="Please select an entry."
message="No entries to be displayed."
/>
</ErrorBoundary>
</ContextProvider>
Expand Down Expand Up @@ -826,7 +826,7 @@ exports[`InteractiveReport handles individual test suites being run 1`] = `
>
<ErrorBoundary>
<Message
message="Please select an entry."
message="No entries to be displayed."
/>
</ErrorBoundary>
</ContextProvider>
Expand Down Expand Up @@ -913,7 +913,7 @@ exports[`InteractiveReport handles individual testcases being run 1`] = `
>
<ErrorBoundary>
<Message
message="Please select an entry."
message="No entries to be displayed."
/>
</ErrorBoundary>
</ContextProvider>
Expand Down Expand Up @@ -1000,7 +1000,7 @@ exports[`InteractiveReport handles tests being run 1`] = `
>
<ErrorBoundary>
<Message
message="Please select an entry."
message="No entries to be displayed."
/>
</ErrorBoundary>
</ContextProvider>
Expand Down
12 changes: 7 additions & 5 deletions testplan/web_ui/testing/src/Report/reportUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ const GetCenterPane = (
selectedEntries,
displayTime
) => {
const selectiedEntry = _.last(selectedEntries);
const logs = selectiedEntry?.logs || [];
const selectedEntry = _.last(selectedEntries);
const logs = selectedEntry?.logs || [];
const selectedDescription = selectedEntries
.slice(-1)
.map((element) => {
Expand All @@ -209,21 +209,23 @@ const GetCenterPane = (
) {
return (
<AssertionPane
key={selectiedEntry ? selectiedEntry.hash || selectiedEntry.uid : null}
key={selectedEntry ? selectedEntry.hash || selectedEntry.uid : null}
assertions={assertions}
logs={logs}
descriptionEntries={selectedDescription}
left={state.navWidth}
testcaseUid={selectiedEntry.uid}
testcaseUid={selectedEntry.uid}
filter={state.filter}
displayPath={state.displayPath}
reportUid={reportUid}
/>
);
} else if (reportFetchMessage !== null) {
return <Message message={reportFetchMessage} />;
} else {
} else if (selectedEntry && selectedEntry.entries.length > 0 ) {
return <Message message="Please select an entry." />;
} else {
return <Message message="No entries to be displayed." />;
}
};

Expand Down

0 comments on commit 430e6e2

Please sign in to comment.