From 887748402df52ee0169a3b1b9b0408a31c018386 Mon Sep 17 00:00:00 2001
From: Donkie <daniel.cf.hultgren@gmail.com>
Date: Thu, 6 Jul 2023 19:05:28 +0200
Subject: [PATCH] Client: Improved filament label if name not set

---
 client/src/pages/spools/create.tsx | 11 +++++++----
 client/src/pages/spools/edit.tsx   | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/src/pages/spools/create.tsx b/client/src/pages/spools/create.tsx
index 6a3ef1f..fd61a45 100644
--- a/client/src/pages/spools/create.tsx
+++ b/client/src/pages/spools/create.tsx
@@ -30,12 +30,15 @@ export const SpoolCreate: React.FC<
   });
 
   const filamentOptions = queryResult.data?.data.map((item) => {
-    let label;
+    let vendorPrefix = "";
     if (item.vendor) {
-      label = `${item.vendor.name} - ${item.name}`;
-    } else {
-      label = item.name;
+      vendorPrefix = `${item.vendor.name} - `;
     }
+    let name = item.name;
+    if (!name) {
+      name = `ID: ${item.id}`;
+    }
+    const label = `${vendorPrefix}${name}`;
 
     return {
       label: label,
diff --git a/client/src/pages/spools/edit.tsx b/client/src/pages/spools/edit.tsx
index 4ba6a49..eff438a 100644
--- a/client/src/pages/spools/edit.tsx
+++ b/client/src/pages/spools/edit.tsx
@@ -14,12 +14,15 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
   });
 
   const filamentOptions = queryResult.data?.data.map((item) => {
-    let label;
+    let vendorPrefix = "";
     if (item.vendor) {
-      label = `${item.vendor.name} - ${item.name}`;
-    } else {
-      label = item.name;
+      vendorPrefix = `${item.vendor.name} - `;
     }
+    let name = item.name;
+    if (!name) {
+      name = `ID: ${item.id}`;
+    }
+    const label = `${vendorPrefix}${name}`;
 
     return {
       label: label,