Parcourir la source

Merge pull request #432 from wunter8/428-server-url-trailing-slash

strip trailing slash in "use another server" URL
Philipp C. Heckel il y a 3 ans
Parent
commit
d48619a940
1 fichiers modifiés avec 8 ajouts et 1 suppressions
  1. 8 1
      web/src/components/SubscribeDialog.js

+ 8 - 1
web/src/components/SubscribeDialog.js

@@ -90,6 +90,13 @@ const SubscribePage = (props) => {
             return validTopic(topic) && !isExistingTopicUrl;
             return validTopic(topic) && !isExistingTopicUrl;
         }
         }
     })();
     })();
+    const updateBaseUrl = (ev, newVal) => {
+        if (validUrl(newVal)) {
+          props.setBaseUrl(newVal.replace(/\/$/, '')); // strip traililng / after https?://
+        } else {
+          props.setBaseUrl(newVal);
+        }
+    };
     return (
     return (
         <>
         <>
             <DialogTitle>{t("subscribe_dialog_subscribe_title")}</DialogTitle>
             <DialogTitle>{t("subscribe_dialog_subscribe_title")}</DialogTitle>
@@ -128,7 +135,7 @@ const SubscribePage = (props) => {
                     options={existingBaseUrls}
                     options={existingBaseUrls}
                     sx={{ maxWidth: 400 }}
                     sx={{ maxWidth: 400 }}
                     inputValue={props.baseUrl}
                     inputValue={props.baseUrl}
-                    onInputChange={(ev, newVal) => props.setBaseUrl(newVal)}
+                    onInputChange={updateBaseUrl}
                     renderInput={ (params) =>
                     renderInput={ (params) =>
                         <TextField
                         <TextField
                             {...params}
                             {...params}