Merge pull request #715 from JakobGue/spool_count

Add Spoolcount in Locations Page

client/src/pages/locations/components/location.tsx

@@ -9,6 +9,7 @@ import { ISpool } from "../../spools/model";
 import { DragItem, ItemTypes, SpoolDragItem } from "../dnd";
 import { EMPTYLOC } from "../functions";
 import { SpoolList } from "./spoolList";
+import { useGetSetting } from "../../../utils/querySettings";
 
 const { useToken } = theme;
 
@@ -139,6 +140,9 @@ export function Location({
   const titleStyle = {
     color: canEditTitle ? undefined : token.colorTextTertiary,
   };
+  const spoolCountStyle = {
+    color: token.colorTextQuaternary,
+  };
 
   return (
     <div
@@ -171,6 +175,7 @@ export function Location({
             style={titleStyle}
           >
             {displayTitle}
+            {<span style={spoolCountStyle}> ({spools.length})</span>}
           </span>
         )}
         {showDelete && <Button icon={<DeleteOutlined />} size="small" type="text" onClick={onDelete} />}

client/src/pages/settings/generalSettings.tsx

@@ -31,7 +31,7 @@ export function GeneralSettings() {
   }, [setCurrency.isSuccess, messageApi, t]);
 
   // Handle form submit
-  const onFinish = (values: { currency: string; base_url: string, round_prices: boolean }) => {
+  const onFinish = (values: { currency: string; base_url: string; round_prices: boolean }) => {
     // Check if the currency has changed
     if (settings.data?.currency.value !== JSON.stringify(values.currency)) {
       setCurrency.mutate(values.currency);
@@ -47,7 +47,8 @@ export function GeneralSettings() {
     }
   };
 
-  return (<>
+  return (
+    <>
       <Form
         form={form}
         labelCol={{ span: 8 }}
@@ -55,6 +56,7 @@ export function GeneralSettings() {
         initialValues={{
           currency: settings.data?.currency.value,
           round_prices: settings.data?.round_prices.value,
+          base_url: settings.data?.base_url.value,
         }}
         onFinish={onFinish}
         style={{
@@ -109,5 +111,6 @@ export function GeneralSettings() {
         </Form.Item>
       </Form>
       {contextHolder}
-  </>);
+    </>
+  );
 }