chore(assessment): remove draft programming answer

- the feature is no longer used by anyone - it's rendered useless after our autosave feature takes place - remove all isDraftAnswer from FE, and draft_answer from BE - remove the column related to allow draft programming answer - rake command to remove all non-current attempting programming answer to make the system consistent
Coursemology · Dec 11, 2024 · 3b77d0d · 3b77d0d
1 parent 0d23ff2
commit 3b77d0d
Show file tree

Hide file tree

Showing 28 changed files with 34 additions and 135 deletions.
diff --git a/app/controllers/course/assessment/assessments_controller.rb b/app/controllers/course/assessment/assessments_controller.rb
@@ -237,7 +237,7 @@ def assessment_params
                    :bonus_end_at, :published, :autograded, :show_mcq_mrq_solution, :show_private,
                    :show_evaluation, :use_public, :use_private, :use_evaluation, :has_personal_times,
                    :affects_personal_times, :block_student_viewing_after_submitted, :has_todo,
-                   :allow_record_draft_answer, :time_limit, :is_koditsu_enabled]
+                   :time_limit, :is_koditsu_enabled]
     base_params += if autograded?
                      [:skippable, :allow_partial_submission, :show_mcq_answer]
                    else

diff --git a/app/models/course/assessment/answer.rb b/app/models/course/assessment/answer.rb
@@ -140,10 +140,6 @@ def generate_live_feedback
     actable.generate_live_feedback
   end
 
-  def draft_answer?
-    attempting? && !current_answer?
-  end
-
   protected
 
   def finalise

diff --git a/app/services/course/assessment/submission/update_service.rb b/app/services/course/assessment/submission/update_service.rb
@@ -106,13 +106,13 @@ def update_submission # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComple
 
           answer = @submission.answers.includes(:actable).find { |a| a.id == answer_params[:id].to_i }
 
-          if answer && !update_answer(answer, answer_params)
-            logger.error("Failed to update answer #{answer.errors.inspect}")
-            answer.errors.messages.each do |attribute, message|
-              @submission.errors.add(attribute, message)
-            end
-            raise ActiveRecord::Rollback
+          next unless answer && !update_answer(answer, answer_params)
+
+          logger.error("Failed to update answer #{answer.errors.inspect}")
+          answer.errors.messages.each do |attribute, message|
+            @submission.errors.add(attribute, message)
           end
+          raise ActiveRecord::Rollback
         end
       end
 
@@ -125,20 +125,6 @@ def update_submission # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComple
     end
   end
 
-  def attempt_draft_answer(answer)
-    return unless answer
-
-    reattempt_answer(answer, finalise: false) if should_attempt_draft_answer?(answer)
-  end
-
-  def should_attempt_draft_answer?(answer)
-    is_save_draft = update_submission_additional_params[:is_save_draft].to_s.downcase == 'true'
-    is_programming = answer.actable_type == Course::Assessment::Answer::Programming.name
-    assessment_save_draft_answer = @assessment.allow_record_draft_answer
-
-    is_save_draft && is_programming && assessment_save_draft_answer
-  end
-
   def unsubmit?
     params[:submission] && params[:submission][:unsubmit].present?
   end

diff --git a/app/views/course/assessment/answers/_answer.json.jbuilder b/app/views/course/assessment/answers/_answer.json.jbuilder
@@ -4,7 +4,6 @@ json.questionId answer.question_id
 json.questionType answer.question.question_type
 json.createdAt answer.created_at&.iso8601
 json.clientVersion answer.client_version
-json.isDraftAnswer answer.draft_answer?
 
 specific_answer = answer.specific
 can_grade = can?(:grade, answer.submission)

diff --git a/app/views/course/assessment/assessments/edit.json.jbuilder b/app/views/course/assessment/assessments/edit.json.jbuilder
@@ -5,7 +5,7 @@ json.attributes do
             :skippable, :tabbed_view, :view_password, :session_password, :delayed_grade_publication, :tab_id,
             :use_public, :use_private, :use_evaluation, :allow_partial_submission, :has_personal_times,
             :affects_personal_times, :show_mcq_answer, :block_student_viewing_after_submitted, :has_todo,
-            :allow_record_draft_answer, :time_limit, :is_koditsu_enabled)
+            :time_limit, :is_koditsu_enabled)
 
   # TODO: [PR#5491] Edit Assessment only changes time in the Default Timeline
   json.start_at @assessment.start_at&.iso8601

diff --git a/app/views/course/assessment/assessments/show.json.jbuilder b/app/views/course/assessment/assessments/show.json.jbuilder
@@ -100,7 +100,6 @@ if can_attempt && assessment.folder.materials.exists?
 end
 
 if can_observe
-  json.allowRecordDraftAnswer assessment.allow_record_draft_answer
   json.showMcqMrqSolution assessment.show_mcq_mrq_solution
   json.gradedTestCases display_graded_test_types(assessment)
 

diff --git a/client/app/bundles/course/assessment/components/AssessmentForm/index.tsx b/client/app/bundles/course/assessment/components/AssessmentForm/index.tsx
@@ -575,18 +575,6 @@ const AssessmentForm = (props: AssessmentFormProps): JSX.Element => {
           sticksToNavbar={editing}
           title={t(translations.answersAndTestCases)}
         >
-          <Controller
-            control={control}
-            name="allow_record_draft_answer"
-            render={({ field, fieldState }): JSX.Element => (
-              <FormCheckboxField
-                disabled={disabled}
-                field={field}
-                fieldState={fieldState}
-                label={t(translations.allowRecordDraftAnswer)}
-              />
-            )}
-          />
           <Controller
             control={control}
             name="skippable"

diff --git a/client/app/bundles/course/assessment/components/AssessmentForm/translations.ts b/client/app/bundles/course/assessment/components/AssessmentForm/translations.ts
@@ -175,10 +175,6 @@ const translations = defineMessages({
     id: 'course.assessment.AssessmentForm.calculateGradeWith',
     defaultMessage: 'Calculate grade and EXP with',
   },
-  allowRecordDraftAnswer: {
-    id: 'course.assessment.AssessmentForm.allowRecordDraftAnswer',
-    defaultMessage: 'Allow versioning of draft programming answer',
-  },
   skippable: {
     id: 'course.assessment.AssessmentForm.skippable',
     defaultMessage: 'Allow to skip steps',

diff --git a/client/app/bundles/course/assessment/components/AssessmentForm/useFormValidation.tsx b/client/app/bundles/course/assessment/components/AssessmentForm/useFormValidation.tsx
@@ -60,7 +60,6 @@ const validationSchema = yup.object({
   has_todo: yup.bool(),
   autograded: yup.bool(),
   block_student_viewing_after_submitted: yup.bool(),
-  allow_record_draft_answer: yup.bool(),
   skippable: yup.bool(),
   allow_partial_submission: yup.bool(),
   show_mcq_answer: yup.bool(),

diff --git a/client/app/bundles/course/assessment/pages/AssessmentEdit/__test__/index.test.tsx b/client/app/bundles/course/assessment/pages/AssessmentEdit/__test__/index.test.tsx
@@ -25,7 +25,6 @@ const INITIAL_VALUES = {
   time_limit: null,
   allow_partial_submission: false,
   block_student_viewing_after_submitted: false,
-  allow_record_draft_answer: false,
   delayed_grade_publication: false,
   password_protected: false,
   view_password: null,

diff --git a/client/app/bundles/course/assessment/pages/AssessmentShow/AssessmentDetails.tsx b/client/app/bundles/course/assessment/pages/AssessmentShow/AssessmentDetails.tsx
@@ -85,16 +85,6 @@ const AssessmentDetails = (props: AssessmentDetailsProps): JSX.Element => {
 
         {assessment.permissions.canObserve && (
           <>
-            <TableRow>
-              <TableCell variant="head">
-                {t(translations.allowRecordDraftAnswer)}
-              </TableCell>
-
-              <TableCell>
-                {assessment.allowRecordDraftAnswer ? '✅' : '❌'}
-              </TableCell>
-            </TableRow>
-
             <TableRow>
               <TableCell variant="head">
                 {t(translations.showMcqMrqSolution)}

diff --git a/client/app/bundles/course/assessment/pages/AssessmentsIndex/NewAssessmentFormButton.jsx b/client/app/bundles/course/assessment/pages/AssessmentsIndex/NewAssessmentFormButton.jsx
@@ -124,7 +124,6 @@ class NewAssessmentFormButton extends Component {
       autograded: false,
       is_koditsu_enabled: false,
       block_student_viewing_after_submitted: false,
-      allow_record_draft_answer: false,
       skippable: false,
       allow_partial_submission: false,
       show_mcq_answer: true,

diff --git a/...app/bundles/course/assessment/submission/components/pastAnswers/PastProgrammingAnswer.jsx b/...app/bundles/course/assessment/submission/components/pastAnswers/PastProgrammingAnswer.jsx
@@ -12,11 +12,7 @@ export default class PastProgrammingAnswer extends Component {
     return (
       <div>
         <ProgrammingImportHistoryView historyAnswer={answer} />
-        <TestCaseView
-          answerId={answer.id}
-          isDraftAnswer={answer.isDraftAnswer}
-          viewHistory
-        />
+        <TestCaseView answerId={answer.id} viewHistory />
       </div>
     );
   }
@@ -33,11 +29,7 @@ export default class PastProgrammingAnswer extends Component {
     return (
       <div>
         {file && <ReadOnlyEditor answerId={answer.id} file={file} />}
-        <TestCaseView
-          answerId={answer.id}
-          isDraftAnswer={answer.isDraftAnswer}
-          viewHistory
-        />
+        <TestCaseView answerId={answer.id} viewHistory />
       </div>
     );
   }

diff --git a/client/app/bundles/course/assessment/submission/containers/PastAnswers.jsx b/client/app/bundles/course/assessment/submission/containers/PastAnswers.jsx
@@ -70,9 +70,6 @@ class PastAnswers extends Component {
       return (
         <MenuItem key={index} value={answer}>
           {formatLongDateTime(answer.createdAt)}
-          {answer.isDraftAnswer && (
-            <>&nbsp;{intl.formatMessage(translations.draftAnswer)}</>
-          )}
         </MenuItem>
       );
     };
@@ -100,10 +97,7 @@ class PastAnswers extends Component {
     return (
       <div key={answer.id}>
         <Typography variant="h6">
-          {answer.isDraftAnswer
-            ? intl.formatMessage(translations.savedAt)
-            : intl.formatMessage(translations.submittedAt)}
-          : {date}
+          {intl.formatMessage(translations.submittedAt)} : {date}
         </Typography>
         {this.getAnswersHistory(question, answer)}
         <hr />

diff --git a/client/app/bundles/course/assessment/submission/containers/TestCaseView/index.jsx b/client/app/bundles/course/assessment/submission/containers/TestCaseView/index.jsx
@@ -187,7 +187,7 @@ export class VisibleTestCaseView extends Component {
     );
   }
 
-  renderTestCases(testCases, testCaseType, warn, isDraftAnswer) {
+  renderTestCases(testCases, testCaseType, warn) {
     const {
       collapsible,
       testCases: { canReadTests },
@@ -277,10 +277,10 @@ export class VisibleTestCaseView extends Component {
 
     return (
       <Accordion
-        className={!isDraftAnswer && testCaseComponentClassName()}
+        className={testCaseComponentClassName()}
         defaultExpanded={!collapsible}
         disableGutters
-        icon={!isDraftAnswer && <TestCasesIndicatorChip />}
+        icon={<TestCasesIndicatorChip />}
         id={testCaseType}
         subtitle={
           warn && <FormattedMessage {...translations.staffOnlyTestCases} />
@@ -326,7 +326,6 @@ export class VisibleTestCaseView extends Component {
       testCases,
       collapsible,
       showStdoutAndStderr,
-      isDraftAnswer,
     } = this.props;
     if (!testCases) {
       return null;
@@ -349,27 +348,20 @@ export class VisibleTestCaseView extends Component {
           </Alert>
         )}
 
-        {this.renderTestCases(
-          testCases.public_test,
-          'publicTestCases',
-          false,
-          isDraftAnswer,
-        )}
+        {this.renderTestCases(testCases.public_test, 'publicTestCases', false)}
 
         {showPrivateTest &&
           this.renderTestCases(
             testCases.private_test,
             'privateTestCases',
             !showPrivateTestToStudents,
-            isDraftAnswer,
           )}
 
         {showEvaluationTest &&
           this.renderTestCases(
             testCases.evaluation_test,
             'evaluationTestCases',
             !showEvaluationTestToStudents,
-            isDraftAnswer,
           )}
 
         {showOutputStreams &&
@@ -412,11 +404,10 @@ VisibleTestCaseView.propTypes = {
     stdout: PropTypes.string,
     stderr: PropTypes.string,
   }),
-  isDraftAnswer: PropTypes.bool,
 };
 
 function mapStateToProps({ assessments: { submission } }, ownProps) {
-  const { questionId, answerId, viewHistory, isDraftAnswer } = ownProps;
+  const { questionId, answerId, viewHistory } = ownProps;
   let testCases;
   let isAutograding;
   if (viewHistory) {
@@ -437,7 +428,6 @@ function mapStateToProps({ assessments: { submission } }, ownProps) {
     collapsible: viewHistory,
     isAutograding,
     testCases,
-    isDraftAnswer,
   };
 }
 

diff --git a/client/app/bundles/course/assessment/submission/propTypes.js b/client/app/bundles/course/assessment/submission/propTypes.js
@@ -91,7 +91,6 @@ export const answerShape = PropTypes.shape({
   file: PropTypes.object,
   files: PropTypes.arrayOf(fileShape),
   option_ids: PropTypes.arrayOf(PropTypes.number),
-  isDraftAnswer: PropTypes.bool,
   createdAt: PropTypes.string,
 });
 

diff --git a/client/app/bundles/course/assessment/submission/reducers/history/answers.js b/client/app/bundles/course/assessment/submission/reducers/history/answers.js
@@ -10,7 +10,6 @@ export default function (state = {}, action) {
             ...obj,
             [answer.id]: {
               ...answer.fields,
-              isDraftAnswer: answer.isDraftAnswer,
               createdAt: answer.createdAt,
             },
           }),
@@ -25,7 +24,6 @@ export default function (state = {}, action) {
           ...state,
           [latestAnswer.id]: {
             ...latestAnswer.fields,
-            isDraftAnswer: latestAnswer.isDraftAnswer,
             createdAt: latestAnswer.createdAt,
           },
         };

diff --git a/client/app/bundles/course/assessment/submission/reducers/history/types.ts b/client/app/bundles/course/assessment/submission/reducers/history/types.ts
@@ -9,6 +9,5 @@ export interface QuestionHistory {
 }
 
 export type AnswerHistory = AnswerData & {
-  isDraftAnswer: boolean;
   createdAt: Date;
 };
diff --git a/client/app/bundles/course/assessment/submission/translations.ts b/client/app/bundles/course/assessment/submission/translations.ts
@@ -164,10 +164,6 @@ const translations = defineMessages({
     id: 'course.assessment.submission.attemptedAt',
     defaultMessage: 'Attempted At',
   },
-  savedAt: {
-    id: 'course.assessment.submission.savedAt',
-    defaultMessage: 'Saved At',
-  },
   submittedAt: {
     id: 'course.assessment.submission.submittedAt',
     defaultMessage: 'Submitted At',
@@ -512,10 +508,6 @@ const translations = defineMessages({
     id: 'course.assessment.submission.getPastAnswersFailure',
     defaultMessage: 'Failed to load past answers',
   },
-  draftAnswer: {
-    id: 'course.assessment.submission.draftAnswer',
-    defaultMessage: ' - Draft',
-  },
   statistics: {
     id: 'course.assessment.submission.statistics',
     defaultMessage: 'Statistics',

diff --git a/client/app/bundles/course/assessment/submission/types.ts b/client/app/bundles/course/assessment/submission/types.ts
@@ -165,7 +165,6 @@ interface Topic {
 export type TopicState = Record<number, Topic>;
 
 export type HistoryAnswer = AnswerData & {
-  isDraftAnswer: boolean;
   createdAt: Date;
 };
 

diff --git a/client/app/bundles/course/assessment/translations.ts b/client/app/bundles/course/assessment/translations.ts
@@ -235,10 +235,6 @@ const translations = defineMessages({
     id: 'course.assessment.show.baseExp',
     defaultMessage: 'Base EXP',
   },
-  allowRecordDraftAnswer: {
-    id: 'course.assessment.show.allowRecordDraftAnswer',
-    defaultMessage: 'Allow versioning of draft programming answer',
-  },
   showMcqMrqSolution: {
     id: 'course.assessment.show.showMcqMrqSolution',
     defaultMessage: 'Show MCQ/MRQ solutions',

diff --git a/client/app/types/course/assessment/assessments.ts b/client/app/types/course/assessment/assessments.ts
@@ -130,7 +130,6 @@ export interface AssessmentData extends AssessmentActionsData {
   isKoditsuAssessmentEnabled?: boolean;
   isSyncedWithKoditsu?: boolean;
   isStudent: boolean;
-  allowRecordDraftAnswer?: boolean;
   showMcqMrqSolution?: boolean;
   gradedTestCases?: string;
   skippable?: boolean;

diff --git a/client/app/types/course/assessment/submission/answer/answer.ts b/client/app/types/course/assessment/submission/answer/answer.ts
@@ -5,7 +5,6 @@ export interface AnswerBaseData {
   questionId: number;
   createdAt: string;
   clientVersion: number | null;
-  isDraftAnswer: boolean;
   grading: {
     id: number; // Answer ID
     grade?: number | null;