Removed commentsThreads & commentsPinning labs flags

apps/admin/src/comments/components/comment-menu.tsx

@@ -2,7 +2,6 @@ import {Button, DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMen
 import {type Comment, usePinComment, useUnpinComment} from '@tryghost/admin-x-framework/api/comments';
 import {DisableCommentingDialog} from './disable-commenting-dialog';
 import {LucideIcon} from '@tryghost/shade/utils';
-import {useCommentsPinningEnabled} from '@/comments/hooks/use-comments-pinning-enabled';
 import {useDisableMemberCommenting, useEnableMemberCommenting} from '@tryghost/admin-x-framework/api/members';
 import {useState} from 'react';
 
@@ -18,13 +17,12 @@ export function CommentMenu({
     const {mutate: pinComment} = usePinComment();
     const {mutate: unpinComment} = useUnpinComment();
     const [disableDialogOpen, setDisableDialogOpen] = useState(false);
-    const commentsPinningEnabled = useCommentsPinningEnabled();
 
     const {id: commentId, post, member} = comment;
     const postUrl = post?.url;
     const memberId = member?.id;
     const canComment = member?.can_comment;
-    const canPin = commentsPinningEnabled && !comment.parent_id && comment.status !== 'deleted';
+    const canPin = !comment.parent_id && comment.status !== 'deleted';
 
     const handleDisableCommenting = (hideComments: boolean) => {
         if (memberId) {

apps/admin/src/comments/components/comment-thread-list.tsx

@@ -8,7 +8,6 @@ import {CommentMetrics} from './comment-metrics';
 import {buildThreadLink} from './thread-link';
 import {Link, useSearchParams} from '@tryghost/admin-x-framework';
 import {LucideIcon, cn} from '@tryghost/shade/utils';
-import {useCommentsPinningEnabled} from '@/comments/hooks/use-comments-pinning-enabled';
 
 function RepliesLine({hasReplies}: {hasReplies: boolean}) {
     if (!hasReplies) {
@@ -36,7 +35,6 @@ function CommentRow({comment, dislikesEnabled, isReply = false, isSelectedCommen
     const {mutate: hideComment} = useHideComment();
     const {mutate: showComment} = useShowComment();
     const {mutate: unpinComment} = useUnpinComment();
-    const commentsPinningEnabled = useCommentsPinningEnabled();
 
     // Check replies array for loaded objects, or count.direct_replies for unloaded
     // TODO: remove count.replies fallback once backend is fully rolled out
@@ -64,10 +62,10 @@ function CommentRow({comment, dislikesEnabled, isReply = false, isSelectedCommen
                             canComment={comment.member?.can_comment}
                             createdAt={comment.created_at}
                             isHidden={comment.status === 'hidden'}
-                            isPinned={commentsPinningEnabled && comment.pinned}
+                            isPinned={comment.pinned}
                             memberId={comment.member?.id}
                             memberName={comment.member?.name}
-                            onUnpinClick={commentsPinningEnabled ? () => unpinComment({id: comment.id}) : undefined}
+                            onUnpinClick={() => unpinComment({id: comment.id})}
                         />
 
                         {comment.in_reply_to_snippet && isSelectedComment && (

apps/admin/src/comments/components/comments-list.tsx

@@ -10,7 +10,6 @@ import {Link, useSearchParams} from '@tryghost/admin-x-framework';
 import {LoadMoreButton, useInfiniteVirtualScroll, useScrollRestoration, useVirtualListWindow} from '@/shared/virtual-list';
 import {LucideIcon, cn} from '@tryghost/shade/utils';
 import {forwardRef, useEffect, useRef, useState} from 'react';
-import {useCommentsPinningEnabled} from '@/comments/hooks/use-comments-pinning-enabled';
 
 const SpacerRow = ({height}: { height: number }) => (
     <div aria-hidden="true" className="flex">
@@ -67,7 +66,6 @@ function CommentsList({
     const {mutate: hideComment} = useHideComment();
     const {mutate: showComment} = useShowComment();
     const {mutate: unpinComment} = useUnpinComment();
-    const commentsPinningEnabled = useCommentsPinningEnabled();
 
     const handleCloseSidebar = (open: boolean) => {
         setThreadSidebarOpen(open);
@@ -157,13 +155,13 @@ function CommentsList({
                                                     canComment={item.member?.can_comment}
                                                     createdAt={item.created_at}
                                                     isHidden={item.status === 'hidden'}
-                                                    isPinned={commentsPinningEnabled && item.pinned}
+                                                    isPinned={item.pinned}
                                                     memberId={item.member?.id}
                                                     memberName={item.member?.name}
                                                     postTitle={item.post?.title}
                                                     onAuthorClick={item.member?.id ? () => onAddFilter('author', item.member!.id) : undefined}
                                                     onPostClick={item.post?.id ? () => onAddFilter('post', item.post!.id) : undefined}
-                                                    onUnpinClick={commentsPinningEnabled ? () => unpinComment({id: item.id}) : undefined}
+                                                    onUnpinClick={() => unpinComment({id: item.id})}
                                                 />
 
                                                 {item.in_reply_to_snippet && (

apps/comments-ui/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@tryghost/comments-ui",
     "type": "module",
-    "version": "1.5.22",
+    "version": "1.6.0",
     "license": "MIT",
     "repository": "https://github.com/TryGhost/Ghost",
     "author": "Ghost Foundation",