From d142b0eaec529d699d14a0defb542798ea06b6ca Mon Sep 17 00:00:00 2001
From: Donkie <daniel.cf.hultgren@gmail.com>
Date: Sun, 24 Nov 2024 14:51:15 +0100
Subject: [PATCH] Include the custom locations in spool edit page

---
 client/src/pages/spools/edit.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/spools/edit.tsx b/client/src/pages/spools/edit.tsx
index 2617825..ff1b40e 100644
--- a/client/src/pages/spools/edit.tsx
+++ b/client/src/pages/spools/edit.tsx
@@ -13,6 +13,7 @@ import { numberFormatter, numberParser } from "../../utils/parsing";
 import { EntityType, useGetFields } from "../../utils/queryFields";
 import { getCurrencySymbol, useCurrency } from "../../utils/settings";
 import { createFilamentFromExternal } from "../filaments/functions";
+import { useLocations } from "../locations/functions";
 import { useGetFilamentSelectOptions } from "./functions";
 import { ISpool, ISpoolParsedExtras, WeightToEnter } from "./model";
 
@@ -148,9 +149,15 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
   };
 
   const locations = useSpoolmanLocations(true);
+  const settingsLocation = useLocations();
   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)) {
     allLocations.push(newLocation.trim());
   }