Merge branch 'master' into rust

Author: bnmnetp

package.json

@@ -19,6 +19,7 @@
     "license": "ISC",
     "devDependencies": {
         "copy-webpack-plugin": "^8.0.0",
+        "compression-webpack-plugin": "^6.0.0",
         "css-loader": "^5.0.0",
         "css-minimizer-webpack-plugin": "^3.0.0",
         "eslint": "^7.0.0",

runestone/common/js/bookfuncs.js

@@ -180,7 +180,10 @@ function handlePageSetup() {
         }
         $(document).trigger("runestone:login");
         addReadingList();
-        timedRefresh();
+        // Avoid the timedRefresh on the grading page.
+        if (window.location.pathname.indexOf("/admin/grading") == -1) {
+            timedRefresh();
+        }
     } else {
         mess = "Not logged in";
         $(document).trigger("runestone:logout");

runestone/common/js/runestonebase.js

@@ -93,27 +93,22 @@ export default class RunestoneBase {
             eventInfo.percent = this.percent;
         }
         if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
-            let request = new Request(eBookConfig.ajaxURL + "hsblog", {
-                method: "POST",
-                headers: this.jsonHeaders,
-                body: JSON.stringify(eventInfo),
-            });
-            try {
-                let response = await fetch(request);
-                if (!response.ok) {
-                    throw new Error("Failed to save the log entry");
-                }
-                post_return = response.json();
-            } catch (e) {
-                if (this.isTimed) {
-                    alert(`Error: Your action was not saved! The error was ${e}`);
-                }
-                console.log(`Error: ${e}`);
-            }
+            post_return = this.postLogMessage(eventInfo)
         }
         if (!this.isTimed || eBookConfig.debug) {
             console.log("logging event " + JSON.stringify(eventInfo));
         }
+        // When selectquestions are part of an assignment especially toggle questions
+        // we need to count using the selector_id of the select question.
+        // We  also need to log an event for that selector so that we will know
+        // that interaction has taken place.  This is **independent** of how the
+        // autograder will ultimately grade the question!
+        if (this.selector_id) {
+            eventInfo.div_id = this.selector_id.replace("-toggleSelectedQuestion", "");
+            eventInfo.event = "selectquestion";
+            eventInfo.act = "interaction"
+            this.postLogMessage(eventInfo);
+        }
         if (
             typeof pageProgressTracker.updateProgress === "function" &&
             eventInfo.act != "edit" &&
@@ -124,6 +119,27 @@ export default class RunestoneBase {
         return post_return;
     }
 
+    async postLogMessage(eventInfo) {
+        var post_return;
+        let request = new Request(eBookConfig.ajaxURL + "hsblog", {
+            method: "POST",
+            headers: this.jsonHeaders,
+            body: JSON.stringify(eventInfo),
+        });
+        try {
+            let response = await fetch(request);
+            if (!response.ok) {
+                throw new Error("Failed to save the log entry");
+            }
+            post_return = response.json();
+        } catch (e) {
+            if (this.isTimed) {
+                alert(`Error: Your action was not saved! The error was ${e}`);
+            }
+            console.log(`Error: ${e}`);
+        }
+        return post_return;
+    }
     // .. _logRunEvent:
     //
     // logRunEvent

webpack.config.js

@@ -10,6 +10,7 @@ const path = require("path");
 
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
+const CompressionPlugin = require("compression-webpack-plugin");
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
@@ -90,6 +91,8 @@ module.exports = (env, argv) => {
                 filename: '[name].css?v=[contenthash]',
                 chunkFilename: '[id].css',
             }),
+            // Copied from the `webpack docs <https://webpack.js.org/plugins/compression-webpack-plugin>`_. This creates ``.gz`` versions of all files. The webserver in use needs to be configured to send this instead of the uncompressed versions.
+            new CompressionPlugin(),
         ],
     };
 };