admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Record filter greaterThan becomes inclusive as lowerThan (#12786)

Browse Source 
# Introduction
Greater than filtering wasn't inclusive whereas lower than was,
resulting in sending empty array to filtering resolver

Also refactored the transpilation methods to avoid asserting on the
`RATING_VALUES` order

closes https://github.com/twentyhq/twenty/issues/12779
This commit is contained in:
Paul Rastoin
2025-06-23 17:15:30 +02:00
committed by GitHub
parent facd2fe26f
commit b6787c6fcd
3 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput.tsx
View File

@ -5,6 +5,7 @@ import { RatingInput } from '@/ui/field/input/components/RatingInput';
import { useApplyObjectFilterDropdownFilterValue } from '@/object-record/object-filter-dropdown/hooks/useApplyObjectFilterDropdownFilterValue';
import { useObjectFilterDropdownFilterValue } from '@/object-record/object-filter-dropdown/hooks/useObjectFilterDropdownFilterValue';
import styled from '@emotion/styled';
import { isDefined } from 'twenty-shared/utils';
const StyledRatingInputContainer = styled.div`
padding: ${({ theme }) => theme.spacing(2)};
@ -12,25 +13,24 @@ const StyledRatingInputContainer = styled.div`
const convertFieldRatingValueToNumber = (
rating: Exclude<FieldRatingValue, null>,
): string => {
return rating.split('_')[1];
};
): string => rating.split('_')[1];
export const convertGreaterThanRatingToArrayOfRatingValues = (
greaterThanValue: number,
) => {
return RATING_VALUES.filter((_, index) => index + 1 > greaterThanValue);
};
) =>
RATING_VALUES.filter(
(ratingValue) => +ratingValue.split('_')[1] >= greaterThanValue,
);
export const convertLessThanRatingToArrayOfRatingValues = (
lessThanValue: number,
) => {
return RATING_VALUES.filter((_, index) => index + 1 <= lessThanValue);
};
) =>
RATING_VALUES.filter(
(ratingValue) => +ratingValue.split('_')[1] <= lessThanValue,
);
export const convertRatingToRatingValue = (rating: number) => {
return `RATING_${rating}` as FieldRatingValue;
};
export const convertRatingToRatingValue = (rating: number) =>
`RATING_${rating}` as FieldRatingValue;
export const ObjectFilterDropdownRatingInput = () => {
const { applyObjectFilterDropdownFilterValue } =
@ -50,9 +50,11 @@ export const ObjectFilterDropdownRatingInput = () => {
applyObjectFilterDropdownFilterValue(ratingValueConverted);
};
const currentFilterValueConvertedToRatingValue = convertRatingToRatingValue(
Number(objectFilterDropdownFilterValue),
);
const currentFilterValueConvertedToRatingValue = isDefined(
objectFilterDropdownFilterValue,
)
? convertRatingToRatingValue(Number(objectFilterDropdownFilterValue))
: null;
return (
<StyledRatingInputContainer>

7
packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRatingValue.ts
View File

@ -1,11 +1,8 @@
import { z } from 'zod';
import { RATING_VALUES } from '@/object-record/record-field/meta-types/constants/RatingValues';
import { FieldRatingValue } from '../FieldMetadata';
const ratingSchema = z.string().pipe(z.enum(RATING_VALUES));
export const isFieldRatingValue = (
fieldValue: unknown,
): fieldValue is FieldRatingValue => ratingSchema.safeParse(fieldValue).success;
): fieldValue is FieldRatingValue =>
RATING_VALUES.includes(fieldValue as NonNullable<FieldRatingValue>);

7
packages/twenty-front/src/modules/object-record/spreadsheet-import/utils/getSpreadSheetFieldValidationDefinitions.ts
View File

@ -1,4 +1,5 @@
import { RATING_VALUES } from '@/object-record/record-field/meta-types/constants/RatingValues';
import { isFieldRatingValue } from '@/object-record/record-field/types/guards/isFieldRatingValue';
import { emailSchema } from '@/object-record/record-field/validation-schemas/emailSchema';
import { SpreadsheetImportFieldValidationDefinition } from '@/spreadsheet-import/types';
import { t } from '@lingui/core/macro';
@ -221,11 +222,7 @@ export const getSpreadSheetFieldValidationDefinitions = (
return [
{
rule: 'function',
isValid: (value: string) => {
return RATING_VALUES.includes(
value as (typeof RATING_VALUES)[number],
);
},
isValid: isFieldRatingValue,
errorMessage: `${fieldName} ${t` must be one of ${ratingValues} values`}`,
level: 'error',
},