Skip to content

[ZEPPELIN-4756] Cassandra: Show "No Results" message folded #3801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexott wants to merge 1 commit into from
Closed

[ZEPPELIN-4756] Cassandra: Show "No Results" message folded #3801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions cassandra/src/main/resources/scalate/noResult.ssp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
*/
--%>
<div class="container">
<div class="row text-center">
<h4>No Result</h4>
<div class="row">
<h5>No Result</h5>
</div>
<br>
</div>
74 changes: 43 additions & 31 deletions cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,57 @@
* limitations under the License.
*/
--%>
#import(java.util.UUID)

#import(com.datastax.oss.driver.api.core.uuid.Uuids)

<%@ val execId: UUID = Uuids.random() %>
<%@ val query: String%>
<%@ val triedHosts: String%>
<%@ val queriedHosts: String%>
<%@ val schemaInAgreement: String%>
<div class="container">
<div class="row text-center">
<h4>No Result</h4>
<div class="row">
<h5>No Result &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a role="button" data-toggle="collapse" data-target="#${execId}" aria-expanded="false">
<span class="text-info"><strong>Last query execution info</strong></span>
</a>
</h5>
</div>
<br/>
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-6 col-offset-md-3 table-responsive table-bordered">
<table class="table">
<caption><h5>Last query execution info</h5></caption>
<div class="panel panel-default">
<div id="${execId}" class="panel-collapse collapse" role="tabpanel">
<div class="panel-body">
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-6 col-offset-md-3 table-responsive table-bordered">
<table class="table">
<thead>
<tr>
<th>Info</th>
<th>Value</th>
</tr>
<tr>
<th>Info</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<tr>
<td>Statement</td>
<td>${query}</td>
</tr>
<tr>
<td>Tried Hosts</td>
<td>${triedHosts}</td>
</tr>
<tr>
<td>Queried Hosts</td>
<td>${queriedHosts}</td>
</tr>
<tr>
<td>Schema in Agreement</td>
<td>${schemaInAgreement}</td>
</tr>
<tr>
<td>Statement</td>
<td>${query}</td>
</tr>
<tr>
<td>Tried Hosts</td>
<td>${triedHosts}</td>
</tr>
<tr>
<td>Queried Hosts</td>
<td>${queriedHosts}</td>
</tr>
<tr>
<td>Schema in Agreement</td>
<td>${schemaInAgreement}</td>
</tr>
</tbody>
</table>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions cassandra/src/test/resources/scalate/NoResult.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container">
<div class="row text-center">
<h4>No Result</h4>
<div class="row">
<h5>No Result</h5>
</div>
<br>
</div>
</div>
46 changes: 45 additions & 1 deletion cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,45 @@
<div class="container"><div class="row text-center"><h4>No Result</h4></div><br/><div class="row"><div class="col-md-3"></div><div class="col-md-6 col-offset-md-3 table-responsive table-bordered"><table class="table"><caption><h5>Last query execution info</h5></caption><thead><tr><th>Info</th><th>Value</th></tr></thead><tbody><tr><td>Statement</td><td>CREATE TABLE IF NOT EXISTS no_select(id int PRIMARY KEY);</td></tr><tr><td>Tried Hosts</td><td>localhost:9142</td></tr><tr><td>Queried Hosts</td><td>localhost:9142</td></tr><tr><td>Schema in Agreement</td><td>true</td></tr></tbody></table></div></div></div>
<div class="container">
<div class="row">
<h5>No Result &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a role="button" data-toggle="collapse" data-target="#72c620c4-bb6c-4a26-a604-ee10ae22c301" aria-expanded="false">
<span class="text-info"><strong>Last query execution info</strong></span>
</a>
</h5>
</div>
<div class="panel panel-default">
<div id="72c620c4-bb6c-4a26-a604-ee10ae22c301" class="panel-collapse collapse" role="tabpanel">
<div class="panel-body">
<div class="row">
<div class="col-md-3"></div>
<div class="col-md-6 col-offset-md-3 table-responsive table-bordered">
<table class="table">
<thead>
<tr>
<th>Info</th>
<th>Value</th>
</tr>
</thead>
<tbody>
<tr>
<td>Statement</td>
<td>CREATE TABLE IF NOT EXISTS no_select(id int PRIMARY KEY);</td>
</tr>
<tr>
<td>Tried Hosts</td>
<td>localhost:9142</td>
</tr>
<tr>
<td>Queried Hosts</td>
<td>localhost:9142</td>
</tr>
<tr>
<td>Schema in Agreement</td>
<td>true</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>