[pull] main from TryGhost:main

apps/admin-x-settings/src/components/settings/general/users/email-notifications-tab.tsx

@@ -107,8 +107,8 @@ const EmailNotificationsInputs: React.FC<{ user: User; setUserData: (user: User)
                             align='center'
                             checked={user.gift_subscription_purchase_notification}
                             direction='rtl'
-                            hint='Every time someone purchases a gift subscription'
-                            label='Gift subscription purchases'
+                            hint='Every time someone purchases or redeems a gift subscription'
+                            label='Gift subscriptions'
                             onChange={(e) => {
                                 setUserData?.({...user, gift_subscription_purchase_notification: e.target.checked});
                             }}

apps/admin/src/ember-bridge/ember-bridge.test.tsx

@@ -137,6 +137,39 @@ describe('useEmberDataSync', () => {
         expect(invalidateSpy).not.toHaveBeenCalled();
     });
 
+    queryTest('invalidates comment queries for mapped Ember comment events', async ({ queryClient, wrapper }) => {
+        const mock = createMockStateBridge();
+        window.EmberBridge = { state: mock.stateBridge };
+
+        queryClient.setQueryData(['MembersResponseType', '/members'], { members: [] });
+        queryClient.setQueryData(['CommentsResponseType', '/comments'], { comments: [] });
+        queryClient.setQueryData(['PostsResponseType', '/posts'], { posts: [] });
+
+        renderHook(() => useEmberDataSync(), { wrapper });
+
+        await waitFor(() => {
+            expect(mock.onSpy).toHaveBeenCalledWith('emberDataChange', expect.any(Function));
+        });
+
+        act(() => {
+            mock.emit('emberDataChange', {
+                operation: 'update',
+                modelName: 'comment',
+                id: 'member-1',
+                data: null
+            });
+        });
+
+        await waitFor(() => {
+            const queries = queryClient.getQueryCache().getAll();
+            const commentQueries = queries.filter(q => q.queryKey[0] === 'CommentsResponseType');
+            const nonCommentQueries = queries.filter(q => q.queryKey[0] !== 'CommentsResponseType');
+
+            expect(commentQueries.every(q => q.state.isInvalidated)).toBe(true);
+            expect(nonCommentQueries.every(q => !q.state.isInvalidated)).toBe(true);
+        });
+    });
+
     queryTest('does not subscribe if unmounted before the bridge becomes available', async ({ wrapper }) => {
         vi.useFakeTimers();
         const mock = createMockStateBridge();
@@ -383,4 +416,3 @@ describe('useEmberRouting', () => {
         });
     });
 });
-

apps/admin/src/ember-bridge/ember-bridge.tsx

@@ -77,6 +77,7 @@ const EMBER_TO_REACT_TYPE_MAPPING: Record<string, string> = {
     'user': 'UsersResponseType',
     'post': 'PostsResponseType',
     'member': 'MembersResponseType',
+    'comment': 'CommentsResponseType',
     'tag': 'TagsResponseType',
     'label': 'LabelsResponseType',
     'webhook': 'WebhooksResponseType'
@@ -310,4 +311,3 @@ export function useForceUpgrade(): boolean {
 
     return true;
 }
-

apps/admin/src/onboarding/components/share-publication-dialog.tsx

@@ -1,5 +1,6 @@
 import {Button} from "@tryghost/shade/components";
 import {ShareModal, type ShareModalSocialLink} from "@tryghost/shade/patterns";
+import {LucideIcon} from "@tryghost/shade/utils";
 
 interface SharePublicationDialogProps {
     description: string;
@@ -47,37 +48,52 @@ export function SharePublicationDialog({
     ];
 
     return (
-        <ShareModal
-            actionsLayout="footer"
-            closeButtonId="ob-close-share-modal"
-            contentProps={{
-                className: "dark:bg-surface-elevated",
-                "data-testid": "onboarding-share-modal",
-            }}
-            copyButtonId="ob-copy-publication-link"
-            copyButtonTestId="onboarding-copy-link"
-            copyLabel="Copy link"
-            copyURL={siteUrl}
-            guidance={(
+        <ShareModal.Root
+            open={open}
+            onOpenChange={onOpenChange}
+        >
+            <ShareModal.Content
+                className="dark:bg-surface-elevated"
+                data-test-modal="onboarding-share"
+                data-testid="onboarding-share-modal"
+            >
+                <ShareModal.Header className="flex-row items-center justify-between gap-4 space-y-0 text-left">
+                    <ShareModal.Title className="text-2xl">Share your publication</ShareModal.Title>
+                    <ShareModal.CloseButton id="ob-close-share-modal" onClick={() => onOpenChange(false)} />
+                </ShareModal.Header>
+                <ShareModal.Preview className="rounded-lg bg-card" href={siteUrl}>
+                    {imageUrl ?
+                        <div className="aspect-video bg-cover bg-center" style={{backgroundImage: `url(${imageUrl})`}}></div>
+                        :
+                        <div className="flex aspect-video items-center justify-center bg-muted text-muted-foreground">
+                            <LucideIcon.Image className="size-8" />
+                        </div>
+                    }
+                    <div className="p-5">
+                        <div className="text-lg font-semibold">{siteTitle}</div>
+                        {description && (
+                            <p className="mt-1 text-sm text-muted-foreground">{description}</p>
+                        )}
+                    </div>
+                </ShareModal.Preview>
                 <p className="text-sm text-muted-foreground">
                     Set your publication&apos;s cover image and description in{" "}
                     <Button asChild className="h-auto p-0 align-baseline text-sm text-green hover:text-green/90" variant="link">
                         <a href="#/settings/design/edit?ref=setup" id="ob-share-modal-design-settings">Design settings</a>
                     </Button>.
                 </p>
-            )}
-            open={open}
-            preview={{
-                description,
-                imageURL: imageUrl,
-                title: siteTitle,
-                url: siteUrl,
-            }}
-            socialLinks={socialLinks}
-            title="Share your publication"
-            variant="publication"
-            onClose={() => onOpenChange(false)}
-            onOpenChange={onOpenChange}
-        />
+                <ShareModal.Footer>
+                    <ShareModal.SocialLinks links={socialLinks} />
+                    <ShareModal.CopyButton
+                        className="ml-0! grow cursor-pointer"
+                        copyURL={siteUrl}
+                        data-testid="onboarding-copy-link"
+                        icon="link"
+                        id="ob-copy-publication-link"
+                        label="Copy link"
+                    />
+                </ShareModal.Footer>
+            </ShareModal.Content>
+        </ShareModal.Root>
     );
 }

apps/portal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/portal",
-  "version": "2.68.32",
+  "version": "2.68.33",
   "license": "MIT",
   "repository": "https://github.com/TryGhost/Ghost",
   "author": "Ghost Foundation",