From fb4af6d02c3fe07bd9c06d2650302c15a5f0a100 Mon Sep 17 00:00:00 2001 From: tahaKhanAbdalli Date: Fri, 22 Dec 2023 18:29:27 +0500 Subject: [PATCH 1/4] remarks were not showing into the address list issue resolved --- src/resources/addresses/AddressList.tsx | 2 +- src/types.d.ts | 2 +- src/utils/init-data.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/resources/addresses/AddressList.tsx b/src/resources/addresses/AddressList.tsx index 4f88d0a6..99e144ad 100644 --- a/src/resources/addresses/AddressList.tsx +++ b/src/resources/addresses/AddressList.tsx @@ -17,7 +17,7 @@ export default function AddressList(): React.ReactElement { source='fullAddress' /> source='active' looseValue /> source='createdAt' /> - source='Remarks' /> + source='remarks' /> ) diff --git a/src/types.d.ts b/src/types.d.ts index 014d2926..99b8e222 100644 --- 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 index 985d06e1..71ce63d6 100644 --- 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 } }) From d414ef3ad0d2d4ff26cd45e73d2291b4ce32f419 Mon Sep 17 00:00:00 2001 From: tahaKhanAbdalli Date: Tue, 26 Dec 2023 12:08:35 +0500 Subject: [PATCH 2/4] added build date into the footer --- src/components/Layout/Footer.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/Layout/Footer.tsx b/src/components/Layout/Footer.tsx index 2a399106..6dee69a0 100644 --- 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 (
Date: Tue, 26 Dec 2023 14:04:13 +0500 Subject: [PATCH 3/4] media type need edit issue resolved --- src/resources/reference-data/ReferenceDataForm.tsx | 2 +- src/resources/reference-data/ReferenceDataShow.tsx | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/resources/reference-data/ReferenceDataForm.tsx b/src/resources/reference-data/ReferenceDataForm.tsx index beab9297..b4835821 100644 --- 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 ? ( ) : null} diff --git a/src/resources/reference-data/ReferenceDataShow.tsx b/src/resources/reference-data/ReferenceDataShow.tsx index a7fbcf48..6a7b2ef9 100644 --- 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 ( + { redirect( @@ -58,8 +59,12 @@ export default function ReferenceDataShow({ variant='h6' source='name' /> {name === R_MEDIA_TYPE ? ( - + + + Note: Item-size is + stored to facilitate future shelf loading calculations. + ) : null} From e258eb255054e4f2791f83e2f0e634685d6c2c84 Mon Sep 17 00:00:00 2001 From: Ian Mayo Date: Tue, 2 Jan 2024 12:31:23 +0000 Subject: [PATCH 4/4] Minor tidying to label --- .../reference-data/ReferenceDataShow.tsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/resources/reference-data/ReferenceDataShow.tsx b/src/resources/reference-data/ReferenceDataShow.tsx index 6a7b2ef9..3e159497 100644 --- a/src/resources/reference-data/ReferenceDataShow.tsx +++ b/src/resources/reference-data/ReferenceDataShow.tsx @@ -59,13 +59,14 @@ export default function ReferenceDataShow({ variant='h6' source='name' /> {name === R_MEDIA_TYPE ? ( - - - - Note: Item-size is - stored to facilitate future shelf loading calculations. - - + + + +   + (Note: Item-size is + stored to facilitate future shelf loading calculations) + + ) : null} source='active' looseValue />