fixed SingleTargetOverviewe link (#48)

Author: zzheng07

.eslintrc.js

@@ -23,5 +23,6 @@ module.exports = {
       ],
       'no-underscore-dangle': ['error', { allow: ['__typename'] }],
       'no-console': 'off',
+      'no-plusplus': 'off',
    },
 };

graphql.schema.json

@@ -5470,9 +5470,13 @@
               }
             ],
             "type": {
-              "kind": "OBJECT",
-              "name": "ClassMissionMastery",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "ClassMissionMastery",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null

src/Components/LinearProgressWithLabel/ObjectiveDropDown.tsx

@@ -107,6 +107,7 @@ const DoublePaddedDiv = styled.div`
 export interface ObjectiveDropDownProps {
    name: string;
    tasks: TaskObjectiveProgress[];
+   username: string;
 }
 
 function getTaskObjectivePorgress(task: TaskObjectiveProgress) {
@@ -171,7 +172,7 @@ function getTaskPercent(mastery: string) {
    return 1;
 }
 
-export default function ObjectiveDropDown({ name, tasks }: ObjectiveDropDownProps) {
+export default function ObjectiveDropDown({ name, tasks, username }: ObjectiveDropDownProps) {
    const classes = useStyles();
    const [open, setOpen] = useState(false);
 
@@ -191,7 +192,7 @@ export default function ObjectiveDropDown({ name, tasks }: ObjectiveDropDownProp
             {tasks.map((task: TaskObjectiveProgress) => (
                <Link
                   to={{
-                     pathname: `/viewTask/${task.task.id}`,
+                     pathname: `/viewTask/${task.task.id}/${username}`,
                      state: getTaskObjectivePorgress(task),
                   }}
                >

src/Components/SingleTargetOverview/SingleTargetOverview.tsx

@@ -92,6 +92,9 @@ function getTargetData(targetData1: TargetProgress[], name: string) {
 export default function SingleTargetOveriew() {
    const history = useHistory();
    const { name } = useParams<Record<string, string | undefined>>();
+
+   const username = 'Google_114813486146105420824';
+
    const test: any = history.location.state;
    const inputUser: User = {
       id: test?.id,
@@ -101,7 +104,7 @@ export default function SingleTargetOveriew() {
    const { data, loading, error } = useGetTargetProgressQuery({
       variables: {
          courseId: 'Integrated Science',
-         username: 'Google_118280657086683968595',
+         username,
       },
    });
 
@@ -153,7 +156,11 @@ export default function SingleTargetOveriew() {
          <RowDiv className="row">
             <TargetColumnDiv className="col-12">
                {targetData?.objectives.map((objective: ObjectiveProgress) => (
-                  <ObjectiveDropDown name={objective.objectiveName} tasks={objective.tasks} />
+                  <ObjectiveDropDown
+                     name={objective.objectiveName}
+                     tasks={objective.tasks}
+                     username={username}
+                  />
                ))}
             </TargetColumnDiv>
          </RowDiv>

src/Components/StudentOverview/LTStudentViewTable.tsx

@@ -6,6 +6,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable no-restricted-syntax */
+
 import { useHistory } from 'react-router-dom';
 import { useQuery } from '@apollo/client';
 import React, { useState } from 'react';
@@ -19,6 +20,20 @@ import {
 import { LIST_TARGETS_BY_COURSE } from '../../hooks/ListTargetsByCourse';
 import SelectedLTStudentViewTable from './SelectedLTStudentViewTable';
 
+interface LTStudentViewRow {
+   row: {
+      section: string;
+      name: string;
+      firstname: string;
+      lastname: string;
+      team?: string;
+      recent: string;
+      average: string;
+      progress: string;
+      studentId: string;
+   };
+}
+
 function LTStudentViewTable() {
    const { data: missionMasteryData } = useClassMissionMasteryQuery();
 
@@ -39,36 +54,33 @@ function LTStudentViewTable() {
       return <div />;
    }
 
-   const rowClicked = (userName: string) => {
+   const rowClicked = (row: LTStudentViewRow) => {
       history.push({
-         pathname: '/singleStudentMasteryOverview',
-         state: { id: '', firstName: userName, lastName: ' ' },
+         pathname: `/singleStudentMasteryOverview/${row.row.studentId}`,
+         state: { id: row.row.studentId, firstname: row.row.firstname, lastname: row.row.lastname },
       });
    };
 
-   const data: any[] = [];
-   missionMasteryData?.classMissionMastery?.studentMissionMasteryList.map(
-      (studentMissionMastery: CmStudentFieldsFragment) =>
-         data.push({
-            row: {
-               section: '1',
-               name: `${studentMissionMastery.student.lastName} ${studentMissionMastery.student.firstName}`,
-               team: studentMissionMastery.student.team,
-               recent: studentMissionMastery.currentTaskName,
-               average: '',
-               progress: `${(studentMissionMastery.progress * 100).toFixed(1)}%`,
-            },
-         })
-   );
-
-   // TODO remove when names are populated
-   data.forEach((dataEntry) => {
-      if (dataEntry.row.name.indexOf('null') !== -1) {
-         dataEntry.row.name = 'Mary Lee';
-      }
-      if (dataEntry.row.name.length > 25) {
-         dataEntry.row.name = dataEntry.row.name.substring(0, 25);
-      }
+   const studentMissionMasteryList: CmStudentFieldsFragment[] =
+      missionMasteryData?.classMissionMastery?.studentMissionMasteryList || [];
+
+   const data: LTStudentViewRow[] = studentMissionMasteryList.map((studentMissionMastery) => {
+      const firstname = studentMissionMastery.student.firstName || 'Mary';
+      const lastname = studentMissionMastery.student.lastName || 'Lee';
+
+      return {
+         row: {
+            section: '1',
+            name: `${firstname} ${lastname}`,
+            firstname,
+            lastname,
+            team: studentMissionMastery.student.team,
+            recent: studentMissionMastery.currentTaskName,
+            average: '',
+            progress: `${(studentMissionMastery.progress * 100).toFixed(1)}%`,
+            studentId: studentMissionMastery.student.studentId,
+         },
+      };
    });
 
    console.log(data);

src/Screens/TaskView/Rubric/RubricMenu.tsx

@@ -8,15 +8,11 @@ import {
    useTheme,
    Typography,
 } from '@material-ui/core';
-import { Form, Button, NavDropdown } from 'react-bootstrap';
+import { Form, NavDropdown } from 'react-bootstrap';
 import { ChevronLeft, ChevronRight, Menu } from '@material-ui/icons';
 import clsx from 'clsx';
 import React from 'react';
-import {
-   RubricRequirement,
-   TaskObjectiveProgress,
-   useGetObjectiveByIdQuery,
-} from '../../../__generated__/types';
+import { RubricRequirement } from '../../../__generated__/types';
 import Rubric from './Rubric';
 import ObjectiveRubric from './ObjectiveRubric';