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

fix: can't set ARR of company to empty (#1474)

Browse Source
This commit is contained in:
Jérémy M
2023-09-06 11:22:42 +02:00
committed by GitHub
parent 91e146ed3e
commit 08b56ec7e2
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/modules/ui/editable-field/types/ViewField.ts
View File

@ -130,7 +130,7 @@ export type ViewFieldDateValue = string;
export type ViewFieldPhoneValue = string; export type ViewFieldPhoneValue = string;
export type ViewFieldEmailValue = string; export type ViewFieldEmailValue = string;
export type ViewFieldBooleanValue = boolean; export type ViewFieldBooleanValue = boolean;
export type ViewFieldMoneyValue = number; export type ViewFieldMoneyValue = number | null;
export type ViewFieldURLValue = string; export type ViewFieldURLValue = string;
export type ViewFieldNumberValue = number | null; export type ViewFieldNumberValue = number | null;
export type ViewFieldProbabilityValue = number; export type ViewFieldProbabilityValue = number;

5
front/src/modules/ui/editable-field/types/guards/isViewFieldMoneyValue.ts
View File

@ -3,5 +3,8 @@ import { ViewFieldMoneyValue } from '../ViewField';
export function isViewFieldMoneyValue( export function isViewFieldMoneyValue(
fieldValue: unknown, fieldValue: unknown,
): fieldValue is ViewFieldMoneyValue { ): fieldValue is ViewFieldMoneyValue {
return typeof fieldValue === 'number'; return (
fieldValue === null ||
(fieldValue !== undefined && typeof fieldValue === 'number')
);
} }

8
front/src/modules/ui/table/editable-cell/type/components/GenericEditableMoneyCellEditMode.tsx
View File

@ -31,17 +31,17 @@ export function GenericEditableMoneyCellEditMode({
if (newText === fieldValue) return; if (newText === fieldValue) return;
try { try {
const numberValue = parseInt(newText); const numberValue = newText !== '' ? parseInt(newText) : null;
if (isNaN(numberValue)) { if (numberValue && isNaN(numberValue)) {
throw new Error('Not a number'); throw new Error('Not a number');
} }
if (numberValue > 2000000000) { if (numberValue && numberValue > 2000000000) {
throw new Error('Number too big'); throw new Error('Number too big');
} }
setFieldValue(numberValue.toString()); setFieldValue(numberValue ? numberValue.toString() : '');
if (currentRowEntityId && updateField) { if (currentRowEntityId && updateField) {
updateField(currentRowEntityId, columnDefinition, numberValue); updateField(currentRowEntityId, columnDefinition, numberValue);