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

Default address country 🗺️ & Phone prefix ☎️ (#8614)

Browse Source 
# Default address 🗺️ country & Phone ☎️ country

We add the ability to add a Default address country and a default Phone
country for fields in the Data model.

fix #8081

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Guillim
2024-12-02 13:34:05 +01:00
committed by GitHub
parent 39a9cd0d51
commit 0527bc296e
28 changed files with 617 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/twenty-front/src/modules/ui/input/components/Select.tsx
View File

@ -26,7 +26,9 @@ type CallToActionButton = {
Icon?: IconComponent;
};
export type SelectProps<Value extends string | number | boolean | null> = {
export type SelectValue = string | number | boolean | null;
export type SelectProps<Value extends SelectValue> = {
className?: string;
disabled?: boolean;
selectSizeVariant?: SelectSizeVariant;
@ -57,7 +59,7 @@ const StyledLabel = styled.span`
margin-bottom: ${({ theme }) => theme.spacing(1)};
`;
export const Select = <Value extends string | number | boolean | null>({
export const Select = <Value extends SelectValue>({
className,
disabled: disabledFromProps,
selectSizeVariant,

22
packages/twenty-front/src/modules/ui/input/components/internal/country/components/CountrySelect.tsx
View File

@ -1,5 +1,5 @@
import { useMemo } from 'react';
import { IconComponentProps } from 'twenty-ui';
import { IconCircleOff, IconComponentProps } from 'twenty-ui';
import { SELECT_COUNTRY_DROPDOWN_ID } from '@/ui/input/components/internal/country/constants/SelectCountryDropdownId';
import { useCountries } from '@/ui/input/components/internal/hooks/useCountries';
@ -15,12 +15,20 @@ export const CountrySelect = ({
const countries = useCountries();
const options: SelectOption<string>[] = useMemo(() => {
return countries.map<SelectOption<string>>(({ countryName, Flag }) => ({
label: countryName,
value: countryName,
Icon: (props: IconComponentProps) =>
Flag({ width: props.size, height: props.size }), // TODO : improve this ?
}));
const countryList = countries.map<SelectOption<string>>(
({ countryName, Flag }) => ({
label: countryName,
value: countryName,
Icon: (props: IconComponentProps) =>
Flag({ width: props.size, height: props.size }), // TODO : improve this ?
}),
);
countryList.unshift({
label: 'No country',
value: '',
Icon: IconCircleOff,
});
return countryList;
}, [countries]);
return (

4
packages/twenty-front/src/modules/ui/input/components/internal/types/Country.ts
View File

@ -1,8 +1,8 @@
import * as Flags from 'country-flag-icons/react/3x2';
import { CountryCallingCode } from 'libphonenumber-js';
import { CountryCallingCode, CountryCode } from 'libphonenumber-js';
export type Country = {
countryCode: string;
countryCode: CountryCode;
countryName: string;
callingCode: CountryCallingCode;
Flag: Flags.FlagComponent;