Skip to content

Disband team form validation #1649

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
anttimaki wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Disband team form validation #1649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a931eb
Prevent team disband submission until confirmation input validates
anttimaki Dec 2, 2025
c5db94d
Fix copy-pasted code
anttimaki Dec 2, 2025
1fdc8f2
Remove unused CSS definitions
anttimaki Dec 2, 2025
64f0093
Remove broken team links from the team disband page
anttimaki Dec 2, 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
37 changes: 3 additions & 34 deletions apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,13 @@
align-self: flex-start;
}

/* Leave Team Form */
.leave-team-form__body {
display: flex;
flex-direction: column;
gap: var(--gap-2xl);
align-items: flex-start;
align-self: stretch;
}

.leave-team-form__text {
color: var(--modal-text-color--default);
font-weight: var(--font-weight-regular);
font-size: var(--font-size-body-lg);
font-style: normal;
line-height: var(--line-height-md);
.team-settings__text--bold {
font-weight: var(--font-weight-bold);
}

/* Disband team Form */
.disband-team-form__body {
.disband-team-form__form {
display: flex;
flex-direction: column;
gap: var(--gap-2xl);
align-items: flex-start;
align-self: stretch;
}

.disband-team-form__text {
color: var(--modal-text-color--default);
font-weight: var(--font-weight-regular);
font-size: var(--font-size-Body-lg);
font-style: normal;
line-height: var(--line-height-md);
}

.disband-team-form__text--bold {
color: var(--color-text-primary);

font-weight: var(--font-weight-bold);
line-height: var(--line-height-bold);
}
}
52 changes: 27 additions & 25 deletions apps/cyberstorm-remix/app/settings/teams/team/tabs/Settings/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
Modal,
NewButton,
NewIcon,
NewLink,
NewTextInput,
useToast,
} from "@thunderstore/cyberstorm";
Expand Down Expand Up @@ -179,14 +178,7 @@ function LeaveTeamForm(props: {
<Modal.Body>
<span>
You are about to leave the team{" "}
<NewLink
primitiveType="cyberstormLink"
linkId="Team"
team={teamName}
csVariant="cyber"
>
{teamName}.
</NewLink>
<span className="team-settings__text--bold">{teamName}</span>.
</span>
</Modal.Body>
<Modal.Footer>
Expand Down Expand Up @@ -237,6 +229,8 @@ function DisbandTeamForm(props: {
team_name: "",
});

const formDisabled = formInputs.team_name !== teamName;

type SubmitorOutput = Awaited<ReturnType<typeof teamDisband>>;

async function submitor(data: typeof formInputs): Promise<SubmitorOutput> {
Expand Down Expand Up @@ -301,29 +295,37 @@ function DisbandTeamForm(props: {
<Modal.Body>
<div>
You are about to disband the team{" "}
<NewLink
primitiveType="cyberstormLink"
linkId="Team"
team={teamName}
csVariant="cyber"
>
{teamName}.
</NewLink>
<span className="team-settings__text--bold">{teamName}</span>.
</div>
<div>
As a precaution, to disband your team, please input{" "}
<span className="disband-team-form__text--bold">{teamName}</span> into
the field below.
<span className="team-settings__text--bold">{teamName}</span> into the
field below.
</div>
<NewTextInput
onChange={(e) =>
updateFormFieldState({ field: "team_name", value: e.target.value })
}
/>

<form
onSubmit={(event) => {
event.preventDefault();
if (!formDisabled) {
strongForm.submit();
}
}}
className="disband-team-form__form"
>
<NewTextInput
onChange={(e) =>
updateFormFieldState({
field: "team_name",
value: e.target.value,
})
}
/>
</form>
</Modal.Body>
<Modal.Footer>
<NewButton
csVariant="danger"
disabled={formDisabled}
onClick={() => {
strongForm.submit();
}}
Expand All @@ -338,4 +340,4 @@ function DisbandTeamForm(props: {
);
}

LeaveTeamForm.displayName = "LeaveTeamForm";
DisbandTeamForm.displayName = "DisbandTeamForm";
Loading