diff --git a/src/components/Article/Comment/Comment.tsx b/src/components/Article/Comment/Comment.tsx index 30878919..0df0a748 100644 --- a/src/components/Article/Comment/Comment.tsx +++ b/src/components/Article/Comment/Comment.tsx @@ -43,11 +43,10 @@ export const Comment = (props: Props) => { const { showConfirm } = useConfirm() const { showSnackbar } = useSnackbar() - const canEdit = createMemo( - () => - Boolean(author()?.id) && - (props.comment?.created_by?.id === author().id || session()?.user?.roles.includes('editor')), + const canEdit = createMemo ( () => + Boolean(author()?.id) && ((props.comment?.created_by?.id === author().id) || session()?.user?.roles.includes('editor')) ) + const comment = createMemo(() => props.comment) const body = createMemo(() => (comment().body || '').trim()) diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx index 4c4d1775..bf289fd3 100644 --- a/src/components/Article/FullArticle.tsx +++ b/src/components/Article/FullArticle.tsx @@ -79,12 +79,9 @@ export const FullArticle = (props: Props) => { const formattedDate = createMemo(() => formatDate(new Date(props.article.published_at * 1000))) - const canEdit = createMemo( - () => - Boolean(author()?.id) && - (props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id) || - props.article?.created_by?.id === author().id || - session()?.user?.roles.includes('editor')), + const canEdit = createMemo ( () => + Boolean(author()?.id) && ((props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id)) || + (props.article?.created_by.id === author().id) || session()?.user?.roles.includes('editor')) ) const mainTopic = createMemo(() => { diff --git a/src/components/Feed/ArticleCard/ArticleCard.tsx b/src/components/Feed/ArticleCard/ArticleCard.tsx index 4d661dc8..5264992f 100644 --- a/src/components/Feed/ArticleCard/ArticleCard.tsx +++ b/src/components/Feed/ArticleCard/ArticleCard.tsx @@ -120,12 +120,9 @@ export const ArticleCard = (props: ArticleCardProps) => { props.article.published_at ? formatDate(new Date(props.article.published_at * 1000)) : '', ) - const canEdit = createMemo( - () => - Boolean(author()?.id) && - (props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id) || - props.article?.created_by?.id === author().id || - session()?.user?.roles.includes('editor')), + const canEdit = createMemo ( () => + Boolean(author()?.id) && ((props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id)) || + (props.article?.created_by.id === author().id) || session()?.user?.roles.includes('editor')) ) const scrollToComments = (event) => {