From 9cb0a2d6488eb567f3661d1ea59e20cc708e3cd4 Mon Sep 17 00:00:00 2001
From: Pranav Rao <56097527+pranavrao145@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:52:41 -0400
Subject: [PATCH] feat(retain-old-grading-data-option): only show option if
 collected submission exists

---
 .../javascripts/Components/repo_browser.jsx   | 25 +++++++++++--------
 config/locales/views/submissions/en.yml       |  6 ++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/Components/repo_browser.jsx b/app/assets/javascripts/Components/repo_browser.jsx
index 3f7c1fdbd4..151ac71a84 100644
--- a/app/assets/javascripts/Components/repo_browser.jsx
+++ b/app/assets/javascripts/Components/repo_browser.jsx
@@ -87,6 +87,7 @@ class RepoBrowser extends React.Component {
           late_penalty={this.props.late_penalty}
           grouping_id={this.props.grouping_id}
           revision_identifier={this.state.revision_identifier}
+          collected_revision_id={this.props.collected_revision_id}
         />
       );
     }
@@ -175,17 +176,19 @@ class ManualCollectionForm extends React.Component {
               {I18n.t("submissions.collect.apply_late_penalty")}
             </label>
           </p>
-          <div className="inline-labels" style={{marginBottom: "1em"}}>
-            <input
-              type="checkbox"
-              name="retain_existing_grading"
-              checked={this.state.retainExistingGrading}
-              onChange={e => {
-                this.setState({retainExistingGrading: e.target.checked});
-              }}
-            />
-            <label>{I18n.t("submissions.collect.retain_existing_grading")}</label>
-          </div>
+          {this.props.collected_revision_id && (
+            <div className="inline-labels" style={{marginBottom: "1em"}}>
+              <input
+                type="checkbox"
+                name="retain_existing_grading"
+                checked={this.state.retainExistingGrading}
+                onChange={e => {
+                  this.setState({retainExistingGrading: e.target.checked});
+                }}
+              />
+              <label>{I18n.t("submissions.collect.retain_existing_grading")}</label>
+            </div>
+          )}
           <button
             type="submit"
             name="commit"
diff --git a/config/locales/views/submissions/en.yml b/config/locales/views/submissions/en.yml
index ca118c9e09..708db6a9ae 100644
--- a/config/locales/views/submissions/en.yml
+++ b/config/locales/views/submissions/en.yml
@@ -19,10 +19,10 @@ en:
       full_overwrite_warning: Collecting and grading this revision will overwrite any previous collections/grading done for this group on this assignment.  Are you sure you want to do this?
       manual_collection: Manual Collection
       override_existing: Recollect previously collected submissions?
-      partial_overwrite_warning: Original marks, annotations, and test results will be retained upon collecting this revision, but all remark data from previous collections/grading will still be lost for this group on this assignment. Are you sure you want to do this?
+      partial_overwrite_warning: Original marks, annotations, feedback files, and test results will be retained upon collecting this revision, but all remark data from previous collections/grading will still be lost for this group on this assignment. Are you sure you want to do this?
       progress: "%{count}/%{size} submissions collected"
       results_loss_warning: This action identifies the version of files to grade for each selected group. Instructors and TAs can begin grading after files are collected.
-      retain_existing_grading: Retain existing grading data (marks, annotations, and test results)
+      retain_existing_grading: Retain existing grading data (marks, annotations, feedback files, and test results)
       retain_existing_grading_warning_html: 'Retain existing grading data <strong>(Warning: without selecting this option, all old grading data for the collected submissions will be lost)</strong>'
       scanned_exam_latest_warning: For scanned exams, the latest submitted file version for each selected group is used regardless of the due date.
       status:
@@ -52,7 +52,7 @@ en:
     help:
       browse:
         instructors: 'Check the status of the student submissions. Before grading can begin, the student assignments must be collected. This associates each group with the version of their files that should be graded. This means that when the grader adds annotations and marks, they belong to this particular submission. There are three different ways of collecting submissions: Collect All Submissions, which automatically collects all submissions, based on the due date and late penalties; clicking on an individual group name triggers automatic collection for that group; clicking on the Repository name takes you the Repository view, where you can manually choose a revision to collect.<br>Rows in green have been collected and are ready to begin marking. Clicking on the group name takes you to the Grader view. When a grader sets the Marking State to Complete and you are ready to allow students to view the results, select the students and press "Release Marks".<br>CSV Report and Detailed CSV Report are two different ways of downloading the marks in csv format. Repository List downloads a text file that maps group name to repository path. Repository Checkout File downloads a text file where each line is a repository checkout command for the collected version of each student submission. Download all submissions downloads a zip file containing repositories for all of the students.'
-        tas: 'Click on assignments to grade them. Rows in green have been collected and are ready to begin marking. If your assigned submissions haven''t been collected, you can click on the group name to collect them. <strong>Warning</strong>: collection will delete any previous annoations or marks.'
+        tas: 'Click on assignments to grade them. Rows in green have been collected and are ready to begin marking. If your assigned submissions haven''t been collected, you can click on the group name to collect them.'
     how_many_marked: "%{num_marked}/%{num_assigned} completed"
     how_many_marked_in_collected: "%{num_marked}/%{num_collected} completed"
     invalid_url: "%{item} is not a valid HTTP/HTTPS URL"