temp: tried to move hooks to hooks.js

edx · Dec 14, 2023 · 7ab9d79 · 7ab9d79
1 parent dabb0d8
commit 7ab9d79
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/src/pages/ExamsPage/components/ReviewExamAttemptModal.jsx b/src/pages/ExamsPage/components/ReviewExamAttemptModal.jsx
@@ -7,12 +7,9 @@ import {
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { Info, Warning } from '@edx/paragon/icons';
 import * as constants from 'data/constants';
-import { useExamsData, useModifyExamAttempt } from '../hooks';
+import { useExamAttemptUpdateData, useExamsData, useModifyExamAttempt } from '../hooks';
 import messages from '../messages';
 import { getLaunchUrlByExamId, getMessageLabelForStatus } from '../utils';
-import { RequestKeys } from 'data/constants';
-import * as reduxHooks from 'data/redux/hooks';
-import { async } from 'regenerator-runtime';
 
 
 
@@ -33,7 +30,12 @@ const ReviewExamAttemptModal = ({
 }) => {
   const [isOpen, open, close] = useToggle(false);
   const modifyExamAttempt = useModifyExamAttempt();
-  const { currentExam } = useExamsData();
+  const {
+    currentExam,
+    isPending,
+    isCompleted,
+    isError,
+  } = useExamsData();
   const [rejectButtonStatus, setRejectButtonStatus] = useState('');
   const [verifyButtonStatus, setVerifyButtonStatus] = useState('');
   const { formatMessage } = useIntl();
@@ -58,27 +60,6 @@ const ReviewExamAttemptModal = ({
     variant: 'primary',
   };
 
-  const getRequestStatus = () => {
-    console.log("OH BOY");
-    if (reduxHooks.useRequestIsPending(RequestKeys.modifyExamAttempt)) {
-      return 'pending';
-    } else if (reduxHooks.useRequestIsCompleted(RequestKeys.modifyExamAttempt)) {
-      return 'complete';
-    } else if (reduxHooks.useRequestError(RequestKeys.modifyExamAttempt)) {
-      return 'error';
-    };
-    return '';
-  };
-
-  // Set the status of the button 
-  const updateButtonStatus = (buttonType) => {
-    if (buttonType == 'verify') {
-      setVerifyButtonStatus(getRequestStatus());
-    } else if (buttonType == 'reject') {
-      setRejectButtonStatus(getRequestStatus());
-    }
-  };
-
   const getButton = (status) => {
     if (ReviewRequiredStatuses.includes(status)) {
       return (
@@ -116,6 +97,12 @@ const ReviewExamAttemptModal = ({
     return null; // we should not get here
   };
 
+  // const {
+  //   isPending,
+  //   isCompleted,
+  //   isError,
+  // } = useExamAttemptUpdateData();
+
   return (
     <>
       <div className="d-flex text-danger">

diff --git a/src/pages/ExamsPage/hooks.js b/src/pages/ExamsPage/hooks.js
@@ -90,10 +90,18 @@ export const useExamsData = () => {
   const setCurrentExam = module.useSetCurrentExam();
   const isLoading = reduxHooks.useRequestIsPending(RequestKeys.fetchCourseExams);
 
+  // Request status vars for modifyexamattempt calls in ResetExamAttemptModal.jsx and ReviewExamAttemptModal.jsx
+  const isPending = reduxHooks.useRequestIsPending(RequestKeys.modifyExamAttempt);
+  const isCompleted = reduxHooks.useRequestIsCompleted(RequestKeys.modifyExamAttempt);
+  const isError = reduxHooks.useRequestError(RequestKeys.modifyExamAttempt);
+
   return {
     currentExam,
     examsList,
     isLoading,
+    isPending,
+    isCompleted,
+    isError,
     exampleValue,
     setCurrentExam,
     setExampleValue,