discours.io/webapp
5
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

can-edit-fix-2

Browse Source
This commit is contained in:
Untone 2024-02-16 13:38:07 +03:00
parent 98264cfce7
commit 19bba97d73
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Article/Comment/Comment.tsx
View File

@ -44,7 +44,9 @@ export const Comment = (props: Props) => {
const { showSnackbar } = useSnackbar() const { showSnackbar } = useSnackbar()
const canEdit = createMemo( const canEdit = createMemo(
() => props.comment.created_by?.slug === author()?.slug || session()?.user?.roles.includes('editor'), () =>
Boolean(author()?.id) &&
(props.comment?.created_by?.id === author().id || session()?.user?.roles.includes('editor')),
) )
const comment = createMemo(() => props.comment) const comment = createMemo(() => props.comment)
const body = createMemo(() => (comment().body || '').trim()) const body = createMemo(() => (comment().body || '').trim())

8
src/components/Article/FullArticle.tsx
View File

@ -78,11 +78,13 @@ export const FullArticle = (props: Props) => {
const { author, session, isAuthenticated, requireAuthentication } = useSession() const { author, session, isAuthenticated, requireAuthentication } = useSession()
const formattedDate = createMemo(() => formatDate(new Date(props.article.published_at * 1000))) const formattedDate = createMemo(() => formatDate(new Date(props.article.published_at * 1000)))
const canEdit = createMemo( const canEdit = createMemo(
() => () =>
props.article.authors?.some((a) => Boolean(a) && a?.slug === author()?.slug) || Boolean(author()?.id) &&
props.article?.created_by.slug === author()?.slug || (props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id) ||
session()?.user?.roles.includes('editor'), props.article?.created_by?.id === author().id ||
session()?.user?.roles.includes('editor')),
) )
const mainTopic = createMemo(() => { const mainTopic = createMemo(() => {

7
src/components/Feed/ArticleCard/ArticleCard.tsx
View File

@ -122,9 +122,10 @@ export const ArticleCard = (props: ArticleCardProps) => {
const canEdit = createMemo( const canEdit = createMemo(
() => () =>
props.article.authors?.some((a) => a && a?.slug === author()?.slug) || Boolean(author()?.id) &&
props.article.created_by?.id === author()?.id || (props.article?.authors?.some((a) => Boolean(a) && a?.id === author().id) ||
session()?.user?.roles.includes('editor'), props.article?.created_by?.id === author().id ||
session()?.user?.roles.includes('editor')),
) )
const scrollToComments = (event) => { const scrollToComments = (event) => {