diff --git a/explorer/static/js/src/explorer.js b/explorer/static/js/src/explorer.js index eb42a813..fbdc0a05 100644 --- a/explorer/static/js/src/explorer.js +++ b/explorer/static/js/src/explorer.js @@ -228,19 +228,19 @@ export class ExplorerEditor { $(".sort").click(function(e) { var t = $(e.target).data("sort"); var dir = $(e.target).data("dir"); - $(".sort").addClass("bi-arrow-down-up"); - $(".sort").removeClass("bi-arrow-down"); - $(".sort").removeClass("bi-arrow-up"); + $(".sort").addClass("bi-chevron-expand"); + $(".sort").removeClass("bi-chevron-down"); + $(".sort").removeClass("bi-chevron-up"); if (dir === "asc"){ $(e.target).data("dir", "desc"); - $(e.target).addClass("bi-arrow-up"); - $(e.target).removeClass("bi-arrow-down"); - $(e.target).removeClass("bi-arrow-down-up"); + $(e.target).addClass("bi-chevron-up"); + $(e.target).removeClass("bi-chevron-down"); + $(e.target).removeClass("bi-chevron-expand"); } else { $(e.target).data("dir", "asc"); - $(e.target).addClass("bi-arrow-down"); - $(e.target).removeClass("bi-arrow-up"); - $(e.target).removeClass("bi-arrow-down-up"); + $(e.target).addClass("bi-chevron-down"); + $(e.target).removeClass("bi-chevron-up"); + $(e.target).removeClass("bi-chevron-expand"); } var vals = []; var ct = 0; diff --git a/explorer/static/scss/explorer.css b/explorer/static/scss/explorer.css index 9233c659..7ce14d26 100644 --- a/explorer/static/scss/explorer.css +++ b/explorer/static/scss/explorer.css @@ -1,17 +1,19 @@ -.cm-wrap { height: 350px; border: 1px solid silver} -.cm-scroller { overflow: auto; min-height: 350px } -.cm-content, .cm-gutter { min-height: 350px !important; } +.cm-wrap { + height: 350px; + border: 1px solid silver +} -.collapse.in { - display: table-row; +.cm-scroller { + overflow: auto; + min-height: 350px } -.collapsing { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.01s ease; - transition: height 0.01s ease; +.cm-content, .cm-gutter { + min-height: 350px !important; +} + +.link-primary { + cursor: pointer; } .rows-input { @@ -50,54 +52,21 @@ td.name.indented { } .stats-wrapper { - width: 120px; display: none; } -.stat-wrapper { - float: left; - width: 120px; -} - -.stat-label { - width: 50%; - font-weight: 300; -} - -.stat-value { - width: 50%; - font-weight: 500; -} - .stats-expand { cursor: pointer; - padding-left: 5px; -} - -.data-row { - white-space: pre; -} - -.CodeMirror { - height: 400px; } .table>thead>tr>th.preview-header { - vertical-align: top; + white-space: nowrap; } div.sort { cursor: pointer; } -.pivot-table { - padding: 15px; -} - -.pvtAxisContainer, .pvtVals { - border-color: #ddd; -} - #schema_frame { width: 100%; border: 0; @@ -107,68 +76,16 @@ div.sort { cursor: pointer; } -.CodeMirror-lines .inserted { - animation: inserted-pulse 700ms; -} - -@keyframes inserted-pulse { - 0% { - background-color: #f9f2f4; - color: #c7254e; - font-weight: bold; - } - 100% { - background-color: transparent; - color: inherit; - font-weight: normal; - } -} - -.dropdown-menu { - z-index: 9999; -} - -.dropdown-menu>li>input { - display: block; - padding: 3px 20px; - clear: both; - font-weight: 400; - line-height: 1.42857143; - color: #333; - white-space: nowrap; - width: 100%; - text-align: left; -} - -.dropdown-menu>li>input:hover { - color: #262626; - text-decoration: none; - background-color: #f5f5f5; -} - -a#fullscreen { - padding-left: 1rem; -} - .counter { display: none; background-color: #ecf0f1; font-family: monospace; } -.name a { - text-decoration: none !important; -} - .sql { width: 33%; } -#sql_toggle { - padding-left: 1rem; - color: #18bc9c; -} - .query_favorite_toggle { cursor: pointer; } diff --git a/explorer/templates/explorer/preview_pane.html b/explorer/templates/explorer/preview_pane.html index 78750b9b..605ca925 100644 --- a/explorer/templates/explorer/preview_pane.html +++ b/explorer/templates/explorer/preview_pane.html @@ -32,7 +32,7 @@ {% endblocktrans %}
- + {% if rows > total_rows %} {% trans "Showing" %}  - - - - - - - + + +
@@ -62,8 +58,8 @@ {% for h in headers %} -
{{ h }}
+ {{ h }} {% endfor %} @@ -72,12 +68,14 @@ {% if h.summary %} -
+ {% for label, value in h.summary.stats.items %} -
{{ label }}: {{ value }}
+ + + + {% endfor %} - +
{{ label }}{{ value }}
{% endif %} {% endfor %} diff --git a/explorer/templates/explorer/query.html b/explorer/templates/explorer/query.html index 5def05da..3181915f 100644 --- a/explorer/templates/explorer/query.html +++ b/explorer/templates/explorer/query.html @@ -83,12 +83,9 @@

- + - - -
{% endif %}

diff --git a/explorer/templates/explorer/query_confirm_delete.html b/explorer/templates/explorer/query_confirm_delete.html index 6091443c..9af66704 100644 --- a/explorer/templates/explorer/query_confirm_delete.html +++ b/explorer/templates/explorer/query_confirm_delete.html @@ -9,7 +9,7 @@ {% endblocktrans %}
- +
{% endblock %} diff --git a/explorer/templates/explorer/query_favorites.html b/explorer/templates/explorer/query_favorites.html index 274d9394..42aff756 100644 --- a/explorer/templates/explorer/query_favorites.html +++ b/explorer/templates/explorer/query_favorites.html @@ -3,7 +3,7 @@ {% block sql_explorer_content %}

{% trans "Favorite Queries" %}

-
+
diff --git a/explorer/templatetags/vite.py b/explorer/templatetags/vite.py index be43dad9..42c2abf3 100644 --- a/explorer/templatetags/vite.py +++ b/explorer/templatetags/vite.py @@ -30,7 +30,6 @@ def get_script(file: str) -> str: return mark_safe(f'') # nosec B308, B703 - @lru_cache def get_manifest(): with open(VITE_MANIFEST_FILE) as f: