Merge branch 'main' into 953_edit_departure_date_useredit

DeepBlueCLtd · Jan 2, 2024 · 2b07b65 · 2b07b65
2 parents 87da05d + 2361e95
commit 2b07b65
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/src/components/Layout/Footer.tsx b/src/components/Layout/Footer.tsx
@@ -3,7 +3,10 @@ import preval from 'preval.macro'
 
 const Footer = (): React.ReactElement => {
   const buildDate = preval`module.exports = new Date().toISOString().slice(0, 19).replace('T', ' ')`
-  const trimmedAppBuildDate = buildDate.substring(0, buildDate.length - 3)
+  const trimmedAppBuildDate = `Build Date: ${buildDate.substring(
+    0,
+    buildDate.length - 3
+  )}`
 
   return (
     <div

diff --git a/src/resources/addresses/AddressList.tsx b/src/resources/addresses/AddressList.tsx
@@ -17,7 +17,7 @@ export default function AddressList(): React.ReactElement {
         <TextField<Address> source='fullAddress' />
         <BooleanField<Address> source='active' looseValue />
         <DateField<Address> source='createdAt' />
-        <TextField<Address> source='Remarks' />
+        <TextField<Address> source='remarks' />
       </Datagrid>
     </List>
   )

diff --git a/src/resources/reference-data/ReferenceDataForm.tsx b/src/resources/reference-data/ReferenceDataForm.tsx
@@ -79,7 +79,7 @@ const FormContent = ({
       {name === constants.R_MEDIA_TYPE ? (
         <NumberInput
           source='itemSize'
-          sx={{ width: '100%', visibility: 'hidden' }}
+          sx={{ width: '100%', visibility: 'show' }}
           defaultValue={10}
         />
       ) : null}

diff --git a/src/resources/reference-data/ReferenceDataShow.tsx b/src/resources/reference-data/ReferenceDataShow.tsx
@@ -23,6 +23,7 @@ const Actions = ({ resource }: ShowActionProps): React.ReactElement => {
   const redirect = useRedirect()
   return (
     <TopToolbar sx={{ alignItems: 'center' }}>
+      <EditButton />
       <HistoryButton
         onClick={() => {
           redirect(
@@ -58,9 +59,14 @@ export default function ReferenceDataShow({
             <TextField<VaultLocation> variant='h6' source='name' />
           </ValueField>
           {name === R_MEDIA_TYPE ? (
-            <ValueField label='Item size' sx={{ visibility: 'hidden' }}>
-              <TextField variant='h6' source='itemSize' />
-            </ValueField>
+            <Typography>
+              <ValueField label='Item size' sx={{ visibility: 'show' }}>
+                <TextField variant='h6' source='itemSize' />
+                &nbsp;
+                <span style={{ fontWeight: 'bold' }}>(Note: </span> Item-size is
+                stored to facilitate future shelf loading calculations)
+              </ValueField>
+            </Typography>
           ) : null}
           <ValueField label='active'>
             <BooleanField<VaultLocation> source='active' looseValue />

diff --git a/src/types.d.ts b/src/types.d.ts
@@ -261,7 +261,7 @@ interface Address {
   createdAt: string
   fullAddress: string
   active: boolean
-  Remarks: string
+  remarks: string
 }
 
 interface Dispatch {

diff --git a/src/utils/init-data.ts b/src/utils/init-data.ts
@@ -96,7 +96,7 @@ export const getAddresses = (
         id: index + 1,
         fullAddress: `${ctr} Some St, Some Town, Some County, DD${ctr} ${ctr}EF`,
         createdAt: DateTime.now().toISO() ?? '',
-        Remarks: '',
+        remarks: '',
         active
       }
     })