From d8cc864acb20bc0ec6b07c2331a0f508eda52bc9 Mon Sep 17 00:00:00 2001
From: karnelll <165611407+karnelll@users.noreply.github.com>
Date: Sat, 30 Nov 2024 03:56:42 +0900
Subject: [PATCH 10/11] [feature] Add cleanURL function and clean URL
validation
---
.../forms/links/\bcomponents/LinkField.tsx" | 17 +++++++++++------
.../[id]/load-mappin/forms/links/page.tsx | 12 ++++++++++--
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git "a/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx" "b/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx"
index e244ed7..983ea05 100644
--- "a/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx"
+++ "b/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx"
@@ -55,6 +55,11 @@ export default function LinkField({
const router = useRouter();
const { id } = useParams();
+ const cleanURL = (url: string): string => {
+ const match = url.match(/https?:\/\/[^\s]+/);
+ return match ? match[0].trim() : "";
+ };
+
useEffect(() => {
const validLinks = inputFields
.filter((field) => field.isValid)
@@ -114,15 +119,15 @@ export default function LinkField({
try {
const clipboardText = await navigator.clipboard.readText();
if (clipboardText.trim()) {
+ const cleanedText = cleanURL(clipboardText);
setInputFields((prevFields) =>
prevFields.map((fieldItem) =>
fieldItem.id === fieldId
- ? { ...fieldItem, text: clipboardText, isValid: false }
+ ? { ...fieldItem, text: cleanedText, isValid: false }
: fieldItem
)
);
-
- validateLink(fieldId, clipboardText, label);
+ validateLink(fieldId, cleanedText, label);
}
} catch (error) {
console.error("클립보드에서 텍스트를 읽는 데 실패했습니다:", error);
@@ -130,15 +135,15 @@ export default function LinkField({
};
const handleInputChange = (fieldId: string, inputValue: string) => {
+ const cleanedValue = cleanURL(inputValue); // URL 정리
setInputFields((prevFields) =>
prevFields.map((fieldItem) =>
fieldItem.id === fieldId
- ? { ...fieldItem, text: inputValue, isValid: false, isTyping: true }
+ ? { ...fieldItem, text: cleanedValue, isValid: false, isTyping: true }
: fieldItem
)
);
-
- validateLink(fieldId, inputValue, label);
+ validateLink(fieldId, cleanedValue, label);
};
const handleFocus = (fieldId: string) => {
diff --git a/fe/src/app/event-maps/[id]/load-mappin/forms/links/page.tsx b/fe/src/app/event-maps/[id]/load-mappin/forms/links/page.tsx
index 3c5dc01..cf82d8a 100644
--- a/fe/src/app/event-maps/[id]/load-mappin/forms/links/page.tsx
+++ b/fe/src/app/event-maps/[id]/load-mappin/forms/links/page.tsx
@@ -27,6 +27,11 @@ export default function LinksPage() {
setIsFormComplete(isComplete);
}, [mapLinks, storeLinks, isChecked, isSubmitting]);
+ const cleanURL = (url: string): string => {
+ const match = url.match(/https?:\/\/[^\s]+/);
+ return match ? match[0].trim() : "";
+ };
+
const handleSubmit = async (e?: React.FormEvent) => {
if (e) e.preventDefault();
@@ -40,12 +45,15 @@ export default function LinksPage() {
return;
}
+ const cleanedMapLinks = mapLinks.map(cleanURL).filter(Boolean);
+ const cleanedStoreLinks = storeLinks.map(cleanURL).filter(Boolean);
+
const requestBody = {
uuid: id,
name,
password: pin,
- bookmarkUrls: mapLinks,
- storeUrls: storeLinks,
+ bookmarkUrls: cleanedMapLinks,
+ storeUrls: cleanedStoreLinks,
};
try {
From bfac6a897114ec99584636c755be0c1c811e8877 Mon Sep 17 00:00:00 2001
From: karnelll <165611407+karnelll@users.noreply.github.com>
Date: Sat, 30 Nov 2024 04:01:23 +0900
Subject: [PATCH 11/11] [fix] Update build.yml
---
.../[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx" | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git "a/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx" "b/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx"
index fc9f52d..983ea05 100644
--- "a/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx"
+++ "b/fe/src/app/event-maps/[id]/load-mappin/forms/links/\bcomponents/LinkField.tsx"
@@ -135,15 +135,15 @@ export default function LinkField({
};
const handleInputChange = (fieldId: string, inputValue: string) => {
+ const cleanedValue = cleanURL(inputValue); // URL 정리
setInputFields((prevFields) =>
prevFields.map((fieldItem) =>
fieldItem.id === fieldId
- ? { ...fieldItem, text: inputValue, isValid: false, isTyping: true }
+ ? { ...fieldItem, text: cleanedValue, isValid: false, isTyping: true }
: fieldItem
)
);
validateLink(fieldId, cleanedValue, label);
-
};
const handleFocus = (fieldId: string) => {