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

Fixing phone search functionality (#9466)

Browse Source 
This PR targets twentyhq/core-team-issues#85. 

@FelixMalfait As we discussed I have made those changes . Could you
please test it at your end?

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Murali Singh
2025-01-13 15:24:00 +05:30
committed by GitHub
parent 128abb2b85
commit 002cbd3b78
7 changed files with 32 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts
View File

@ -103,7 +103,6 @@ export type EmailsFilter = {
export type PhonesFilter = {
primaryPhoneNumber?: StringFilter;
primaryPhoneCountryCode?: StringFilter;
};
export type SelectFilter = {

2
packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/NumberFilterTypes.ts
View File

@ -1 +1 @@
export const NUMBER_FILTER_TYPES = ['NUMBER', 'CURRENCY'];
export const NUMBER_FILTER_TYPES = ['NUMBER', 'CURRENCY', 'PHONES'];

2
packages/twenty-front/src/modules/object-record/object-filter-dropdown/constants/TextFilterTypes.ts
View File

@ -2,7 +2,6 @@ export const TEXT_FILTER_TYPES = [
'TEXT',
'EMAIL',
'EMAILS',
'PHONE',
'FULL_NAME',
'LINK',
'LINKS',
@ -10,5 +9,4 @@ export const TEXT_FILTER_TYPES = [
'ACTOR',
'ARRAY',
'RAW_JSON',
'PHONES',
];

66
packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/computeViewRecordGqlOperationFilter.test.ts
View File

@ -588,36 +588,16 @@ describe('should work as expected for the different field types', () => {
},
},
},
{
phones: {
primaryPhoneCountryCode: {
ilike: '%1234567890%',
},
},
},
],
},
{
and: [
{
not: {
phones: {
primaryPhoneNumber: {
ilike: '%1234567890%',
},
},
not: {
phones: {
primaryPhoneNumber: {
ilike: '%1234567890%',
},
},
{
not: {
phones: {
primaryPhoneCountryCode: {
ilike: '%1234567890%',
},
},
},
},
],
},
},
{
and: [
@ -639,24 +619,6 @@ describe('should work as expected for the different field types', () => {
},
],
},
{
or: [
{
phones: {
primaryPhoneCountryCode: {
is: 'NULL',
},
},
},
{
phones: {
primaryPhoneCountryCode: {
ilike: '',
},
},
},
],
},
],
},
{
@ -680,24 +642,6 @@ describe('should work as expected for the different field types', () => {
},
],
},
{
or: [
{
phones: {
primaryPhoneCountryCode: {
is: 'NULL',
},
},
},
{
phones: {
primaryPhoneCountryCode: {
ilike: '',
},
},
},
],
},
],
},
},

36
packages/twenty-front/src/modules/object-record/record-filter/utils/computeViewRecordGqlOperationFilter.ts
View File

@ -10,6 +10,7 @@ import {
EmailsFilter,
FloatFilter,
MultiSelectFilter,
PhonesFilter,
RatingFilter,
RawJsonFilter,
RecordGqlOperationFilter,
@ -831,23 +832,34 @@ const computeFilterRecordGqlOperationFilter = (
);
}
case 'PHONES': {
const phonesFilters = generateILikeFiltersForCompositeFields(
filter.value,
correspondingField.name,
['primaryPhoneNumber', 'primaryPhoneCountryCode'],
);
const filterValue = filter.value.replace(/[^0-9]/g, '');
switch (filter.operand) {
case ViewFilterOperand.Contains:
return {
or: phonesFilters,
or: [
{
[correspondingField.name]: {
primaryPhoneNumber: {
ilike: `%${filterValue}%`,
},
} as PhonesFilter,
},
],
};
case ViewFilterOperand.DoesNotContain:
return {
and: phonesFilters.map((filter) => {
return {
not: filter,
};
}),
return {
and: [
{
not: {
[correspondingField.name]: {
primaryPhoneNumber: {
ilike: `%${filterValue}%`,
},
} as PhonesFilter,
},
},
],
};
case ViewFilterOperand.IsEmpty:
case ViewFilterOperand.IsNotEmpty:

2
packages/twenty-front/src/modules/object-record/record-filter/utils/getEmptyRecordGqlOperationFilter.ts
View File

@ -46,7 +46,7 @@ export const getEmptyRecordGqlOperationFilter = (
const phonesFilter = generateILikeFiltersForCompositeFields(
'',
correspondingField.name,
['primaryPhoneNumber', 'primaryPhoneCountryCode'],
['primaryPhoneNumber'],
true,
);

3
packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
View File

@ -324,8 +324,7 @@ export const isRecordMatchingFilter = ({
const phonesFilter = filterValue as PhonesFilter;
const keys: (keyof PhonesFilter)[] = [
'primaryPhoneNumber',
'primaryPhoneCountryCode',
'primaryPhoneNumber'
];
return keys.some((key) => {