The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix: replace unsafe JSON.parse casts with parseJson in filter dropdowns (#18513)
Hamza Faididb5b4d9c6cdf
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsxindex 48d7811b34e..50f111c1373 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCountrySelect.tsx@@ -15,8 +15,9 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { type ChangeEvent, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, parseJson } from 'twenty-shared/utils';import { MenuItem, MenuItemMultiSelectAvatar } from 'twenty-ui/navigation';+import { z } from 'zod';export const EMPTY_FILTER_VALUE = '[]';export const MAX_ITEMS_TO_DISPLAY = 5;@@ -44,7 +45,10 @@ export const ObjectFilterDropdownCountrySelect = () => {const selectedCountryNames = isNonEmptyString(objectFilterDropdownCurrentRecordFilter?.value,)- ? (JSON.parse(objectFilterDropdownCurrentRecordFilter.value) as string[]) // TODO: replace by a safe parse+ ? (z+ .array(z.string())+ .safeParse(parseJson(objectFilterDropdownCurrentRecordFilter.value))+ .data ?? []): [];const filteredSelectableItems = countriesAsSelectableItems.filter(diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsxindex a359fe41b3e..11d0647dc33 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx@@ -14,8 +14,9 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { type ChangeEvent, useState } from 'react';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, parseJson } from 'twenty-shared/utils';import { MenuItem, MenuItemMultiSelectAvatar } from 'twenty-ui/navigation';+import { z } from 'zod';export const EMPTY_FILTER_VALUE = '[]';export const MAX_ITEMS_TO_DISPLAY = 3;@@ -41,7 +42,10 @@ export const ObjectFilterDropdownCurrencySelect = () => {const selectedCurrencies = isNonEmptyString(objectFilterDropdownCurrentRecordFilter?.value,)- ? (JSON.parse(objectFilterDropdownCurrentRecordFilter.value) as string[]) // TODO: replace by a safe parse+ ? (z+ .array(z.string())+ .safeParse(parseJson(objectFilterDropdownCurrentRecordFilter.value))+ .data ?? []): [];const filteredSelectableItems = currenciesAsSelectableItems.filter(diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsxindex 3e4a59e2d00..793f60b1871 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOptionSelect.tsx@@ -22,8 +22,9 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';import { MAX_OPTIONS_TO_DISPLAY } from 'twenty-shared/constants';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, parseJson } from 'twenty-shared/utils';import { MenuItem, MenuItemMultiSelect } from 'twenty-ui/navigation';+import { z } from 'zod';export const EMPTY_FILTER_VALUE = '';@@ -58,9 +59,10 @@ export const ObjectFilterDropdownOptionSelect = ({const selectedOptions = useMemo(() =>isNonEmptyString(objectFilterDropdownCurrentRecordFilter?.value)- ? (JSON.parse(- objectFilterDropdownCurrentRecordFilter.value,- ) as string[]) // TODO: replace by a safe parse+ ? (z+ .array(z.string())+ .safeParse(parseJson(objectFilterDropdownCurrentRecordFilter.value))+ .data ?? []): [],[objectFilterDropdownCurrentRecordFilter?.value],);diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsxindex 11271dbf113..508db9d7b6d 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownSourceSelect.tsx@@ -11,7 +11,8 @@ import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, parseJson } from 'twenty-shared/utils';+import { z } from 'zod';export const EMPTY_FILTER_VALUE = '[]';export const MAX_ITEMS_TO_DISPLAY = 3;@@ -39,7 +40,10 @@ export const ObjectFilterDropdownSourceSelect = ({const selectedSources = isNonEmptyString(objectFilterDropdownCurrentRecordFilter?.value,)- ? (JSON.parse(objectFilterDropdownCurrentRecordFilter.value) as string[]) // TODO: replace by a safe parse+ ? (z+ .array(z.string())+ .safeParse(parseJson(objectFilterDropdownCurrentRecordFilter.value))+ .data ?? []): [];const sourceTypes = getActorSourceMultiSelectOptions(selectedSources);