fix: Do not copy edit path from headers

chore: Rename url -> path in routeHelpers
closes #5229

app/scenes/Document/components/Document.tsx

@@ -39,9 +39,9 @@ import { emojiToUrl } from "~/utils/emoji";
 import { isModKey } from "~/utils/keyboard";
 
 import {
-  documentHistoryUrl,
-  editDocumentUrl,
-  updateDocumentUrl,
+  documentHistoryPath,
+  documentEditPath,
+  updateDocumentPath,
 } from "~/utils/routeHelpers";
 import Container from "./Container";
 import Contents from "./Contents";
@@ -211,7 +211,7 @@ class DocumentScene extends React.Component<Props> {
     const { document, abilities } = this.props;
 
     if (abilities.update) {
-      this.props.history.push(editDocumentUrl(document));
+      this.props.history.push(documentEditPath(document));
     }
   };
 
@@ -228,7 +228,7 @@ class DocumentScene extends React.Component<Props> {
     if (location.pathname.endsWith("history")) {
       this.props.history.push(document.url);
     } else {
-      this.props.history.push(documentHistoryUrl(document));
+      this.props.history.push(documentHistoryPath(document));
     }
   };
 
@@ -307,7 +307,7 @@ class DocumentScene extends React.Component<Props> {
         this.props.history.push(savedDocument.url);
         this.props.ui.setActiveDocument(savedDocument);
       } else if (document.isNew) {
-        this.props.history.push(editDocumentUrl(savedDocument));
+        this.props.history.push(documentEditPath(savedDocument));
         this.props.ui.setActiveDocument(savedDocument);
       }
     } catch (err) {
@@ -399,7 +399,7 @@ class DocumentScene extends React.Component<Props> {
 
     const canonicalUrl = shareId
       ? this.props.match.url
-      : updateDocumentUrl(this.props.match.url, document);
+      : updateDocumentPath(this.props.match.url, document);
 
     return (
       <ErrorBoundary showTitle>

app/scenes/Document/components/DocumentMeta.tsx

@@ -10,7 +10,7 @@ import Document from "~/models/Document";
 import DocumentMeta from "~/components/DocumentMeta";
 import Fade from "~/components/Fade";
 import useStores from "~/hooks/useStores";
-import { documentUrl, documentInsightsUrl } from "~/utils/routeHelpers";
+import { documentPath, documentInsightsPath } from "~/utils/routeHelpers";
 
 type Props = {
   /* The document to display meta data for */
@@ -32,7 +32,7 @@ function TitleDocumentMeta({ to, isDraft, document, ...rest }: Props) {
 
   const Wrapper = viewsLoadedOnMount.current ? React.Fragment : Fade;
 
-  const insightsUrl = documentInsightsUrl(document);
+  const insightsPath = documentInsightsPath(document);
   const commentsCount = comments.inDocument(document.id).length;
 
   return (
@@ -41,7 +41,9 @@ function TitleDocumentMeta({ to, isDraft, document, ...rest }: Props) {
         <Wrapper>
           &nbsp;•&nbsp;
           <Link
-            to={match.url === insightsUrl ? documentUrl(document) : insightsUrl}
+            to={
+              match.url === insightsPath ? documentPath(document) : insightsPath
+            }
           >
             {t("Viewed by")}{" "}
             {onlyYou
@@ -56,7 +58,7 @@ function TitleDocumentMeta({ to, isDraft, document, ...rest }: Props) {
         <>
           &nbsp;•&nbsp;
           <CommentLink
-            to={documentUrl(document)}
+            to={documentPath(document)}
             onClick={() => ui.toggleComments(document.id)}
           >
             <CommentIcon size={18} />

app/scenes/Document/components/Editor.tsx

@@ -15,8 +15,8 @@ import useMobile from "~/hooks/useMobile";
 import usePolicy from "~/hooks/usePolicy";
 import useStores from "~/hooks/useStores";
 import {
-  documentHistoryUrl,
-  documentUrl,
+  documentHistoryPath,
+  documentPath,
   matchDocumentHistory,
 } from "~/utils/routeHelpers";
 import { useDocumentContext } from "../../../components/DocumentContext";
@@ -167,8 +167,8 @@ function DocumentEditor(props: Props, ref: React.RefObject<any>) {
           document={document}
           to={
             match.path === matchDocumentHistory
-              ? documentUrl(document)
-              : documentHistoryUrl(document)
+              ? documentPath(document)
+              : documentHistoryPath(document)
           }
           rtl={
             titleRef.current?.getComputedDirection() === "rtl" ? true : false

app/scenes/Document/components/Header.tsx

@@ -32,7 +32,7 @@ import NewChildDocumentMenu from "~/menus/NewChildDocumentMenu";
 import TableOfContentsMenu from "~/menus/TableOfContentsMenu";
 import TemplatesMenu from "~/menus/TemplatesMenu";
 import { metaDisplay } from "~/utils/keyboard";
-import { newDocumentPath, editDocumentUrl } from "~/utils/routeHelpers";
+import { newDocumentPath, documentEditPath } from "~/utils/routeHelpers";
 import ObservingBanner from "./ObservingBanner";
 import PublicBreadcrumb from "./PublicBreadcrumb";
 import ShareButton from "./ShareButton";
@@ -133,7 +133,7 @@ function DocumentHeader({
         <Button
           as={Link}
           icon={<EditIcon />}
-          to={editDocumentUrl(document)}
+          to={documentEditPath(document)}
           neutral
         >
           {t("Edit")}

app/scenes/Document/components/History.tsx

@@ -8,7 +8,7 @@ import Empty from "~/components/Empty";
 import PaginatedEventList from "~/components/PaginatedEventList";
 import useKeyDown from "~/hooks/useKeyDown";
 import useStores from "~/hooks/useStores";
-import { documentUrl } from "~/utils/routeHelpers";
+import { documentPath } from "~/utils/routeHelpers";
 import Sidebar from "./SidebarLayout";
 
 const EMPTY_ARRAY: Event[] = [];
@@ -26,7 +26,7 @@ function History() {
 
   const onCloseHistory = () => {
     if (document) {
-      history.push(documentUrl(document));
+      history.push(documentPath(document));
     } else {
       history.goBack();
     }

app/scenes/Document/components/Insights.tsx

@@ -17,7 +17,7 @@ import Time from "~/components/Time";
 import useKeyDown from "~/hooks/useKeyDown";
 import useStores from "~/hooks/useStores";
 import useTextSelection from "~/hooks/useTextSelection";
-import { documentUrl } from "~/utils/routeHelpers";
+import { documentPath } from "~/utils/routeHelpers";
 import Sidebar from "./SidebarLayout";
 
 function Insights() {
@@ -34,7 +34,7 @@ function Insights() {
 
   const onCloseInsights = () => {
     if (document) {
-      history.push(documentUrl(document));
+      history.push(documentPath(document));
     }
   };
 

app/scenes/Document/components/RevisionViewer.tsx

@@ -5,7 +5,7 @@ import Document from "~/models/Document";
 import Revision from "~/models/Revision";
 import { Props as EditorProps } from "~/components/Editor";
 import Flex from "~/components/Flex";
-import { documentUrl } from "~/utils/routeHelpers";
+import { documentPath } from "~/utils/routeHelpers";
 import { Meta as DocumentMeta } from "./DocumentMeta";
 
 type Props = Omit<EditorProps, "extensions"> & {
@@ -28,7 +28,7 @@ function RevisionViewer(props: Props) {
       {!shareId && (
         <DocumentMeta
           document={document}
-          to={documentUrl(document)}
+          to={documentPath(document)}
           rtl={revision.rtl}
         />
       )}