fix(forms) Simplify formik prop propagation

Update src/pages/settings/Settings.tsx Co-authored-by: Michele Lo Russo <michele.lorusso@canonical.com> Signed-off-by: David Edler <david.edler@canonical.com>
canonical · Dec 1, 2023 · 42c65c3 · 42c65c3
1 parent 330c22e
commit 42c65c3
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 90 deletions.
diff --git a/src/components/forms/CloudInitForm.tsx b/src/components/forms/CloudInitForm.tsx
@@ -46,7 +46,7 @@ const CloudInitForm: FC<Props> = ({ formik }) => {
         }
         rows={[
           getInstanceConfigurationRow({
-            formik: formik,
+            formik,
             label: "Network config",
             name: "cloud_init_network_config",
             defaultValue: "\n\n",
@@ -62,7 +62,7 @@ const CloudInitForm: FC<Props> = ({ formik }) => {
           }),
 
           getInstanceConfigurationRow({
-            formik: formik,
+            formik,
             label: "User data",
             name: "cloud_init_user_data",
             defaultValue: "\n\n",
@@ -78,7 +78,7 @@ const CloudInitForm: FC<Props> = ({ formik }) => {
           }),
 
           getInstanceConfigurationRow({
-            formik: formik,
+            formik,
             label: "Vendor data",
             name: "cloud_init_vendor_data",
             defaultValue: "\n\n",

diff --git a/src/components/forms/ResourceLimitsForm.tsx b/src/components/forms/ResourceLimitsForm.tsx
@@ -48,7 +48,7 @@ const ResourceLimitsForm: FC<Props> = ({ formik }) => {
     <InstanceConfigurationTable
       rows={[
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           name: "limits_cpu",
           label: "Exposed CPU limit",
           defaultValue: DEFAULT_CPU_LIMIT,
@@ -65,7 +65,7 @@ const ResourceLimitsForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           name: "limits_memory",
           label: "Memory limit",
           defaultValue: DEFAULT_MEM_LIMIT,
@@ -82,7 +82,7 @@ const ResourceLimitsForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           name: "limits_memory_swap",
           label: "Memory swap (Containers only)",
           defaultValue: "",
@@ -97,15 +97,15 @@ const ResourceLimitsForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           name: "limits_disk_priority",
           label: "Disk priority",
           defaultValue: "",
           children: <Select options={diskPriorities} />,
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           name: "limits_processes",
           label: "Max number of processes (Containers only)",
           defaultValue: "",

diff --git a/src/components/forms/SecurityPoliciesForm.tsx b/src/components/forms/SecurityPoliciesForm.tsx
@@ -60,7 +60,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
     <InstanceConfigurationTable
       rows={[
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Protect deletion",
           name: "security_protection_delete",
           defaultValue: "",
@@ -69,7 +69,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Privileged (Containers only)",
           name: "security_privileged",
           defaultValue: "",
@@ -84,7 +84,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Protect UID/GID shift (Containers only)",
           name: "security_protection_shift",
           defaultValue: "",
@@ -96,7 +96,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Base host id (Containers only)",
           name: "security_idmap_base",
           defaultValue: "",
@@ -114,7 +114,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Idmap size (Containers only)",
           name: "security_idmap_size",
           defaultValue: "",
@@ -133,7 +133,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Unique idmap (Containers only)",
           name: "security_idmap_isolated",
           defaultValue: "",
@@ -145,7 +145,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Allow /dev/lxd in the instance (Containers only)",
           name: "security_devlxd",
           defaultValue: "",
@@ -157,7 +157,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label:
             "Make /1.0/images API available over /dev/lxd (Containers only)",
           name: "security_devlxd_images",
@@ -170,7 +170,7 @@ const SecurityPoliciesForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Enable secureboot (VMs only)",
           name: "security_secureboot",
           defaultValue: "",

diff --git a/src/components/forms/SnapshotsForm.tsx b/src/components/forms/SnapshotsForm.tsx
@@ -35,23 +35,23 @@ const SnapshotsForm: FC<Props> = ({ formik }) => {
     <InstanceConfigurationTable
       rows={[
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Snapshot name pattern",
           name: "snapshots_pattern",
           defaultValue: "",
           children: <Input placeholder="Enter name pattern" type="text" />,
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Expire after",
           name: "snapshots_expiry",
           defaultValue: "",
           children: <Input placeholder="Enter expiry expression" type="text" />,
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Snapshot stopped instances",
           name: "snapshots_schedule_stopped",
           defaultValue: "",
@@ -60,7 +60,7 @@ const SnapshotsForm: FC<Props> = ({ formik }) => {
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           label: "Schedule",
           name: "snapshots_schedule",
           defaultValue: "",

diff --git a/src/pages/networks/forms/NetworkFormBridge.tsx b/src/pages/networks/forms/NetworkFormBridge.tsx
@@ -14,7 +14,7 @@ const NetworkFormBridge: FC<Props> = ({ formik }) => {
     <ConfigurationTable
       rows={[
         getNetworkConfigurationRow({
-          formik: formik,
+          formik,
           name: "bridge_mtu",
           label: "MTU",
           help: "Bridge MTU (default varies if tunnel or fan setup)",
@@ -23,7 +23,7 @@ const NetworkFormBridge: FC<Props> = ({ formik }) => {
         }),
 
         getNetworkConfigurationRow({
-          formik: formik,
+          formik,
           name: "bridge_hwaddr",
           label: "Hardware address",
           help: "MAC address for the bridge",
@@ -34,7 +34,7 @@ const NetworkFormBridge: FC<Props> = ({ formik }) => {
         ...(formik.values.type === "bridge"
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "bridge_driver",
                 label: "Bridge driver",
                 help: "Native or openvswitch",

diff --git a/src/pages/networks/forms/NetworkFormDns.tsx b/src/pages/networks/forms/NetworkFormDns.tsx
@@ -14,7 +14,7 @@ const NetworkFormDns: FC<Props> = ({ formik }) => {
     <ConfigurationTable
       rows={[
         getNetworkConfigurationRow({
-          formik: formik,
+          formik,
           name: "dns_domain",
           label: "DNS domain",
           help: "Domain to advertise to DHCP clients and use for DNS resolution",
@@ -25,7 +25,7 @@ const NetworkFormDns: FC<Props> = ({ formik }) => {
         ...(formik.values.type === "bridge"
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "dns_mode",
                 label: "DNS mode",
                 defaultValue: "",
@@ -57,7 +57,7 @@ const NetworkFormDns: FC<Props> = ({ formik }) => {
           : []),
 
         getNetworkConfigurationRow({
-          formik: formik,
+          formik,
           name: "dns_search",
           label: "DNS search",
           help: "Full comma-separated domain search list, defaulting to DNS domain value",

diff --git a/src/pages/networks/forms/NetworkFormIpv4.tsx b/src/pages/networks/forms/NetworkFormIpv4.tsx
@@ -17,7 +17,7 @@ const NetworkFormIpv4: FC<Props> = ({ formik }) => {
     <ConfigurationTable
       rows={[
         getNetworkConfigurationRow({
-          formik: formik,
+          formik,
           name: "ipv4_dhcp",
           label: "IPv4 DHCP",
           defaultValue: "",
@@ -27,7 +27,7 @@ const NetworkFormIpv4: FC<Props> = ({ formik }) => {
         ...(formik.values.type !== "ovn" && hasDhcp
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv4_dhcp_expiry",
                 label: "IPv4 DHCP expiry",
                 help: "When to expire DHCP leases",
@@ -36,7 +36,7 @@ const NetworkFormIpv4: FC<Props> = ({ formik }) => {
               }),
 
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv4_dhcp_ranges",
                 label: "IPv4 DHCP ranges",
                 help: "Comma-separated list of IP ranges to use for DHCP (FIRST-LAST format)",
@@ -49,7 +49,7 @@ const NetworkFormIpv4: FC<Props> = ({ formik }) => {
         ...(formik.values.type === "ovn"
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv4_l3only",
                 label: "IPv4 L3 only",
                 defaultValue: "",
@@ -61,7 +61,7 @@ const NetworkFormIpv4: FC<Props> = ({ formik }) => {
         ...(formik.values.type !== "ovn"
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv4_ovn_ranges",
                 label: "IPv4 OVN ranges",
                 help: "Comma-separated list of IPv4 ranges to use for child OVN network routers (FIRST-LAST format)",

diff --git a/src/pages/networks/forms/NetworkFormIpv6.tsx b/src/pages/networks/forms/NetworkFormIpv6.tsx
@@ -17,7 +17,7 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
     <ConfigurationTable
       rows={[
         getNetworkConfigurationRow({
-          formik: formik,
+          formik,
           name: "ipv6_dhcp",
           label: "IPv6 DHCP",
           defaultValue: "",
@@ -27,7 +27,7 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
         ...(hasDhcp && formik.values.type !== "ovn"
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv6_dhcp_expiry",
                 label: "IPv6 DHCP expiry",
                 help: "When to expire DHCP leases",
@@ -36,7 +36,7 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
               }),
 
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv6_dhcp_ranges",
                 label: "IPv6 DHCP ranges",
                 help: "Comma-separated list of IPv6 ranges to use for DHCP (FIRST-LAST format)",
@@ -49,7 +49,7 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
         ...(hasDhcp
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv6_dhcp_stateful",
                 label: "IPv6 DHCP stateful",
                 defaultValue: "",
@@ -61,7 +61,7 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
         ...(formik.values.type === "ovn"
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv6_l3only",
                 label: "IPv6 L3 only",
                 defaultValue: "",
@@ -73,7 +73,7 @@ const NetworkFormIpv6: FC<Props> = ({ formik }) => {
         ...(formik.values.type !== "ovn"
           ? [
               getNetworkConfigurationRow({
-                formik: formik,
+                formik,
                 name: "ipv6_ovn_ranges",
                 label: "IPv6 OVN ranges",
                 help: "Comma-separated list of IPv6 ranges to use for child OVN network routers (FIRST-LAST format)",

diff --git a/src/pages/networks/forms/NetworkFormMain.tsx b/src/pages/networks/forms/NetworkFormMain.tsx
@@ -63,7 +63,7 @@ const NetworkFormMain: FC<Props> = ({ formik, project }) => {
       <ConfigurationTable
         rows={[
           getNetworkConfigurationRow({
-            formik: formik,
+            formik,
             name: "ipv4_address",
             label: "IPv4 address",
             defaultValue: "auto",
@@ -93,7 +93,7 @@ const NetworkFormMain: FC<Props> = ({ formik, project }) => {
           ...(formik.values.ipv4_address !== "none"
             ? [
                 getNetworkConfigurationRow({
-                  formik: formik,
+                  formik,
                   name: "ipv4_nat",
                   label: "IPv4 NAT",
                   defaultValue: "",
@@ -103,7 +103,7 @@ const NetworkFormMain: FC<Props> = ({ formik, project }) => {
             : []),
 
           getNetworkConfigurationRow({
-            formik: formik,
+            formik,
             name: "ipv6_address",
             label: "IPv6 address",
             defaultValue: "auto",
@@ -135,7 +135,7 @@ const NetworkFormMain: FC<Props> = ({ formik, project }) => {
           ...(formik.values.ipv6_address !== "none"
             ? [
                 getNetworkConfigurationRow({
-                  formik: formik,
+                  formik,
                   name: "ipv6_nat",
                   label: "IPv6 NAT",
                   defaultValue: "",

diff --git a/src/pages/projects/forms/ClusterRestrictionForm.tsx b/src/pages/projects/forms/ClusterRestrictionForm.tsx
@@ -31,15 +31,15 @@ const ClusterRestrictionForm: FC<Props> = ({ formik }) => {
     <InstanceConfigurationTable
       rows={[
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           name: "restricted_cluster_groups",
           label: "Cluster groups targeting",
           defaultValue: "",
           children: <Input placeholder="Enter value" type="text" />,
         }),
 
         getInstanceConfigurationRow({
-          formik: formik,
+          formik,
           name: "restricted_cluster_target",
           label: "Direct cluster targeting",
           defaultValue: "",