From 3ce3c41b59aa8faa6d474c9d4f799dbb070d671c Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Wed, 11 Oct 2023 15:24:26 +0300 Subject: [PATCH] 6180 fix dashboard empty tables scroll Updates #6180 Squashed commit of the following: commit ad4188f6b019977977f9230b2518383c5f16ac47 Merge: 830250640 0fb6d6163 Author: Ildar Kamalov Date: Wed Oct 11 15:03:55 2023 +0300 Merge branch 'master' into ADG-7473 commit 830250640ef456c7e64561e573c7763046870f32 Author: Ildar Kamalov Date: Mon Oct 9 19:43:02 2023 +0300 Revert "ADG-7473 get table page size from local storage" This reverts commit b6bf48a2690e0ea93bac621e6ddb90b172a7c3eb. commit 960f3a1814a437f5c5945e4cc0351a59268ada40 Author: Ildar Kamalov Date: Mon Oct 9 19:42:31 2023 +0300 fix stats config page commit b6bf48a2690e0ea93bac621e6ddb90b172a7c3eb Author: Ildar Kamalov Date: Mon Oct 9 19:30:22 2023 +0300 ADG-7473 get table page size from local storage commit 7201d00a880e4efabea9c809ce980fa1bc628c5b Author: Ildar Kamalov Date: Mon Oct 9 17:20:48 2023 +0300 ADG-7473 fix dashboard tables scroll --- client/src/components/Settings/LogsConfig/index.js | 2 +- client/src/components/Settings/StatsConfig/index.js | 2 +- client/src/components/ui/Card.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/components/Settings/LogsConfig/index.js b/client/src/components/Settings/LogsConfig/index.js index 3e609a2d..b6ce9624 100644 --- a/client/src/components/Settings/LogsConfig/index.js +++ b/client/src/components/Settings/LogsConfig/index.js @@ -62,7 +62,7 @@ class LogsConfig extends Component { interval, customInterval, anonymize_client_ip, - ignored: ignored.join('\n'), + ignored: ignored?.join('\n'), }} onSubmit={this.handleFormSubmit} processing={processing} diff --git a/client/src/components/Settings/StatsConfig/index.js b/client/src/components/Settings/StatsConfig/index.js index 7b68064c..bcc9a7d0 100644 --- a/client/src/components/Settings/StatsConfig/index.js +++ b/client/src/components/Settings/StatsConfig/index.js @@ -59,7 +59,7 @@ class StatsConfig extends Component { interval, customInterval, enabled, - ignored: ignored.join('\n'), + ignored: ignored?.join('\n'), }} onSubmit={this.handleFormSubmit} processing={processing} diff --git a/client/src/components/ui/Card.css b/client/src/components/ui/Card.css index 9e649264..fcf16ce8 100644 --- a/client/src/components/ui/Card.css +++ b/client/src/components/ui/Card.css @@ -20,7 +20,7 @@ } .dashboard .card-table-overflow--limited { - max-height: 18rem; + max-height: 19rem; } .card-actions {