Merge pull request #22 from ucbds-infra/force-save

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Updated `ottr::export` so that notebook PDF generation failures do not prevent zip file creation [#766](https://github.com/ucbds-infra/otter-grader/issues/766)
 * Added the `debug` argument to `ottr::export` to assist in debugging PDF generation failures
+* Updated `ottr::export` force-save functionality to rely on [`ottr_force_save_labextension`](https://github.com/chrispyles/ottr-force-save-labextension) per [#767](https://github.com/ucbds-infra/otter-grader/issues/767)
 
 **v1.4.0:**
 

R/export.R

@@ -44,8 +44,10 @@ ext <- tools::file_ext(submission_path)
     success <- save_notebook(submission_path)
     if (!success) {
       warning(paste0(
-        "Couldn't automatically save the notebook; we recommend using File > Save & ",
-        "Checkpoint and then re-running this cell. The zip file returned by this call ",
+        "Couldn't automatically save the notebook; ensure that you have ",
+        "ottr_force_save_labextension installed. If you have it installed and this issue keeps",
+        "reoccurring, you should use File > Save & ",
+        "Checkpoint and then rerun this cell. The zip file generated by this call ",
         "will use the last saved version of this notebook."
       ))
     }

R/save_notebook.R

@@ -24,9 +24,8 @@ save_notebook <- function(nb_path, timeout = 10) {
   IRdisplay::display_javascript("
     if (typeof Jupyter !== 'undefined') {
       Jupyter.notebook.save_checkpoint();
-    }
-    else {
-      document.querySelector('[data-command=\"docmanager:save\"]').click();
+    } else if ('__ottr_force_save_labextension_force_save' in window) {
+      window.__ottr_force_save_labextension_force_save();
     }
   ")