From 5eb213dcee0986addf3ff6befd94054dba4a6d19 Mon Sep 17 00:00:00 2001
From: aeberhardt <alexandre.eberhardt@savoirfairelinux.com>
Date: Fri, 7 Feb 2025 10:33:17 -0500
Subject: [PATCH] Server name: regex accepts "-"
"my-jams-server.domain.com" is now a valid name
GitLab: #152
Change-Id: I83c9e287fdcc718df9d2578ee3dafbc9dd04a78c
---
.../src/components/ServerParameters/ServerParameters.tsx | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/jams-react-client/src/components/ServerParameters/ServerParameters.tsx b/jams-react-client/src/components/ServerParameters/ServerParameters.tsx
index f0a0846b..0ecbe0ce 100644
--- a/jams-react-client/src/components/ServerParameters/ServerParameters.tsx
+++ b/jams-react-client/src/components/ServerParameters/ServerParameters.tsx
@@ -142,8 +142,10 @@ export default function ServerParameters({
function handleSubmit(values: Settings) {
let jsonData = {};
- const re = new RegExp(/^http[s]?:\/\/\w+(\.\w+)*(:[0-9]+)?\/?(\/[.\w]*)*$/);
- const nohttpre = new RegExp(/^\w+(\.\w+)*(:[0-9]+)?\/?(\/[.\w]*)*$/);
+ const re = new RegExp(
+ /^http[s]?:\/\/[\w-]+(\.[\w-]+)*(:[0-9]+)?\/?(\/[.\w-]*)*$/
+ );
+ const nohttpre = new RegExp(/^[\w-]+(\.[\w-]+)*(:[0-9]+)?\/?(\/[.\w-]*)*$/);
if (values.domain.match(nohttpre))
values.domain = window.location.protocol + "//" + values.domain;
--
GitLab