The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[Forms 3/5] Take currency amounts in units in record forms (#26423)
Thomas des Francsbc3e80d909f1
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FormFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FormFieldInput.tsxindex a8d118f2c83..0c39da1c1fa 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FormFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FormFieldInput.tsx@@ -23,6 +23,7 @@ import { FormRichTextFieldInput } from '@/object-record/record-field/ui/form-typimport { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';import { FormUuidFieldInput } from '@/object-record/record-field/ui/form-types/components/FormUuidFieldInput';+import { type FormFieldInputSettings } from '@/object-record/record-field/ui/form-types/types/FormFieldInputSettings';import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';import {@@ -73,6 +74,7 @@ type FormFieldInputProps = {error?: string;onError?: (error: string | undefined) => void;timeZone?: string;+ settings?: FormFieldInputSettings;};export const FormFieldInput = ({@@ -86,6 +88,7 @@ export const FormFieldInput = ({error,onError,timeZone,+ settings,}: FormFieldInputProps) => {return isFieldNumber(field) || field.type === FieldMetadataType.NUMERIC ? (<FormNumberFieldInput@@ -223,6 +226,11 @@ export const FormFieldInput = ({/>) : isFieldCurrency(field) ? (<FormCurrencyFieldInput+ amountUnit={+ settings?.type === FieldMetadataType.CURRENCY+ ? settings.amountUnit+ : undefined+ }label={field.label}defaultValue={defaultValue as FormFieldCurrencyValue | null}onChange={onChange}diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyAmountFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyAmountFieldInput.tsxnew file mode 100644index 00000000000..d8ab7af6eb8--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyAmountFieldInput.tsx@@ -0,0 +1,57 @@+import { FormNumberFieldInput } from '@/object-record/record-field/ui/form-types/components/FormNumberFieldInput';+import { isNonEmptyString, isNumber } from '@sniptt/guards';+import { type ComponentProps } from 'react';+import { isStandaloneVariableString } from 'twenty-shared/workflow';+import {+ convertCurrencyAmountToCurrencyMicros,+ convertCurrencyMicrosToCurrencyAmount,+} from '~/utils/convertCurrencyToCurrencyMicros';++type FormCurrencyAmountFieldInputProps = Pick<+ ComponentProps<typeof FormNumberFieldInput>,+ 'label' | 'defaultValue' | 'onChange' | 'VariablePicker' | 'readonly' | 'hint'+>;++const getAmountFromAmountMicros = (+ amountMicros: FormCurrencyAmountFieldInputProps['defaultValue'],+) => {+ if (isNumber(amountMicros)) {+ return convertCurrencyMicrosToCurrencyAmount(amountMicros);+ }++ if (!isNonEmptyString(amountMicros)) {+ return '';+ }++ if (isStandaloneVariableString(amountMicros)) {+ return amountMicros;+ }++ return convertCurrencyMicrosToCurrencyAmount(Number(amountMicros));+};++export const FormCurrencyAmountFieldInput = ({+ defaultValue,+ onChange,+ label,+ VariablePicker,+ readonly,+ hint,+}: FormCurrencyAmountFieldInputProps) => {+ return (+ <FormNumberFieldInput+ label={label}+ VariablePicker={VariablePicker}+ readonly={readonly}+ hint={hint}+ defaultValue={getAmountFromAmountMicros(defaultValue)}+ onChange={(newAmount) =>+ onChange(+ isNumber(newAmount)+ ? convertCurrencyAmountToCurrencyMicros(newAmount)+ : newAmount,+ )+ }+ />+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsxindex 6b03e4044de..33abd1915dd 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx@@ -1,7 +1,9 @@+import { FormNumberFieldInput } from '@/object-record/record-field/ui/form-types/components/FormNumberFieldInput';import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';import { FormNestedFieldInputContainer } from '@/object-record/record-field/ui/form-types/components/FormNestedFieldInputContainer';-import { FormNumberFieldInput } from '@/object-record/record-field/ui/form-types/components/FormNumberFieldInput';+import { FormCurrencyAmountFieldInput } from '@/object-record/record-field/ui/form-types/components/FormCurrencyAmountFieldInput';import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';+import { type FormFieldCurrencyInputSettings } from '@/object-record/record-field/ui/form-types/types/FormFieldCurrencyInputSettings';import { type VariablePickerComponent } from '@/object-record/record-field/ui/form-types/types/VariablePickerComponent';import { type FormFieldCurrencyValue } from '@/object-record/record-field/ui/types/FieldMetadata';import { CURRENCIES } from '@/settings/data-model/constants/Currencies';@@ -17,6 +19,7 @@ type FormCurrencyFieldInputProps = {onChange: (value: FormFieldCurrencyValue) => void;VariablePicker?: VariablePickerComponent;readonly?: boolean;+ amountUnit?: FormFieldCurrencyInputSettings['amountUnit'];};export const FormCurrencyFieldInput = ({@@ -25,6 +28,7 @@ export const FormCurrencyFieldInput = ({onChange,VariablePicker,readonly,+ amountUnit = 'micros',}: FormCurrencyFieldInputProps) => {const currencies = useMemo(() => {return [@@ -53,6 +57,11 @@ export const FormCurrencyFieldInput = ({});};+ const FormAmountInput =+ amountUnit === 'units'+ ? FormCurrencyAmountFieldInput+ : FormNumberFieldInput;+return (<FormFieldInputContainer>{label ? <Field.Label>{label}</Field.Label> : null}@@ -65,12 +74,16 @@ export const FormCurrencyFieldInput = ({VariablePicker={VariablePicker}readonly={readonly}/>- <FormNumberFieldInput- label={t`Amount Micros`}+ <FormAmountInput+ label={amountUnit === 'units' ? t`Amount` : t`Amount Micros`}+ hint={+ amountUnit === 'micros'+ ? t`Enter amount x 1 000 000 (e.g. $3.21 → 3210000)`+ : undefined+ }defaultValue={defaultValue?.amountMicros ?? ''}onChange={handleAmountMicrosChange}VariablePicker={VariablePicker}- hint={t`Enter amount x 1 000 000 (e.g. $3.21 → 3210000)`}readonly={readonly}/></FormNestedFieldInputContainer>diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__tests__/FormCurrencyFieldInput.test.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__tests__/FormCurrencyFieldInput.test.tsxnew file mode 100644index 00000000000..11cd1150b3e--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__tests__/FormCurrencyFieldInput.test.tsx@@ -0,0 +1,179 @@+import { FormCurrencyAmountFieldInput } from '@/object-record/record-field/ui/form-types/components/FormCurrencyAmountFieldInput';+import { FormCurrencyFieldInput } from '@/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput';+import { type FormFieldCurrencyInputSettings } from '@/object-record/record-field/ui/form-types/types/FormFieldCurrencyInputSettings';+import { type FormFieldCurrencyValue } from '@/object-record/record-field/ui/types/FieldMetadata';+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { createStore, Provider } from 'jotai';+import { useState } from 'react';+import { CurrencyCode } from 'twenty-shared/constants';++jest.mock(+ '@/object-record/record-field/ui/form-types/components/VariableChipStandalone',+ () => ({+ VariableChipStandalone: ({+ rawVariableName,+ }: {+ rawVariableName: string;+ }) => <span>{rawVariableName}</span>,+ }),+);++const renderCurrencyInput = ({+ amountMicros,+ readonly = false,+ amountUnit,+}: {+ amountMicros: FormFieldCurrencyValue['amountMicros'];+ readonly?: boolean;+ amountUnit?: FormFieldCurrencyInputSettings['amountUnit'];+}) => {+ const onChange = jest.fn();+ const store = createStore();+ const Form = () => {+ const [value, setValue] = useState<FormFieldCurrencyValue>({+ currencyCode: CurrencyCode.USD,+ amountMicros,+ });+ return (+ <FormCurrencyFieldInput+ defaultValue={value}+ amountUnit={amountUnit}+ readonly={readonly}+ onChange={(newValue) => {+ setValue(newValue);+ onChange(newValue);+ }}+ />+ );+ };+ render(+ <I18nProvider i18n={i18n}>+ <Provider store={store}>+ <Form />+ </Provider>+ </I18nProvider>,+ );+ return { onChange };+};++it.each([+ [24_000_000_000, '24000'],+ [3_210_000, '3.21'],+ ['3210000', '3.21'],+ [0, '0'],+ [null, ''],+ ['', ''],+])('displays stored micros %s as amount %s', (storedValue, displayedValue) => {+ const { onChange } = renderCurrencyInput({+ amountMicros: storedValue,+ amountUnit: 'units',+ });+ expect(screen.getByRole('textbox')).toHaveValue(displayedValue);+ expect(screen.getByText('Amount')).toBeInTheDocument();+ expect(screen.queryByText('Amount Micros')).not.toBeInTheDocument();+ expect(onChange).not.toHaveBeenCalled();+});++it.each([+ ['24000', 24_000_000_000],+ ['3.21', 3_210_000],+ ['-12.34', -12_340_000],+ ['0', 0],+ ['0.000249', 249],+])('stores entered amount %s as %s micros', async (amount, amountMicros) => {+ const user = userEvent.setup();+ const { onChange } = renderCurrencyInput({+ amountMicros: null,+ amountUnit: 'units',+ });+ await user.type(screen.getByRole('textbox'), amount);+ expect(onChange).toHaveBeenLastCalledWith({+ currencyCode: CurrencyCode.USD,+ amountMicros,+ });+ expect(screen.getByRole('textbox')).toHaveValue(amount);+});++it('clears the amount to null', async () => {+ const user = userEvent.setup();+ const { onChange } = renderCurrencyInput({+ amountMicros: 3_210_000,+ amountUnit: 'units',+ });+ await user.clear(screen.getByRole('textbox'));+ expect(onChange).toHaveBeenLastCalledWith({+ currencyCode: CurrencyCode.USD,+ amountMicros: null,+ });+});++it('preserves the stored amount when switching currency', async () => {+ const user = userEvent.setup();+ const { onChange } = renderCurrencyInput({+ amountMicros: 3_210_000,+ amountUnit: 'units',+ });+ await user.click(screen.getByText(/\(USD\)/));+ await user.click(await screen.findByText(/\(EUR\)/));+ expect(onChange).toHaveBeenLastCalledWith({+ currencyCode: CurrencyCode.EUR,+ amountMicros: 3_210_000,+ });+ expect(screen.getByRole('textbox')).toHaveValue('3.21');+});++it('preserves workflow variable references', () => {+ const reference = '{{step.amount.amountMicros}}';+ const { onChange } = renderCurrencyInput({+ amountMicros: reference,+ amountUnit: 'units',+ });+ expect(screen.getByText(reference)).toBeInTheDocument();+ expect(onChange).not.toHaveBeenCalled();+});++it('displays read-only amounts in currency units', () => {+ renderCurrencyInput({+ amountMicros: 44_000_000,+ readonly: true,+ amountUnit: 'units',+ });+ expect(screen.getByRole('textbox')).toHaveValue('44');+ expect(screen.getByRole('textbox')).toBeDisabled();+});++it('passes selected workflow variables through without converting them', async () => {+ const user = userEvent.setup();+ const onChange = jest.fn();+ const reference = '{{step.amount.amountMicros}}';+ render(+ <FormCurrencyAmountFieldInput+ defaultValue=""+ onChange={onChange}+ VariablePicker={({ onVariableSelect }) => (+ <button onClick={() => onVariableSelect(reference)}>+ Choose variable+ </button>+ )}+ />,+ );+ await user.click(screen.getByRole('button', { name: 'Choose variable' }));+ expect(onChange).toHaveBeenCalledWith(reference);+});++it('keeps raw micros by default for workflow currency forms', async () => {+ const user = userEvent.setup();+ const { onChange } = renderCurrencyInput({ amountMicros: 3_210_000 });+ const input = screen.getByRole('textbox');+ expect(input).toHaveValue('3210000');+ expect(screen.getByText('Amount Micros')).toBeInTheDocument();+ await user.clear(input);+ await user.type(input, '24');+ expect(onChange).toHaveBeenLastCalledWith({+ currencyCode: CurrencyCode.USD,+ amountMicros: 24,+ });+});diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/types/FormFieldCurrencyInputSettings.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/types/FormFieldCurrencyInputSettings.tsnew file mode 100644index 00000000000..ac66fc1bd09--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/types/FormFieldCurrencyInputSettings.ts@@ -0,0 +1,6 @@+import { type FieldMetadataType } from 'twenty-shared/types';++export type FormFieldCurrencyInputSettings = {+ type: FieldMetadataType.CURRENCY;+ amountUnit: 'micros' | 'units';+};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/types/FormFieldInputSettings.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/types/FormFieldInputSettings.tsnew file mode 100644index 00000000000..3d261712479--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/types/FormFieldInputSettings.ts@@ -0,0 +1,3 @@+import { type FormFieldCurrencyInputSettings } from '@/object-record/record-field/ui/form-types/types/FormFieldCurrencyInputSettings';++export type FormFieldInputSettings = FormFieldCurrencyInputSettings;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 1e8df9dafcc..0098b0b5c65 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@@ -3,6 +3,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIteimport { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';import { getFieldMetadataItemGqlFieldName } from '@/object-metadata/utils/getFieldMetadataItemGqlFieldName';import { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';+import { getRecordFormFieldInputSettings } from '@/object-record/record-form/utils/getRecordFormFieldInputSettings';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';import { styled } from '@linaria/react';import { type JsonValue } from 'type-fest';@@ -44,6 +45,7 @@ export const RecordFormFieldInputs = ({defaultValue={draftRecord[gqlFieldName]}onChange={(value) => onFieldValueChange(gqlFieldName, value)}onClear={() => onFieldValueClear(gqlFieldName)}+ settings={getRecordFormFieldInputSettings(fieldMetadataItem.type)}/>);})}diff --git a/packages/twenty-front/src/modules/object-record/record-form/utils/__tests__/getRecordFormFieldInputSettings.test.ts b/packages/twenty-front/src/modules/object-record/record-form/utils/__tests__/getRecordFormFieldInputSettings.test.tsnew file mode 100644index 00000000000..39f3546b275--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-form/utils/__tests__/getRecordFormFieldInputSettings.test.ts@@ -0,0 +1,17 @@+import { getRecordFormFieldInputSettings } from '@/object-record/record-form/utils/getRecordFormFieldInputSettings';+import { FieldMetadataType } from 'twenty-shared/types';++describe('getRecordFormFieldInputSettings', () => {+ it('should take currency amounts in units', () => {+ expect(getRecordFormFieldInputSettings(FieldMetadataType.CURRENCY)).toEqual(+ { type: FieldMetadataType.CURRENCY, amountUnit: 'units' },+ );+ });++ it.each([FieldMetadataType.NUMBER, FieldMetadataType.TEXT])(+ 'should have no settings for %s fields',+ (fieldType) => {+ expect(getRecordFormFieldInputSettings(fieldType)).toBeUndefined();+ },+ );+});diff --git a/packages/twenty-front/src/modules/object-record/record-form/utils/getRecordFormFieldInputSettings.ts b/packages/twenty-front/src/modules/object-record/record-form/utils/getRecordFormFieldInputSettings.tsnew file mode 100644index 00000000000..473b4cf53ce--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-form/utils/getRecordFormFieldInputSettings.ts@@ -0,0 +1,9 @@+import { type FormFieldInputSettings } from '@/object-record/record-field/ui/form-types/types/FormFieldInputSettings';+import { FieldMetadataType } from 'twenty-shared/types';++export const getRecordFormFieldInputSettings = (+ fieldType: FieldMetadataType,+): FormFieldInputSettings | undefined =>+ fieldType === FieldMetadataType.CURRENCY+ ? { type: FieldMetadataType.CURRENCY, amountUnit: 'units' }+ : undefined;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 743503b0284..0c2314e6f96 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,6 +1,7 @@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 { 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';@@ -85,6 +86,7 @@ export const UpdateMultipleRecordsForm = ({defaultValue={value}onChange={handleValueChange}onClear={() => onChange(fieldNameOrRelationIdName, undefined)}+ settings={getRecordFormFieldInputSettings(fieldMetadataItem.type)}/>);})}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__tests__/WorkflowStepFilterValueCompositeInput.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__tests__/WorkflowStepFilterValueCompositeInput.test.tsxnew file mode 100644index 00000000000..4b331cb9353--- /dev/null+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/__tests__/WorkflowStepFilterValueCompositeInput.test.tsx@@ -0,0 +1,40 @@+import { WorkflowStepFilterValueCompositeInput } from '@/workflow/workflow-steps/filters/components/WorkflowStepFilterValueCompositeInput';+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { ViewFilterOperand } from 'twenty-shared/types';++jest.mock(+ '@/workflow/workflow-variables/components/WorkflowVariablePicker',+ () => ({+ WorkflowVariablePicker: () => null,+ }),+);++it('preserves raw micros in workflow conditions', async () => {+ const user = userEvent.setup();+ const onChange = jest.fn();+ render(+ <I18nProvider i18n={i18n}>+ <WorkflowStepFilterValueCompositeInput+ stepFilter={{+ id: 'filter',+ type: 'CURRENCY',+ stepOutputKey: 'amount',+ operand: ViewFilterOperand.GREATER_THAN_OR_EQUAL,+ value: '3210000',+ stepFilterGroupId: 'group',+ compositeFieldSubFieldName: 'amountMicros',+ }}+ onChange={onChange}+ onClear={() => {}}+ />+ </I18nProvider>,+ );+ const input = screen.getByRole('textbox');+ expect(input).toHaveValue('3210000');+ await user.clear(input);+ await user.type(input, '24');+ expect(onChange).toHaveBeenLastCalledWith(24);+});diff --git a/packages/twenty-front/src/utils/__tests__/convert-currency-amount.test.ts b/packages/twenty-front/src/utils/__tests__/convert-currency-amount.test.tsindex 44849ab34eb..e44bda018ee 100644--- a/packages/twenty-front/src/utils/__tests__/convert-currency-amount.test.ts+++ b/packages/twenty-front/src/utils/__tests__/convert-currency-amount.test.ts@@ -8,6 +8,10 @@ describe('convertCurrencyAmountToCurrencyMicros', () => {expect(convertCurrencyAmountToCurrencyMicros(1)).toBe(1000000);expect(convertCurrencyAmountToCurrencyMicros(1.5)).toBe(1500000);});++ it('should return whole micros when floating point multiplication drifts', () => {+ expect(convertCurrencyAmountToCurrencyMicros(8.2)).toBe(8200000);+ });});describe('convertCurrencyMicrosToCurrencyAmount', () => {diff --git a/packages/twenty-front/src/utils/convertCurrencyToCurrencyMicros.ts b/packages/twenty-front/src/utils/convertCurrencyToCurrencyMicros.tsindex 229e84b0cf7..d5ab628a288 100644--- a/packages/twenty-front/src/utils/convertCurrencyToCurrencyMicros.ts+++ b/packages/twenty-front/src/utils/convertCurrencyToCurrencyMicros.ts@@ -1,9 +1,7 @@export const convertCurrencyAmountToCurrencyMicros = (currencyAmount: number,) => {- const currencyAmountAsMicros = currencyAmount * 1000000;-- return currencyAmountAsMicros;+ return Math.round(currencyAmount * 1000000);};export const convertCurrencyMicrosToCurrencyAmount = (