[News] fix empty author

parti-renaissance · Dec 30, 2024 · 0c94c64 · 0c94c64
1 parent ec40b77
commit 0c94c64
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/components/News/NewsList.jsx b/src/components/News/NewsList.jsx
@@ -20,7 +20,7 @@ const NewsList = ({ data, toggleNewsStatus, toggleNewsPinned, handleEdit, handle
                 <Header {...n} />
                 <Title
                   subject={n.title}
-                  author={`${n.creator.first_name} ${n.creator.last_name}`}
+                  author={n.creator ? `${n.creator.first_name} ${n.creator.last_name}` : null}
                   sx={{ pt: 1 }}
                   dateTime={n.createdAt}
                 />

diff --git a/src/components/News/ReadModal.jsx b/src/components/News/ReadModal.jsx
@@ -1,6 +1,6 @@
 import { useMemo } from 'react'
 import PropTypes from 'prop-types'
-import { Grid, Icon as MuiIcon, Typography } from '@mui/material'
+import { Box, Grid, Typography } from '@mui/material'
 import { styled } from '@mui/system'
 import NotificationsActiveRoundedIcon from '@mui/icons-material/NotificationsActiveRounded'
 import NotificationsOffRoundedIcon from '@mui/icons-material/NotificationsOffRounded'
@@ -128,9 +128,13 @@ const ReadModal = ({ open, news, handleEdit, onCloseResolve }) => {
       </Grid>
       <Title title={news?.title}>{news?.title}</Title>
       <UserTimeContainer>
-        <PersonIcon sx={{ mr: 0.5, color: 'gray600', fontSize: '12px' }} />
-        <Author>{`${news?.creator?.first_name} ${news?.creator?.last_name}`}</Author>
-        <AccessTimeIcon sx={{ mr: 0.5, ml: 2, color: 'gray600', fontSize: '12px' }} />
+        {news?.creator && (
+          <>
+            <PersonIcon sx={{ mr: 0.5, color: 'gray600', fontSize: '12px' }} />
+            <Author>{`${news?.creator?.first_name} ${news?.creator?.last_name}`}</Author>
+          </>
+        )}
+        <AccessTimeIcon sx={{ mr: 0.5, color: 'gray600', fontSize: '12px' }} />
         <DateItem>
           {news?.createdAt && `Le ${formatDate(news.createdAt, 'dd/MM/yyyy')} à ${formatDate(news.createdAt, 'HH:mm')}`}
         </DateItem>

diff --git a/src/ui/Card/Title/Title.jsx b/src/ui/Card/Title/Title.jsx
@@ -11,12 +11,14 @@ export const Title = ({ subject, author, dateTime, lines = 1, ...props }) => (
     <TruncatedText variant="subtitle1" sx={{ color: 'gray900', height: '45px', mb: 0.5 }} lines={lines} title={subject}>
       {subject}
     </TruncatedText>
-    <HorizontalContainer>
-      <Person sx={{ mr: 0.5, color: 'gray600', fontSize: '12px' }} />
-      <Typography variant="subtitle2" sx={{ color: 'gray600' }}>
-        {author}
-      </Typography>
-    </HorizontalContainer>
+    {author && (
+      <HorizontalContainer>
+        <Person sx={{ mr: 0.5, color: 'gray600', fontSize: '12px' }} />
+        <Typography variant="subtitle2" sx={{ color: 'gray600' }}>
+          {author}
+        </Typography>
+      </HorizontalContainer>
+    )}
     {dateTime && (
       <HorizontalContainer>
         <AccessTime sx={{ mr: 0.5, color: 'gray600', fontSize: '12px' }} />
@@ -31,6 +33,6 @@ export const Title = ({ subject, author, dateTime, lines = 1, ...props }) => (
 Title.propTypes = {
   subject: PropTypes.string.isRequired,
   lines: PropTypes.number,
-  author: PropTypes.string.isRequired,
+  author: PropTypes.string,
   dateTime: PropTypes.object,
 }