diff --git a/backend/app/http/endpoints/api/team/delete.go b/backend/app/http/endpoints/api/team/delete.go index 9fc09a51..d2cec883 100644 --- a/backend/app/http/endpoints/api/team/delete.go +++ b/backend/app/http/endpoints/api/team/delete.go @@ -22,7 +22,13 @@ func DeleteTeam(ctx *gin.Context) { return } - teamId, err := strconv.Atoi(ctx.Param("teamid")) + teamIdParam := ctx.Param("teamid") + if teamIdParam == "default" { + ctx.JSON(400, utils.ErrorStr("Default team cannot be deleted")) + return + } + + teamId, err := strconv.Atoi(teamIdParam) if err != nil { ctx.JSON(400, utils.ErrorStr("Failed to delete team. Please try again.")) return diff --git a/frontend/src/pages/manage/teams/_index.tsx b/frontend/src/pages/manage/teams/_index.tsx index 23b10824..101a14c4 100644 --- a/frontend/src/pages/manage/teams/_index.tsx +++ b/frontend/src/pages/manage/teams/_index.tsx @@ -315,6 +315,8 @@ const TeamsPage: FC = () => { }; const deleteTeam = async (id: string) => { + if (id === "default" || id === "0") return; + try { await apiClient.teams.delete(guildId, id, SKIP_ERROR_TOAST); toast.success("Team deleted successfully"); @@ -475,7 +477,7 @@ const TeamsPage: FC = () => { label="Team" /> - {activeTeamId !== "0" && ( + {activeTeamId !== "default" && activeTeamId !== "0" && (