Xikui Wang has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1950
Change subject: [ASTERIXDB-1977][UI] Disable wrap into array option for certain
cases
......................................................................
[ASTERIXDB-1977][UI] Disable wrap into array option for certain cases
1. When formatted JSON is checked, we disable the wrap in array option for
better display. Also, this option is not applicable when output format
is CSV.
2. Fixed the CSV with header format.
Change-Id: I8168e021c1f97e7e3c94fc073447656b481a4380
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
M asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
2 files changed, 16 insertions(+), 0 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/50/1950/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
index 7874aa3..0024f1c 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
@@ -98,6 +98,10 @@
OutputFormat format;
boolean csvAndHeader = false;
String output = request.getParameter("output-format");
+ if (output.equals("CSV-Header")) {
+ output = "CSV";
+ csvAndHeader = true;
+ }
try {
format = OutputFormat.valueOf(output);
} catch (IllegalArgumentException e) {
diff --git a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
index cffec6f..383754e 100644
--- a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
@@ -72,6 +72,18 @@
}
});
+ $('#output-format').on('change', function() {
+ var resultFormat = $('#output-format option:checked').text();
+ if (resultFormat == 'JSON (formatted)' || resultFormat == 'CSV (no
header)' || resultFormat == 'CSV (with header)') {
+ $('input[name=wrapper-array]').attr('disabled', true);
+ $('input[name=wrapper-array]').prop('checked', false);
+ $('input[name=wrapper-array]').parent().css('color', 'grey');
+ } else {
+ $('input[name=wrapper-array]').attr("disabled", false);
+ $('input[name=wrapper-array]').parent().css('color', '');
+ }
+ });
+
$("form#queryform").submit(function() {
$('#output-message').html("");
$.post("/", $("form#queryform").serialize(), function(data) {
--
To view, visit https://asterix-gerrit.ics.uci.edu/1950
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8168e021c1f97e7e3c94fc073447656b481a4380
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <[email protected]>
