Merge branch 'develop/autolab-3.0' into import-export-course

Author: 20wildmanj

.gitignore

@@ -53,7 +53,7 @@ doc/
 out.txt
 .vscode/
 .byebug_history
-
+node_modules/
 # Credentials
 .env
 

Gemfile.lock

@@ -267,7 +267,7 @@ GEM
       stringio
     public_suffix (4.0.7)
     racc (1.6.1)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
     rack-protection (2.2.0)

app/assets/javascripts/annotations.js

@@ -84,31 +84,39 @@ function refreshAnnotations() {
   });
 }
 
+// Updates relevant elements of the speedgrader when a new file is selected
+function loadFile(newFile) {
+  // Update the code viewer and symbol tree with the cached data
+  $('#code-box').replaceWith(newFile.codeBox);
+  $('#symbol-tree-container').replaceWith(newFile.symbolTree);
+
+  // Add syntax highlighting to the new code viewer
+  $('pre code').each(function () {
+    hljs.highlightBlock(this);
+  });
+
+  // Update the page URL
+  history.replaceState(null, null, newFile.url);
+
+  // Update version dropdown
+  $('#version-dropdown').replaceWith(newFile.versionDropdown);
+
+  // Update version buttons
+  $('#version-links').replaceWith(newFile.versionLinks);
+
+  displayAnnotations();
+  attachEvents();
+}
+
 // Returns true if the file was cached, false otherwise
 function changeFile(headerPos) {
   $('#code-box').addClass('loading');
   setActiveFilePos(headerPos);
 
   // If we've cached this file locally, just get it
-  if (localCache[headerPos] != undefined) {
+  if (localCache[headerPos] !== undefined) {
     newFile = localCache[headerPos];
-    // Update the code viewer and symbol tree with the cached data
-    $('#code-box').replaceWith(newFile.codeBox);
-    $('#symbol-tree-container').replaceWith(newFile.symbolTree);
-
-    // Add syntax highlighting to the new code viewer
-    $('pre code').each(function () {
-      hljs.highlightBlock(this);
-    });
-
-    // Update the page URL
-    history.replaceState(null, null, newFile.url);
-
-    // Update version buttons
-    $('#version-links').replaceWith(newFile.versionLinks);
-
-    displayAnnotations();
-    attachEvents();
+    loadFile(newFile);
     return true;
   }
   return false;
@@ -120,6 +128,7 @@ function purgeCurrentPageCache() {
     pdf: false,
     symbolTree: `<div id="symbol-tree-box">${$('#symbol-tree-box').html()}</div>`,
     versionLinks: `<span id="version-links">${$('#version-links').html()}</span>`,
+    versionDropdown: `<span id="version-dropdown">${$('#version-dropdown').html()}</span>`,
     url: window.location.href,
   };
 }

app/assets/javascripts/git_submission.js

@@ -3,11 +3,12 @@
 
 const github_endpoints = {
   get_repos: '/github_integration/get_repositories',
-	get_branches: '/github_integration/get_branches',
+  get_branches: '/github_integration/get_branches',
+  get_commits: '/github_integration/get_commits',
 }
 
 function update_repos() {
-	$.getJSON(github_endpoints['get_repos'], function(data, status){
+  $.getJSON(github_endpoints['get_repos'], function(data, status) {
     repos_html = "";
     data.forEach(repo => {
       repos_html += `<div class="item">${repo["repo_name"]}</div>`;
@@ -16,11 +17,24 @@ function update_repos() {
   });
 }
 
-function update_branches(repo) {
+function clear_branches() {
   $("#branch-dropdown input[name='branch']").addClass("noselection");
   $("#branch-dropdown .text").addClass("default");
   $("#branch-dropdown .text").text("Select branch");
-	$.getJSON(github_endpoints['get_branches'], {repository: repo}, function(data, status){
+  $("#branch-dropdown .menu").html("");
+}
+
+function clear_commits() {
+  $("#commit-dropdown input[name='commit']").addClass("noselection");
+  $("#commit-dropdown .text").addClass("default");
+  $("#commit-dropdown .text").text("Select commit");
+  $("#commit-dropdown .menu").html("");
+}
+
+function update_branches(repo) {
+  clear_branches();
+  clear_commits();
+  $.getJSON(github_endpoints['get_branches'], {repository: repo}, function(data, status) {
     branches_html = "";
     data.forEach(branch => {
       branches_html += `<div class="item">${branch["name"]}</div>`;
@@ -29,6 +43,17 @@ function update_branches(repo) {
   });
 }
 
+function update_commits(repo, branch) {
+  clear_commits();
+  $.getJSON(github_endpoints['get_commits'], {repository: repo, branch: branch}, function(data, status) {
+    commits_html = "";
+    data.forEach(commit => {
+      commits_html += `<div data-value="${commit["sha"]}" class="item">${commit["sha"]} (${commit["msg"]})</div>`;
+    });
+    $("#commit-dropdown .menu").html(commits_html);
+  });
+}
+
 $("a[data-tab=github]").click(function (e) {
   update_repos();
 });
@@ -38,6 +63,12 @@ $("#repo-dropdown").change(function() {
   update_branches(repo_name);
 });
 
+$("#branch-dropdown").change(function() {
+  var repo_name = $("#repo-dropdown input[name='repo']").val();
+  var branch_name = $("#branch-dropdown input[name='branch']").val();
+  update_commits(repo_name, branch_name);
+});
+
 // https://stackoverflow.com/questions/5524045/jquery-non-ajax-post
 function submit(action, method, input) {
   'use strict';
@@ -65,8 +96,9 @@ $(document).on("click", "input[type='submit']", function (e) {
     e.preventDefault();
     var repo_name = $("#repo-dropdown input[name='repo']").val();
     var branch_name = $("#branch-dropdown input[name='branch']").val();
+    var commit_sha = $("#commit-dropdown input[name='commit']").val();
     var token = $("meta[name=csrf-token]").attr("content");
-    var params = {repo: repo_name, branch: branch_name, authenticity_token: token};
+    var params = {repo: repo_name, branch: branch_name, commit: commit_sha, authenticity_token: token};
     var assessment_nav = $(".sub-navigation").find(".item").last();
     var assessment_url = assessment_nav.find("a").attr("href");
     var url = assessment_url + "/handin"
@@ -75,6 +107,7 @@ $(document).on("click", "input[type='submit']", function (e) {
 });
 
 $(document).ready(function () {
+  $('.ui.dropdown input[type="hidden"]').val("");
   $('.ui.dropdown').dropdown({
     fullTextSearch: true,
   });

app/assets/javascripts/table_floating_header.js

@@ -14,7 +14,7 @@
 .submission-controls select {
   height: 2rem;
   display: inline-block;
-  width: 50px;
+  width: 5ch;
 }
 
 .submission-controls .btn {

app/assets/stylesheets/annotations.scss

@@ -68,3 +68,9 @@ div.dataTables_paginate span>a {
   width: 15px;
   text-align: center;
 }
+
+th {
+  z-index: 1;
+  position: sticky;
+  top: 0;
+}

app/assets/stylesheets/datatable.adapter.css

@@ -37,7 +37,7 @@ def handin
       github_integration = current_user.github_integration
 
       begin
-        @tarfile_path = github_integration.clone_repo(params["repo"], params["branch"], @assessment.max_size * (2 ** 20))
+        @tarfile_path = github_integration.clone_repo(params["repo"], params["branch"], params["commit"], @assessment.max_size * (2 ** 20))
       rescue StandardError => msg
         flash[:error] = msg
         redirect_to(action: :show)
@@ -354,8 +354,6 @@ def validateHandin_forHTML
       return false
     end
 
-    validate_custom_form
-
     validity = validateHandin(params[:submission]["file"].size,
                               params[:submission]["file"].content_type,
                               params[:submission]["file"].original_filename)
@@ -401,18 +399,6 @@ def validateHandinForGroups_forHTML
     return false
   end
 
-  def validate_custom_form
-    # check if custom form exists
-    if @assessment.has_custom_form
-      for i in 0..@assessment.getTextfields.size - 1
-        if params[:submission][("formfield" + (i + 1).to_s).to_sym].blank?
-          flash[:error] = @assessment.getTextfields[i] + " is a required field."
-          return false
-        end
-      end
-    end
-  end
-
   def handle_validity(validity)
     case validity
     when :valid