Merge branch '237-inventory-barcode-field-not-visible' into 'main'

Resolve "Inventory. Barcode field not visible."

Closes #237

See merge request grin-global/grin-global-ui!225

(cherry picked from commit 7676b54f)

workspaces/ui-express/src/accession/ui/AccessionBrowsePage.tsx

@@ -123,8 +123,8 @@ class BrowsePage extends React.Component<IBrowsePageProps> {
 
     return (
       <>
-        <PageTitle title={ data?.totalElements ? t('accession.browse.title', { count: data.totalElements }) : t('accession.browse.loading') }/>
-        <ContentHeader title={ data?.totalElements ? t('accession.browse.title', { count: data.totalElements }) : t('accession.browse.loading') }>
+        <PageTitle title={ data ? t('accession.browse.title', { count: data?.totalElements }) : t('accession.browse.loading') }/>
+        <ContentHeader title={ data ? t('accession.browse.title', { count: data?.totalElements }) : t('accession.browse.loading') }>
           <FiltersButton>
             <Filters
               onSubmit={ applyFilter }

workspaces/ui-express/src/inventory/ui/InventoryBrowsePage.tsx

@@ -144,8 +144,8 @@ class BrowsePage extends React.Component<IBrowsePageProps> {
 
     return (
       <>
-        <PageTitle title={ data && data.totalElements ? t('inventory.browse.title', { count: data.totalElements }) : t('inventory.browse.loading') }/>
-        <ContentHeader title={ data && data.totalElements ? t('inventory.browse.title', { count: data.totalElements }) : t('inventory.browse.loading') }>
+        <PageTitle title={ data ? t('inventory.browse.title', { count: data?.totalElements }) : t('inventory.browse.loading') }/>
+        <ContentHeader title={ data ? t('inventory.browse.title', { count: data?.totalElements }) : t('inventory.browse.loading') }>
           <FiltersButton>
             <Filters
               onSubmit={ applyFilter }

workspaces/ui-express/src/inventory/ui/InventoryDetailsPage.tsx

@@ -458,6 +458,12 @@ class InventoryDetailsPage extends React.Component<IDetailsPageProps> {
                               <InventoryLink inventory={ inventory.parentInventory }/>
                             </PropertiesItem>
                             }
+                            { inventory.barcode &&
+                            <PropertiesItem title={ t(['client:model.Inventory.barcode', 'client:model._.barcode']) }>
+                              <code>{ inventory.barcode }</code>
+                            </PropertiesItem>
+                            }
+
                             { inventory.storageLocationPart1 &&
                             <>
                               <h3 className={ classes.h2 }>Storage</h3>