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

Include the custom locations in spool edit page

Browse Source
This commit is contained in:
Donkie
2024-11-24 14:51:15 +01:00
parent 0827cc8a5a
commit d142b0eaec
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ import { numberFormatter, numberParser } from "../../utils/parsing";
import { EntityType, useGetFields } from "../../utils/queryFields"; import { EntityType, useGetFields } from "../../utils/queryFields";
import { getCurrencySymbol, useCurrency } from "../../utils/settings"; import { getCurrencySymbol, useCurrency } from "../../utils/settings";
import { createFilamentFromExternal } from "../filaments/functions"; import { createFilamentFromExternal } from "../filaments/functions";
import { useLocations } from "../locations/functions";
import { useGetFilamentSelectOptions } from "./functions"; import { useGetFilamentSelectOptions } from "./functions";
import { ISpool, ISpoolParsedExtras, WeightToEnter } from "./model"; import { ISpool, ISpoolParsedExtras, WeightToEnter } from "./model";
@@ -148,9 +149,15 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
}; };
const locations = useSpoolmanLocations(true); const locations = useSpoolmanLocations(true);
const settingsLocation = useLocations();
const [newLocation, setNewLocation] = useState(""); const [newLocation, setNewLocation] = useState("");
const allLocations = [...(locations.data || [])]; const allLocations = [...(settingsLocation || [])];
locations?.data?.forEach((loc) => {
if (!allLocations.includes(loc)) {
allLocations.push(loc);
}
});
if (newLocation.trim() && !allLocations.includes(newLocation)) { if (newLocation.trim() && !allLocations.includes(newLocation)) {
allLocations.push(newLocation.trim()); allLocations.push(newLocation.trim());
} }