fix(network) allow disabling of dhcp in ipv4/ipv6 network configurati…

…on i.e. on bridge networks. Avoid crash reported in #814 Signed-off-by: David Edler <david.edler@canonical.com>
canonical · Jul 12, 2024 · 01eaf3f · 01eaf3f
1 parent 0fc2601
commit 01eaf3f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git 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
@@ -28,15 +28,16 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
             ]
           : []),
 
-        ...(hasDhcp &&
-        formik.values.networkType !== "ovn" &&
+        ...(formik.values.networkType !== "ovn" &&
         formik.values.networkType !== "physical"
           ? [
               getConfigurationRow({
                 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} />,
               }),
             ]