fixup! feat: subsection settings

Author: navinkarkera

src/course-outline/data/api.ts

@@ -258,7 +258,7 @@ export async function configureCourseSubsection(variables: ConfigureSubsectionDa
         is_time_limited: variables.isTimeLimited,
         is_proctored_enabled: variables.isProctoredExam || variables.isPracticeExam || variables.isOnboardingExam,
         exam_review_rules: variables.examReviewRules,
-        default_time_limit_minutes: variables.defaultTimeLimitMin,
+        default_time_limit_minutes: variables.defaultTimeLimitMinutes,
         is_onboarding_exam: variables.isOnboardingExam,
         start: variables.releaseDate,
       },

src/course-outline/data/slice.ts

@@ -58,8 +58,8 @@ const slice = createSlice({
       state.outlineIndexData = payload;
       state.sectionsList = payload.courseStructure?.childInfo?.children || [];
       state.isCustomRelativeDatesActive = payload.isCustomRelativeDatesActive;
-      state.enableProctoredExams = payload.courseStructure?.enableProctoredExams;
-      state.enableTimedExams = payload.courseStructure?.enableTimedExams;
+      state.enableProctoredExams = true || payload.courseStructure?.enableProctoredExams;
+      state.enableTimedExams = true || payload.courseStructure?.enableTimedExams;
       state.createdOn = payload.createdOn;
     },
     updateOutlineIndexLoadingStatus: (state: CourseOutlineState, { payload }) => {

src/course-outline/data/types.ts

@@ -109,7 +109,7 @@ export interface ConfigureSubsectionData {
   isOnboardingExam?: boolean,
   isPracticeExam?: boolean,
   examReviewRules?: string,
-  defaultTimeLimitMin?: number,
+  defaultTimeLimitMinutes?: number,
   hideAfterDue: boolean,
   showCorrectness: "always" | "never" | "past_due" | "never_but_include_grade",
   isPrereq?: boolean,

src/course-outline/outline-sidebar/info-sidebar/SubsectionSettings.tsx

@@ -112,7 +112,7 @@ const GradingSection = ({ subsectionId, onChange }: SubProps) => {
           <Form.Control
             as="select"
             defaultValue={itemData?.format}
-            onChange={(e) => setLocalState({ ...localState, graderType: e.target.value })}
+            onChange={(e) => setLocalState((prev) => ({ ...prev, graderType: e.target.value }))}
             data-testid="grader-type-select"
           >
             <option key="notgraded" value="notgraded">
@@ -129,15 +129,15 @@ const GradingSection = ({ subsectionId, onChange }: SubProps) => {
             value={localState?.dueDate}
             label={intl.formatMessage(messages.subsectionGradingDueDateLabel)}
             controlName="state-date"
-            onChange={(val) => setLocalState({ ...localState, dueDate: val })}
+            onChange={(val) => setLocalState((prev) => ({ ...prev, dueDate: val }))}
             data-testid="due-date-picker"
           />
           <DatepickerControl
             type={DATEPICKER_TYPES.time}
             value={localState?.dueDate}
             label={intl.formatMessage(messages.subsectionGradingDueTimeLabel)}
             controlName="start-time"
-            onChange={(val) => setLocalState({ ...localState, dueDate: val })}
+            onChange={(val) => setLocalState((prev) => ({ ...prev, dueDate: val }))}
           />
         </Stack>
       }
@@ -163,29 +163,29 @@ const VisibilitySection = ({ subsectionId, onChange }: SubProps) => {
       <ButtonGroup toggle>
         <Button
           variant={localState?.isVisibleToStaffOnly ? 'outline-primary' : 'primary'}
-          onClick={() => setLocalState({ ...localState,  isVisibleToStaffOnly: false })}
+          onClick={() => setLocalState((prev) => ({ ...prev,  isVisibleToStaffOnly: false }))}
         >
           <FormattedMessage {...messages.subsectionVisibilityStudentVisible} />
         </Button>
         <Button
           variant={localState?.isVisibleToStaffOnly ? 'primary' : 'outline-primary'}
-          onClick={() => setLocalState({
-            ...localState,
+          onClick={() => setLocalState((prev) => ({
+            ...prev,
             isVisibleToStaffOnly: true,
             hideAfterDue: false,
-          })}
+          }))}
         >
           <FormattedMessage {...messages.subsectionVisibilityStaffOnly} />
         </Button>
       </ButtonGroup>
       {!localState?.isVisibleToStaffOnly && <Form.Checkbox
         checked={localState?.hideAfterDue}
         className="mt-2"
-        onChange={ (e) => setLocalState({
-          ...localState,
+        onChange={ (e) => setLocalState((prev) => ({
+          ...prev,
           hideAfterDue: e.target.checked,
           isVisibleToStaffOnly: false,
-        }) }
+        }))}
       >
         <FormattedMessage {...messages.subsectionVisibilityHideAfterDueLabel} />
       </Form.Checkbox>}
@@ -243,30 +243,35 @@ const SpecialExamSection = ({ subsectionId, onChange }: SubProps) => {
   const enableProctoredExams = useSelector(getProctoredExamsFlag);
   const [localState, setLocalState] = useStateWithCallback<Partial<ConfigureSubsectionData>>(
     {
-      showCorrectness: itemData?.showCorrectness,
+      isProctoredExam: itemData?.isProctoredExam,
+      isTimeLimited: itemData?.isTimeLimited,
+      isOnboardingExam: itemData?.isOnboardingExam,
+      isPracticeExam: itemData?.isPracticeExam,
+      defaultTimeLimitMinutes: itemData?.defaultTimeLimitMinutes,
+      examReviewRules: itemData?.examReviewRules,
     },
-    (val) => onChange(val || {})
+    (val) => onChange(val || {}),
   );
 
   const setFieldValue = (key: keyof ConfigureSubsectionData, value: any) => {
-    setLocalState({
-      ...localState,
+    setLocalState((prev) => ({
+      ...prev,
       [key]: value,
-    })
-  }
+    }));
+  };
 
   return (
     <SidebarSection
       title={intl.formatMessage(messages.subsectionSpecialExamTitle)}
     >
       <AdvancedTab
         values={{
-          isProctoredExam: itemData?.isProctoredExam,
-          isTimeLimited: itemData?.isTimeLimited,
-          isOnboardingExam: itemData?.isOnboardingExam,
-          isPracticeExam: itemData?.isPracticeExam,
-          defaultTimeLimitMinutes: itemData?.defaultTimeLimitMinutes,
-          examReviewRules: itemData?.examReviewRules,
+          isProctoredExam: localState?.isProctoredExam,
+          isTimeLimited: localState?.isTimeLimited,
+          isOnboardingExam: localState?.isOnboardingExam,
+          isPracticeExam: localState?.isPracticeExam,
+          defaultTimeLimitMinutes: localState?.defaultTimeLimitMinutes,
+          examReviewRules: localState?.examReviewRules,
         }}
         setFieldValue={setFieldValue}
         prereqs={itemData?.prereqs}
@@ -278,6 +283,8 @@ const SpecialExamSection = ({ subsectionId, onChange }: SubProps) => {
         showReviewRules={itemData?.showReviewRules}
         wasProctoredExam={itemData?.isProctoredExam}
         onlineProctoringRules={itemData?.onlineProctoringRules}
+        hideTitle
+        useBtnGroup
       />
     </SidebarSection>
   );
@@ -306,7 +313,7 @@ export const SubsectionSettings = ({ subsectionId }: Props) => {
       isOnboardingExam: itemData.isOnboardingExam,
       isPracticeExam: itemData.isPracticeExam,
       examReviewRules: itemData.examReviewRules,
-      defaultTimeLimitMin: itemData.defaultTimeLimitMinutes,
+      defaultTimeLimitMinutes: itemData.defaultTimeLimitMinutes,
       hideAfterDue: itemData.hideAfterDue === undefined ? false : itemData.hideAfterDue,
       showCorrectness: itemData.showCorrectness,
       isPrereq: itemData.isPrereq,