ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor students tab code and tests 

closes ADMIN-2687

test plan:
 - Load assignment in A2 and ensure Students tab works:
 - 1. Student Tray slides out and closes correctly
 - 2. Student row renders
 - 3. Searching by student name works

Change-Id: If5b28db29af8fc833cce38c398768886b16bc6a3
Reviewed-on: https://gerrit.instructure.com/195264
Reviewed-by: Carl Kibler <ckibler@instructure.com>
Reviewed-by: Mysti Lilla <mysti@instructure.com>
QA-Review: Carl Kibler <ckibler@instructure.com>
Tested-by: Jenkins
Product-Review: Carl Kibler <ckibler@instructure.com>
This commit is contained in:
Carl Kibler 2019-05-24 13:36:45 -06:00
parent 93fc19368b
commit d54b496b13
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jsx/assignments_2/teacher/components/ContentTabs.js
View File

@ -22,7 +22,7 @@ import I18n from 'i18n!assignments_2'
import TabList, {TabPanel} from '@instructure/ui-tabs/lib/components/TabList'
import {TeacherAssignmentShape} from '../assignmentData'
import Details from './Details'
import StudentsSearcher from './StudentsSearcher'
import StudentsSearcher from './StudentsTab/StudentsSearcher'
import {Img} from '@instructure/ui-elements'
ContentTabs.propTypes = {

2
app/jsx/assignments_2/teacher/components/StudentSearchQuery.js → app/jsx/assignments_2/teacher/components/StudentsTab/StudentSearchQuery.js
View File

@ -24,7 +24,7 @@ import View from '@instructure/ui-layout/lib/components/View'
import I18n from 'i18n!assignments_2'
import {STUDENT_SEARCH_QUERY, StudentSearchQueryShape} from '../assignmentData'
import {STUDENT_SEARCH_QUERY, StudentSearchQueryShape} from '../../assignmentData'
StudentSearchQuery.propTypes = {
children: func,

4
app/jsx/assignments_2/teacher/components/StudentTray.js → app/jsx/assignments_2/teacher/components/StudentsTab/StudentTray.js
View File

@ -22,13 +22,13 @@ import I18n from 'i18n!assignments_2'
import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
import {bool, func} from 'prop-types'
import {TeacherAssignmentShape, UserShape} from '../assignmentData'
import {TeacherAssignmentShape, UserShape} from '../../assignmentData'
import {Flex, FlexItem, View} from '@instructure/ui-layout'
import {Button, CloseButton} from '@instructure/ui-buttons'
import {Avatar, Heading, Link, Text} from '@instructure/ui-elements'
import {Tray} from '@instructure/ui-overlays'
import {DateTimeInput} from '@instructure/ui-forms'
import OverrideAttempts from './Overrides/OverrideAttempts'
import OverrideAttempts from '../Overrides/OverrideAttempts'
import {
IconArrowOpenEndLine,
IconArrowOpenStartLine,

2
app/jsx/assignments_2/teacher/components/StudentsSearcher.js → app/jsx/assignments_2/teacher/components/StudentsTab/StudentsSearcher.js
View File

@ -32,7 +32,7 @@ import {
} from '@instructure/ui-icons'
import {Badge} from '@instructure/ui-elements'
import {TeacherAssignmentShape} from '../assignmentData'
import {TeacherAssignmentShape} from '../../assignmentData'
import StudentSearchQuery from './StudentSearchQuery'
import StudentsTable from './StudentsTable'
import Flex, {FlexItem} from '@instructure/ui-layout/lib/components/Flex'

6
app/jsx/assignments_2/teacher/components/StudentsTable.js → app/jsx/assignments_2/teacher/components/StudentsTab/StudentsTable.js
View File

@ -22,15 +22,15 @@ import I18n from 'i18n!assignments_2'
import ScreenReaderContent from '@instructure/ui-a11y/lib/components/ScreenReaderContent'
import {TeacherAssignmentShape, SubmissionShape} from '../assignmentData'
import {TeacherAssignmentShape, SubmissionShape} from '../../assignmentData'
import View from '@instructure/ui-layout/lib/components/View'
import {Table} from '@instructure/ui-table'
import Button from '@instructure/ui-buttons/lib/components/Button'
import IconExpandStart from '@instructure/ui-icons/lib/Line/IconExpandStart'
import Avatar from '@instructure/ui-elements/lib/components/Avatar'
import SubmissionStatusPill from '../../shared/SubmissionStatusPill'
import FriendlyDatetime from '../../../shared/FriendlyDatetime'
import SubmissionStatusPill from '../../../shared/SubmissionStatusPill'
import FriendlyDatetime from '../../../../shared/FriendlyDatetime'
import Link from '@instructure/ui-elements/lib/components/Link'
import StudentTray from './StudentTray'

2
app/jsx/assignments_2/teacher/components/__tests__/StudentTray.test.js → app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentTray.test.js
View File

@ -18,7 +18,7 @@
import React from 'react'
import {render} from 'react-testing-library'
import {closest, mockAssignment, mockUser, mockSubmission} from '../../test-utils'
import {closest, mockAssignment, mockUser, mockSubmission} from '../../../test-utils'
import StudentTray from '../StudentTray'
describe('student tray data', () => {

4
app/jsx/assignments_2/teacher/components/__tests__/StudentsSearcher.test.js → app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsSearcher.test.js
View File

@ -20,8 +20,8 @@ import React from 'react'
import {render, fireEvent} from 'react-testing-library'
import MockDate from 'mockdate'
import CanvasValidatedMockedProvider from 'jsx/__tests__/CanvasValidatedMockedProvider'
import {STUDENT_SEARCH_QUERY} from '../../assignmentData'
import {mockAssignment, mockSubmission, mockUser, closest} from '../../test-utils'
import {STUDENT_SEARCH_QUERY} from '../../../assignmentData'
import {mockAssignment, mockSubmission, mockUser, closest} from '../../../test-utils'
import StudentsSearcher from '../StudentsSearcher'
function mockRequest({users = [mockUser()], variables = {}}) {

2
app/jsx/assignments_2/teacher/components/__tests__/StudentsTable.test.js → app/jsx/assignments_2/teacher/components/StudentsTab/__tests__/StudentsTable.test.js
View File

@ -18,7 +18,7 @@
import React from 'react'
import {render} from 'react-testing-library'
import {closest, mockAssignment, mockUser, mockSubmission} from '../../test-utils'
import {closest, mockAssignment, mockUser, mockSubmission} from '../../../test-utils'
import apiUserContent from 'compiled/str/apiUserContent'
import StudentsTable from '../StudentsTable'