chore: peer grade load next fix (#136)

* chore: use grade next step fix

* chore: show peer grade status alert correctly

Author: leangseu-edx

src/components/ModalActions/hooks/useModalActionConfig.js

@@ -1,6 +1,6 @@
 import { stepNames, stepStates } from 'constants/index';
 
-import { useGlobalState } from 'hooks/app';
+import { useGlobalState, useStepInfo } from 'hooks/app';
 import { useHasSubmitted } from 'hooks/assessment';
 import { useViewStep } from 'hooks/routing';
 import {
@@ -18,6 +18,7 @@ const useModalActionConfig = ({ options }) => {
   const hasSubmitted = useHasSubmitted();
   const finishedStateActions = useFinishedStateActions();
   const inProgressActions = useInProgressActions({ options });
+  const stepInfo = useStepInfo();
 
   const loadNextAction = useLoadNextAction();
   const startStepAction = useStartStepAction();
@@ -31,7 +32,7 @@ const useModalActionConfig = ({ options }) => {
   // finished state
   if (hasSubmitted) {
     if (globalState.activeStepState === stepStates.waitingForPeerGrades) {
-      return { primary: loadNextAction, secondary: exitAction };
+      return { primary: stepInfo.peer?.isWaitingForSubmissions ? null : loadNextAction, secondary: exitAction };
     }
     if (globalState.activeStepState !== stepStates.inProgress) {
       return { primary: exitAction };

src/components/StatusAlert/hooks/useSuccessAlerts.js

@@ -1,5 +1,5 @@
 import { useViewStep } from 'hooks/routing';
-import { useGlobalState } from 'hooks/app';
+import { useGlobalState, useStepInfo } from 'hooks/app';
 import { useHasSubmitted } from 'hooks/assessment';
 import { useStartStepAction, useLoadNextAction } from 'hooks/actions';
 
@@ -16,6 +16,7 @@ const useSuccessAlerts = ({ step }) => {
   const hasSubmitted = useHasSubmitted();
   const startStepAction = useStartStepAction();
   const loadNextAction = useLoadNextAction();
+  const stepInfo = useStepInfo();
   const exitAlert = useCreateExitAlert({ step });
   const createAlert = useCreateAlert({ step });
 
@@ -32,13 +33,14 @@ const useSuccessAlerts = ({ step }) => {
       } else if (viewStep === stepNames.peer) {
         successAlert.actions = [loadNextAction.action];
       }
-    } else if (activeStepState === stepStates.waitingForPeerGrades) {
+    } else if (activeStepState === stepStates.waitingForPeerGrades && !stepInfo.peer.isWaitingForSubmissions) {
       successAlert.actions = [loadNextAction.action];
     }
-    out.push(createAlert(successAlert));
 
     if (activeStepState !== stepStates.inProgress) {
       out.push(exitAlert(activeStepState));
+    } else {
+      out.push(createAlert(successAlert));
     }
     if (activeStepName === stepNames.staff) {
       out.push(exitAlert(stepNames.staff));

src/components/StatusAlert/index.jsx

@@ -17,7 +17,7 @@ const StatusAlert = ({
   step,
 }) => {
   const isPageDataLoading = useIsPageDataLoading();
-  const alerts = useStatusAlertData({ hasSubmitted, step });
+  const alerts = useStatusAlertData({ step });
   const customWrapper = ({ children }) => (
     <div className="w-100 h-100">
       {children}

src/components/StepProgressIndicator/index.jsx

@@ -53,7 +53,7 @@ const StepProgressIndicator = ({ step }) => {
     : needed;
   const showAction = hasSubmitted
     && !(step === stepNames.peer && stepInfo[step].isWaitingForSubmissions)
-    && (needed !== done);
+    && !(step === stepNames.studentTraining && needed === done);
 
   return (
     <div className={className}>

src/hooks/actions/useLoadNextAction.js

@@ -4,13 +4,11 @@ import {
   usePageDataStatus,
   useRefreshPageData,
   useActiveStepName,
+  useStepInfo,
 } from 'hooks/app';
 import { useResetAssessment } from 'hooks/assessment';
 import { useViewStep } from 'hooks/routing';
-import {
-  MutationStatus,
-  stepNames,
-} from 'constants/index';
+import { MutationStatus, stepNames } from 'constants/index';
 
 import messages, { loadNextSteps } from './messages';
 
@@ -22,8 +20,15 @@ export default () => {
   const pageDataStatus = usePageDataStatus().status;
   const viewStep = useViewStep();
   const activeStep = useActiveStepName();
+  const stepInfo = useStepInfo();
   const step = viewStep === stepNames.xblock ? activeStep : viewStep;
-  if (![stepNames.studentTraining, stepNames.peer].includes(step)) {
+  if (
+    !(
+      step === stepNames.studentTraining
+      || (step === stepNames.peer)
+      || (step === stepNames.peer && !stepInfo.peer?.isWaitingForSubmissions)
+    )
+  ) {
     return null;
   }
   const label = (message) => `${formatMessage(message)} ${formatMessage(loadNextSteps[step])}`;

src/views/XBlockView/Actions/index.jsx

@@ -32,6 +32,7 @@ const SubmissionActions = () => {
       [stepNames.studentTraining, stepNames.peer].includes(activeStepName)
       && stepState !== stepStates.waiting
       && stepInfo.numberOfAssessmentsCompleted > 0
+      && !stepInfo.isWaitingForSubmissions
     ) {
       const onClick = () => openModal({ view: activeStepName, title: activeStepName });
       return (