Эх сурвалжийг харах

HUE-3797 [notebook] Option to avoid HTML escaping the query result

Useful for managed/util queries not displayed to the user.
Romain 5 жил өмнө
parent
commit
6cd67f1cba

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -2028,7 +2028,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
       <div class="tab-content">
         <div class="tab-pane active" id="schedule-hive-page-properties${ SUFFIX }">
-          <pre data-bind="highlight: { value: properties['query'], formatted: false, dialect: 'hive' }"></pre>
+          <pre data-bind="highlight: { value: properties['query'], formatted: true, dialect: 'hive' }"></pre>
         </div>
 
         <div class="tab-pane" id="schedule-hive-page-queries${ SUFFIX }">

+ 2 - 2
desktop/libs/notebook/src/notebook/api.py

@@ -316,7 +316,7 @@ def fetch_result_data(request):
     return JsonResponse(response)
 
 
-def _fetch_result_data(user, notebook=None, snippet=None, operation_id=None, rows=100, start_over=False):
+def _fetch_result_data(user, notebook=None, snippet=None, operation_id=None, rows=100, start_over=False, nulls_only=False):
   snippet = _get_snippet(user, notebook, snippet, operation_id)
   request = MockRequest(user)
 
@@ -326,7 +326,7 @@ def _fetch_result_data(user, notebook=None, snippet=None, operation_id=None, row
 
   # Materialize and HTML escape results
   if response['result'].get('data') and response['result'].get('type') == 'table' and not response['result'].get('isEscaped'):
-    response['result']['data'] = escape_rows(response['result']['data'])
+    response['result']['data'] = escape_rows(response['result']['data'], nulls_only=nulls_only)
     response['result']['isEscaped'] = True
 
   return response

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/base.py

@@ -342,7 +342,7 @@ class Notebook(object):
   def fetch_result_data(self, user, operation_id):
     from notebook.api import _fetch_result_data
 
-    return _fetch_result_data(user, operation_id=operation_id, rows=100, start_over=False)
+    return _fetch_result_data(user, operation_id=operation_id, rows=100, start_over=False, nulls_only=True)
 
 
 def get_interpreter(connector_type, user=None):