tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed not being able to clear price field

Browse Source 
Resolves #525
This commit is contained in:
Donkie
2024-11-25 20:39:24 +01:00
parent 649c074bb3
commit a3be91b89c
5 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/pages/filaments/create.tsx
View File

@@ -8,7 +8,7 @@ import { useEffect, useState } from "react";
import { ExtraFieldFormItem, ParsedExtras, StringifiedExtras } from "../../components/extraFields";
import { FilamentImportModal } from "../../components/filamentImportModal";
import { MultiColorPicker } from "../../components/multiColorPicker";
import { numberFormatter, numberParser } from "../../utils/parsing";
import { numberFormatter, numberParser, numberParserAllowEmpty } from "../../utils/parsing";
import { ExternalFilament } from "../../utils/queryExternalDB";
import { EntityType, useGetFields } from "../../utils/queryFields";
import { getCurrencySymbol, useCurrency } from "../../utils/settings";
@@ -73,7 +73,7 @@ export const FilamentCreate: React.FC<IResourceComponentsProps & CreateOrClonePr
invalidates: ["list", "detail"],
});
setColorType(filament.color_hexes ? "multi" : "single")
setColorType(filament.color_hexes ? "multi" : "single");
form.setFieldsValue({
name: filament.name,
@@ -251,7 +251,7 @@ export const FilamentCreate: React.FC<IResourceComponentsProps & CreateOrClonePr
addonAfter={getCurrencySymbol(undefined, currency)}
precision={2}
formatter={numberFormatter}
parser={numberParser}
parser={numberParserAllowEmpty}
/>
</Form.Item>
<Form.Item

4
client/src/pages/filaments/edit.tsx
View File

@@ -6,7 +6,7 @@ import dayjs from "dayjs";
import React, { useEffect, useState } from "react";
import { ExtraFieldFormItem, ParsedExtras, StringifiedExtras } from "../../components/extraFields";
import { MultiColorPicker } from "../../components/multiColorPicker";
import { numberFormatter, numberParser } from "../../utils/parsing";
import { numberFormatter, numberParser, numberParserAllowEmpty } from "../../utils/parsing";
import { EntityType, useGetFields } from "../../utils/queryFields";
import { getCurrencySymbol, useCurrency } from "../../utils/settings";
import { IVendor } from "../vendors/model";
@@ -226,7 +226,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
addonAfter={getCurrencySymbol(undefined, currency)}
precision={2}
formatter={numberFormatter}
parser={numberParser}
parser={numberParserAllowEmpty}
/>
</Form.Item>
<Form.Item

4
client/src/pages/spools/create.tsx
View File

@@ -10,7 +10,7 @@ import { ExtraFieldFormItem, ParsedExtras, StringifiedExtras } from "../../compo
import { useSpoolmanLocations } from "../../components/otherModels";
import { searchMatches } from "../../utils/filtering";
import "../../utils/overrides.css";
import { numberFormatter, numberParser } from "../../utils/parsing";
import { numberFormatter, numberParser, numberParserAllowEmpty } from "../../utils/parsing";
import { EntityType, useGetFields } from "../../utils/queryFields";
import { getCurrencySymbol, useCurrency } from "../../utils/settings";
import { createFilamentFromExternal } from "../filaments/functions";
@@ -331,7 +331,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
addonAfter={getCurrencySymbol(undefined, currency)}
precision={2}
formatter={numberFormatter}
parser={numberParser}
parser={numberParserAllowEmpty}
/>
</Form.Item>
<Form.Item

4
client/src/pages/spools/edit.tsx
View File

@@ -9,7 +9,7 @@ import { useNavigate, useSearchParams } from "react-router-dom";
import { ExtraFieldFormItem, ParsedExtras, StringifiedExtras } from "../../components/extraFields";
import { useSpoolmanLocations } from "../../components/otherModels";
import { searchMatches } from "../../utils/filtering";
import { numberFormatter, numberParser } from "../../utils/parsing";
import { numberFormatter, numberParser, numberParserAllowEmpty } from "../../utils/parsing";
import { EntityType, useGetFields } from "../../utils/queryFields";
import { getCurrencySymbol, useCurrency } from "../../utils/settings";
import { createFilamentFromExternal } from "../filaments/functions";
@@ -321,7 +321,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
addonAfter={getCurrencySymbol(undefined, currency)}
precision={2}
formatter={numberFormatter}
parser={numberParser}
parser={numberParserAllowEmpty}
/>
</Form.Item>
<Form.Item