The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Ask only for the URL and the email in record form links and emails fields (#28120)
Thomas Trompettef72287d3cd32
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormEmailsFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormEmailsFieldInput.tsxindex cd34b65a7df..93b1774c26a 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormEmailsFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormEmailsFieldInput.tsx@@ -13,6 +13,7 @@ type FormEmailsFieldInputProps = {VariablePicker?: VariablePickerComponent;readonly?: boolean;subFieldPlaceholders?: Partial<Record<keyof FieldEmailsValue, string>>;+ isPrimaryEmailOnly?: boolean;};export const FormEmailsFieldInput = ({@@ -22,6 +23,7 @@ export const FormEmailsFieldInput = ({readonly,VariablePicker,subFieldPlaceholders,+ isPrimaryEmailOnly = false,}: FormEmailsFieldInputProps) => {const { t } = useLingui();@@ -32,6 +34,19 @@ export const FormEmailsFieldInput = ({});};+ if (isPrimaryEmailOnly) {+ return (+ <FormTextFieldInput+ label={label}+ defaultValue={defaultValue?.primaryEmail}+ onChange={handleChange}+ placeholder={subFieldPlaceholders?.primaryEmail ?? t`Email`}+ readonly={readonly}+ VariablePicker={VariablePicker}+ />+ );+ }+return (<FormFieldInputContainer>{label ? <Field.Label>{label}</Field.Label> : null}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormLinksFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormLinksFieldInput.tsxindex 83e8e8fc8a1..f4899f2297f 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormLinksFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormLinksFieldInput.tsx@@ -21,6 +21,7 @@ type FormLinksFieldInputProps = {readonly?: boolean;subFieldPlaceholders?: Partial<Record<keyof FieldLinksDraftValue, string>>;maxNumberOfValues?: number | null;+ isPrimaryLinkUrlOnly?: boolean;};export const FormLinksFieldInput = ({@@ -31,6 +32,7 @@ export const FormLinksFieldInput = ({VariablePicker,subFieldPlaceholders,maxNumberOfValues,+ isPrimaryLinkUrlOnly = false,}: FormLinksFieldInputProps) => {const allowsSecondaryLinks = maxNumberOfValues !== 1;const secondaryLinks = defaultValue?.secondaryLinks;@@ -66,6 +68,19 @@ export const FormLinksFieldInput = ({});};+ if (isPrimaryLinkUrlOnly) {+ return (+ <FormTextFieldInput+ label={label}+ defaultValue={defaultValue?.primaryLinkUrl}+ onChange={handleChange('primaryLinkUrl')}+ placeholder={subFieldPlaceholders?.primaryLinkUrl ?? t`URL`}+ readonly={readonly}+ VariablePicker={VariablePicker}+ />+ );+ }+return (<FormFieldInputContainer>{label ? <Field.Label>{label}</Field.Label> : null}diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInput.tsxnew file mode 100644index 00000000000..af597ab64b6--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInput.tsx@@ -0,0 +1,75 @@+import { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';+import { FormEmailsFieldInput } from '@/object-record/record-field/ui/form-types/components/FormEmailsFieldInput';+import { FormLinksFieldInput } from '@/object-record/record-field/ui/form-types/components/FormLinksFieldInput';+import { type FormFieldInputSubFieldPlaceholders } from '@/object-record/record-field/ui/form-types/types/FormFieldInputSubFieldPlaceholders';+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';+import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';+import { isFieldEmails } from '@/object-record/record-field/ui/types/guards/isFieldEmails';+import { isFieldEmailsValue } from '@/object-record/record-field/ui/types/guards/isFieldEmailsValue';+import { isFieldLinks } from '@/object-record/record-field/ui/types/guards/isFieldLinks';+import { isFieldLinksValue } from '@/object-record/record-field/ui/types/guards/isFieldLinksValue';+import { getRecordFormFieldInputSettings } from '@/object-record/record-form/utils/getRecordFormFieldInputSettings';+import { type JsonValue } from 'type-fest';++type RecordFormFieldInputProps = {+ field: Pick<FieldDefinition<FieldMetadata>, 'label' | 'metadata' | 'type'>;+ defaultValue: JsonValue;+ onChange: (value: JsonValue) => void;+ onClear?: () => void;+ readonly?: boolean;+ placeholder?: string;+ subFieldPlaceholders?: FormFieldInputSubFieldPlaceholders;+};++export const RecordFormFieldInput = ({+ field,+ defaultValue,+ onChange,+ onClear,+ readonly,+ placeholder,+ subFieldPlaceholders,+}: RecordFormFieldInputProps) => {+ if (isFieldLinks(field)) {+ return (+ <FormLinksFieldInput+ label={field.label}+ defaultValue={+ isFieldLinksValue(defaultValue) ? defaultValue : undefined+ }+ onChange={onChange}+ readonly={readonly}+ subFieldPlaceholders={subFieldPlaceholders}+ isPrimaryLinkUrlOnly+ />+ );+ }++ if (isFieldEmails(field)) {+ return (+ <FormEmailsFieldInput+ label={field.label}+ defaultValue={+ isFieldEmailsValue(defaultValue) ? defaultValue : undefined+ }+ onChange={onChange}+ readonly={readonly}+ subFieldPlaceholders={subFieldPlaceholders}+ isPrimaryEmailOnly+ />+ );+ }++ return (+ <FormFieldInput+ field={field}+ defaultValue={defaultValue}+ onChange={onChange}+ onClear={onClear}+ readonly={readonly}+ placeholder={placeholder}+ subFieldPlaceholders={subFieldPlaceholders}+ settings={getRecordFormFieldInputSettings(field.type)}+ />+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInputs.tsx b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInputs.tsxindex f8420596302..9fc950b3d16 100644--- a/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInputs.tsx+++ b/packages/twenty-front/src/modules/object-record/record-form/components/RecordFormFieldInputs.tsx@@ -2,10 +2,9 @@ import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/Enricheimport { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';-import { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';+import { RecordFormFieldInput } from '@/object-record/record-form/components/RecordFormFieldInput';import { RecordFormFieldInputsEffect } from '@/object-record/record-form/components/RecordFormFieldInputsEffect';import { getRecordFormCurrencyFieldDefaultValue } from '@/object-record/record-form/utils/getRecordFormCurrencyFieldDefaultValue';-import { getRecordFormFieldInputSettings } from '@/object-record/record-form/utils/getRecordFormFieldInputSettings';import { getRecordFormFieldPlaceholders } from '@/object-record/record-form/utils/getRecordFormFieldPlaceholders';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';import { type ValidationRuleViolation } from '@/validation-rules/types/ValidationRuleViolation';@@ -56,7 +55,7 @@ export const RecordFormFieldInputs = ({return (<Field.Root key={fieldMetadataItem.id}>- <FormFieldInput+ <RecordFormFieldInputfield={formatFieldMetadataItemAsFieldDefinition({field: fieldMetadataItem,objectMetadataItem,@@ -69,9 +68,6 @@ export const RecordFormFieldInputs = ({}onChange={(value) => onFieldValueChange(gqlFieldName, value)}onClear={() => onFieldValueClear(gqlFieldName)}- settings={getRecordFormFieldInputSettings(- fieldMetadataItem.type,- )}placeholder={placeholder}subFieldPlaceholders={subFieldPlaceholders}/>diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsxindex 41402c66b4c..2f49f0c49cd 100644--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx@@ -1,7 +1,6 @@import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';-import { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';-import { getRecordFormFieldInputSettings } from '@/object-record/record-form/utils/getRecordFormFieldInputSettings';+import { RecordFormFieldInput } from '@/object-record/record-form/components/RecordFormFieldInput';import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';import { type UpdateMultipleRecordsState } from '@/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer';import { isUpdateRecordValueEmpty } from '@/object-record/record-update-multiple/utils/isUpdateRecordValueEmpty';@@ -78,14 +77,13 @@ export const UpdateMultipleRecordsForm = ({};return (- <FormFieldInput+ <RecordFormFieldInputkey={fieldDefinition.metadata.fieldName}readonly={disabled}field={fieldDefinition}defaultValue={value}onChange={handleValueChange}onClear={() => onChange(fieldNameOrRelationIdName, undefined)}- settings={getRecordFormFieldInputSettings(fieldMetadataItem.type)}/>);})}