Merge pull request #1139 from isaacphysics/hotfix/simplify-gameboard-stages

Show fewer difficulties on gameboards

Author: jacbn

src/app/components/pages/Gameboard.tsx

@@ -1,5 +1,6 @@
 import React, {useEffect} from "react";
 import {
+    AppState,
     logAction,
     selectors,
     setAssignBoardPath,
@@ -24,7 +25,8 @@ import {
     siteSpecific,
     TAG_ID,
     TAG_LEVEL,
-    tags
+    tags,
+    useUserViewingContext
 } from "../../services";
 import {Redirect} from "react-router";
 import queryString from "query-string";
@@ -74,6 +76,10 @@ const GameboardItemComponent = ({gameboard, question}: {gameboard: GameboardDTO,
     const questionTags = tags.getByIdsAsHierarchy((question.tags || []) as TAG_ID[])
         .filter((t, i) => !isAda || i !== 0); // CS always has Computer Science at the top level
 
+    const questionViewingContexts = filterAudienceViewsByProperties(determineAudienceViews(question.audience, question.creationContext), AUDIENCE_DISPLAY_FIELDS);
+    const userViewingContext = useUserViewingContext();
+    const currentUser = useAppSelector((state: AppState) => state?.user?.loggedIn && state.user || null);
+    const uniqueStage = questionViewingContexts.find(context => context.stage === userViewingContext.stage);
     return <ListGroupItem key={question.id} className={itemClasses}>
         <Link to={`/questions/${question.id}?board=${gameboard.id}`} className={classNames("position-relative", {"align-items-center": isPhy, "justify-content-center": isAda})}>
             <span className={"question-progress-icon"}>
@@ -101,7 +107,7 @@ const GameboardItemComponent = ({gameboard, question}: {gameboard: GameboardDTO,
                 </div>
 
                 {question.audience && <StageAndDifficultySummaryIcons audienceViews={
-                    filterAudienceViewsByProperties(determineAudienceViews(question.audience, question.creationContext), AUDIENCE_DISPLAY_FIELDS)
+                    isPhy && !isTutorOrAbove(currentUser) && uniqueStage ? [uniqueStage] : questionViewingContexts                 
                 } />}
             </div>
             {isAda && <div className={"list-caret vertical-center"}><img src={"/assets/common/icons/chevron_right.svg"} alt={"Go to question"}/></div>}