Merge pull request #463 from shubhamkumar9199/fix/conditional-hook-calls

[fix] Fix conditional hook calls in DNS and TLS policy create pages

Author: R-Lawton

src/components/KuadrantDNSPolicyCreatePage.tsx

@@ -164,19 +164,16 @@ const KuadrantDNSPolicyCreatePage: React.FC = () => {
   }
 
   //Checking if the policy already exists and is to be edited or if its new and is being created
-  let dnsResource = null;
-  if (nameEdit) {
-    dnsResource = {
-      groupVersionKind: dnsPolicyGVK,
-      isList: false,
-      name: nameEdit,
-      namespace: namespaceEdit,
-    };
-  }
+  const dnsResource = nameEdit
+    ? {
+        groupVersionKind: dnsPolicyGVK,
+        isList: false,
+        name: nameEdit,
+        namespace: namespaceEdit,
+      }
+    : null;
 
-  const [dnsData, dnsLoaded, dnsError] = dnsResource
-    ? useK8sWatchResource(dnsResource)
-    : [null, false, null]; //Syntax allows for dnsResource to be null in the case of a create
+  const [dnsData, dnsLoaded, dnsError] = useK8sWatchResource(dnsResource);
 
   React.useEffect(() => {
     if (dnsLoaded && !dnsError) {

src/components/KuadrantTLSCreatePage.tsx

@@ -118,19 +118,16 @@ const KuadrantTLSCreatePage: React.FC = () => {
   }
 
   //Checking if the policy already exists and is to be edited or if its new and is being created
-  let tlsResource = null;
-  if (nameEdit) {
-    tlsResource = {
-      groupVersionKind: tlsPolicyGVK,
-      isList: false,
-      name: nameEdit,
-      namespace: namespaceEdit,
-    };
-  }
+  const tlsResource = nameEdit
+    ? {
+        groupVersionKind: tlsPolicyGVK,
+        isList: false,
+        name: nameEdit,
+        namespace: namespaceEdit,
+      }
+    : null;
 
-  const [tlsData, tlsLoaded, tlsError] = tlsResource
-    ? useK8sWatchResource(tlsResource)
-    : [null, false, null]; //Syntax allows for tlsResource to be null in the case of a create
+  const [tlsData, tlsLoaded, tlsError] = useK8sWatchResource(tlsResource);
 
   // When a resource is being updated setting the form from the yaml it gets from useK8sWatchResource
   React.useEffect(() => {