Skip to content

Commit 08b56ec

Browse files
authored
fix: can't set ARR of company to empty (#1474)
1 parent 91e146e commit 08b56ec

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ export type ViewFieldDateValue = string;
130130
export type ViewFieldPhoneValue = string;
131131
export type ViewFieldEmailValue = string;
132132
export type ViewFieldBooleanValue = boolean;
133-
export type ViewFieldMoneyValue = number;
133+
export type ViewFieldMoneyValue = number | null;
134134
export type ViewFieldURLValue = string;
135135
export type ViewFieldNumberValue = number | null;
136136
export type ViewFieldProbabilityValue = number;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ import { ViewFieldMoneyValue } from '../ViewField';
33
export function isViewFieldMoneyValue(
44
fieldValue: unknown,
55
): fieldValue is ViewFieldMoneyValue {
6-
return typeof fieldValue === 'number';
6+
return (
7+
fieldValue === null ||
8+
(fieldValue !== undefined && typeof fieldValue === 'number')
9+
);
710
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ export function GenericEditableMoneyCellEditMode({
3131
if (newText === fieldValue) return;
3232

3333
try {
34-
const numberValue = parseInt(newText);
34+
const numberValue = newText !== '' ? parseInt(newText) : null;
3535

36-
if (isNaN(numberValue)) {
36+
if (numberValue && isNaN(numberValue)) {
3737
throw new Error('Not a number');
3838
}
3939

40-
if (numberValue > 2000000000) {
40+
if (numberValue && numberValue > 2000000000) {
4141
throw new Error('Number too big');
4242
}
4343

44-
setFieldValue(numberValue.toString());
44+
setFieldValue(numberValue ? numberValue.toString() : '');
4545

4646
if (currentRowEntityId && updateField) {
4747
updateField(currentRowEntityId, columnDefinition, numberValue);

0 commit comments

Comments
 (0)