Fixes for RevisionsDialog

- Dismiss modal on save
- Prevent form from submitting on button clicks
- Controls document revision change through manager fn
- Fix unchecked access on revisions list

src/api/document.js

@@ -163,13 +163,18 @@ export async function changeAccess(ids, access) {
 
 export async function changeRevisionControl(ids, revision_control) {
   // Enable or disable revision control on specified documents
-  await session.patch(
-    apiUrl(`documents/`),
+  const { data } = await session.patch(
+    apiUrl(
+      queryBuilder(`documents/`, {
+        expand: [DEFAULT_EXPAND, "revisions"].join(","),
+      }),
+    ),
     ids.map((id) => ({
       id,
       revision_control,
     })),
   );
+  return data;
 }
 
 export async function reprocessDocument(ids, forceOcr, ocrEngine) {

src/common/dialog/RevisionsDialog.svelte

@@ -19,12 +19,12 @@
   export let enabled: boolean = false;
   export let revisions: Revision[] | null = [];
   export let onSave: (enabled: boolean) => void;
-  export let onCancel: () => {};
+  export let onCancel: () => void;
 
   $: sortedRevisions =
     revisions?.sort((a, b) => {
       return b.version - a.version;
-    }) ?? [];
+    }) ?? null;
 
   let user;
   let loading = false;
@@ -57,7 +57,7 @@
         <PremiumBadge />
       </header>
 
-      {#if enabled}
+      {#if enabled && Array.isArray(revisions)}
         <div class="overflow-scroll">
           <table class="revisions">
             {#each sortedRevisions as revision}
@@ -89,7 +89,11 @@
       {/if}
 
       {#if isPremiumOrg(user?.organization)}
-        <form>
+        <form
+          on:submit={(event) => {
+            event.preventDefault();
+          }}
+        >
           <label class="revision-control-input">
             <input
               type="checkbox"

src/common/dialog/RevisionsDialogContainer.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { changeRevisionControl } from "../../api/document.js";
+  import { changeRevisionControlForDocuments } from "../../manager/documents";
   import { viewer } from "../../viewer/viewer.js";
   import RevisionsDialog from "./RevisionsDialog.svelte";
   import emitter from "../../emit.js";
@@ -12,9 +12,13 @@
   const documentId = document?.id;
   const revisions = document?.revisions;
   const enabled = document?.revisionControl;
-  const onSave = (enabled: boolean) =>
-    changeRevisionControl([documentId], enabled);
-  const onCancel = () => emit.dismiss();
+  const onSave = async (enabled: boolean) => {
+    await changeRevisionControlForDocuments([document], enabled);
+    emit.dismiss();
+  };
+  const onCancel = () => {
+    emit.dismiss();
+  };
 </script>
 
 <RevisionsDialog {documentId} {revisions} {enabled} {onSave} {onCancel} />

src/manager/documents.js

@@ -9,12 +9,13 @@ import {
   editMetadata,
   addData,
   removeData,
-} from "@/api/document.js";
+  changeRevisionControl,
+} from "../api/document.js";
 import {
   addDocumentsToProject,
   removeDocumentsFromProject,
-} from "@/api/project.js";
-import { layout, hideAccess } from "./layout.js";
+} from "../api/project.js";
+import { layout, hideAccess, hideRevisions } from "./layout.js";
 import { wrapLoad, wrapSeparate } from "@/util/wrapLoad.js";
 import { showConfirm } from "./confirmDialog.js";
 import { router } from "@/router/router.js";
@@ -433,6 +434,27 @@ export async function changeAccessForDocuments(
   hideAccess();
 }
 
+export async function changeRevisionControlForDocuments(
+  documents,
+  revision_control,
+) {
+  await wrapLoad(layout, async () => {
+    await changeRevisionControl(
+      documents.map((doc) => doc.id),
+      revision_control,
+    );
+    documents.forEach((doc) => {
+      updateInCollection(doc, (d) => {
+        d.doc = {
+          ...d.doc,
+          revision_control,
+        };
+      });
+    });
+  });
+  hideRevisions();
+}
+
 export async function changeOwnerForDocuments(
   documents,
   user,