Skip to content

Record filter greaterThan becomes inclusive as lowerThan #12786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 23, 2025
Merged

Record filter greaterThan becomes inclusive as lowerThan #12786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
688dd46
fix(front): greater than becomes inclusive as lower than
prastoin Jun 23, 2025
16fd872
refactor(front): do not user order based assertions
prastoin Jun 23, 2025
cf68dbd
nipicks(front): isFieldRatingValue
prastoin Jun 23, 2025
bfcf3eb
fix(front): filter default value
prastoin Jun 23, 2025
8d0f5cb
chore(front): default value to null
prastoin Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions ...dules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRatingInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@ 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)};
`;

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 } =
Expand All @@ -50,9 +50,11 @@ export const ObjectFilterDropdownRatingInput = () => {
applyObjectFilterDropdownFilterValue(ratingValueConverted);
};

const currentFilterValueConvertedToRatingValue = convertRatingToRatingValue(
Number(objectFilterDropdownFilterValue),
);
const currentFilterValueConvertedToRatingValue = isDefined(
objectFilterDropdownFilterValue,
)
? convertRatingToRatingValue(Number(objectFilterDropdownFilterValue))
: null;

return (
<StyledRatingInputContainer>
Expand Down
7 changes: 2 additions & 5 deletions ...es/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRatingValue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 5 deletions ...odules/object-record/spreadsheet-import/utils/getSpreadSheetFieldValidationDefinitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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',
},
Expand Down