Release 202507061803

This commit is contained in:
pluja
2025-07-06 18:03:45 +00:00
parent 349c26a4df
commit 7a294cb0a1
11 changed files with 66 additions and 5 deletions

View File

@@ -33,6 +33,7 @@ type Props = HTMLAttributes<'div'> & {
highlightedCommentId: number | null
serviceSlug: string
itemReviewedId: string
strictCommentingEnabled?: boolean
}
const {
@@ -42,6 +43,7 @@ const {
highlightedCommentId = null,
serviceSlug,
itemReviewedId,
strictCommentingEnabled,
class: className,
...htmlProps
} = Astro.props
@@ -492,6 +494,7 @@ const commentUrl = makeCommentUrl({ serviceSlug, commentId: comment.id, origin:
serviceId={comment.serviceId}
parentId={comment.id}
commentId={comment.id}
strictCommentingEnabled={strictCommentingEnabled}
class="mt-2 hidden peer-checked/collapse:hidden peer-checked/reply:block"
/>
</>

View File

@@ -20,6 +20,7 @@ type Props = Omit<HTMLAttributes<'form'>, 'action' | 'enctype' | 'method'> & {
serviceId: number
parentId?: number
commentId?: number
strictCommentingEnabled?: boolean
activeRatingComment?: Prisma.CommentGetPayload<{
select: {
id: true
@@ -28,7 +29,15 @@ type Props = Omit<HTMLAttributes<'form'>, 'action' | 'enctype' | 'method'> & {
}> | null
}
const { serviceId, parentId, commentId, activeRatingComment, class: className, ...htmlProps } = Astro.props
const {
serviceId,
parentId,
commentId,
activeRatingComment,
strictCommentingEnabled,
class: className,
...htmlProps
} = Astro.props
const MIN_COMMENT_LENGTH = parentId ? 10 : 30
@@ -117,6 +126,7 @@ const userCommentsDisabled = user ? user.karmaUnlocks.commentsDisabled : false
maxlength: 100,
placeholder: 'Order ID / URL / Proof',
class: 'bg-night-800',
required: strictCommentingEnabled,
}}
descriptionLabel="Only visible to admins, to verify your comment"
class="grow"

View File

@@ -35,6 +35,7 @@ type Props = {
name: true
description: true
createdAt: true
strictCommentingEnabled: true
}
}>
}
@@ -173,7 +174,12 @@ function makeReplySchema(comment: CommentWithRepliesPopulated): Comment {
comment: comments.map(makeReplySchema),
} as WithContext<DiscussionForumPosting>}
/>
<CommentReply serviceId={service.id} activeRatingComment={activeRatingComment} class="xs:mb-4 mb-2" />
<CommentReply
serviceId={service.id}
activeRatingComment={activeRatingComment}
strictCommentingEnabled={service.strictCommentingEnabled}
class="xs:mb-4 mb-2"
/>
<div class="mb-6 flex flex-wrap items-center justify-between gap-2">
<div class="flex items-center">
@@ -258,6 +264,7 @@ function makeReplySchema(comment: CommentWithRepliesPopulated): Comment {
showPending={params.showPending}
serviceSlug={service.slug}
itemReviewedId={itemReviewedId}
strictCommentingEnabled={service.strictCommentingEnabled}
/>
))
) : (

View File

@@ -7,6 +7,8 @@ import type { ComponentProps } from 'astro/types'
type Props = Pick<ComponentProps<typeof InputWrapper>, 'error' | 'name' | 'required'> & {
disabled?: boolean
checked?: boolean
descriptionInline?: string
id?: string
} & (
| {
@@ -19,13 +21,11 @@ type Props = Pick<ComponentProps<typeof InputWrapper>, 'error' | 'name' | 'requi
}
)
const { disabled, name, required, error, id, label } = Astro.props
const { disabled, name, required, error, id, label, checked, descriptionInline } = Astro.props
const hasError = !!error && error.length > 0
---
{}
<div>
<label
class={cn(
@@ -41,9 +41,11 @@ const hasError = !!error && error.length > 0
name={name}
required={required}
disabled={disabled}
checked={checked}
class={cn(disabled && 'opacity-50')}
/>
<span class="text-sm leading-none text-pretty">{label ?? <slot />}</span>
{descriptionInline && <p class="text-day-400 text-xs">{descriptionInline}</p>}
</label>
{