|
1 | 1 | import type { GitBookSiteContext } from '@/lib/context'; |
2 | | -import { Icon } from '@gitbook/icons'; |
3 | | -import React from 'react'; |
| 2 | +import { AdminToolbarClient } from './AdminToolbarClient'; |
4 | 3 |
|
5 | | -import { tcls } from '@/lib/tailwind'; |
6 | | -import { DateRelative } from '../primitives'; |
7 | | -import { IframeWrapper } from './IframeWrapper'; |
8 | | -import { RefreshChangeRequestButton } from './RefreshChangeRequestButton'; |
9 | | -import { Toolbar, ToolbarBody, ToolbarButton, ToolbarButtonGroups } from './Toolbar'; |
10 | | - |
11 | | -interface AdminToolbarProps { |
| 4 | +export interface AdminToolbarProps { |
12 | 5 | context: GitBookSiteContext; |
13 | 6 | } |
14 | 7 |
|
15 | | -function ToolbarLayout(props: { children: React.ReactNode }) { |
16 | | - return ( |
17 | | - <div |
18 | | - className={tcls( |
19 | | - 'fixed', |
20 | | - 'bottom-5', |
21 | | - 'left-1/2', |
22 | | - 'z-50', |
23 | | - 'transform', |
24 | | - '-translate-x-1/2', |
25 | | - 'rounded-full', |
| 8 | +// Minimal types containing only the fields needed for AdminToolbar to restrict what gets serialized |
| 9 | +export type MinimalChangeRequest = { |
| 10 | + id: string; |
| 11 | + number: number; |
| 12 | + subject: string | null; |
| 13 | + revision: string; |
| 14 | + updatedAt: string; |
| 15 | + createdBy: { |
| 16 | + displayName: string; |
| 17 | + }; |
| 18 | + urls: { |
| 19 | + app: string; |
| 20 | + }; |
| 21 | +}; |
| 22 | + |
| 23 | +export type MinimalRevision = { |
| 24 | + createdAt: string; |
| 25 | + urls: { |
| 26 | + app: string; |
| 27 | + }; |
| 28 | + git?: { |
| 29 | + url: string | undefined; |
| 30 | + } | null; |
| 31 | +}; |
26 | 32 |
|
27 | | - 'bg-tint-12/9', |
28 | | - 'dark:bg-tint-1/9', |
| 33 | +export type AdminToolbarContext = { |
| 34 | + space: { |
| 35 | + id: string; |
| 36 | + revision: string; |
| 37 | + }; |
| 38 | + changeRequest: MinimalChangeRequest | null; |
| 39 | + revision: MinimalRevision; |
| 40 | + revisionId: string; |
| 41 | + site: { |
| 42 | + title: string; |
| 43 | + urls: { |
| 44 | + published: string | undefined; |
| 45 | + }; |
| 46 | + }; |
| 47 | +}; |
29 | 48 |
|
30 | | - 'shadow-lg', |
31 | | - 'min-h-10', |
32 | | - 'min-w-40', |
33 | | - 'p-2', |
34 | | - 'max-w-md', |
35 | | - 'border-tint-12/1', |
36 | | - 'backdrop-blur-md' |
37 | | - )} |
38 | | - > |
39 | | - <React.Suspense fallback={null}>{props.children}</React.Suspense> |
40 | | - </div> |
41 | | - ); |
| 49 | +export interface AdminToolbarClientProps { |
| 50 | + context: AdminToolbarContext; |
42 | 51 | } |
43 | 52 |
|
44 | 53 | /** |
45 | | - * Toolbar with information for the content admin when previewing a revision or change-request. |
| 54 | + * Server component that determines what type of toolbar to show and passes data to client component |
46 | 55 | */ |
47 | 56 | export async function AdminToolbar(props: AdminToolbarProps) { |
48 | 57 | const { context } = props; |
49 | 58 |
|
50 | | - if (context.changeRequest) { |
51 | | - return ( |
52 | | - <IframeWrapper> |
53 | | - <ChangeRequestToolbar context={context} /> |
54 | | - </IframeWrapper> |
55 | | - ); |
56 | | - } |
57 | | - |
58 | | - if (context.revisionId !== context.space.revision) { |
59 | | - return ( |
60 | | - <IframeWrapper> |
61 | | - <RevisionToolbar context={context} /> |
62 | | - </IframeWrapper> |
63 | | - ); |
64 | | - } |
65 | | - |
66 | | - return null; |
67 | | -} |
68 | | - |
69 | | -async function ChangeRequestToolbar(props: { context: GitBookSiteContext }) { |
70 | | - const { context } = props; |
71 | | - const { space, changeRequest } = context; |
| 59 | + if (context.changeRequest || context.revisionId !== context.space.revision) { |
| 60 | + // Create a minimal context with only the fields needed for AdminToolbar |
| 61 | + const minimalContext: AdminToolbarContext = { |
| 62 | + space: { |
| 63 | + id: context.space.id, |
| 64 | + revision: context.space.revision, |
| 65 | + }, |
| 66 | + changeRequest: context.changeRequest |
| 67 | + ? { |
| 68 | + id: context.changeRequest.id, |
| 69 | + number: context.changeRequest.number, |
| 70 | + subject: context.changeRequest.subject, |
| 71 | + revision: context.changeRequest.revision, |
| 72 | + updatedAt: context.changeRequest.updatedAt, |
| 73 | + createdBy: { |
| 74 | + displayName: context.changeRequest.createdBy.displayName, |
| 75 | + }, |
| 76 | + urls: { |
| 77 | + app: context.changeRequest.urls.app, |
| 78 | + }, |
| 79 | + } |
| 80 | + : null, |
| 81 | + revision: { |
| 82 | + createdAt: context.revision.createdAt, |
| 83 | + urls: { |
| 84 | + app: context.revision.urls.app, |
| 85 | + }, |
| 86 | + git: context.revision.git |
| 87 | + ? { |
| 88 | + url: context.revision.git.url, |
| 89 | + } |
| 90 | + : null, |
| 91 | + }, |
| 92 | + revisionId: context.revisionId, |
| 93 | + site: { |
| 94 | + title: context.site.title, |
| 95 | + urls: { |
| 96 | + published: context.site.urls.published, |
| 97 | + }, |
| 98 | + }, |
| 99 | + }; |
72 | 100 |
|
73 | | - if (!changeRequest) { |
74 | | - return null; |
| 101 | + return <AdminToolbarClient context={minimalContext} />; |
75 | 102 | } |
76 | | - |
77 | | - return ( |
78 | | - <ToolbarLayout> |
79 | | - <Toolbar> |
80 | | - <ToolbarButton title="Open in application" href={changeRequest.urls.app}> |
81 | | - <Icon icon="code-branch" className="size-4" /> |
82 | | - </ToolbarButton> |
83 | | - <ToolbarBody> |
84 | | - <p> |
85 | | - #{changeRequest.number}: {changeRequest.subject ?? 'No subject'} |
86 | | - </p> |
87 | | - <p className="text-tint-2 text-xs dark:text-tint-11"> |
88 | | - Change request updated <DateRelative value={changeRequest.updatedAt} /> |
89 | | - </p> |
90 | | - </ToolbarBody> |
91 | | - <ToolbarButtonGroups> |
92 | | - <ToolbarButton title="Open in application" href={changeRequest.urls.app}> |
93 | | - <Icon icon="arrow-up-right-from-square" className="size-4" /> |
94 | | - </ToolbarButton> |
95 | | - <RefreshChangeRequestButton |
96 | | - spaceId={space.id} |
97 | | - changeRequestId={changeRequest.id} |
98 | | - revisionId={changeRequest.revision} |
99 | | - updatedAt={new Date(changeRequest.updatedAt).getTime()} |
100 | | - /> |
101 | | - </ToolbarButtonGroups> |
102 | | - </Toolbar> |
103 | | - </ToolbarLayout> |
104 | | - ); |
105 | | -} |
106 | | - |
107 | | -async function RevisionToolbar(props: { context: GitBookSiteContext }) { |
108 | | - const { context } = props; |
109 | | - const { revision } = context; |
110 | | - |
111 | | - return ( |
112 | | - <ToolbarLayout> |
113 | | - <Toolbar> |
114 | | - <ToolbarButton title="Open in application" href={revision.urls.app}> |
115 | | - <Icon icon="code-commit" className="size-4" /> |
116 | | - </ToolbarButton> |
117 | | - <ToolbarBody> |
118 | | - <p> |
119 | | - Revision created <DateRelative value={revision.createdAt} /> |
120 | | - </p> |
121 | | - {revision.git ? ( |
122 | | - <p className="text-tint-2 text-xs dark:text-tint-11"> |
123 | | - {revision.git.message} |
124 | | - </p> |
125 | | - ) : null} |
126 | | - </ToolbarBody> |
127 | | - <ToolbarButtonGroups> |
128 | | - <ToolbarButton title="Open in application" href={revision.urls.app}> |
129 | | - <Icon icon="arrow-up-right-from-square" className="size-4" /> |
130 | | - </ToolbarButton> |
131 | | - {revision.git?.url ? ( |
132 | | - <ToolbarButton title="Open git commit" href={revision.git.url}> |
133 | | - <Icon |
134 | | - icon={revision.git.url.includes('github.com') ? 'github' : 'gitlab'} |
135 | | - className="size-4" |
136 | | - /> |
137 | | - </ToolbarButton> |
138 | | - ) : null} |
139 | | - </ToolbarButtonGroups> |
140 | | - </Toolbar> |
141 | | - </ToolbarLayout> |
142 | | - ); |
143 | 103 | } |
0 commit comments