issue-1143 Ensure minimum question counts in ActivitiesRequiredCell and AssignmentReadingsTable

Author: morozov-av

bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/reading/AssignmentReadingsTable.tsx

@@ -48,7 +48,7 @@ export const AssignmentReadingsTable = ({
   const getNumQuestionsOrDefault = (numQuestions: Nullable<number>): number => {
     const defaultNumQuestions = 1;
 
-    return numQuestions ?? defaultNumQuestions;
+    return Math.max(numQuestions ?? 0, defaultNumQuestions);
   };
 
   return (

bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/reading/components/ActivitiesRequiredCell.tsx

@@ -24,7 +24,7 @@ export const ActivitiesRequiredCell = ({
 
   const handleValueChange = (newValue: number | null | undefined) => {
     const numValue = newValue ?? MIN_ACTIVITIES;
-    const activityCount = exercise.numQuestions || MIN_ACTIVITIES;
+    const activityCount = Math.max(exercise.numQuestions ?? 0, MIN_ACTIVITIES);
 
     if (numValue > activityCount) {
       showToast({
@@ -46,7 +46,7 @@ export const ActivitiesRequiredCell = ({
       value={currentValue}
       onValueChange={(e) => handleValueChange(e.value)}
       min={MIN_ACTIVITIES}
-      max={exercise.numQuestions || MIN_ACTIVITIES}
+      max={Math.max(exercise.numQuestions ?? 0, MIN_ACTIVITIES)}
       showButtons={false}
       style={{
         width: "100%",

bases/rsptx/assignment_server_api/routers/instructor.py

@@ -664,9 +664,9 @@ async def get_assignment_questions(
 
         if aq["reading_assignment"] == True:  # noqa: E712
             try:
-                aq["numQuestions"] = countd[q["chapter"]][q["subchapter"]]
+                aq["numQuestions"] = max(countd[q["chapter"]][q["subchapter"]], 1)
             except KeyError:
-                aq["numQuestions"] = 0
+                aq["numQuestions"] = 1
 
         # augment the assignment question with additional question data
         aq["name"] = q["name"]