Skip to content

Commit

Permalink
Enable phone field type (twentyhq#5052)
Browse files Browse the repository at this point in the history
### Description

 Enable phone field type

### Refs

twentyhq#2700

### Demo


https://github.com/twentyhq/twenty/assets/140154534/e9810718-9916-4ad4-a080-4d718777de15

Fixes twentyhq#2700

---------

Co-authored-by: gitstart-twenty <gitstart-twenty@users.noreply.github.com>
Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
  • Loading branch information
3 people authored and i-am-chitti committed May 4, 2024
1 parent 62bd61c commit 0983a20
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const formatFieldMetadataItemsAsSortDefinitions = ({
FieldMetadataType.Text,
FieldMetadataType.Boolean,
FieldMetadataType.Select,
FieldMetadataType.Phone,
].includes(field.type)
) {
return acc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const getOperandsForFilterType = (
case 'EMAIL':
case 'FULL_NAME':
case 'ADDRESS':
case 'PHONE':
case 'LINK':
return [ViewFilterOperand.Contains, ViewFilterOperand.DoesNotContain];
case 'CURRENCY':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { isFieldPhone } from '../../types/guards/isFieldPhone';
export const usePhoneField = () => {
const { entityId, fieldDefinition, hotkeyScope } = useContext(FieldContext);

assertFieldMetadata(FieldMetadataType.Text, isFieldPhone, fieldDefinition);
assertFieldMetadata(FieldMetadataType.Phone, isFieldPhone, fieldDefinition);

const fieldName = fieldDefinition.metadata.fieldName;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { FieldDefinition } from '../FieldDefinition';
import { FieldMetadata, FieldPhoneMetadata } from '../FieldMetadata';

export const isFieldPhone = (
field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
): field is FieldDefinition<FieldPhoneMetadata> =>
field.metadata.objectMetadataNameSingular === 'person' &&
field.metadata.fieldName === 'phone' &&
field.type === FieldMetadataType.Text;
field.type === FieldMetadataType.Phone;
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { isFieldLinkValue } from '@/object-record/record-field/types/guards/isFi
import { isFieldMultiSelect } from '@/object-record/record-field/types/guards/isFieldMultiSelect';
import { isFieldMultiSelectValue } from '@/object-record/record-field/types/guards/isFieldMultiSelectValue';
import { isFieldNumber } from '@/object-record/record-field/types/guards/isFieldNumber';
import { isFieldPhone } from '@/object-record/record-field/types/guards/isFieldPhone';
import { isFieldRating } from '@/object-record/record-field/types/guards/isFieldRating';
import { isFieldRawJson } from '@/object-record/record-field/types/guards/isFieldRawJson';
import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
Expand Down Expand Up @@ -47,8 +48,8 @@ export const isFieldValueEmpty = ({
isFieldEmail(fieldDefinition) ||
isFieldBoolean(fieldDefinition) ||
isFieldRelation(fieldDefinition) ||
isFieldRawJson(fieldDefinition)
//|| isFieldPhone(fieldDefinition)
isFieldRawJson(fieldDefinition) ||
isFieldPhone(fieldDefinition)
) {
return isValueEmpty(fieldValue);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ export const SETTINGS_FIELD_TYPE_CONFIGS: Record<
Icon: IconRelationManyToMany,
},
[FieldMetadataType.Email]: { label: 'Email', Icon: IconMail },
[FieldMetadataType.Phone]: { label: 'Phone', Icon: IconPhone },
[FieldMetadataType.Phone]: {
label: 'Phone',
Icon: IconPhone,
defaultValue: '+1234-567-890',
},
[FieldMetadataType.Probability]: {
label: 'Rating',
Icon: IconTwentyStar,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const previewableTypes = [
FieldMetadataType.Text,
FieldMetadataType.Address,
FieldMetadataType.RawJson,
FieldMetadataType.Phone,
];

export const SettingsDataModelFieldSettingsFormCard = ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ export const SettingsObjectNewFieldStep2 = () => {
FieldMetadataType.Link,
FieldMetadataType.Links,
FieldMetadataType.Numeric,
FieldMetadataType.Phone,
FieldMetadataType.Probability,
FieldMetadataType.Uuid,
];
Expand Down

0 comments on commit 0983a20

Please sign in to comment.