From 1daabb97e54e3cc2fa8a5046ddaae3c01dd60d2c Mon Sep 17 00:00:00 2001
From: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon, 20 Mar 2023 18:51:52 +0300
Subject: [PATCH] Pull request 1775: 5581-leases-table-mobile
Updates #5581.
Squashed commit of the following:
commit 2034c2f9c369f5e2a6e9826090fffa356fc16624
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:44:40 2023 +0200
client: fix static leases
commit be509f0037af58a0e0e8c82d283b14910c20110b
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Mon Mar 20 17:23:34 2023 +0200
client: fix leases table on mobile
---
client/src/components/Settings/Dhcp/Leases.js | 4 ++++
client/src/components/Settings/Dhcp/StaticLeases/index.js | 3 +++
2 files changed, 7 insertions(+)
diff --git a/client/src/components/Settings/Dhcp/Leases.js b/client/src/components/Settings/Dhcp/Leases.js
index 70400538..2973d1b5 100644
--- a/client/src/components/Settings/Dhcp/Leases.js
+++ b/client/src/components/Settings/Dhcp/Leases.js
@@ -23,19 +23,23 @@ class Leases extends Component {
{
Header: 'MAC',
accessor: 'mac',
+ minWidth: 160,
Cell: this.cellWrap,
}, {
Header: 'IP',
accessor: 'ip',
+ minWidth: 230,
Cell: this.cellWrap,
sortMethod: sortIp,
}, {
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
+ minWidth: 230,
Cell: this.cellWrap,
}, {
Header: <Trans>dhcp_table_expires</Trans>,
accessor: 'expires',
+ minWidth: 130,
Cell: this.cellWrap,
},
]}
diff --git a/client/src/components/Settings/Dhcp/StaticLeases/index.js b/client/src/components/Settings/Dhcp/StaticLeases/index.js
index 2374f044..299d0a7d 100644
--- a/client/src/components/Settings/Dhcp/StaticLeases/index.js
+++ b/client/src/components/Settings/Dhcp/StaticLeases/index.js
@@ -54,17 +54,20 @@ const StaticLeases = ({
{
Header: 'MAC',
accessor: 'mac',
+ minWidth: 160,
Cell: cellWrap,
},
{
Header: 'IP',
accessor: 'ip',
+ minWidth: 230,
sortMethod: sortIp,
Cell: cellWrap,
},
{
Header: <Trans>dhcp_table_hostname</Trans>,
accessor: 'hostname',
+ minWidth: 230,
Cell: cellWrap,
},
{