From 36926c9ccff7f2bc9de18b3a1b807ae62381a3c9 Mon Sep 17 00:00:00 2001
From: Donkie <daniel.cf.hultgren@gmail.com>
Date: Tue, 30 Jan 2024 18:57:23 +0100
Subject: [PATCH] Added "Add Spool" button on filament list page

Resolves #281
---
 client/public/locales/en/common.json | 3 +++
 client/src/pages/filaments/list.tsx  | 4 +++-
 client/src/pages/spools/create.tsx   | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json
index 21c1326..8ee24d6 100644
--- a/client/public/locales/en/common.json
+++ b/client/public/locales/en/common.json
@@ -217,6 +217,9 @@
         },
         "form": {
             "filament_updated": "This filament has been updated by someone/something else since you opened this page. Saving will overwrite those changes!"
+        },
+        "buttons": {
+            "add_spool": "Add Spool"
         }
     },
     "vendor": {
diff --git a/client/src/pages/filaments/list.tsx b/client/src/pages/filaments/list.tsx
index a825e26..704e5cf 100644
--- a/client/src/pages/filaments/list.tsx
+++ b/client/src/pages/filaments/list.tsx
@@ -5,7 +5,7 @@ import { Table, Button, Dropdown } from "antd";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 import { IFilament } from "./model";
-import { EditOutlined, EyeOutlined, FilterOutlined, PlusSquareOutlined } from "@ant-design/icons";
+import { EditOutlined, EyeOutlined, FileOutlined, FilterOutlined, PlusSquareOutlined } from "@ant-design/icons";
 import { TableState, useInitialTableState, useStoreInitialState } from "../../utils/saveload";
 import {
   DateColumn,
@@ -146,10 +146,12 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
   }
 
   const { editUrl, showUrl, cloneUrl } = useNavigation();
+  const filamentAddSpoolUrl = (id: number): string => `/spool/create?filament_id=${id}`;
   const actions = (record: IFilamentCollapsed) => [
     { name: t("buttons.show"), icon: <EyeOutlined />, link: showUrl("filament", record.id) },
     { name: t("buttons.edit"), icon: <EditOutlined />, link: editUrl("filament", record.id) },
     { name: t("buttons.clone"), icon: <PlusSquareOutlined />, link: cloneUrl("filament", record.id) },
+    { name: t("filament.buttons.add_spool"), icon: <FileOutlined />, link: filamentAddSpoolUrl(record.id) },
   ];
 
   const commonProps = {
diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx
index 830b41a..052dd49 100644
--- a/client/src/pages/spools/create.tsx
+++ b/client/src/pages/spools/create.tsx
@@ -47,6 +47,13 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
     formProps.initialValues.filament_id = formProps.initialValues.filament.id;
   }
 
+  // If the query variable filament_id is set, set the filament_id field to that value
+  const query = new URLSearchParams(window.location.search);
+  const filament_id = query.get("filament_id");
+  if (filament_id) {
+    formProps.initialValues.filament_id = parseInt(filament_id);
+  }
+
   const handleSubmit = async (redirectTo: "list" | "edit" | "create") => {
     const values = StringifiedExtras(await form.validateFields());
     if (quantity > 1) {