From 38aa79a3504c9e8844e565292c5375a4e7ce4a9a Mon Sep 17 00:00:00 2001 From: Miodec Date: Wed, 14 Aug 2024 12:58:15 +0200 Subject: [PATCH] fix: default result filters not passing schema also update migration to handle previous schema !nuf --- frontend/src/ts/constants/default-result-filters.ts | 2 +- frontend/src/ts/elements/account/result-filters.ts | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/ts/constants/default-result-filters.ts b/frontend/src/ts/constants/default-result-filters.ts index 71ff08662..a1a2af9af 100644 --- a/frontend/src/ts/constants/default-result-filters.ts +++ b/frontend/src/ts/constants/default-result-filters.ts @@ -1,7 +1,7 @@ import { ResultFilters } from "@monkeytype/contracts/schemas/users"; const object: ResultFilters = { - _id: "default-result-filters-id", + _id: "default", name: "default result filters", pb: { no: true, diff --git a/frontend/src/ts/elements/account/result-filters.ts b/frontend/src/ts/elements/account/result-filters.ts index 4a51bdd36..46aa44f2b 100644 --- a/frontend/src/ts/elements/account/result-filters.ts +++ b/frontend/src/ts/elements/account/result-filters.ts @@ -24,7 +24,13 @@ export function mergeWithDefaultFilters( try { const merged = {} as ResultFilters; for (const groupKey of Misc.typedKeys(defaultResultFilters)) { - if (groupKey === "_id" || groupKey === "name") { + if (groupKey === "_id") { + let id = filters[groupKey] ?? defaultResultFilters[groupKey]; + if (id === "default-result-filters-id" || id === "") { + id = "default"; + } + merged[groupKey] = id; + } else if (groupKey === "name") { merged[groupKey] = filters[groupKey] ?? defaultResultFilters[groupKey]; } else { // @ts-expect-error i cant figure this out