Fix the "Update" button in the server dialog

Author: Paul Korzhyk

client/package.json

@@ -208,7 +208,6 @@
     "redux-persist": "^5.4.0",
     "redux-thunk": "^2.3.0",
     "screenfull": "^3.3.2",
-    "url-search-params": "^0.10.0",
     "uuid": "^3.1.0"
   }
 }

client/src/actions/url.js

@@ -32,7 +32,7 @@ export const updateUrl = url => async (dispatch, getState) => {
         url,
     });
 
-    checkHealth(url)(dispatch, getState);
+    dispatch(checkHealth(url));
 };
 
 export const checkHealth = (url, onFailure) => async (dispatch, getState) => {
@@ -44,6 +44,7 @@ export const checkHealth = (url, onFailure) => async (dispatch, getState) => {
         dispatch(updateConnectedState(true));
     } catch (err) {
         console.error(err);
+        console.error("Unable to connect to the server at " + url);
         dispatch(updateConnectedState(false));
         onFailure && onFailure();
     } finally {

client/src/components/SidebarUpdateUrl.js

@@ -87,7 +87,10 @@ export default function SidebarUpdateUrl({
                     size={5}
                     value={urlInput}
                     onChange={e => setUrlInput(e.target.value)}
-                    onDoubleClick={e => handleSubmit(e.target.value)}
+                    onDoubleClick={e => {
+                        setUrlInput(e.target.value);
+                        handleSubmit(e.target.value);
+                    }}
                     onKeyPress={handleKeyPress}
                     style={{
                         width: "100%",
@@ -102,7 +105,7 @@ export default function SidebarUpdateUrl({
             </div>
             <Button
                 variant="primary"
-                onClick={handleSubmit}
+                onClick={e => handleSubmit()}
                 disabled={!urlInput.trim()}
             >
                 Update

client/src/lib/helpers.js

@@ -8,7 +8,6 @@
 
 import * as dgraph from "dgraph-js-http";
 import memoizeOne from "memoize-one";
-import URLSearchParams from "url-search-params";
 
 export function createCookie(name, val, days, options = {}) {
     const cookie = [`${name}=${val}`, "path=/"];
@@ -70,7 +69,11 @@ export function serverLatency(latencyObj) {
 
 const createDgraphClient = memoizeOne(async url => {
     const stub = new dgraph.DgraphClientStub(url);
-    await stub.detectApiVersion();
+    try {
+        await stub.detectApiVersion();
+    } catch (err) {
+        // Ignore error, it's probably a bad URL
+    }
 
     return {
         client: new dgraph.DgraphClient(stub),
@@ -118,8 +121,7 @@ export async function executeAlter(url, schema) {
 }
 
 export function getAddrParam() {
-    const params = new URLSearchParams(window.location.search);
-    const addrParam = params.get("addr");
+    const addrParam = new URLSearchParams(window.location.search).get("addr");
     return addrParam ? ensureSlash(addrParam) : "";
 }