From 01eaf3feaae6c08aede6ec9742d0ea4124767163 Mon Sep 17 00:00:00 2001
From: David Edler <david.edler@canonical.com>
Date: Fri, 12 Jul 2024 15:24:42 +0200
Subject: [PATCH] fix(network) allow disabling of dhcp in ipv4/ipv6 network
 configuration i.e. on bridge networks. Avoid crash reported in #814

Signed-off-by: David Edler <david.edler@canonical.com>
---
 src/pages/networks/forms/NetworkFormIpv4.tsx |  7 +++++--
 src/pages/networks/forms/NetworkFormIpv6.tsx | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/pages/networks/forms/NetworkFormIpv4.tsx b/src/pages/networks/forms/NetworkFormIpv4.tsx
index 7c921b72e..7b5a6d07e 100644
--- a/src/pages/networks/forms/NetworkFormIpv4.tsx
+++ b/src/pages/networks/forms/NetworkFormIpv4.tsx
@@ -29,14 +29,15 @@ const NetworkFormIpv4: FC<Props> = ({ formik }) => {
           : []),
 
         ...(formik.values.networkType !== "ovn" &&
-        formik.values.networkType !== "physical" &&
-        hasDhcp
+        formik.values.networkType !== "physical"
           ? [
               getConfigurationRow({
                 formik,
                 name: "ipv4_dhcp_expiry",
                 label: "IPv4 DHCP expiry",
                 defaultValue: "",
+                disabled: !hasDhcp,
+                disabledReason: "IPv4 DHCP is disabled",
                 children: <Input type="text" />,
               }),
 
@@ -45,6 +46,8 @@ const NetworkFormIpv4: FC<Props> = ({ formik }) => {
                 name: "ipv4_dhcp_ranges",
                 label: "IPv4 DHCP ranges",
                 defaultValue: "",
+                disabled: !hasDhcp,
+                disabledReason: "IPv4 DHCP is disabled",
                 children: <Textarea />,
               }),
             ]
diff --git a/src/pages/networks/forms/NetworkFormIpv6.tsx b/src/pages/networks/forms/NetworkFormIpv6.tsx
index c1ddb8213..dff38cc5c 100644
--- a/src/pages/networks/forms/NetworkFormIpv6.tsx
+++ b/src/pages/networks/forms/NetworkFormIpv6.tsx
@@ -28,8 +28,7 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
             ]
           : []),
 
-        ...(hasDhcp &&
-        formik.values.networkType !== "ovn" &&
+        ...(formik.values.networkType !== "ovn" &&
         formik.values.networkType !== "physical"
           ? [
               getConfigurationRow({
@@ -37,6 +36,8 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
                 name: "ipv6_dhcp_expiry",
                 label: "IPv6 DHCP expiry",
                 defaultValue: "",
+                disabled: !hasDhcp,
+                disabledReason: "IPv6 DHCP is disabled",
                 children: <Input type="text" />,
               }),
 
@@ -45,18 +46,22 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
                 name: "ipv6_dhcp_ranges",
                 label: "IPv6 DHCP ranges",
                 defaultValue: "",
+                disabled: !hasDhcp,
+                disabledReason: "IPv6 DHCP is disabled",
                 children: <Textarea />,
               }),
             ]
           : []),
 
-        ...(hasDhcp && formik.values.networkType !== "physical"
+        ...(formik.values.networkType !== "physical"
           ? [
               getConfigurationRow({
                 formik,
                 name: "ipv6_dhcp_stateful",
                 label: "IPv6 DHCP stateful",
                 defaultValue: "",
+                disabled: !hasDhcp,
+                disabledReason: "IPv6 DHCP is disabled",
                 children: <Select options={optionTrueFalse} />,
               }),
             ]