diff --git a/app/features/calendar/calendar-constants.ts b/app/features/calendar/calendar-constants.ts index 1b2c84822..2fb09c967 100644 --- a/app/features/calendar/calendar-constants.ts +++ b/app/features/calendar/calendar-constants.ts @@ -28,12 +28,6 @@ export const tags = { QUALIFIER: { color: "#FFC0CB", }, - SZ: { - color: "#F44336", - }, - TW: { - color: "#D50000", - }, ONES: { color: "#FAEC25", }, @@ -97,12 +91,7 @@ export type RegClosesAtOption = (typeof REG_CLOSES_AT_OPTIONS)[number]; export const DAYS_SHOWN_AT_A_TIME = 4; /** Tags not shown on the tournament cards */ -export const EXCLUDED_TAGS: Array = [ - "CARDS", - "SR", - "SZ", - "TW", -]; +export const EXCLUDED_TAGS: Array = ["CARDS", "SR"]; export const CALENDAR_EVENT_RESULT = { MAX_PARTICIPANTS_COUNT: 1000, diff --git a/app/features/calendar/calendar-schemas.ts b/app/features/calendar/calendar-schemas.ts index 3db80b10f..931c3956b 100644 --- a/app/features/calendar/calendar-schemas.ts +++ b/app/features/calendar/calendar-schemas.ts @@ -63,8 +63,6 @@ const TAGS_TO_OMIT: CalendarEventTag[] = [ "SR", "S1", "S2", - "SZ", - "TW", "ONES", "DUOS", "TRIOS", diff --git a/app/features/calendar/routes/calendar.new.tsx b/app/features/calendar/routes/calendar.new.tsx index 4bcd7ebd2..6c3a00768 100644 --- a/app/features/calendar/routes/calendar.new.tsx +++ b/app/features/calendar/routes/calendar.new.tsx @@ -598,7 +598,7 @@ function TagsAdder() { const tagsForSelect = CALENDAR_EVENT.TAGS.filter( (tag) => !tags.includes(tag), - ).filter((tag) => tag !== "SZ" && tag !== "TW"); // TODO: these are now added automatically, remove in migration? + ); return (
diff --git a/app/features/tournament-bracket/core/tests/mocks-zones-weekly.ts b/app/features/tournament-bracket/core/tests/mocks-zones-weekly.ts index a9718d5e4..5da540050 100644 --- a/app/features/tournament-bracket/core/tests/mocks-zones-weekly.ts +++ b/app/features/tournament-bracket/core/tests/mocks-zones-weekly.ts @@ -291,7 +291,7 @@ export const ZONES_WEEKLY_38 = (): TournamentData => ({ tier: null, tentativeTier: null, discordUrl: "https://discord.gg/A6NW3VCHRh", - tags: "REGION,SZ", + tags: "REGION", settings: { bracketProgression: [ { diff --git a/db-test.sqlite3 b/db-test.sqlite3 index 75ffffbc7..7b5c26491 100644 Binary files a/db-test.sqlite3 and b/db-test.sqlite3 differ diff --git a/e2e/seeds/db-seed-AB_RR.sqlite3 b/e2e/seeds/db-seed-AB_RR.sqlite3 index ef8a147d7..d0b569c57 100644 Binary files a/e2e/seeds/db-seed-AB_RR.sqlite3 and b/e2e/seeds/db-seed-AB_RR.sqlite3 differ diff --git a/e2e/seeds/db-seed-DEFAULT.sqlite3 b/e2e/seeds/db-seed-DEFAULT.sqlite3 index 84e45b86b..6ea084d1e 100644 Binary files a/e2e/seeds/db-seed-DEFAULT.sqlite3 and b/e2e/seeds/db-seed-DEFAULT.sqlite3 differ diff --git a/e2e/seeds/db-seed-FINALIZED_BRACKET.sqlite3 b/e2e/seeds/db-seed-FINALIZED_BRACKET.sqlite3 index cbf1fbcc4..07795956e 100644 Binary files a/e2e/seeds/db-seed-FINALIZED_BRACKET.sqlite3 and b/e2e/seeds/db-seed-FINALIZED_BRACKET.sqlite3 differ diff --git a/e2e/seeds/db-seed-NO_SCRIMS.sqlite3 b/e2e/seeds/db-seed-NO_SCRIMS.sqlite3 index e200e2f47..7a7fb7490 100644 Binary files a/e2e/seeds/db-seed-NO_SCRIMS.sqlite3 and b/e2e/seeds/db-seed-NO_SCRIMS.sqlite3 differ diff --git a/e2e/seeds/db-seed-NO_SQ_GROUPS.sqlite3 b/e2e/seeds/db-seed-NO_SQ_GROUPS.sqlite3 index 2aa80b740..32078b287 100644 Binary files a/e2e/seeds/db-seed-NO_SQ_GROUPS.sqlite3 and b/e2e/seeds/db-seed-NO_SQ_GROUPS.sqlite3 differ diff --git a/e2e/seeds/db-seed-NO_TOURNAMENT_TEAMS.sqlite3 b/e2e/seeds/db-seed-NO_TOURNAMENT_TEAMS.sqlite3 index 52c27d975..ed290e1ec 100644 Binary files a/e2e/seeds/db-seed-NO_TOURNAMENT_TEAMS.sqlite3 and b/e2e/seeds/db-seed-NO_TOURNAMENT_TEAMS.sqlite3 differ diff --git a/e2e/seeds/db-seed-NZAP_IN_TEAM.sqlite3 b/e2e/seeds/db-seed-NZAP_IN_TEAM.sqlite3 index 211fbe48b..87f56620a 100644 Binary files a/e2e/seeds/db-seed-NZAP_IN_TEAM.sqlite3 and b/e2e/seeds/db-seed-NZAP_IN_TEAM.sqlite3 differ diff --git a/e2e/seeds/db-seed-REG_OPEN.sqlite3 b/e2e/seeds/db-seed-REG_OPEN.sqlite3 index 92388cb5f..f75c5156a 100644 Binary files a/e2e/seeds/db-seed-REG_OPEN.sqlite3 and b/e2e/seeds/db-seed-REG_OPEN.sqlite3 differ diff --git a/e2e/seeds/db-seed-SMALL_SOS.sqlite3 b/e2e/seeds/db-seed-SMALL_SOS.sqlite3 index fdaf1c892..aa90e3a40 100644 Binary files a/e2e/seeds/db-seed-SMALL_SOS.sqlite3 and b/e2e/seeds/db-seed-SMALL_SOS.sqlite3 differ diff --git a/e2e/seeds/db-seed-TEAM_MAP_PREFS.sqlite3 b/e2e/seeds/db-seed-TEAM_MAP_PREFS.sqlite3 index 79ca1fe6b..c48a82ca3 100644 Binary files a/e2e/seeds/db-seed-TEAM_MAP_PREFS.sqlite3 and b/e2e/seeds/db-seed-TEAM_MAP_PREFS.sqlite3 differ diff --git a/locales/da/common.json b/locales/da/common.json index ae76e065d..db96c2c53 100644 --- a/locales/da/common.json +++ b/locales/da/common.json @@ -203,8 +203,6 @@ "tag.name.COUNT": "Tilmeldingsloft", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Kvalifikationsturnering", - "tag.name.SZ": "Kun DD (SZ)", - "tag.name.TW": "RK (TW) Inkluderet", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/da/forms.json b/locales/da/forms.json index f765ac44f..d5a94874d 100644 --- a/locales/da/forms.json +++ b/locales/da/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/de/common.json b/locales/de/common.json index df000ce93..79827b01e 100644 --- a/locales/de/common.json +++ b/locales/de/common.json @@ -203,8 +203,6 @@ "tag.name.COUNT": "Zulassungsgrenze", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Qualifikation", - "tag.name.SZ": "Nur Herrschaft", - "tag.name.TW": "", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/de/forms.json b/locales/de/forms.json index 3e8616cab..643c38e52 100644 --- a/locales/de/forms.json +++ b/locales/de/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/en/common.json b/locales/en/common.json index 7cecf893b..1adfa3d7c 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -203,8 +203,6 @@ "tag.name.COUNT": "Entry limit", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Qualifier", - "tag.name.SZ": "SZ Only", - "tag.name.TW": "Includes TW", "tag.name.ONES": "1v1", "tag.name.DUOS": "2v2", "tag.name.TRIOS": "3v3", diff --git a/locales/en/forms.json b/locales/en/forms.json index ff38a26a9..d08e0979a 100644 --- a/locales/en/forms.json +++ b/locales/en/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "LAN", "options.tag.QUALIFIER": "Qualifier", "options.tag.COLLEGIATE": "Collegiate", - "options.tag.SZ": "SZ Only", - "options.tag.TW": "Includes TW", "options.tag.ONES": "1v1", "options.tag.DUOS": "2v2", "options.tag.TRIOS": "3v3", diff --git a/locales/es-ES/common.json b/locales/es-ES/common.json index 89999e731..a84b0ea42 100644 --- a/locales/es-ES/common.json +++ b/locales/es-ES/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Límite de inscripciones", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Clasificatorio", - "tag.name.SZ": "Solo Pintazonas", - "tag.name.TW": "Incluye Territorial", "tag.name.ONES": "1v1", "tag.name.DUOS": "2v2", "tag.name.TRIOS": "3v3", diff --git a/locales/es-ES/forms.json b/locales/es-ES/forms.json index 337ed8398..9358c00dd 100644 --- a/locales/es-ES/forms.json +++ b/locales/es-ES/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "LAN", "options.tag.QUALIFIER": "Clasificatorio", "options.tag.COLLEGIATE": "Universitario", - "options.tag.SZ": "Solo Pintazonas", - "options.tag.TW": "Incluye Territorial", "options.tag.ONES": "1v1", "options.tag.DUOS": "2v2", "options.tag.TRIOS": "3v3", diff --git a/locales/es-US/common.json b/locales/es-US/common.json index ae90bbddb..859cfafac 100644 --- a/locales/es-US/common.json +++ b/locales/es-US/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Limite de entrada", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Clasificatorio", - "tag.name.SZ": "Solo Pintazonas", - "tag.name.TW": "Incluye Territorial", "tag.name.ONES": "1v1", "tag.name.DUOS": "2v2", "tag.name.TRIOS": "3v3", diff --git a/locales/es-US/forms.json b/locales/es-US/forms.json index 1869fddc1..dcb5df5af 100644 --- a/locales/es-US/forms.json +++ b/locales/es-US/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/fr-CA/common.json b/locales/fr-CA/common.json index 5f5610359..b03ac5124 100644 --- a/locales/fr-CA/common.json +++ b/locales/fr-CA/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Limite d'inscriptions", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Qualifications", - "tag.name.SZ": "DdZ uniquement", - "tag.name.TW": "GdT comprises", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/fr-CA/forms.json b/locales/fr-CA/forms.json index bce1360f3..12319dc2b 100644 --- a/locales/fr-CA/forms.json +++ b/locales/fr-CA/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/fr-EU/common.json b/locales/fr-EU/common.json index ff4ceef2c..750c4ae52 100644 --- a/locales/fr-EU/common.json +++ b/locales/fr-EU/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Limite d'inscriptions", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Qualifications", - "tag.name.SZ": "DdZ uniquement", - "tag.name.TW": "GdT comprises", "tag.name.ONES": "1v1", "tag.name.DUOS": "2v2", "tag.name.TRIOS": "3v3", diff --git a/locales/fr-EU/forms.json b/locales/fr-EU/forms.json index 21f4905ef..5a1195ca0 100644 --- a/locales/fr-EU/forms.json +++ b/locales/fr-EU/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/he/common.json b/locales/he/common.json index 15a06c15e..72080b407 100644 --- a/locales/he/common.json +++ b/locales/he/common.json @@ -203,8 +203,6 @@ "tag.name.COUNT": "מגבלת כניסה", "tag.name.LAN": "רשת מקומית", "tag.name.QUALIFIER": "מוקדמות", - "tag.name.SZ": "רק SZ", - "tag.name.TW": "מכיל TW", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/he/forms.json b/locales/he/forms.json index df8814026..214dee354 100644 --- a/locales/he/forms.json +++ b/locales/he/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/it/common.json b/locales/it/common.json index b03de3778..14b8156ba 100644 --- a/locales/it/common.json +++ b/locales/it/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Limite d'ingresso", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Qualifica", - "tag.name.SZ": "Solo ZS", - "tag.name.TW": "Include MM", "tag.name.ONES": "1v1", "tag.name.DUOS": "2v2", "tag.name.TRIOS": "3v3", diff --git a/locales/it/forms.json b/locales/it/forms.json index 3ebe56146..f6548787c 100644 --- a/locales/it/forms.json +++ b/locales/it/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/ja/common.json b/locales/ja/common.json index 53eaf2116..6e9120b82 100644 --- a/locales/ja/common.json +++ b/locales/ja/common.json @@ -201,8 +201,6 @@ "tag.name.COUNT": "参加数限定", "tag.name.LAN": "オフライン", "tag.name.QUALIFIER": "参加資格", - "tag.name.SZ": "エリアのみ", - "tag.name.TW": "ナワバリあり", "tag.name.ONES": "タイマン (一対一)", "tag.name.DUOS": "二対二", "tag.name.TRIOS": "三対三", diff --git a/locales/ja/forms.json b/locales/ja/forms.json index 1127db5fd..db449d1a8 100644 --- a/locales/ja/forms.json +++ b/locales/ja/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/ko/common.json b/locales/ko/common.json index 6deb1b74d..45de83e8e 100644 --- a/locales/ko/common.json +++ b/locales/ko/common.json @@ -201,8 +201,6 @@ "tag.name.COUNT": "참가 제한", "tag.name.LAN": "현장 이벤트", "tag.name.QUALIFIER": "예선전", - "tag.name.SZ": "에어리어 한정", - "tag.name.TW": "영역 배틀 포함", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/ko/forms.json b/locales/ko/forms.json index fe64b48dc..991ec10ae 100644 --- a/locales/ko/forms.json +++ b/locales/ko/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/nl/common.json b/locales/nl/common.json index 17367f1db..2bcc5484c 100644 --- a/locales/nl/common.json +++ b/locales/nl/common.json @@ -203,8 +203,6 @@ "tag.name.COUNT": "Beperkte deelname", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Qualificatie", - "tag.name.SZ": "", - "tag.name.TW": "", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/nl/forms.json b/locales/nl/forms.json index a3d5f9b6c..0ab281a55 100644 --- a/locales/nl/forms.json +++ b/locales/nl/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/pl/common.json b/locales/pl/common.json index e4252c03c..aae0f9980 100644 --- a/locales/pl/common.json +++ b/locales/pl/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Limit zapisów", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Qualifier", - "tag.name.SZ": "", - "tag.name.TW": "", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/pl/forms.json b/locales/pl/forms.json index 9149f2586..a8f73eec2 100644 --- a/locales/pl/forms.json +++ b/locales/pl/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/pt-BR/common.json b/locales/pt-BR/common.json index 47549b85b..da6a451e7 100644 --- a/locales/pt-BR/common.json +++ b/locales/pt-BR/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Vagas limitadas", "tag.name.LAN": "LAN (Local)", "tag.name.QUALIFIER": "Qualificatória", - "tag.name.SZ": "Apenas Zones", - "tag.name.TW": "Inclui Turf", "tag.name.ONES": "", "tag.name.DUOS": "", "tag.name.TRIOS": "", diff --git a/locales/pt-BR/forms.json b/locales/pt-BR/forms.json index ad2f85eb5..f1484ad19 100644 --- a/locales/pt-BR/forms.json +++ b/locales/pt-BR/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/ru/common.json b/locales/ru/common.json index 77246069f..bcc54a41b 100644 --- a/locales/ru/common.json +++ b/locales/ru/common.json @@ -204,8 +204,6 @@ "tag.name.COUNT": "Лимит участников", "tag.name.LAN": "LAN", "tag.name.QUALIFIER": "Квалификационный", - "tag.name.SZ": "Только Бой за зоны", - "tag.name.TW": "Включает Бой за район", "tag.name.ONES": "1 на 1", "tag.name.DUOS": "2 на 2", "tag.name.TRIOS": "3 на 3", diff --git a/locales/ru/forms.json b/locales/ru/forms.json index 952426f0f..8ca1382db 100644 --- a/locales/ru/forms.json +++ b/locales/ru/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/locales/zh/common.json b/locales/zh/common.json index 8af1e24ee..a5415fb35 100644 --- a/locales/zh/common.json +++ b/locales/zh/common.json @@ -201,8 +201,6 @@ "tag.name.COUNT": "队伍数量限制", "tag.name.LAN": "线下", "tag.name.QUALIFIER": "资格赛", - "tag.name.SZ": "仅限区域模式", - "tag.name.TW": "包含占地对战", "tag.name.ONES": "1v1", "tag.name.DUOS": "2v2", "tag.name.TRIOS": "3v3", diff --git a/locales/zh/forms.json b/locales/zh/forms.json index 02619d2ea..e467ab873 100644 --- a/locales/zh/forms.json +++ b/locales/zh/forms.json @@ -154,8 +154,6 @@ "options.tag.LAN": "", "options.tag.QUALIFIER": "", "options.tag.COLLEGIATE": "", - "options.tag.SZ": "", - "options.tag.TW": "", "options.tag.ONES": "", "options.tag.DUOS": "", "options.tag.TRIOS": "", diff --git a/migrations/134-calendar-event-strip-mode-tags.js b/migrations/134-calendar-event-strip-mode-tags.js new file mode 100644 index 000000000..3caa20517 --- /dev/null +++ b/migrations/134-calendar-event-strip-mode-tags.js @@ -0,0 +1,25 @@ +export function up(db) { + db.transaction(() => { + const rows = db + .prepare( + /* sql */ `select "id", "tags" from "CalendarEvent" where "tags" is not null`, + ) + .all(); + + const stmt = db.prepare( + /* sql */ `update "CalendarEvent" set "tags" = ? where "id" = ?`, + ); + + for (const row of rows) { + const cleaned = row.tags + .split(",") + .filter((tag) => tag !== "SZ" && tag !== "TW") + .join(","); + const newTags = cleaned === "" ? null : cleaned; + + if (newTags !== row.tags) { + stmt.run(newTags, row.id); + } + } + })(); +}