From 6332de8d701ca2b42c9db331a2b12fa450193e90 Mon Sep 17 00:00:00 2001
From: Matthias Mair <code@mjmair.com>
Date: Wed, 1 May 2024 15:47:27 +0200
Subject: [PATCH] fix merge issues

---
 src/frontend/src/pages/Index/Scan.tsx              | 1 -
 src/frontend/src/tables/ColumnRenderers.tsx        | 4 +++-
 src/frontend/src/tables/build/BuildOutputTable.tsx | 6 +++---
 src/frontend/src/tables/company/CompanyTable.tsx   | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/frontend/src/pages/Index/Scan.tsx b/src/frontend/src/pages/Index/Scan.tsx
index a8c2581e8a..029afe7a9a 100644
--- a/src/frontend/src/pages/Index/Scan.tsx
+++ b/src/frontend/src/pages/Index/Scan.tsx
@@ -4,7 +4,6 @@ import {
   Badge,
   Button,
   Checkbox,
-  Col,
   Container,
   Grid,
   Group,
diff --git a/src/frontend/src/tables/ColumnRenderers.tsx b/src/frontend/src/tables/ColumnRenderers.tsx
index 83cfdf0884..ef53d810b1 100644
--- a/src/frontend/src/tables/ColumnRenderers.tsx
+++ b/src/frontend/src/tables/ColumnRenderers.tsx
@@ -46,7 +46,9 @@ export function LocationColumn({
       let location = resolveItem(record, accessor);
 
       if (!location) {
-        return <Text italic>{t`No location set`}</Text>;
+        return (
+          <Text style={{ fontStyle: 'italic' }}>{t`No location set`}</Text>
+        );
       }
 
       return <Text>{location.name}</Text>;
diff --git a/src/frontend/src/tables/build/BuildOutputTable.tsx b/src/frontend/src/tables/build/BuildOutputTable.tsx
index 31ccdd8238..a3bf368012 100644
--- a/src/frontend/src/tables/build/BuildOutputTable.tsx
+++ b/src/frontend/src/tables/build/BuildOutputTable.tsx
@@ -190,10 +190,10 @@ export default function BuildOutputTable({
           }
 
           return (
-            <Group position="left" noWrap>
+            <Group justify="left" wrap="nowrap">
               <Text>{text}</Text>
               {record.batch && (
-                <Text italic size="sm">
+                <Text style={{ fontStyle: 'italic' }} size="sm">
                   {t`Batch`}: {record.batch}
                 </Text>
               )}
@@ -225,7 +225,7 @@ export default function BuildOutputTable({
             record.results?.map((result: TestResultOverview) => {
               return (
                 result && (
-                  <Group position="left" key={result.name} noWrap>
+                  <Group justify="left" key={result.name} wrap="nowrap">
                     {result.result ? (
                       <IconCircleCheck color="green" />
                     ) : (
diff --git a/src/frontend/src/tables/company/CompanyTable.tsx b/src/frontend/src/tables/company/CompanyTable.tsx
index c46ae9abbe..bcff8a77dc 100644
--- a/src/frontend/src/tables/company/CompanyTable.tsx
+++ b/src/frontend/src/tables/company/CompanyTable.tsx
@@ -6,6 +6,7 @@ import { useNavigate } from 'react-router-dom';
 import { AddItemButton } from '../../components/buttons/AddItemButton';
 import { Thumbnail } from '../../components/images/Thumbnail';
 import { ApiEndpoints } from '../../enums/ApiEndpoints';
+import { ModelType } from '../../enums/ModelType';
 import { UserRoles } from '../../enums/Roles';
 import { companyFields } from '../../forms/CompanyForms';
 import {