Fixed bug with redirecting to GitHub Classrooms

source-academy · Jun 18, 2021 · a12e707 · a12e707
1 parent 537862c
commit a12e707
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/commons/navigationBar/subcomponents/GitHubAssessmentsNavigationBar.tsx b/src/commons/navigationBar/subcomponents/GitHubAssessmentsNavigationBar.tsx
@@ -15,9 +15,9 @@ import { Octokit } from '@octokit/rest';
 import classNames from 'classnames';
 import * as React from 'react';
 import { NavLink } from 'react-router-dom';
-import { assessmentTypeLink } from 'src/commons/utils/ParamParseHelper';
-import { GHAssessmentTypeOverview } from 'src/pages/githubAssessments/GitHubClassroom';
 
+import { assessmentTypeLink } from '../../../commons/utils/ParamParseHelper';
+import { GHAssessmentTypeOverview } from '../../../pages/githubAssessments/GitHubClassroom';
 import { ControlBarGitHubLoginButton } from '../../controlBar/github/ControlBarGitHubLoginButton';
 
 type GitHubAssessmentsNavigationBarProps = DispatchProps & StateProps;

diff --git a/src/pages/githubAssessments/GitHubAssessmentListing.tsx b/src/pages/githubAssessments/GitHubAssessmentListing.tsx
@@ -44,7 +44,11 @@ const GitHubAssessmentListing: React.FC<GitHubAssessmentListingProps> = props =>
   );
 
   const refreshButton = useMemo(
-    () => <Button icon={IconNames.REFRESH} onClick={props.refreshAssessmentOverviews} />,
+    () => (
+      <Button icon={IconNames.REFRESH} onClick={props.refreshAssessmentOverviews}>
+        Refresh Assessments
+      </Button>
+    ),
     [props.refreshAssessmentOverviews]
   );
 
@@ -106,11 +110,11 @@ function convertAssessmentOverviewToCard(
 
   const assessmentNotAccepted = assessmentOverview.link !== undefined;
   let buttonText = 'Open';
-  const handleClick = () => history.push(`/githubassessments/editor`, assessmentOverview);
+  let handleClick = () => history.push(`/githubassessments/editor`, assessmentOverview);
 
   if (assessmentNotAccepted) {
     buttonText = 'Accept';
-    window.open(assessmentOverview.link);
+    handleClick = () => window.open(assessmentOverview.link);
   }
 
   if (isOverdue) {

diff --git a/src/pages/githubAssessments/GitHubClassroom.tsx b/src/pages/githubAssessments/GitHubClassroom.tsx
@@ -6,13 +6,13 @@ import * as React from 'react';
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { Redirect, Route, Switch, useLocation } from 'react-router-dom';
-import { assessmentTypeLink } from 'src/commons/utils/ParamParseHelper';
 
 import { OverallState } from '../../commons/application/ApplicationTypes';
 import ContentDisplay from '../../commons/ContentDisplay';
 import { MissionRepoData } from '../../commons/githubAssessments/GitHubMissionTypes';
 import GitHubAssessmentsNavigationBar from '../../commons/navigationBar/subcomponents/GitHubAssessmentsNavigationBar';
 import { showWarningMessage } from '../../commons/utils/NotificationsHelper';
+import { assessmentTypeLink } from '../../commons/utils/ParamParseHelper';
 import GitHubAssessmentListing from './GitHubAssessmentListing';
 import GitHubAssessmentWorkspaceContainer from './GitHubAssessmentWorkspaceContainer';
 import GitHubClassroomWelcome from './GitHubClassroomWelcome';