ADG-7473 fix dashboard tables scroll

AdguardTeam · Oct 12, 2023 · 5e4f35c · 5e4f35c
1 parent d3fabdd
commit 5e4f35c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/client/src/components/Dashboard/BlockedDomains.js b/client/src/components/Dashboard/BlockedDomains.js
@@ -62,7 +62,7 @@ const BlockedDomains = ({
                 ]}
                 showPagination={false}
                 noDataText={t('no_domains_found')}
-                minRows={6}
+                minRows={5}
                 defaultPageSize={100}
                 className="-highlight card-table-overflow--limited stats__table"
             />

diff --git a/client/src/components/Dashboard/Clients.js b/client/src/components/Dashboard/Clients.js
@@ -134,7 +134,7 @@ const Clients = ({
                 ]}
                 showPagination={false}
                 noDataText={t('no_clients_found')}
-                minRows={6}
+                minRows={5}
                 defaultPageSize={100}
                 className="-highlight card-table-overflow--limited clients__table"
                 getTrProps={(_state, rowInfo) => {

diff --git a/client/src/components/Dashboard/QueriedDomains.js b/client/src/components/Dashboard/QueriedDomains.js
@@ -58,7 +58,7 @@ const QueriedDomains = ({
             ]}
             showPagination={false}
             noDataText={t('no_domains_found')}
-            minRows={6}
+            minRows={5}
             defaultPageSize={100}
             className="-highlight card-table-overflow--limited stats__table"
         />

diff --git a/client/src/components/Dashboard/UpstreamAvgTime.js b/client/src/components/Dashboard/UpstreamAvgTime.js
@@ -62,7 +62,7 @@ const UpstreamAvgTime = ({
             ]}
             showPagination={false}
             noDataText={t('no_upstreams_data_found')}
-            minRows={6}
+            minRows={5}
             defaultPageSize={100}
             className="-highlight card-table-overflow--limited stats__table"
         />

diff --git a/client/src/components/Dashboard/UpstreamResponses.js b/client/src/components/Dashboard/UpstreamResponses.js
@@ -64,7 +64,7 @@ const UpstreamResponses = ({
             ]}
             showPagination={false}
             noDataText={t('no_upstreams_data_found')}
-            minRows={6}
+            minRows={5}
             defaultPageSize={100}
             className="-highlight card-table-overflow--limited stats__table"
         />

diff --git a/client/src/components/Settings/Dhcp/Leases.js b/client/src/components/Settings/Dhcp/Leases.js
@@ -76,7 +76,7 @@ class Leases extends Component {
                 showPageSizeOptions={false}
                 showPagination={leases.length > LEASES_TABLE_DEFAULT_PAGE_SIZE}
                 noDataText={t('dhcp_leases_not_found')}
-                minRows={6}
+                minRows={5}
                 className="-striped -highlight card-table-overflow"
             />
         );

diff --git a/client/src/components/ui/Card.css b/client/src/components/ui/Card.css
@@ -2,6 +2,7 @@
     align-items: center;
     justify-content: space-between;
     padding: 0.6rem 1.5rem;
+    flex-shrink: 0;
 }
 
 .card-subtitle {
@@ -20,7 +21,11 @@
 }
 
 .dashboard .card-table-overflow--limited {
-    max-height: 18rem;
+    max-height: 290px;
+}
+
+.dashboard .ReactTable .rt-tr-group {
+    min-height: 52px;
 }
 
 .card-actions {
@@ -125,7 +130,7 @@
 
 @media (min-width: 992px) {
     .dashboard .card:not(.card--full) {
-        height: 22rem;
+        height: 362px;
     }
 }