From e7cfb4c3c0dbd4036490348b0878d597921e54f8 Mon Sep 17 00:00:00 2001
From: Chris Thorn <chris-thorn@users.noreply.github.com>
Date: Mon, 11 Nov 2024 22:48:16 +0000
Subject: [PATCH] Add level indicators and path to stock location and part
 category dropdowns (#8366)

* Add level indicators and path to stock location dropdown

* Add level indicators and path to part category dropdown

* Updated stock location string to include location path

* Fix PUI form test (set location)

---------

Co-authored-by: Matthias Mair <code@mjmair.com>
---
 src/frontend/src/components/render/Part.tsx  | 4 ++--
 src/frontend/src/components/render/Stock.tsx | 4 ++--
 src/frontend/tests/pages/pui_scan.spec.ts    | 2 +-
 src/frontend/tests/pui_forms.spec.ts         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/frontend/src/components/render/Part.tsx b/src/frontend/src/components/render/Part.tsx
index de0635541c..a7f404e48a 100644
--- a/src/frontend/src/components/render/Part.tsx
+++ b/src/frontend/src/components/render/Part.tsx
@@ -63,11 +63,11 @@ export function RenderPartCategory(
       tooltip={instance.pathstring}
       prefix={
         <>
-          <div style={{ width: 10 * (instance.level || 0) }}></div>
+          {instance.level > 0 && `${'- '.repeat(instance.level)}`}
           {instance.icon && <ApiIcon name={instance.icon} />}
         </>
       }
-      primary={instance.name}
+      primary={instance.pathstring}
       secondary={instance.description}
       url={
         props.link
diff --git a/src/frontend/src/components/render/Stock.tsx b/src/frontend/src/components/render/Stock.tsx
index 6d0854f05c..8c0c75220f 100644
--- a/src/frontend/src/components/render/Stock.tsx
+++ b/src/frontend/src/components/render/Stock.tsx
@@ -21,11 +21,11 @@ export function RenderStockLocation(
       tooltip={instance.pathstring}
       prefix={
         <>
-          <div style={{ width: 10 * (instance.level || 0) }}></div>
+          {instance.level > 0 && `${'- '.repeat(instance.level)}`}
           {instance.icon && <ApiIcon name={instance.icon} />}
         </>
       }
-      primary={instance.name}
+      primary={instance.pathstring}
       secondary={instance.description}
       url={
         props.link
diff --git a/src/frontend/tests/pages/pui_scan.spec.ts b/src/frontend/tests/pages/pui_scan.spec.ts
index 35c2d94342..0d021b7132 100644
--- a/src/frontend/tests/pages/pui_scan.spec.ts
+++ b/src/frontend/tests/pages/pui_scan.spec.ts
@@ -73,7 +73,7 @@ test('Scanning (StockLocation)', async ({ page }) => {
   await defaultScanTest(page, '{"stocklocation": 3}');
 
   // stocklocation: 3
-  await page.getByText('Storage Room B', { exact: true }).waitFor();
+  await page.getByText('Factory/Storage Room B', { exact: true }).waitFor();
   await page.getByText('Storage Room B (green door)').waitFor();
   await page.getByRole('cell', { name: 'stocklocation' }).waitFor();
 });
diff --git a/src/frontend/tests/pui_forms.spec.ts b/src/frontend/tests/pui_forms.spec.ts
index 9512f4d0b0..222b19ef4d 100644
--- a/src/frontend/tests/pui_forms.spec.ts
+++ b/src/frontend/tests/pui_forms.spec.ts
@@ -39,7 +39,7 @@ test('Forms - Stock Item Validation', async ({ page }) => {
 
   // Set location
   await page.getByLabel('related-field-location').click();
-  await page.getByRole('option', { name: /Electronics Lab/ }).click();
+  await page.getByText('Electronics production facility').click();
 
   // Create the stock item
   await page.getByLabel('number-field-quantity').fill('123');