diff --git a/src/frontend/src/components/render/Company.tsx b/src/frontend/src/components/render/Company.tsx index 8b62085629..01f3c816e5 100644 --- a/src/frontend/src/components/render/Company.tsx +++ b/src/frontend/src/components/render/Company.tsx @@ -1,4 +1,3 @@ -import { Text } from '@mantine/core'; import type { ReactNode } from 'react'; import { ModelType } from '@lib/enums/ModelType'; @@ -38,7 +37,7 @@ export function RenderCompany( {...props} image={instance.thumbnail || instance.image} primary={instance.name} - secondary={instance.description} + suffix={instance.description} url={ props.link ? getDetailUrl(ModelType.company, instance.pk) : undefined } @@ -73,9 +72,7 @@ export function RenderSupplierPart( image={ part?.thumbnail ?? part?.image ?? supplier?.thumbnail ?? supplier?.image } - suffix={ - part.full_name ? {part.full_name} : undefined - } + suffix={part.full_name} url={ props.link ? getDetailUrl(ModelType.supplierpart, instance.pk) @@ -100,9 +97,7 @@ export function RenderManufacturerPart( {...props} primary={manufacturer.name} secondary={instance.MPN} - suffix={ - part.full_name ? {part.full_name} : undefined - } + suffix={part.full_name} image={manufacturer?.thumbnail ?? manufacturer.image} url={ props.link diff --git a/src/frontend/src/components/render/Order.tsx b/src/frontend/src/components/render/Order.tsx index 36d8397b23..e74915db18 100644 --- a/src/frontend/src/components/render/Order.tsx +++ b/src/frontend/src/components/render/Order.tsx @@ -119,7 +119,7 @@ export function RenderSalesOrderShipment({ return ( {`${t`Shipment`} ${instance.reference}`}} + suffix={{`${t`Shipment`} ${instance.reference}`}} /> ); } diff --git a/src/frontend/src/components/render/User.tsx b/src/frontend/src/components/render/User.tsx index 5869d2564a..6c545e6fe9 100644 --- a/src/frontend/src/components/render/User.tsx +++ b/src/frontend/src/components/render/User.tsx @@ -33,7 +33,7 @@ export function RenderUser({ primary={instance.username} secondary={ - {!instance.is_active && ( + {instance.is_active === false && ( {t`Inactive`} )}