From b7e414a04250574cefc44e83d66bd135cc2ce4b4 Mon Sep 17 00:00:00 2001
From: orangemug <info@orangemug.co.uk>
Date: Thu, 14 May 2020 12:13:47 +0100
Subject: [PATCH] Fix URL entry to use form submission and improved errors if
 protocol isn't present.

---
 src/components/Button.jsx           |  1 +
 src/components/inputs/UrlInput.jsx  | 29 ++++++++++++++++++++--
 src/components/modals/OpenModal.jsx | 38 ++++++++++++++++-------------
 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/components/Button.jsx b/src/components/Button.jsx
index 4c2105f3..e7289c71 100644
--- a/src/components/Button.jsx
+++ b/src/components/Button.jsx
@@ -15,6 +15,7 @@ class Button extends React.Component {
 
   render() {
     return <button
+      type={this.props.type}
       onClick={this.props.onClick}
       disabled={this.props.disabled}
       aria-label={this.props["aria-label"]}
diff --git a/src/components/inputs/UrlInput.jsx b/src/components/inputs/UrlInput.jsx
index 335d3ff0..29f54682 100644
--- a/src/components/inputs/UrlInput.jsx
+++ b/src/components/inputs/UrlInput.jsx
@@ -1,10 +1,14 @@
-import React from 'react'
+import React, {Fragment} from 'react'
 import PropTypes from 'prop-types'
 import StringInput from './StringInput'
 import SmallError from '../util/SmallError'
 
 
 function validate (url) {
+  if (url === "") {
+    return;
+  }
+
   let error;
   const getProtocol = (url) => {
     try {
@@ -16,7 +20,20 @@ function validate (url) {
     }
   };
   const protocol = getProtocol(url);
-  if (
+  const isSsl = window.location.protocol === "https:";
+
+  if (!protocol) {
+    error = (
+      <SmallError>
+        Must provide protocol {
+          isSsl
+          ? <code>http://</code>
+          : <><code>http://</code> or <code>https://</code></>
+        }
+      </SmallError>
+    );
+  }
+  else if (
     protocol &&
     protocol === "http:" &&
     window.location.protocol === "https:"
@@ -61,12 +78,20 @@ class UrlInput extends React.Component {
     this.props.onInput(url);
   }
 
+  onChange = (url) => {
+    this.setState({
+      error: validate(url)
+    });
+    this.props.onChange(url);
+  }
+
   render () {
     return (
       <div>
         <StringInput
           {...this.props}
           onInput={this.onInput}
+          onChange={this.onChange}
         />
         {this.state.error}
       </div>
diff --git a/src/components/modals/OpenModal.jsx b/src/components/modals/OpenModal.jsx
index 67f289da..a480e30a 100644
--- a/src/components/modals/OpenModal.jsx
+++ b/src/components/modals/OpenModal.jsx
@@ -123,7 +123,8 @@ class OpenModal extends React.Component {
     })
   }
 
-  onOpenUrl = (url) => {
+  onSubmitUrl = (e) => {
+    e.preventDefault();
     this.onStyleSelect(this.state.styleUrl);
   }
 
@@ -209,22 +210,25 @@ class OpenModal extends React.Component {
             <p>
               Load from a URL. Note that the URL must have <a href="https://enable-cors.org" target="_blank" rel="noopener noreferrer">CORS enabled</a>.
             </p>
-            <UrlInput
-              data-wd-key="open-modal.url.input"
-              type="text"
-              className="maputnik-input"
-              default="Enter URL..."
-              value={this.state.styleUrl}
-              onInput={this.onChangeUrl}
-            />
-            <div>
-              <Button
-                data-wd-key="open-modal.url.button"
-                className="maputnik-big-button"
-                onClick={this.onOpenUrl}
-                disabled={this.state.styleUrl.length < 1}
-              >Open URL</Button>
-            </div>
+            <form onSubmit={this.onSubmitUrl}>
+              <UrlInput
+                data-wd-key="open-modal.url.input"
+                type="text"
+                className="maputnik-input"
+                default="Enter URL..."
+                value={this.state.styleUrl}
+                onInput={this.onChangeUrl}
+                onChange={this.onChangeUrl}
+              />
+              <div>
+                <Button
+                  data-wd-key="open-modal.url.button"
+                  type="submit"
+                  className="maputnik-big-button"
+                  disabled={this.state.styleUrl.length < 1}
+                >Open URL</Button>
+              </div>
+            </form>
           </section>
 
           <section className="maputnik-modal-section maputnik-modal-section--shrink">