From 60cbb93488ec3fa1ca720d88e79ae48130ac9461 Mon Sep 17 00:00:00 2001
From: Ildar Kamalov <i.kamalov@adguard.com>
Date: Wed, 18 Dec 2019 13:40:05 +0300
Subject: [PATCH] + client: show DHCP static leases all the time
---
client/src/components/Settings/Dhcp/index.js | 74 ++++++++++----------
1 file changed, 36 insertions(+), 38 deletions(-)
diff --git a/client/src/components/Settings/Dhcp/index.js b/client/src/components/Settings/Dhcp/index.js
index 959922ce..9aba37da 100644
--- a/client/src/components/Settings/Dhcp/index.js
+++ b/client/src/components/Settings/Dhcp/index.js
@@ -219,46 +219,44 @@ class Dhcp extends Component {
</div>
</Card>
{dhcp.config.enabled && (
- <Fragment>
- <Card
- title={t('dhcp_leases')}
- bodyType="card-body box-body--settings"
- >
- <div className="row">
- <div className="col">
- <Leases leases={dhcp.leases} />
- </div>
+ <Card
+ title={t('dhcp_leases')}
+ bodyType="card-body box-body--settings"
+ >
+ <div className="row">
+ <div className="col">
+ <Leases leases={dhcp.leases} />
</div>
- </Card>
- <Card
- title={t('dhcp_static_leases')}
- bodyType="card-body box-body--settings"
- >
- <div className="row">
- <div className="col-12">
- <StaticLeases
- staticLeases={dhcp.staticLeases}
- isModalOpen={dhcp.isModalOpen}
- addStaticLease={addStaticLease}
- removeStaticLease={removeStaticLease}
- toggleLeaseModal={toggleLeaseModal}
- processingAdding={dhcp.processingAdding}
- processingDeleting={dhcp.processingDeleting}
- />
- </div>
- <div className="col-12">
- <button
- type="button"
- className="btn btn-success btn-standard mt-3"
- onClick={() => toggleLeaseModal()}
- >
- <Trans>dhcp_add_static_lease</Trans>
- </button>
- </div>
- </div>
- </Card>
- </Fragment>
+ </div>
+ </Card>
)}
+ <Card
+ title={t('dhcp_static_leases')}
+ bodyType="card-body box-body--settings"
+ >
+ <div className="row">
+ <div className="col-12">
+ <StaticLeases
+ staticLeases={dhcp.staticLeases}
+ isModalOpen={dhcp.isModalOpen}
+ addStaticLease={addStaticLease}
+ removeStaticLease={removeStaticLease}
+ toggleLeaseModal={toggleLeaseModal}
+ processingAdding={dhcp.processingAdding}
+ processingDeleting={dhcp.processingDeleting}
+ />
+ </div>
+ <div className="col-12">
+ <button
+ type="button"
+ className="btn btn-success btn-standard mt-3"
+ onClick={() => toggleLeaseModal()}
+ >
+ <Trans>dhcp_add_static_lease</Trans>
+ </button>
+ </div>
+ </div>
+ </Card>
</Fragment>
)}
</Fragment>