Merge branch 'master' into ec2-testing

Author: KesterTan

Gemfile.lock

@@ -205,7 +205,7 @@ GEM
     libv8-node (16.19.0.1-x86_64-darwin)
     libv8-node (16.19.0.1-x86_64-linux)
     lockbox (1.3.0)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -247,11 +247,11 @@ GEM
     newrelic_rpm (9.6.0)
       base64
     nio4r (2.7.0)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -306,7 +306,7 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (5.0.4)
-    racc (1.7.3)
+    racc (1.8.1)
     rack (2.2.9)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
@@ -335,9 +335,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     railties (6.1.7.6)
       actionpack (= 6.1.7.6)
       activesupport (= 6.1.7.6)

app/assets/javascripts/manage_submissions.js

@@ -1,5 +1,8 @@
 const manage_submissions_endpoints = {
     'regrade-selected': 'regradeBatch',
+    'delete-selected': 'submissions/destroy_batch',
+    'download-selected': 'submissions/download_batch',
+    'excuse-selected': 'submissions/excuse_batch',
     'score_details': 'submissions/score_details',
 };
 
@@ -303,6 +306,7 @@ $(document).ready(function() {
 
     if (!is_autograded) {
       $('#regrade-selected').hide();
+      $('#regrade-all-html').hide();
     }
 
     // base URLs for selected buttons
@@ -311,23 +315,90 @@ $(document).ready(function() {
       baseURLs[id] = $(id).prop('href');
     });
 
-    function changeButtonStates(state) {
-      state ? buttonIDs.forEach((id) => $(id).addClass('disabled')) : buttonIDs.forEach((id) => $(id).removeClass('disabled'));
-
-      // prop each selected button with selected submissions
-      if (!state) {
-        var urlParam = $.param({'submission_ids': selectedSubmissions});
-        buttonIDs.forEach(function(id) {
-          var newHref = baseURLs[id] + '?' + urlParam;
-          $(id).prop('href', newHref);
-        });
-      } else {
-        buttonIDs.forEach(function(id) {
-          $(id).prop('href', baseURLs[id]);
-        });
+    function updateSelectedCount(numericSubmissions) {
+      const allBoxes = $('#submissions tbody .cbox').length;
+      const selectedCountElement = document.getElementById("selected-count-html");
+      const placeholder = document.querySelector(".selected-count-placeholder");
+      if (selectedCountElement) {
+        selectedCountElement.innerText = `All ${numericSubmissions.length} submissions on this page selected.`;
+        if (numericSubmissions.length === allBoxes) {
+          placeholder.style.display = "block";
+        } else if (numericSubmissions.length <= allBoxes) {
+          placeholder.style.display = "none";
+        }
       }
     }
 
+    function changeButtonStates(state) {
+      buttonIDs.forEach((id) => {
+        const button = $(id);
+        if (state) {
+          if (id === "#download-selected") {
+            $(id).prop('href', baseURLs[id]);
+          }
+          button.addClass("disabled");
+          button.off("click").prop("disabled", true);
+        } else {
+          button.removeClass("disabled").prop("disabled", false);
+          if (id == "#download-selected") {
+            var urlParam = $.param({'submission_ids': selectedSubmissions});
+            buttonIDs.forEach(function(id) {
+              var newHref = baseURLs[id] + '?' + urlParam;
+              $(id).prop('href', newHref);
+            });
+            return;
+          }
+          $(document).off("click", id).on("click", id, function (event) {
+            console.log(`${id} button clicked`);
+            event.preventDefault();
+            if (selectedSubmissions.length === 0) {
+              alert("No submissions selected.");
+              return;
+            }
+            const endpoint = manage_submissions_endpoints[id.replace("#", "")];
+            const requestData = { submission_ids: selectedSubmissions };
+            if (id === "#delete-selected") {
+              if (!confirm("Deleting will delete all checked submissions and cannot be undone. Are you sure you want to delete these submissions?")) {
+                return;
+              }
+            }
+            let refreshInterval = setInterval(() => {
+              location.reload();
+            }, 5000);
+            $.ajax({
+              url: endpoint,
+              type: "POST",
+              contentType: "application/json",
+              data: JSON.stringify(requestData),
+              dataType: "json",
+              headers: {
+                "X-CSRF-Token": $('meta[name="csrf-token"]').attr("content"),
+              },
+              success: function (response) {
+                clearInterval(refreshInterval);
+                if (response.redirect) {
+                  window.location.href = response.redirect;
+                  return;
+                }
+                if (response.error) {
+                  alert(response.error);
+                }
+                if (response.success) {
+                  alert(response.success);
+                }
+                selectedSubmissions = [];
+                changeButtonStates(true);
+              },
+              error: function (error) {
+                clearInterval(refreshInterval);
+                alert("An error occurred while processing the request.");
+              },
+            });
+          });
+        }
+      });
+    }
+
     changeButtonStates(true); // disable all buttons by default
 
     // SELECTING STUDENT CHECKBOXES
@@ -362,6 +433,7 @@ $(document).ready(function() {
       const numericSelectedSubmissions = selectedSubmissions.filter(submissionId => typeof submissionId === 'number');
       // Update the "Select All" checkbox based on filtered numeric submissions
       $('#cbox-select-all').prop('checked', numericSelectedSubmissions.length === $('#submissions tbody .cbox').length);
+      updateSelectedCount(numericSelectedSubmissions);
       changeButtonStates(disableButtons);
     }
 

app/assets/stylesheets/style.css.scss

@@ -1628,6 +1628,21 @@ table.sub td, th {
   align-items: center;
 }
 
+.selected-count-placeholder {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  text-align: center;
+  background-color: $autolab-submissions-background;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  border-radius: 4px;
+}
+
+.selected-count-red {
+  color: $autolab-red;
+}
+
 .excused-popover {
   background-color: $autolab-submissions-background;
   border-radius: 11px;

app/controllers/assessment/autograde.rb

@@ -28,10 +28,11 @@ def autograde_done
 
     extend_config_module(@assessment, submissions[0], @cud)
 
-    if (@assessment.use_unique_module_name)
+    if @assessment.use_unique_module_name
       require_relative(@assessment.unique_config_file_path)
     else
-      require_relative(Rails.root.join("assessmentConfig", "#{@course.name}-#{@assessment.name}.rb"))
+      require_relative(Rails.root.join("assessmentConfig", 
+"#{@course.name}-#{@assessment.name}.rb"))
     end
 
     if @assessment.overwrites_method?(:autogradeDone)
@@ -86,7 +87,19 @@ def regrade
   #
   # action_auth_level :regradeBatch, :instructor
   def regradeBatch
-    submission_ids = params[:submission_ids]
+    request_body = request.body.read
+    submission_ids = begin if request_body.present?
+                             parsed_data = JSON.parse(request_body)
+                         Array(parsed_data['submission_ids'])
+                       else
+                         params[:submission_ids]
+                       end
+                     rescue JSON::ParserError => e
+                       params[:submission_ids] || []
+                     end
+
+    # Ensure submission_ids is an array
+    submission_ids = Array(submission_ids)
 
     # Now regrade only the most recent submissions. Keep track of
     # any handins that fail.
@@ -106,26 +119,32 @@ def regradeBatch
 
     failure_jobs = failed_list.length
     if failure_jobs > 0
-      flash[:error] = "Warning: Could not regrade #{ActionController::Base.helpers.pluralize(failure_jobs, "submission")}:<br>"
+      flash[:error] = 
+        "Warning: Could not regrade #{ActionController::Base.helpers.pluralize(failure_jobs, 
+"submission")}:<br>"
       failed_list.each do |failure|
-        if failure[:error].error_code == :nil_submission
-          flash[:error] += "Unrecognized submission ID<br>"
-        else
-          flash[:error] += "#{failure[:submission].filename}: #{failure[:error].message}<br>"
-        end
+        flash[:error] += if failure[:error].error_code == :nil_submission
+                           "Unrecognized submission ID<br>"
+                         else
+                           "#{failure[:submission].filename}: #{failure[:error].message}<br>"
+                         end
       end
     end
 
     success_jobs = submissions.size - failure_jobs
     if success_jobs > 0
-      link = "<a href=\"#{url_for(controller: 'jobs')}\">#{ActionController::Base.helpers.pluralize(success_jobs, "submission")}</a>"
-      flash[:success] = ("Regrading #{link}")
+      link = "<a href=\"#{url_for(controller: 'jobs')}\">#{ActionController::Base.helpers.pluralize(
+success_jobs, "submission")}</a>"
+      flash[:success] = "Regrading #{link}"
     end
 
     # For both :success and :error
     flash[:html_safe] = true
 
-    redirect_to([@course, @assessment, :submissions]) && return
+    respond_to do |format|
+      format.html { redirect_to [@course, @assessment, :submissions] }
+      format.json { render json: { redirect: url_for([@course, @assessment, :submissions]) } }
+    end
   end
 
   #
@@ -136,7 +155,7 @@ def regradeBatch
   # action_auth_level :regradeAll, :instructor
   def regradeAll
     # Grab all of the submissions for this assessment
-    @submissions = @assessment.submissions.where(special_type: Submission::NORMAL)
+    @submissions = @assessment.submissions.where(special_type: [Submission::NORMAL, nil])
                    .order("version DESC")
 
     last_submissions = @submissions.latest
@@ -153,20 +172,22 @@ def regradeAll
 
     failure_jobs = failed_list.length
     if failure_jobs > 0
-      flash[:error] = "Warning: Could not regrade #{ActionController::Base.helpers.pluralize(failure_jobs, "submission")}:<br>"
+      flash[:error] =
+        "Warning: Could not regrade #{ActionController::Base.helpers.pluralize(failure_jobs, "submission")}"
+
+      @failure_messages = []
       failed_list.each do |failure|
-        if failure[:error].error_code == :nil_submission
-          flash[:error] += "Unrecognized submission ID<br>"
-        else
-          flash[:error] += "#{failure[:submission].filename}: #{failure[:error].message}<br>"
-        end
+        @failure_messages << if failure[:error].error_code == :nil_submission
+                               "Unrecognized submission ID"
+                             else
+                               "#{failure[:submission].filename}: #{failure[:error].message}"
+                             end
       end
     end
 
     success_jobs = last_submissions.size - failure_jobs
     if success_jobs > 0
-      link = "<a href=\"#{url_for(controller: 'jobs')}\">#{ActionController::Base.helpers.pluralize(success_jobs, "student")}</a>"
-      flash[:success] = ("Regrading the most recent submissions from #{link}")
+      flash[:success] = "Regrading #{success_jobs} recent submissions"
     end
 
     # For both :success and :error
@@ -189,7 +210,8 @@ def regradeAll
   #
   def sendJob_AddHTMLMessages(course, assessment, submissions)
     # Check for nil first, since students should know about this
-    flash[:error] = "Submission could not be autograded due to an error in creation" && return if submissions.blank?
+    flash[:error] = 
+      "Submission could not be autograded due to an error in creation" && return if submissions.blank?
 
     begin
       job = sendJob(course, assessment, submissions, @cud)
@@ -198,36 +220,42 @@ def sendJob_AddHTMLMessages(course, assessment, submissions)
       when :missing_autograding_props
         flash[:error] = "Autograding failed because there are no autograding properties."
         if @cud.instructor?
-          link = (view_context.link_to "Autograder Settings", [:edit, course, assessment, :autograder])
+          link = (view_context.link_to "Autograder Settings", 
+[:edit, course, assessment, :autograder])
           flash[:error] += " Visit #{link} to set the autograding properties."
           flash[:html_safe] = true
         else
           flash[:error] += " Please contact your instructor."
         end
       when :tango_open
-        flash[:error] = "There was an error submitting your autograding job. We are likely down for maintenance if issues persist, please contact #{Rails.configuration.school['support_email']}"
+        flash[:error] = 
+          "There was an error submitting your autograding job. We are likely down for maintenance if issues persist, please contact #{Rails.configuration.school['support_email']}"
       when :tango_upload
         flash[:error] = "There was an error uploading the submission file."
       when :tango_add_job
         flash[:error] = "Submission was rejected by autograder."
         if @cud.instructor?
-          link = (view_context.link_to "Autograder Settings", [:edit, course, assessment, :autograder])
+          link = (view_context.link_to "Autograder Settings", 
+[:edit, course, assessment, :autograder])
           flash[:error] += " Verify the autograding properties at #{link}.<br>ErrorMsg: " + e.additional_data
           flash[:html_safe] = true
         end
       when :missing_autograder_file
-        flash[:error] = "One or more files are missing in the server. Please contact the instructor. The missing files are: " + e.additional_data
+        flash[:error] = 
+          "One or more files are missing in the server. Please contact the instructor. The missing files are: " + e.additional_data
       else
         flash[:error] = "Autograding failed because of an unexpected exception in the system."
       end
 
       raise e # pass it on
     end
 
-    link = "<a href=\"#{url_for(controller: 'jobs', action: 'getjob', id: job)}\">Job ID = #{job}</a>"
-    viewFeedbackLink = "<a href=\"#{url_for(controller: 'assessments', action: 'viewFeedback', submission_id: submissions[0].id, feedback: assessment.problems[0].id)}\">View autograding progress.</a>"
-    flash[:success] = ("Submitted file #{submissions[0].filename} (#{link}) for autograding." \
-      " #{viewFeedbackLink}")
+    link = "<a href=\"#{url_for(controller: 'jobs', action: 'getjob', 
+id: job)}\">Job ID = #{job}</a>"
+    viewFeedbackLink = "<a href=\"#{url_for(controller: 'assessments', action: 'viewFeedback', 
+submission_id: submissions[0].id, feedback: assessment.problems[0].id)}\">View autograding progress.</a>"
+    flash[:success] = "Submitted file #{submissions[0].filename} (#{link}) for autograding." \
+      " #{viewFeedbackLink}"
     flash[:html_safe] = true
     job
   end

app/controllers/assessment/handin.rb

@@ -27,6 +27,10 @@ def handin
       return false
     end
 
+    # Clear cache since new submission made, need to remake cache
+    Rails.cache.delete(["submission_ids", @assessment.id])
+    Rails.cache.delete(["submissions_to_cud", @assessment.id])
+
     if @assessment.embedded_quiz
       contents = params[:submission]["embedded_quiz_form_answer"].to_s
       out_file = Tempfile.new('out.txt-')