You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by al...@apache.org on 2020/06/17 07:40:19 UTC
[zeppelin] branch master updated: [ZEPPELIN-4756] Cassandra: Show
"No Results" message folded
This is an automated email from the ASF dual-hosted git repository.
alexott pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 84b6a1b [ZEPPELIN-4756] Cassandra: Show "No Results" message folded
84b6a1b is described below
commit 84b6a1bdebd63fff6bafa95cff501c423c1a1d56
Author: Alex Ott <al...@gmail.com>
AuthorDate: Sun Jun 14 11:29:49 2020 +0200
[ZEPPELIN-4756] Cassandra: Show "No Results" message folded
### What is this PR for?
Right now, when operation returns no results, for example, when executing most operations other than `SELECT` (DDL/INSERT/UPDATE/DELETE/...), interpreter shows the extended information - what hosts were used to execute command, etc. This information occupies a significant amount of the screen space and isn't critical for execution.
Given PR provides the same information but folds it by default, saving the screen space.
### What type of PR is it?
Improvement
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-4756
### How should this be tested?
* https://travis-ci.org/github/alexott/zeppelin/builds/698161348
### Screenshots (if appropriate)
Old view:
New view:
Author: Alex Ott <al...@gmail.com>
Closes #3801 from alexott/ZEPPELIN-4756 and squashes the following commits:
3b0618c5a [Alex Ott] [ZEPPELIN-4756] Cassandra: Show "No Results" message folded
---
cassandra/src/main/resources/scalate/noResult.ssp | 4 +-
.../scalate/noResultWithExecutionInfo.ssp | 74 +++++++++++++---------
cassandra/src/test/resources/scalate/NoResult.html | 6 +-
.../scalate/NoResultWithExecutionInfo.html | 46 +++++++++++++-
4 files changed, 93 insertions(+), 37 deletions(-)
diff --git a/cassandra/src/main/resources/scalate/noResult.ssp b/cassandra/src/main/resources/scalate/noResult.ssp
index a3dc4b6..020b3a6 100644
--- a/cassandra/src/main/resources/scalate/noResult.ssp
+++ b/cassandra/src/main/resources/scalate/noResult.ssp
@@ -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>
\ No newline at end of file
diff --git a/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp b/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp
index 465558a..7517f1f 100644
--- a/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp
+++ b/cassandra/src/main/resources/scalate/noResultWithExecutionInfo.ssp
@@ -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
+ <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>
\ No newline at end of file
+ </div>
+</div>
diff --git a/cassandra/src/test/resources/scalate/NoResult.html b/cassandra/src/test/resources/scalate/NoResult.html
index e7c2d46..aa87821 100644
--- a/cassandra/src/test/resources/scalate/NoResult.html
+++ b/cassandra/src/test/resources/scalate/NoResult.html
@@ -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>
\ No newline at end of file
+</div>
diff --git a/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html b/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html
index 9ca4d45..3f58d0f 100644
--- a/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html
+++ b/cassandra/src/test/resources/scalate/NoResultWithExecutionInfo.html
@@ -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 Hos [...]
\ No newline at end of file
+<div class="container">
+<div class="row">
+ <h5>No Result
+ <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>