diff --git a/client/src/App.tsx b/client/src/App.tsx
index ad355e5..da011ab 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -19,13 +19,7 @@ import { useTranslation } from "react-i18next";
import { BrowserRouter, Outlet, Route, Routes } from "react-router-dom";
import { Header } from "./components/header";
import { ColorModeContextProvider } from "./contexts/color-mode";
-import {
- SpoolClone,
- SpoolCreate,
- SpoolEdit,
- SpoolList,
- SpoolShow,
-} from "./pages/spools";
+import { SpoolCreate, SpoolEdit, SpoolList, SpoolShow } from "./pages/spools";
import {
FilamentCreate,
FilamentEdit,
@@ -152,8 +146,14 @@ function App() {
/>
} />
- } />
- } />
+ }
+ />
+ }
+ />
} />
} />
diff --git a/client/src/pages/spools/clone.tsx b/client/src/pages/spools/clone.tsx
deleted file mode 100644
index f27125e..0000000
--- a/client/src/pages/spools/clone.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import React from "react";
-import { IResourceComponentsProps } from "@refinedev/core";
-import { Create, useForm, useSelect } from "@refinedev/antd";
-import { Form, Input, DatePicker, Select, InputNumber } from "antd";
-import dayjs from "dayjs";
-import TextArea from "antd/es/input/TextArea";
-import { IFilament } from "../filaments/model";
-
-export const SpoolClone: React.FC = () => {
- const { formProps, saveButtonProps, formLoading } = useForm();
-
- if (formProps.initialValues) {
- formProps.initialValues.first_used = null;
- formProps.initialValues.last_used = null;
- formProps.initialValues.used_weight = 0;
- formProps.initialValues.filament_id = formProps.initialValues.filament.id;
- }
-
- const { queryResult } = useSelect({
- resource: "filament",
- });
-
- const filamentOptions = queryResult.data?.data.map((item) => {
- let label;
- if (item.vendor) {
- label = `${item.vendor.name} - ${item.name}`;
- } else {
- label = item.name;
- }
-
- return {
- label: label,
- value: item.id,
- };
- });
-
- return (
-
- ({
- value: value ? dayjs(value) : undefined,
- })}
- >
-
-
- ({
- value: value ? dayjs(value) : undefined,
- })}
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
-};
diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx
index 66f12e2..1e7d5a1 100644
--- a/client/src/pages/spools/create.tsx
+++ b/client/src/pages/spools/create.tsx
@@ -6,8 +6,24 @@ import dayjs from "dayjs";
import TextArea from "antd/es/input/TextArea";
import { IFilament } from "../filaments/model";
-export const SpoolCreate: React.FC = () => {
- const { formProps, saveButtonProps } = useForm();
+interface CreateOrCloneProps {
+ mode: "create" | "clone";
+}
+
+export const SpoolCreate: React.FC<
+ IResourceComponentsProps & CreateOrCloneProps
+> = (props: IResourceComponentsProps & CreateOrCloneProps) => {
+ const { formProps, saveButtonProps, formLoading } = useForm();
+
+ if (props.mode === "clone" && formProps.initialValues) {
+ // Clear out the values that we don't want to clone
+ formProps.initialValues.first_used = null;
+ formProps.initialValues.last_used = null;
+ formProps.initialValues.used_weight = 0;
+
+ // Fix the filament_id
+ formProps.initialValues.filament_id = formProps.initialValues.filament.id;
+ }
const { queryResult } = useSelect({
resource: "filament",
@@ -28,7 +44,11 @@ export const SpoolCreate: React.FC = () => {
});
return (
-
+