✨ Changed comments to be enabled by default

apps/admin/src/layout/app-sidebar/nav-content.tsx

@@ -3,6 +3,7 @@ import React from "react"
 import {SidebarGroup, SidebarGroupContent, SidebarMenu, SidebarMenuBadge} from "@tryghost/shade/components"
 import {formatNumber, LucideIcon} from "@tryghost/shade/utils"
 import { useCurrentUser } from "@tryghost/admin-x-framework/api/current-user";
+import {getSettingValue, useBrowseSettings} from "@tryghost/admin-x-framework/api/settings";
 import { canManageMembers, canManageTags } from "@tryghost/admin-x-framework/api/users";
 import { NavMenuItem } from "./nav-menu-item";
 import { useMemberCount } from "./hooks/use-member-count";
@@ -69,6 +70,7 @@ function MembersNavItemContent({
 
 function NavContent({ ...props }: React.ComponentProps<typeof SidebarGroup>) {
     const { data: currentUser } = useCurrentUser();
+    const {data: settingsData} = useBrowseSettings();
     const [savedPostsExpanded, setPostsExpanded] = useNavigationExpanded('posts');
     const [savedMembersExpanded, setMembersExpanded] = useNavigationExpanded('members');
     const postCustomViews = useCustomSidebarViews('posts');
@@ -82,6 +84,8 @@ function NavContent({ ...props }: React.ComponentProps<typeof SidebarGroup>) {
 
     const showTags = currentUser && canManageTags(currentUser);
     const showMembers = currentUser && canManageMembers(currentUser);
+    const commentsEnabled = getSettingValue<string>(settingsData?.settings, 'comments_enabled');
+    const showComments = !!showMembers && commentModerationEnabled && commentsEnabled !== 'off';
     const isDraftPostsRouteActive = routing.isRouteActive('posts', {type: 'draft'});
     const isScheduledPostsRouteActive = routing.isRouteActive('posts', {type: 'scheduled'});
     const isPublishedPostsRouteActive = routing.isRouteActive('posts', {type: 'published'});
@@ -202,7 +206,7 @@ function NavContent({ ...props }: React.ComponentProps<typeof SidebarGroup>) {
                         </>
                     )}
 
-                    {showMembers && commentModerationEnabled && (
+                    {showComments && (
                         <NavMenuItem>
                             <NavMenuItem.Link
                                 to="comments"

e2e/tests/portal/member-actions.test.ts

@@ -2,6 +2,7 @@ import {APIRequestContext, Page} from '@playwright/test';
 import {HomePage, MemberDetailsPage, MembersPage} from '@/helpers/pages';
 import {MemberFactory, createMemberFactory} from '@/data-factory';
 import {PortalAccountHomePage, PortalNewsletterManagementPage} from '@/portal-pages';
+import {SettingsService} from '@/helpers/services/settings/settings-service';
 import {expect, test} from '@/helpers/playwright';
 import {usePerTestIsolation} from '@/helpers/playwright/isolation';
 
@@ -78,6 +79,9 @@ test.describe('Portal - Member Actions', () => {
     });
 
     test('can unsubscribe from newsletter', async ({page}) => {
+        const settingsService = new SettingsService(page.request);
+        await settingsService.setCommentsEnabled('off');
+
         const member = await createSubscribedMember(page.request, memberFactory);
 
         await impersonateMember(page, member.name!);
@@ -120,7 +124,9 @@ test.describe('Portal - Member Actions', () => {
         await expect(newsletterManagement.newsletterToggleCheckbox(0)).not.toBeChecked();
         await expect(newsletterManagement.newsletterToggleCheckbox(1)).not.toBeChecked();
 
-        const memberNewsletters = await getMemberNewsletters(page.request, member.id);
-        expect(memberNewsletters).toHaveLength(0);
+        await expect(async () => {
+            const memberNewsletters = await getMemberNewsletters(page.request, member.id);
+            expect(memberNewsletters).toHaveLength(0);
+        }).toPass();
     });
 });

e2e/tests/public/stripe-webhook-subscription-lifecycle.test.ts

@@ -1,6 +1,7 @@
 import {APIRequestContext, Page} from '@playwright/test';
 import {HomePage, MemberDetailsPage, MembersPage, PortalAccountPage} from '@/helpers/pages';
 import {MembersService} from '@/helpers/services/members';
+import {SettingsService} from '@/helpers/services/settings/settings-service';
 import {expect, test} from '@/helpers/playwright';
 
 async function waitForMemberStatus(request: APIRequestContext, email: string, status: string) {
@@ -84,6 +85,9 @@ test.describe('Portal - Stripe Subscription Lifecycle via Webhooks', () => {
     });
 
     test('subscription-deleted webhook - shows free membership in portal', async ({page, stripe}) => {
+        const settingsService = new SettingsService(page.request);
+        await settingsService.setCommentsEnabled('off');
+
         const email = `portal-free-${Date.now()}@example.com`;
         const {subscription} = await stripe!.createPaidMemberViaWebhooks({email, name: 'Portal Free Member'});
 

ghost/core/core/server/data/schema/default-settings/default-settings.json

@@ -599,7 +599,7 @@
     "comments": {
         "comments_enabled": {
             "type": "string",
-            "defaultValue": "off",
+            "defaultValue": "all",
             "validations": {
                 "isEmpty": false,
                 "isIn": [[