Move to urls page actions

Author: nolannbiron

packages/gitbook/src/components/PageActions/PageActionsDropdown.tsx

@@ -18,17 +18,22 @@ import {
     ActionViewAsPDF,
 } from './PageActions';
 
-interface PageActionsDropdownProps {
-    siteTitle: string;
-    markdownPageURL: string;
-    mcpURL?: string;
-    pdfURL?: string;
-    className?: string;
-    actions: SiteCustomizationSettings['pageActions'];
+export type PageActionsDropdownURLs = {
+    html: string;
+    markdown: string;
+    mcp?: string;
+    pdf?: string;
     editOnGit?: {
         provider: GitSyncState['installationProvider'];
         url: string;
     };
+};
+
+interface PageActionsDropdownProps {
+    siteTitle: string;
+    urls: PageActionsDropdownURLs;
+    className?: string;
+    actions: SiteCustomizationSettings['pageActions'];
 }
 
 /**
@@ -75,7 +80,7 @@ export function PageActionsDropdown(props: PageActionsDropdownProps) {
  * Return the list of actions to show in the dropdown menu.
  */
 function getPageDropdownActions(props: PageActionsDropdownProps): React.ReactNode[] {
-    const { siteTitle, markdownPageURL, mcpURL, actions } = props;
+    const { siteTitle, urls, actions } = props;
     const assistants = useAI().assistants.filter(
         (assistant) => assistant.ui === true && assistant.pageAction
     );
@@ -94,55 +99,45 @@ function getPageDropdownActions(props: PageActionsDropdownProps): React.ReactNod
                 <DropdownMenuSeparator className="first:hidden" />
                 <ActionCopyMarkdown
                     isDefaultAction={!assistants.length}
-                    markdownPageURL={markdownPageURL}
+                    markdownPageURL={urls.markdown}
                     type="dropdown-menu-item"
                 />
-                <ActionViewAsMarkdown markdownPageURL={markdownPageURL} type="dropdown-menu-item" />
+                <ActionViewAsMarkdown markdownPageURL={urls.markdown} type="dropdown-menu-item" />
             </React.Fragment>
         ) : null,
 
         actions.externalAI ? (
             <React.Fragment key="externalAI">
                 <DropdownMenuSeparator className="first:hidden" />
-                <ActionOpenInLLM
-                    provider="chatgpt"
-                    url={markdownPageURL}
-                    type="dropdown-menu-item"
-                />
-                <ActionOpenInLLM
-                    provider="claude"
-                    url={markdownPageURL}
-                    type="dropdown-menu-item"
-                />
+                <ActionOpenInLLM provider="chatgpt" url={urls.html} type="dropdown-menu-item" />
+                <ActionOpenInLLM provider="claude" url={urls.html} type="dropdown-menu-item" />
             </React.Fragment>
         ) : null,
 
-        actions.mcp && mcpURL ? (
+        actions.mcp && urls.mcp ? (
             <React.Fragment key="mcp">
                 <DropdownMenuSeparator className="first:hidden" />
-                <ActionCopyMCPURL mcpURL={mcpURL} type="dropdown-menu-item" />
+                <ActionCopyMCPURL mcpURL={urls.mcp} type="dropdown-menu-item" />
                 <ActionOpenMCP
                     provider="vscode"
-                    mcpURL={mcpURL}
+                    mcpURL={urls.mcp}
                     siteTitle={siteTitle}
                     type="dropdown-menu-item"
                 />
             </React.Fragment>
         ) : null,
 
-        props.editOnGit || props.pdfURL ? (
+        urls.editOnGit || urls.pdf ? (
             <React.Fragment key="editOnGit">
                 <DropdownMenuSeparator className="first:hidden" />
-                {props.editOnGit ? (
+                {urls.editOnGit ? (
                     <ActionOpenEditOnGit
                         type="dropdown-menu-item"
-                        provider={props.editOnGit.provider}
-                        url={props.editOnGit.url}
+                        provider={urls.editOnGit.provider}
+                        url={urls.editOnGit.url}
                     />
                 ) : null}
-                {props.pdfURL ? (
-                    <ActionViewAsPDF url={props.pdfURL} type="dropdown-menu-item" />
-                ) : null}
+                {urls.pdf ? <ActionViewAsPDF url={urls.pdf} type="dropdown-menu-item" /> : null}
             </React.Fragment>
         ) : null,
     ].filter(Boolean);
@@ -152,7 +147,7 @@ function getPageDropdownActions(props: PageActionsDropdownProps): React.ReactNod
  * A default action shown as a quick-access button beside the dropdown menu
  */
 function getPageDefaultAction(props: PageActionsDropdownProps) {
-    const { markdownPageURL, actions } = props;
+    const { urls, actions } = props;
     const assistants = useAI().assistants.filter(
         (assistant) => assistant.ui === true && assistant.pageAction
     );
@@ -162,12 +157,12 @@ function getPageDefaultAction(props: PageActionsDropdownProps) {
         return <ActionOpenAssistant assistant={assistant} type="button" />;
     }
 
-    if (props.editOnGit) {
+    if (urls.editOnGit) {
         return (
             <ActionOpenEditOnGit
                 type="button"
-                provider={props.editOnGit.provider}
-                url={props.editOnGit.url}
+                provider={urls.editOnGit.provider}
+                url={urls.editOnGit.url}
             />
         );
     }
@@ -176,7 +171,7 @@ function getPageDefaultAction(props: PageActionsDropdownProps) {
         return (
             <ActionCopyMarkdown
                 isDefaultAction={!assistant}
-                markdownPageURL={markdownPageURL}
+                markdownPageURL={urls.markdown}
                 type="button"
             />
         );

packages/gitbook/src/components/PageBody/PageHeader.tsx

@@ -5,7 +5,10 @@ import { type RevisionPageDocument, SiteVisibility } from '@gitbook/api';
 import { Icon } from '@gitbook/icons';
 import urlJoin from 'url-join';
 import { getPDFURLSearchParams } from '../PDF';
-import { PageActionsDropdown } from '../PageActions/PageActionsDropdown';
+import {
+    PageActionsDropdown,
+    type PageActionsDropdownURLs,
+} from '../PageActions/PageActionsDropdown';
 import { PageIcon } from '../PageIcon';
 import { StyledLink } from '../primitives';
 
@@ -40,35 +43,7 @@ export async function PageHeader(props: {
                 // Show page actions if *any* of the actions are enabled
                 <PageActionsDropdown
                     siteTitle={context.site.title}
-                    markdownPageURL={`${context.linker.toAbsoluteURL(context.linker.toPathInSpace(page.path))}`}
-                    editOnGit={
-                        context.customization.git.showEditLink &&
-                        context.space.gitSync?.url &&
-                        page.git
-                            ? {
-                                  provider: context.space?.gitSync?.installationProvider,
-                                  url: urlJoin(context.space.gitSync.url, page.git.path),
-                              }
-                            : undefined
-                    }
-                    pdfURL={
-                        context.customization.pdf.enabled
-                            ? context.linker.toPathInSpace(
-                                  `~gitbook/pdf?${getPDFURLSearchParams({
-                                      page: page.id,
-                                      only: true,
-                                      limit: 100,
-                                  }).toString()}`
-                              )
-                            : undefined
-                    }
-                    mcpURL={
-                        context.site.visibility !== SiteVisibility.VisitorAuth
-                            ? context.linker.toAbsoluteURL(
-                                  context.linker.toPathInSpace('~gitbook/mcp')
-                              )
-                            : undefined
-                    }
+                    urls={getPageActionsURLs(context, page)}
                     actions={context.customization.pageActions}
                     className={tcls(
                         'float-right ml-4 xl:max-2xl:page-api-block:mr-62',
@@ -146,3 +121,33 @@ export async function PageHeader(props: {
         </header>
     );
 }
+
+function getPageActionsURLs(
+    context: GitBookSiteContext,
+    page: RevisionPageDocument
+): PageActionsDropdownURLs {
+    return {
+        html: `${context.linker.toAbsoluteURL(context.linker.toPathInSpace(page.path))}`,
+        markdown: `${context.linker.toAbsoluteURL(context.linker.toPathInSpace(page.path))}.md`,
+        mcp:
+            context.site.visibility !== SiteVisibility.VisitorAuth
+                ? context.linker.toAbsoluteURL(context.linker.toPathInSpace('~gitbook/mcp'))
+                : undefined,
+        pdf: context.customization.pdf.enabled
+            ? context.linker.toPathInSpace(
+                  `~gitbook/pdf?${getPDFURLSearchParams({
+                      page: page.id,
+                      only: true,
+                      limit: 100,
+                  }).toString()}`
+              )
+            : undefined,
+        editOnGit:
+            context.customization.git.showEditLink && context.space.gitSync?.url && page.git
+                ? {
+                      provider: context.space?.gitSync?.installationProvider,
+                      url: urlJoin(context.space.gitSync.url, page.git.path),
+                  }
+                : undefined,
+    };
+}