fix: Cannot edit templates in settings with separate editing mode

app/menus/DocumentMenu.tsx

@@ -265,7 +265,8 @@ function DocumentMenu({
               type: "route",
               title: t("Edit"),
               to: documentEditPath(document),
-              visible: !!can.update && user.separateEditMode,
+              visible:
+                !!can.update && user.separateEditMode && !document.template,
               icon: <EditIcon />,
             },
             actionToMenuItem(createNestedDocument, context),

app/scenes/Document/components/DataLoader.tsx

@@ -12,7 +12,7 @@ import useStores from "~/hooks/useStores";
 import Logger from "~/utils/Logger";
 import { NotFoundError, OfflineError } from "~/utils/errors";
 import history from "~/utils/history";
-import { matchDocumentEdit } from "~/utils/routeHelpers";
+import { matchDocumentEdit, settingsPath } from "~/utils/routeHelpers";
 import Loading from "./Loading";
 
 type Params = {
@@ -71,7 +71,8 @@ function DataLoader({ match, children }: Props) {
   const sharedTree = document
     ? documents.getSharedTree(document.id)
     : undefined;
-  const isEditRoute = match.path === matchDocumentEdit;
+  const isEditRoute =
+    match.path === matchDocumentEdit || match.path.startsWith(settingsPath());
   const isEditing = isEditRoute || !auth.user?.separateEditMode;
   const can = usePolicy(document?.id);
   const location = useLocation<LocationState>();

app/scenes/Document/components/Header.tsx

@@ -251,7 +251,7 @@ function DocumentHeader({
                   <ShareButton document={document} />
                 </Action>
               )}
-            {isEditing && (
+            {(isEditing || isTemplate) && (
               <Action>
                 <Tooltip
                   tooltip={t("Save")}
@@ -259,27 +259,17 @@ function DocumentHeader({
                   delay={500}
                   placement="bottom"
                 >
-                  <Button
-                    onClick={handleSave}
-                    disabled={savingIsDisabled}
-                    neutral={isDraft}
-                  >
-                    {isDraft ? t("Save draft") : t("Done editing")}
-                  </Button>
-                </Tooltip>
-              </Action>
-            )}
-            {isTemplate && (
-              <Action>
                   <Button
                     context={context}
-                  action={navigateToTemplateSettings}
+                    action={isTemplate ? navigateToTemplateSettings : undefined}
+                    onClick={isTemplate ? undefined : handleSave}
                     disabled={savingIsDisabled}
                     neutral={isDraft}
                     hideIcon
                   >
-                  {t("Done editing")}
+                    {isDraft ? t("Save draft") : t("Done editing")}
                   </Button>
+                </Tooltip>
               </Action>
             )}
             {can.update &&