Skip to content

Create link error message and bug fix #2609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcusljf wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Create link error message and bug fix #2609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f10aef7
Create link error message and bug fix
marcusljf Jul 4, 2025
c92a14c
Merge branch 'main' into partner-create-link
steven-tey Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/web/ui/links/destination-url-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export const DestinationUrlInput = forwardRef<
{...(formContext && {
onChange: (e) => {
const url = e.target.value;

formContext.setValue("url", url);
const parentParams = getParamsFromURL(url);

Expand Down
11 changes: 8 additions & 3 deletions apps/web/ui/links/link-builder/controls/link-builder-destination-url-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { useAvailableDomains } from "../../use-available-domains";
*/
export const LinkBuilderDestinationUrlInput = memo(
forwardRef<HTMLInputElement>((_, ref) => {
const { control, setValue, clearErrors } = useFormContext<LinkFormData>();
const { control, setValue, clearErrors, setError } = useFormContext<LinkFormData>();
0;

const { errors } = useFormState({ control, name: ["url"] });
Expand All @@ -42,8 +42,13 @@ export const LinkBuilderDestinationUrlInput = memo(
value={field.value}
domains={domains}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
clearErrors("url");
field.onChange(e.target.value);
const value = e.target.value;
if (/\s/.test(value)) {
setError("url", { message: "Enter a valid URL" });
} else {
clearErrors("url");
field.onChange(value);
}
}}
required={key !== "_root"}
error={errors.url?.message || undefined}
Expand Down
22 changes: 18 additions & 4 deletions apps/web/ui/partners/add-partner-link-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const AddPartnerLinkModal = ({
const [isSubmitting, setIsSubmitting] = useState(false);
const [errorMessage, setErrorMessage] = useState<string | null>(null);

const { register, handleSubmit, watch } = useForm<FormData>({
const { register, handleSubmit, watch, setError, clearErrors, formState } = useForm<FormData>({
defaultValues: {
url: "",
key: "",
Expand Down Expand Up @@ -91,7 +91,11 @@ const AddPartnerLinkModal = ({
copyToClipboard(data.shortLink);
} catch (error) {
setErrorMessage(
error instanceof Error ? error.message : "Failed to create link.",
error instanceof Error && error.message === "Invalid key."
? "Enter a valid short link"
: error instanceof Error
? error.message
: "Failed to create link."
);
} finally {
setIsSubmitting(false);
Expand Down Expand Up @@ -188,9 +192,14 @@ const AddPartnerLinkModal = ({
<span className="inline-flex items-center rounded-l-md border border-r-0 border-neutral-300 bg-neutral-50 px-3 text-neutral-500 sm:text-sm">
{destinationDomain}
</span>

<input
{...register("url", { required: false })}
{...register("url", {
required: false,
validate: value =>
value && /\s/.test(value)
? "Enter a valid URL"
: true
})}
type="text"
id="url"
placeholder="(optional)"
Expand All @@ -209,6 +218,11 @@ const AddPartnerLinkModal = ({
}}
/>
</div>
{formState.errors.url && (
<span className="mt-1 block text-sm text-red-600 dark:text-red-400">
{formState.errors.url.message}
</span>
)}
</div>
</div>
</div>
Expand Down