diff --git a/web/pgadmin/dashboard/templates/dashboard/sql/default/dashboard_stats.sql b/web/pgadmin/dashboard/templates/dashboard/sql/default/dashboard_stats.sql index 8d35c87c..88b2868a 100644 --- a/web/pgadmin/dashboard/templates/dashboard/sql/default/dashboard_stats.sql +++ b/web/pgadmin/dashboard/templates/dashboard/sql/default/dashboard_stats.sql @@ -2,7 +2,7 @@ {% set add_union = false %} {% if 'session_stats' in chart_names %} {% set add_union = true %} -SELECT 'session_stats' AS chart_name, row_to_json(t) AS chart_data +SELECT 'session_stats' AS chart_name, row_to_json(t)::jsonb AS chart_data FROM (SELECT (SELECT count(*) FROM pg_stat_activity{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Total') }}", (SELECT count(*) FROM pg_stat_activity WHERE state = 'active'{% if did %} AND datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Active') }}", @@ -14,7 +14,7 @@ UNION ALL {% endif %} {% if 'tps_stats' in chart_names %} {% set add_union = true %} -SELECT 'tps_stats' AS chart_name, row_to_json(t) AS chart_data +SELECT 'tps_stats' AS chart_name, row_to_json(t)::jsonb AS chart_data FROM (SELECT (SELECT sum(xact_commit) + sum(xact_rollback) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Transactions') }}", (SELECT sum(xact_commit) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Commits') }}", @@ -26,7 +26,7 @@ UNION ALL {% endif %} {% if 'ti_stats' in chart_names %} {% set add_union = true %} -SELECT 'ti_stats' AS chart_name, row_to_json(t) AS chart_data +SELECT 'ti_stats' AS chart_name, row_to_json(t)::jsonb AS chart_data FROM (SELECT (SELECT sum(tup_inserted) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Inserts') }}", (SELECT sum(tup_updated) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Updates') }}", @@ -38,7 +38,7 @@ UNION ALL {% endif %} {% if 'to_stats' in chart_names %} {% set add_union = true %} -SELECT 'to_stats' AS chart_name, row_to_json(t) AS chart_data +SELECT 'to_stats' AS chart_name, row_to_json(t)::jsonb AS chart_data FROM (SELECT (SELECT sum(tup_fetched) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Fetched') }}", (SELECT sum(tup_returned) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Returned') }}" @@ -49,7 +49,7 @@ UNION ALL {% endif %} {% if 'bio_stats' in chart_names %} {% set add_union = true %} -SELECT 'bio_stats' AS chart_name, row_to_json(t) AS chart_data +SELECT 'bio_stats' AS chart_name, row_to_json(t)::jsonb AS chart_data FROM (SELECT (SELECT sum(blks_read) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Reads') }}", (SELECT sum(blks_hit) FROM pg_stat_database{% if did %} WHERE datname = (SELECT datname FROM pg_database WHERE oid = {{ did }}){% endif %}) AS "{{ _('Hits') }}" diff --git a/web/pgadmin/static/js/slickgrid/editors.js b/web/pgadmin/static/js/slickgrid/editors.js index 18bba9e9..0fae86ca 100644 --- a/web/pgadmin/static/js/slickgrid/editors.js +++ b/web/pgadmin/static/js/slickgrid/editors.js @@ -33,12 +33,12 @@ // return wrapper element function getWrapper() { - return $('
'); + return $('
'); } // return textarea element function getTextArea() { - return $('