From 6b1c6bcc32b9b6dac3f361adc1e5c6518efa8525 Mon Sep 17 00:00:00 2001
From: checktheroads <matt@allroads.io>
Date: Tue, 24 Mar 2020 12:32:00 -0700
Subject: [PATCH] fix VRF help; add CORS support to DNS over HTTPS

---
 hyperglass/ui/components/HyperglassForm.js | 8 +++-----
 hyperglass/ui/components/ResolvedTarget.js | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hyperglass/ui/components/HyperglassForm.js b/hyperglass/ui/components/HyperglassForm.js
index 8018d4b..67b1669 100644
--- a/hyperglass/ui/components/HyperglassForm.js
+++ b/hyperglass/ui/components/HyperglassForm.js
@@ -47,7 +47,8 @@ const HyperglassForm = React.forwardRef(
     ({ isSubmitting, setSubmitting, setFormData, ...props }, ref) => {
         const config = useConfig();
         const { handleSubmit, register, setValue, errors } = useForm({
-            validationSchema: formSchema(config)
+            validationSchema: formSchema(config),
+            defaultValues: { query_vrf: "default" }
         });
 
         const [queryLocation, setQueryLocation] = useState([]);
@@ -58,9 +59,6 @@ const HyperglassForm = React.forwardRef(
         const [fqdnTarget, setFqdnTarget] = useState("");
         const [displayTarget, setDisplayTarget] = useState("");
         const onSubmit = values => {
-            if (values.query_vrf === undefined) {
-                values.query_vrf = "default";
-            }
             setFormData(values);
             setSubmitting(true);
         };
@@ -77,7 +75,7 @@ const HyperglassForm = React.forwardRef(
             });
             const intersecting = lodash.intersectionWith(...allVrfs, lodash.isEqual);
             setAvailVrfs(intersecting);
-            !intersecting.includes(queryVrf) && setQueryVrf("");
+            !intersecting.includes(queryVrf) && queryVrf !== "default" && setQueryVrf("default");
         };
 
         const handleChange = e => {
diff --git a/hyperglass/ui/components/ResolvedTarget.js b/hyperglass/ui/components/ResolvedTarget.js
index 82fb16c..42d2b17 100644
--- a/hyperglass/ui/components/ResolvedTarget.js
+++ b/hyperglass/ui/components/ResolvedTarget.js
@@ -20,12 +20,14 @@ const ResolvedTarget = React.forwardRef(({ fqdnTarget, setTarget, queryTarget },
         url: dnsUrl,
         params: { name: fqdnTarget, type: "A" },
         headers: { accept: "application/dns-json" },
+        crossdomain: true,
         timeout: 1000
     };
     const params6 = {
         url: dnsUrl,
         params: { name: fqdnTarget, type: "AAAA" },
         headers: { accept: "application/dns-json" },
+        crossdomain: true,
         timeout: 1000
     };