Fix and improve custom team member role form controls

2026-09-12 22:26:12 -05:00 · 2026-07-09 18:14:20 +03:00
parent 04fa7aae79
commit d84b5834ac
18 changed files with 3 additions and 50 deletions
--- a/app/features/team/routes/t.$customUrl.roster.tsx
+++ b/app/features/team/routes/t.$customUrl.roster.tsx
@@ -123,7 +123,7 @@ function MemberActions() {
 						userId: member.id,
 						role: member.customRole ? CUSTOM_ROLE_VALUE : (member.role ?? null),
 						customRole: member.customRole ?? null,
-						roleType: member.roleType ?? null,
+						roleType: member.roleType ?? "PLAYER",
 						isManager: Boolean(member.isManager),
 					})),
 				}}
--- a/app/features/team/team-schemas.ts
+++ b/app/features/team/team-schemas.ts
@@ -4,6 +4,7 @@ import {
 	fieldset,
 	idConstant,
 	image,
+	select,
 	selectOptional,
 	stringConstant,
 	textAreaOptional,
@@ -90,7 +91,7 @@ export const updateRosterSchema = z
 						label: "labels.teamMemberCustomRole",
 						maxLength: CUSTOM_ROLE_MAX_LENGTH,
 					}),
-					roleType: selectOptional({
+					roleType: select({
 						label: "labels.teamMemberRoleType",
 						items: [
 							{ value: "PLAYER", label: "options.teamMemberRoleType.PLAYER" },
@@ -113,21 +114,5 @@ export const updateRosterSchema = z
 					message: "forms:errors.customRoleRequired",
 				});
 			}
-
-			if (isCustom && !member.roleType) {
-				ctx.addIssue({
-					code: z.ZodIssueCode.custom,
-					path: ["members", index, "roleType"],
-					message: "forms:errors.customRoleTypeRequired",
-				});
-			}
-
-			if (!isCustom && member.customRole) {
-				ctx.addIssue({
-					code: z.ZodIssueCode.custom,
-					path: ["members", index, "customRole"],
-					message: "forms:errors.customRoleOnlyWhenCustom",
-				});
-			}
 		}
 	});
--- a/locales/da/forms.json
+++ b/locales/da/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Våbenpulje",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/de/forms.json
+++ b/locales/de/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Waffenpool",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/en/forms.json
+++ b/locales/en/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "There is already an organization with this name",
 	"errors.noOnlySpecialCharacters": "Name can't be only special characters",
 	"errors.customRoleRequired": "Enter a name for the custom role",
-	"errors.customRoleTypeRequired": "Select a role type for the custom role",
-	"errors.customRoleOnlyWhenCustom": "Custom role is only allowed when the role is set to Custom",
 	"labels.weaponPool": "Weapon pool",
 	"placeholders.weaponPoolFull": "Pool full - remove a weapon to add more",
 	"labels.voiceChat": "Can voice chat",
--- a/locales/es-ES/forms.json
+++ b/locales/es-ES/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "El nombre no puede ser solo caracteres especiales",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Selección de armas",
 	"placeholders.weaponPoolFull": "Selección llena - elimina un arma para añadir más",
 	"labels.voiceChat": "Puede usar chat de voz",
--- a/locales/es-US/forms.json
+++ b/locales/es-US/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Grupo de armas",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/fr-CA/forms.json
+++ b/locales/fr-CA/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Armes jouées",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/fr-EU/forms.json
+++ b/locales/fr-EU/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Armes jouées",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/he/forms.json
+++ b/locales/he/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "מאגר נשקים",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/it/forms.json
+++ b/locales/it/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Pool armi",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/ja/forms.json
+++ b/locales/ja/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "使用ブキ",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/ko/forms.json
+++ b/locales/ko/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/nl/forms.json
+++ b/locales/nl/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/pl/forms.json
+++ b/locales/pl/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Pula broni",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/pt-BR/forms.json
+++ b/locales/pt-BR/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Seleção de armas",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/ru/forms.json
+++ b/locales/ru/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "",
 	"errors.noOnlySpecialCharacters": "",
 	"errors.customRoleRequired": "",
-	"errors.customRoleTypeRequired": "",
-	"errors.customRoleOnlyWhenCustom": "",
 	"labels.weaponPool": "Используемое оружие",
 	"placeholders.weaponPoolFull": "",
 	"labels.voiceChat": "",
--- a/locales/zh/forms.json
+++ b/locales/zh/forms.json
@@ -65,8 +65,6 @@
 	"errors.duplicateOrgName": "该组织名称已被占用",
 	"errors.noOnlySpecialCharacters": "名称不能仅由特殊字符组成",
 	"errors.customRoleRequired": "请输入自定义职责的名称",
-	"errors.customRoleTypeRequired": "请选择自定义职责的类型",
-	"errors.customRoleOnlyWhenCustom": "仅当职责设为“自定义”时，才允许配置自定义职责",
 	"labels.weaponPool": "武器池",
 	"placeholders.weaponPoolFull": "武器池已满。请移除一个武器以添加新武器",
 	"labels.voiceChat": "可以进行语音聊天吗？",