commit 080993c3d4118274cb2549b18db91b34e418c21f
author Xikui Wang <xkkwww@gmail.com> Fri Aug 25 09:59:59 2017 -0700
committer Xikui Wang <xkkwww@gmail.com> Tue Aug 29 09:42:35 2017 -0700
tree 5433bb15eca2101266ed1cb3cbbc22288a81e136
parent 80d20195f57b2eab4a7ead81e10e985b0852cdb3

[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
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1950
Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: abdullah alamoudi <bamousaa@gmail.com>

asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java

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 58c282f..ba09d6c 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 ("CSV-Header".equals(output)) {
+            output = "CSV";
+            csvAndHeader = true;
+        }
         try {
             format = OutputFormat.valueOf(output);
         } catch (IllegalArgumentException e) {

asterixdb/asterix-app/src/main/resources/webui/querytemplate.html

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) {