Fixed pasting JSON-query with yql

2 files changed, 14 insertions, 5 deletions

diff --git a/controller-server/src/main/resources/static/_includes/index.html b/controller-server/src/main/resources/static/_includes/index.html
index 4608898663e..56f433e808b 100644
--- a/controller-server/src/main/resources/static/_includes/index.html
+++ b/controller-server/src/main/resources/static/_includes/index.html
@@ -127,7 +127,7 @@
                     <div class="intro-copy" onclick="copyToClipboard(response);" style="cursor:pointer;">
                       <img src="/querybuilder/img/copy.svg" height="30" width="30" />
                     </div>
-                    <div class="intro-refresh" onclick="changeInformation();" style="cursor:pointer;">
+                    <div class="intro-refresh" onclick="refresh();" style="cursor:pointer;">
                       <img src="/querybuilder/img/reload.svg" height="30" width="30" />
                     </div>
                   </div>
@@ -489,7 +489,11 @@
           keySelected(temp, value)
         }
         if (value || value2==="false"){
-          newInputVal.value= value;
+          if (key === "yql"){
+            editAreaLoader.setValue(window.yqlID, value);
+          } else {
+            newInputVal.value= value;
+          }
         }
         generateJSON();
         return temp;
@@ -499,7 +503,11 @@
         var a = document.getElementById("inf"+no);
         if(validKey(key)){
         a.style = "visibility: visible;";
-        document.getElementById("span"+no).innerHTML = changeInformation(no, key);
+        try {
+          document.getElementById("span"+no).innerHTML = changeInformation(no, key);
+        } catch (err) {
+          document.getElementById("span"+no).innerHTML = "Something went wrong loading search api reference. Please refresh page";
+        }
         }
         else{
         a.style = "visibility: hidden;"
@@ -952,6 +960,7 @@
           }
           return name;
       }
+
       </script>
 
       <!-- Global Site Tag (gtag.js) - Google Analytics -->
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/gui/GUIHandlerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/gui/GUIHandlerTest.java
index 76561f722e9..64f45fb4268 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/gui/GUIHandlerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/gui/GUIHandlerTest.java
@@ -25,12 +25,12 @@ public class GUIHandlerTest {
 
     @After
     public void stopContainer() {
-    /*
+
         try {
             Thread.sleep(120_000);
         } catch (InterruptedException e) {
             e.printStackTrace();
-        }*/
+        }
         container.close();
     }