Compare commits

...

45 Commits

Author SHA1 Message Date
Alex Dusenbery
d93476c198 fix(UI): round numerator of grade ratios. 2018-12-10 14:26:19 -05:00
Simon Chen
4aecfce14a Merge pull request #42 from edx/schen/test3
Add all the tests to reducers
2018-12-10 13:01:03 -05:00
Douglas Hall
14f7ad01b8 Merge pull request #46 from douglashall/douglashall/fix_logo
fix(header): fix edX logo in header
2018-12-10 12:29:39 -05:00
Douglas Hall
104cb30ef5 fix(header): fix edX logo in header 2018-12-10 12:16:58 -05:00
Simon Chen
e9bc4cebe4 Merge pull request #43 from edx/schen/fix_local
fix(auth): fix locally running gradebook auth refresh issue
2018-12-07 14:15:03 -05:00
Simon Chen
559180592c fix(auth): fix locally running gradebook auth refresh issue 2018-12-07 14:09:50 -05:00
Richard I Reilly
0f1f0ae89d Merge pull request #41 from edx/rir/header
Add super simple header
2018-12-07 14:04:14 -05:00
Simon Chen
a812ee3816 Add all the tests to reducers 2018-12-07 12:11:21 -05:00
Rick Reilly
2e725e0441 Add super simple header 2018-12-07 11:48:26 -05:00
Simon Chen
a1c2ccc539 Merge pull request #40 from edx/schen/tests2
Add more unit tests on actions and reducers
2018-12-07 10:59:02 -05:00
Simon Chen
a70ddd79f6 Add more unit tests on actions and reducers 2018-12-07 10:12:13 -05:00
Simon Chen
dd82054bbc Merge pull request #39 from edx/schen/setup-test
feat(test): Setup unit testing
2018-12-05 14:20:58 -05:00
Jansen Kantor
6a4bc67841 Merge pull request #38 from edx/encoding
fix(UI) specify utf8 to avoid incorrect character rendering
2018-12-05 14:15:51 -05:00
Simon Chen
adfefac85d feat(test): Setup unit testing 2018-12-05 13:52:33 -05:00
jkantor
c92144c436 fix(UI) specify utf8 to avoid incorrect character rendering 2018-12-05 13:35:28 -05:00
Jansen Kantor
ca0156ea4c Merge pull request #36 from edx/rounded-percents
fix(UI) rounded percentages to two decimal places
2018-12-05 13:33:38 -05:00
jkantor
61c4bc11bd fix(UI) rounded percentages to two decimal places 2018-12-05 10:53:55 -05:00
Jansen Kantor
db25a18f9d Merge pull request #35 from edx/updateMessage-filter
fix(UI) box should appear after editing grade
2018-12-04 14:01:05 -05:00
jkantor
0d7fa18acd fix(UI) box should appear after editing grade 2018-12-04 13:38:27 -05:00
Simon Chen
012bb3a1f3 Merge pull request #34 from edx/schen/EDUCATOR-3754
Add hardcoded page size on frontend
2018-12-04 09:58:43 -05:00
Simon Chen
de233e0285 fix(pagination): Add hardcoded page size on frontend 2018-12-03 16:04:41 -05:00
Richard I Reilly
ae7544cd53 Merge pull request #31 from edx/rir/spinner
Show a spinner when waiting for the grades call to come back
2018-12-03 15:04:09 -05:00
Rick Reilly
14df81b312 Show a spinner when waiting for the grades call to come back 2018-12-03 14:54:07 -05:00
Jansen Kantor
4706cfcd94 Merge pull request #30 from edx/retain_filter
fix(filter) filter should remain active after we edit a grade
2018-11-30 15:52:45 -05:00
jkantor
1f5a2469b2 fix(filter) filter should remain active after we edit a grade 2018-11-30 12:53:18 -05:00
Simon Chen
e31c670938 Merge pull request #29 from edx/schen/percent
fix(UI): Update the percent number view so it is actually percent
2018-11-30 12:07:47 -05:00
Simon Chen
db9f683297 fix(UI): Update the percent number view so it is actually percent with symbols 2018-11-30 11:55:02 -05:00
Richard I Reilly
7a43cdcaea Merge pull request #27 from edx/rir/dynamic-assignments
Make it so the assignment time column filter is dynamic and api driven
2018-11-30 11:08:59 -05:00
Rick Reilly
d5637a4550 Make it so the assignment time column filter is dynamic and api driven 2018-11-30 10:56:08 -05:00
Simon Chen
0b9fa36fb7 Merge pull request #28 from edx/schen/styles
fix(Styles): Fix the gradebook styles to increase its width
2018-11-30 10:51:03 -05:00
Simon Chen
7bd0c49c14 fix(Styles): Fix the gradebook styles to increase its width 2018-11-30 10:30:59 -05:00
Alex Dusenbery
44f91bb453 Add documentation on platform configuration for local development. 2018-11-30 10:16:08 -05:00
Jansen Kantor
d8f229838f Merge pull request #25 from edx/pagination
fix(pagination) use paragon buttons, hide rather than disable
2018-11-29 16:22:38 -05:00
jkantor
7b5a095898 fix(pagination) use paragon buttons, hide rather than disable 2018-11-29 15:35:13 -05:00
Jansen Kantor
ff7937c2d7 Merge pull request #24 from edx/pagination
feat(pagination) added next and previous buttons to grades page
2018-11-29 14:34:56 -05:00
jkantor
d057497105 feat(pagination) added next and previous buttons to grades page 2018-11-29 13:11:11 -05:00
Richard I Reilly
e1402b0d4f Merge pull request #23 from edx/rir/update-auth
Update auth to the latest version of edx/frontend-auth
2018-11-28 15:41:24 -05:00
Rick Reilly
3ea337e3f8 Update auth to the latest version of edx/frontend-auth 2018-11-28 15:31:19 -05:00
Alex Dusenbery
9c2c16e378 Remove boilerplate README strings, add note about installing into LMS. 2018-11-28 10:30:12 -05:00
Simon Chen
7e9ef204a7 Merge pull request #22 from edx/schen/fix_search
fix(functionality): Fix search so results are rendered with proper heading
2018-11-27 15:02:07 -05:00
Simon Chen
f779e7fd35 fix(functionality): Fix search so results are rendered with proper heading 2018-11-27 14:47:57 -05:00
Richard I Reilly
a5a62922b5 Merge pull request #13 from edx/schen/clean
Clean up not needed example code
2018-11-26 14:41:00 -05:00
Richard I Reilly
2c6aa96f8e Merge pull request #20 from edx/rir/fix-sorting
Fix column sorting in the grade table
2018-11-26 14:29:48 -05:00
Rick Reilly
30e866128f Fix column sorting in the grade table 2018-11-26 14:25:11 -05:00
Simon Chen
1687a6ca1a Clean up not needed example code 2018-11-14 14:02:53 -05:00
44 changed files with 7809 additions and 6658 deletions

View File

@@ -30,3 +30,6 @@ restart-detached:
validate-no-uncommitted-package-lock-changes:
git diff --exit-code package-lock.json
test:
docker exec -it edx.gradebook jest

View File

@@ -29,6 +29,26 @@ If you don't, you can see the log messages for the docker container by executing
Note that `make up-detached` executes the `npm run start` script which will hot-reload JavaScript and Sass files changes, so you should (:crossed_fingers:) not need to do anything (other than wait) when making changes.
## Configuring for local use in edx-platform
Assuming you've got the UI running at `http://localhost:1991`, you can configure the LMS in edx-platform
to point to your local gradebook from the instructor dashboard by putting this settings in `lms/env/private.py`:
```
WRITABLE_GRADEBOOK_URL = 'http://localhost:1991'
```
There are also several edx-platform waffle and feature flags you'll have to enable from the Django admin:
1. Grades > Persistent grades enabled flag. Add this flag if it doesn't exist,
check the ``enabled`` and ``enabled for all courses`` boxes.
2. Waffle > Switches. Add the ``grades.assume_zero_grade_if_absent`` switch and make it active.
3. Waffle_utils > Waffle flag course overrides. You want to activate this flag for any course
in which you'd like to enable the gradebook. Add a course override flag using a course id and the flag name
``grades.writable_gradebook``. Make sure to check the ``enabled`` box. Alternatively, you could add this as a
regular waffle flag to enable the gradebook for all courses.
## Directory Structure
* `config`
@@ -46,61 +66,6 @@ Note that `make up-detached` executes the `npm run start` script which will hot-
* `constants`
* `reducers`
* Directory for `Redux` reducers
* [`.babelrc`](#babelrc)
* [`.dockerignore`](#dockerignore)
* [`.eslintignore`](#eslintignore)
* [`.eslintrc.js`](#eslintrcjs)
* `.gitignore`
* [`npmignore`](#npmignore)
* [`.travis.yml`](#travisyml)
* `docker-compose.yml`
* `Dockerfile`
* `LICENSE`
* `Makefile`
* `package-lock.json`
* [`package.json`](#packagejson)
### `.babelrc`
We use [`Babel`](https://babeljs.io/) to transpile `ES2015+` JavaScript to `ES5` JavaScript. `ES5` JavaScript has [greater browser compatibility](http://kangax.github.io/compat-table/es5/) than [`ES2015+`](http://kangax.github.io/compat-table/es6/).
The `.babelrc` file is used to specify a particular configuration - for example, we use the [`babel-preset-react`](https://babeljs.io/docs/plugins/preset-react/), which, among other things, allows `babel` to parse `JSX`.
### `.dockerignore`
The important thing to remember is to add the `node_modules` directory to `.dockerignore` - for more information [see the Docker documentation](https://docs.docker.com/engine/reference/builder/#dockerignore-file).
### `.eslintignore`
We use [`eslint`](https://eslint.org/) for our `JavaScript` linting needs. The `.eslintignore` file is used to [specify files or directories to, well, ignore](https://eslint.org/docs/user-guide/configuring#ignoring-files-and-directories).
While `eslint` automatically ignores `node_modules`, we like to add it to the `.eslintignore` just for the added explicitness. In addition, you probably want to add the directory for your compiled files (in our case, `./dist`) and your coverage directory (in our case, `./coverage`).
### `.eslintrc`
This is where the actual `eslint` configuration is specified. All `edX` JavaScript projects should extend either the [`eslint-config-edx`](https://github.com/edx/eslint-config-edx/blob/master/packages/eslint-config-edx/README.md) or [`eslint-config-edx-es5`](https://github.com/edx/eslint-config-edx/blob/master/packages/eslint-config-edx-es5/README.md) configurations (for `ES2015+` and `ES5` JavaScript, respectively). Both configurations can be found in [the `eslint-config-edx` repository](https://github.com/edx/eslint-config-edx).
### `.npmignore`
We are not currently publishing this package to [`npm`](https://www.npmjs.com/). If we did, we would want to exclude certain files from getting uploaded to `npm` (like our coverage files, for example). For more information, see [the `npm` documentation](https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package).
### `.travis.yml`
We use [`Travis CI`](https://travis-ci.org/) to build (and deploy) our application. The `.travis.yml` file specifies the configuration for `Travis` builds. For more information, see [the `Travis` documentation](https://docs.travis-ci.com/user/customizing-the-build/).
### `package.json`
Arguably, one of the **most important files in an `npm`-based application**, the `package.json` file specifies everything from the `name` of the application, were it to be published to `npm`, to it's `dependencies`.
For more information, see [the `npm` documentation](https://docs.npmjs.com/files/package.json).
## Helpful Applications
### [`Greenkeeper`](https://greenkeeper.io/)
[`Greenkeeper`](https://greenkeeper.io/) is basically a `GitHub` application that handles `npm` dependencies. It will automatically open PRs with `package.json` updates when new versions of your `npm` dependencies get published. There are ways to also automatically keep the `package-lock.json` in-line, in the same PR, using [`greenkeeper-lockfile`].
For more information, see [the `Greenkeeper` documentation](https://greenkeeper.io/docs.html#what-greenkeeper-does).
## Authentication with backend API services

BIN
assets/edx-sm.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -64,6 +64,28 @@ module.exports = Merge.smart(commonConfig, {
test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/,
loader: 'file-loader',
},
{
test: /\.(jpe?g|png|gif|ico)(\?v=\d+\.\d+\.\d+)?$/,
use: [
'file-loader',
{
loader: 'image-webpack-loader',
options: {
optimizationlevel: 7,
mozjpeg: {
progressive: true,
},
gifsicle: {
interlaced: false,
},
pngquant: {
quality: '65-90',
speed: 4,
},
},
},
],
},
],
},
// Specify additional processing or side-effects done on the Webpack output bundles as a whole.
@@ -79,7 +101,8 @@ module.exports = Merge.smart(commonConfig, {
LMS_BASE_URL: 'http://localhost:18000',
LOGIN_URL: 'http://localhost:18000/login',
LOGOUT_URL: 'http://localhost:18000/login',
REFRESH_ACCESS_TOKEN_ENDPOINT: 'http://localhost:18000/login',
CSRF_TOKEN_API_PATH: '/csrf/api/v1/token',
REFRESH_ACCESS_TOKEN_ENDPOINT: 'http://localhost:18000/login_refresh',
DATA_API_BASE_URL: 'http://localhost:8000',
// LMS_CLIENT_ID should match the lms DOT client application id your LMS container
LMS_CLIENT_ID: 'login-service-client-id',

View File

@@ -70,6 +70,28 @@ module.exports = Merge.smart(commonConfig, {
test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/,
loader: 'file-loader',
},
{
test: /\.(jpe?g|png|gif|ico)(\?v=\d+\.\d+\.\d+)?$/,
use: [
'file-loader',
{
loader: 'image-webpack-loader',
options: {
optimizationlevel: 7,
mozjpeg: {
progressive: true,
},
gifsicle: {
interlaced: false,
},
pngquant: {
quality: '65-90',
speed: 4,
},
},
},
],
},
],
},
// New in Webpack 4. Replaces CommonChunksPlugin. Extract common modules among all chunks to one
@@ -98,6 +120,7 @@ module.exports = Merge.smart(commonConfig, {
LMS_BASE_URL: null,
LOGIN_URL: null,
LOGOUT_URL: null,
CSRF_TOKEN_API_PATH: null,
REFRESH_ACCESS_TOKEN_ENDPOINT: null,
DATA_API_BASE_URL: null,
SEGMENT_KEY: null,

11714
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -25,8 +25,8 @@
},
"dependencies": {
"@edx/edx-bootstrap": "^0.4.3",
"@edx/frontend-auth": "1.1.0",
"@edx/paragon": "^3.7.1",
"@edx/frontend-auth": "^1.2.1",
"@edx/paragon": "^3.7.2",
"babel-polyfill": "^6.26.0",
"classnames": "^2.2.5",
"email-prop-type": "^1.1.5",
@@ -47,6 +47,7 @@
"whatwg-fetch": "^2.0.3"
},
"devDependencies": {
"axios-mock-adapter": "^1.15.0",
"babel-cli": "^6.26.0",
"babel-eslint": "^8.2.2",
"babel-jest": "^22.4.0",
@@ -68,6 +69,7 @@
"html-webpack-plugin": "^3.0.3",
"husky": "^0.14.3",
"identity-obj-proxy": "^3.0.0",
"image-webpack-loader": "^4.2.0",
"jest": "^22.4.0",
"node-sass": "^4.7.2",
"react-dev-utils": "^5.0.0",

View File

@@ -1,6 +1,8 @@
<!doctype html>
<html>
<head></head>
<head>
<meta charset="utf-8">
</head>
<body>
<div id="root"></div>
</body>

View File

@@ -1,6 +1,34 @@
.back-link{
float:right;
.spinner-overlay {
position: fixed;
height: 100%;
width: 100%;
top: 0;
background-color: #999;
opacity: 0.5;
z-index: 99999;
display:flex;
align-items: flex-start;
justify-content: center;
padding: 200px;
}
.color-black {
color: black;
}
.gradebook-container{
width: 500px;
@media only screen and (min-width: 640px) {
width: 630px;
}
@media only screen and (min-width: 992px) {
width: 900px;
}
@media only screen and (min-width: 1200px) {
width: 1024px;
}
}
.student-filters{
display: flex;
.label{
@@ -32,10 +60,6 @@
display: block;
background-color: #fff;
}
.table tr td:not(:first-child) {
//not real sylz. plz kill before prod
min-width: 250px;
}
.table tr td:nth-child(2) {
box-sizing: content-box;
padding-left: 170px;

View File

@@ -1,16 +1,23 @@
import React from 'react';
import { Button, InputSelect, Modal, SearchField, StatusAlert, Table } from '@edx/paragon';
import {
Button,
InputSelect,
Modal,
SearchField,
StatusAlert,
Table,
Icon,
} from '@edx/paragon';
import queryString from 'query-string';
import { configuration } from '../../config';
const DECIMAL_PRECISION = 2;
export default class Gradebook extends React.Component {
constructor(props) {
super(props);
this.state = {
grades: [], // this.mapUserEntriesPercent(this.props.grades).sort(this.sortAlphaDesc),
headings: [], // this.mapHeadings(this.props.grades[0]),
filterValue: '',
modalContent: (<h1>Hello, World!</h1>),
modalOpen: false,
modalModel: [{}],
updateVal: 0,
@@ -28,6 +35,7 @@ export default class Gradebook extends React.Component {
);
this.props.getTracks(this.props.match.params.courseId);
this.props.getCohorts(this.props.match.params.courseId);
this.props.getAssignmentTypes(this.props.match.params.courseId);
}
setNewModalState = (userEntry, subsection) => {
@@ -53,15 +61,20 @@ export default class Gradebook extends React.Component {
}
handleAdjustedGradeClick = () => {
this.props.updateGrades(this.props.match.params.courseId, [
{
user_id: this.state.updateUserId,
usage_id: this.state.updateModuleId,
grade: {
earned_graded_override: this.state.updateVal,
this.props.updateGrades(
this.props.match.params.courseId, [
{
user_id: this.state.updateUserId,
usage_id: this.state.updateModuleId,
grade: {
earned_graded_override: this.state.updateVal,
},
},
},
]);
],
this.state.filterValue,
this.props.selectedCohort,
this.props.selectedTrack,
);
this.setState({
modalModel: [{}],
@@ -77,6 +90,15 @@ export default class Gradebook extends React.Component {
return `?${queryString.stringify(parsed)}`;
};
mapAssignmentTypeEntries = (entries) => {
const mapped = entries.map(entry => ({
id: entry,
label: entry,
}));
mapped.unshift({ id: 0, label: 'All' });
return mapped;
};
mapCohortsEntries = (entries) => {
const mapped = entries.map(entry => ({
id: entry.id,
@@ -95,6 +117,10 @@ export default class Gradebook extends React.Component {
return mapped;
};
updateAssignmentTypes = (event) => {
this.props.filterColumns(event, this.props.grades[0]);
}
updateTracks = (event) => {
const selectedTrackItem = this.props.tracks.find(x => x.name === event);
let selectedTrackSlug = null;
@@ -125,6 +151,15 @@ export default class Gradebook extends React.Component {
this.props.history.push(updatedQueryStrings);
};
mapSelectedAssignmentTypeEntry = (entry) => {
const selectedAssignmentTypeEntry = this.props.assignmentTypes
.find(x => x.id === parseInt(entry, 10));
if (selectedAssignmentTypeEntry) {
return selectedAssignmentTypeEntry.name;
}
return 'All';
};
mapSelectedCohortEntry = (entry) => {
const selectedCohortEntry = this.props.cohorts.find(x => x.id === parseInt(entry, 10));
if (selectedCohortEntry) {
@@ -141,6 +176,8 @@ export default class Gradebook extends React.Component {
return 'Tracks';
};
roundGrade = percent => parseFloat(percent.toFixed(DECIMAL_PRECISION));
formatter = {
percent: entries => entries.map((entry) => {
const results = { username: entry.username };
@@ -152,11 +189,11 @@ export default class Gradebook extends React.Component {
className="btn btn-header link-style"
onClick={() => this.setNewModalState(entry, subsection)}
>
{subsection.percent}
{this.roundGrade(subsection.percent * 100)}%
</button>);
return acc;
}, {});
const totals = { total: entry.percent * 100 };
const totals = { total: `${this.roundGrade(entry.percent * 100)}%` };
return Object.assign(results, assignments, totals);
}),
@@ -170,12 +207,12 @@ export default class Gradebook extends React.Component {
className="btn btn-header link-style"
onClick={() => this.setNewModalState(entry, subsection)}
>
{subsection.score_earned}/{subsection.score_possible}
{this.roundGrade(subsection.score_earned)}/{this.roundGrade(subsection.score_possible)}
</button>);
return acc;
}, {});
const totals = { total: entry.percent * 100 };
const totals = { total: `${this.roundGrade(entry.percent * 100)}/100` };
return Object.assign(results, assignments, totals);
}),
};
@@ -185,13 +222,14 @@ export default class Gradebook extends React.Component {
render() {
return (
<div className="d-flex justify-content-center">
<div className="card" style={{ width: '50rem' }}>
<div className="card-body">
{ this.props.showSpinner && <div className="spinner-overlay"><Icon className={['fa', 'fa-spinner', 'fa-spin', 'fa-5x', 'color-black']} /></div>}
<div className="gradebook-container">
<div>
<a
href={this.lmsInstructorDashboardUrl(this.props.match.params.courseId)}
className="back-link"
className="mb-3"
>
Back to Dashboard
{'<< Back to Dashboard'}
</a>
<h1>Gradebook</h1>
<h3> {this.props.match.params.courseId}</h3>
@@ -223,46 +261,19 @@ export default class Gradebook extends React.Component {
<label htmlFor="score-view-absolute">Absolute</label>
</span>
</div>
<div>
Category:
<span>
<input
id="category-all"
className="ml-2 mr-1"
type="radio"
name="category"
value="all"
onClick={() => this.props.filterColumns('all', this.props.grades[0])}
{ this.props.assignmnetTypes.length > 0 &&
<div className="student-filters">
<span className="label">
Assignment Types:
</span>
<InputSelect
name="assignment-types"
value={this.mapSelectedTrackEntry(this.props.selectedAssignmentType)}
options={this.mapAssignmentTypeEntries(this.props.assignmnetTypes)}
onChange={this.updateAssignmentTypes}
/>
<label className="mr-2" htmlFor="category-all">
All
</label>
</span>
<span>
<input
id="category-homework"
className="mr-1"
type="radio"
name="category"
value="homework"
onClick={() => this.props.filterColumns('hw', this.props.grades[0])}
/>
<label className="mr-2" htmlFor="category-homework">Homework</label>
</span>
<span>
<input
id="category-exam"
type="radio"
name="category"
value="exam"
className="ml-2 mr-1"
onClick={() => this.props.filterColumns('exam', this.props.grades[0])}
/>
<label htmlFor="Exam">
Exam
</label>
</span>
</div>
</div>
}
{(this.props.tracks.length > 0 || this.props.cohorts.length > 0) &&
<div className="student-filters">
<span className="label">
@@ -297,6 +308,21 @@ export default class Gradebook extends React.Component {
onClear={() => this.props.getUserGrades(this.props.match.params.courseId, this.props.selectedCohort, this.props.selectedTrack)}
value={this.state.filterValue}
/>
<div className="d-flex justify-content-end" style={{ marginTop: '20px' }}>
<Button
label="Previous"
buttonType="primary"
style={{ visibility: (!this.props.prevPage ? 'hidden' : 'visible') }}
onClick={() => this.props.getPrevNextGrades(this.props.prevPage, this.props.selectedCohort, this.props.selectedTrack)}
/>
<div style={{ width: '10px' }} />
<Button
label="Next"
buttonType="primary"
style={{ visibility: (!this.props.nextPage ? 'hidden' : 'visible') }}
onClick={() => this.props.getPrevNextGrades(this.props.nextPage, this.props.selectedCohort, this.props.selectedTrack)}
/>
</div>
</div>
</div>
<br />
@@ -310,7 +336,8 @@ export default class Gradebook extends React.Component {
<Table
columns={this.props.headings}
data={this.formatter[this.props.format](this.props.grades)}
defaultSortDirection="desc"
tableSortable
defaultSortDirection="asc"
defaultSortedColumn="username"
/>
</div>
@@ -323,9 +350,6 @@ export default class Gradebook extends React.Component {
<Table
columns={[{ label: 'Username', key: 'username' }, { label: 'Current grade', key: 'currentGrade' }, { label: 'Adjusted grade', key: 'adjustedGrade' }]}
data={this.state.modalModel}
tableSortable
defaultSortDirection="desc"
defaultSortedColumn="username"
/>
</div>
)}

View File

@@ -0,0 +1,30 @@
import React from 'react';
import { Hyperlink } from '@edx/paragon';
import EdxLogo from '../../../assets/edx-sm.png';
export default class Header extends React.Component {
constructor(props) {
super(props);
this.state = {
mobileNavOpen: false,
};
}
renderLogo() {
return (
<img src={EdxLogo} alt="edX logo" height="30" width="60" />
);
}
render() {
return (
<div className="mb-3">
<header className="d-flex justify-content-center align-items-center p-3 border-bottom-blue">
<Hyperlink content={this.renderLogo()} destination="https://www.edx.org" />
<div />
</header>
</div>
);
}
}

View File

@@ -3,6 +3,7 @@ const configuration = {
LMS_BASE_URL: process.env.LMS_BASE_URL,
LOGIN_URL: process.env.LOGIN_URL,
LOGOUT_URL: process.env.LOGOUT_URL,
CSRF_TOKEN_API_PATH: process.env.CSRF_TOKEN_API_PATH,
REFRESH_ACCESS_TOKEN_ENDPOINT: process.env.REFRESH_ACCESS_TOKEN_ENDPOINT,
DATA_API_BASE_URL: process.env.DATA_API_BASE_URL,
SECURE_COOKIES: process.env.NODE_ENV !== 'development',

View File

@@ -4,6 +4,7 @@ import Gradebook from '../../components/Gradebook';
import {
fetchGrades,
fetchMatchingUserGrades,
fetchPrevNextGrades,
updateGrades,
toggleGradeFormat,
filterColumns,
@@ -11,6 +12,7 @@ import {
} from '../../data/actions/grades';
import { fetchCohorts } from '../../data/actions/cohorts';
import { fetchTracks } from '../../data/actions/tracks';
import { fetchAssignmentTypes } from '../../data/actions/assignmentTypes';
const mapStateToProps = state => (
{
@@ -22,6 +24,10 @@ const mapStateToProps = state => (
selectedCohort: state.grades.selectedCohort,
format: state.grades.gradeFormat,
showSuccess: state.grades.showSuccess,
prevPage: state.grades.prevPage,
nextPage: state.grades.nextPage,
assignmnetTypes: state.assignmentTypes.results,
showSpinner: state.grades.showSpinner,
}
);
@@ -31,7 +37,10 @@ const mapDispatchToProps = dispatch => (
dispatch(fetchGrades(courseId, cohort, track));
},
searchForUser: (courseId, searchText, cohort, track) => {
dispatch(fetchMatchingUserGrades(courseId, searchText, cohort, track));
dispatch(fetchMatchingUserGrades(courseId, searchText, cohort, track, false));
},
getPrevNextGrades: (endpoint, cohort, track) => {
dispatch(fetchPrevNextGrades(endpoint, cohort, track));
},
getCohorts: (courseId) => {
dispatch(fetchCohorts(courseId));
@@ -39,8 +48,11 @@ const mapDispatchToProps = dispatch => (
getTracks: (courseId) => {
dispatch(fetchTracks(courseId));
},
updateGrades: (courseId, updateData) => {
dispatch(updateGrades(courseId, updateData));
getAssignmentTypes: (courseId) => {
dispatch(fetchAssignmentTypes(courseId));
},
updateGrades: (courseId, updateData, searchText, cohort, track) => {
dispatch(updateGrades(courseId, updateData, searchText, cohort, track));
},
toggleFormat: (formatType) => {
dispatch(toggleGradeFormat(formatType));

View File

@@ -0,0 +1,32 @@
import {
STARTED_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
} from '../constants/actionTypes/assignmentTypes';
import LmsApiService from '../services/LmsApiService';
const startedFetchingAssignmentTypes = () => ({ type: STARTED_FETCHING_ASSIGNMENT_TYPES });
const errorFetchingAssignmentTypes = () => ({ type: ERROR_FETCHING_ASSIGNMENT_TYPES });
const gotAssignmentTypes = assignmentTypes => ({ type: GOT_ASSIGNMENT_TYPES, assignmentTypes });
const fetchAssignmentTypes = courseId => (
(dispatch) => {
dispatch(startedFetchingAssignmentTypes());
return LmsApiService.fetchAssignmentTypes(courseId)
.then(response => response.data)
.then((data) => {
dispatch(gotAssignmentTypes(Object.keys(data.assignment_types)));
})
.catch(() => {
dispatch(errorFetchingAssignmentTypes());
});
}
);
export {
fetchAssignmentTypes,
startedFetchingAssignmentTypes,
gotAssignmentTypes,
errorFetchingAssignmentTypes,
};

View File

@@ -0,0 +1,73 @@
import configureMockStore from 'redux-mock-store';
import MockAdapter from 'axios-mock-adapter';
import thunk from 'redux-thunk';
import apiClient from '../apiClient';
import { configuration } from '../../config';
import { fetchAssignmentTypes } from './assignmentTypes';
import {
STARTED_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
} from '../constants/actionTypes/assignmentTypes';
const mockStore = configureMockStore([thunk]);
const axiosMock = new MockAdapter(apiClient);
describe('actions', () => {
afterEach(() => {
axiosMock.reset();
});
describe('fetchAssignmentTypes', () => {
const courseId = 'course-v1:edX+DemoX+Demo_Course';
it('dispatches success action after fetching fetchAssignmentTypes', () => {
const responseData = {
assignment_types: {
Exam: {
drop_count: 0,
min_count: 1,
short_label: 'Exam',
type: 'Exam',
weight: 0.25,
},
Homework: {
drop_count: 1,
min_count: 3,
short_label: 'Ex',
type: 'Homework',
weight: 0.75,
},
},
};
const expectedActions = [
{ type: STARTED_FETCHING_ASSIGNMENT_TYPES },
{ type: GOT_ASSIGNMENT_TYPES, assignmentTypes: Object.keys(responseData.assignment_types) },
];
const store = mockStore();
axiosMock.onGet(`${configuration.LMS_BASE_URL}/api/grades/v1/gradebook/${courseId}/grading-info?graded_only=true`)
.replyOnce(200, JSON.stringify(responseData));
return store.dispatch(fetchAssignmentTypes(courseId)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
it('dispatches failure action after fetching cohorts', () => {
const expectedActions = [
{ type: STARTED_FETCHING_ASSIGNMENT_TYPES },
{ type: ERROR_FETCHING_ASSIGNMENT_TYPES },
];
const store = mockStore();
axiosMock.onGet(`${configuration.LMS_BASE_URL}/api/grades/v1/gradebook/${courseId}/grading-info?graded_only=true`)
.replyOnce(500, JSON.stringify({}));
return store.dispatch(fetchAssignmentTypes(courseId)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
});
});

View File

@@ -17,7 +17,7 @@ const fetchCohorts = courseId => (
.then((data) => {
dispatch(gotCohorts(data.cohorts));
})
.catch((error) => {
.catch(() => {
dispatch(errorFetchingCohorts());
});
}

View File

@@ -0,0 +1,74 @@
import configureMockStore from 'redux-mock-store';
import MockAdapter from 'axios-mock-adapter';
import thunk from 'redux-thunk';
import apiClient from '../apiClient';
import { configuration } from '../../config';
import { fetchCohorts } from './cohorts';
import {
STARTED_FETCHING_COHORTS,
GOT_COHORTS,
ERROR_FETCHING_COHORTS,
} from '../constants/actionTypes/cohorts';
const mockStore = configureMockStore([thunk]);
const axiosMock = new MockAdapter(apiClient);
describe('actions', () => {
afterEach(() => {
axiosMock.reset();
});
describe('fetchCohorts', () => {
const courseId = 'course-v1:edX+DemoX+Demo_Course';
it('dispatches success action after fetching cohorts', () => {
const responseData = {
cohorts: [
{
assignment_type: 'manual',
group_id: null,
id: 1,
name: 'default_group',
user_count: 2,
user_partition_id: null,
},
{
assignment_type: 'auto',
group_id: null,
id: 2,
name: 'auto_group',
user_count: 5,
user_partition_id: null,
}],
};
const expectedActions = [
{ type: STARTED_FETCHING_COHORTS },
{ type: GOT_COHORTS, cohorts: responseData.cohorts },
];
const store = mockStore();
axiosMock.onGet(`${configuration.LMS_BASE_URL}/courses/${courseId}/cohorts/`)
.replyOnce(200, JSON.stringify(responseData));
return store.dispatch(fetchCohorts(courseId)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
it('dispatches failure action after fetching cohorts', () => {
const expectedActions = [
{ type: STARTED_FETCHING_COHORTS },
{ type: ERROR_FETCHING_COHORTS },
];
const store = mockStore();
axiosMock.onGet(`${configuration.LMS_BASE_URL}/courses/${courseId}/cohorts/`)
.replyOnce(500, JSON.stringify({}));
return store.dispatch(fetchCohorts(courseId)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
});
});

View File

@@ -1,38 +0,0 @@
import 'whatwg-fetch';
import {
STARTED_FETCHING_COMMENT,
FINISHED_FETCHING_COMMENT,
ERROR_FETCHING_COMMENT,
GET_COMMENT,
} from '../constants/actionTypes/comment';
const startedFetchingComment = () => ({ type: STARTED_FETCHING_COMMENT });
const finishedFetchingComment = () => ({ type: FINISHED_FETCHING_COMMENT });
const errorFetchingComment = () => ({ type: ERROR_FETCHING_COMMENT });
const getComment = comment => ({ type: GET_COMMENT, comment });
const fetchComment = commentId => (
(dispatch) => {
dispatch(startedFetchingComment());
return fetch(`https://jsonplaceholder.typicode.com/comments/${commentId}`)
.then((response) => {
if (response.ok) {
return response.json();
}
throw new Error();
})
.then((data) => {
dispatch(getComment(data));
dispatch(finishedFetchingComment());
})
.catch(() => dispatch(errorFetchingComment()));
}
);
export {
startedFetchingComment,
finishedFetchingComment,
errorFetchingComment,
getComment,
fetchComment,
};

View File

@@ -12,21 +12,38 @@ import {
UPDATE_BANNER,
} from '../constants/actionTypes/grades';
import LmsApiService from '../services/LmsApiService';
import { headingMapper } from './utils';
import store from '../store';
import { headingMapper, gradeSortMap, sortAlphaAsc } from './utils';
import apiClient from '../apiClient';
const defaultAssignmentFilter = 'All';
const sortGrades = (columnName, direction) => {
const sortFn = gradeSortMap(columnName, direction);
const { results } = store.getState().grades;
results.sort(sortFn);
/* have to make a copy of results or React wont know there was
* a change and wont trigger a re-render
*/
return ({ type: SORT_GRADES, results: [...results] });
};
const startedFetchingGrades = () => ({ type: STARTED_FETCHING_GRADES });
const finishedFetchingGrades = () => ({ type: FINISHED_FETCHING_GRADES });
const errorFetchingGrades = () => ({ type: ERROR_FETCHING_GRADES });
const gotGrades = (grades, cohort, track, headings) => ({
const gotGrades = (grades, cohort, track, headings, prev, next) => ({
type: GOT_GRADES,
grades,
cohort,
track,
headings,
prev,
next,
});
const gradeUpdateRequest = () => ({ type: GRADE_UPDATE_REQUEST });
const gradeUpdateSuccess = (responseData) => ({
const gradeUpdateSuccess = responseData => ({
type: GRADE_UPDATE_SUCCESS,
payload: { responseData },
});
@@ -37,14 +54,15 @@ const gradeUpdateFailure = error => ({
const toggleGradeFormat = formatType => ({ type: TOGGLE_GRADE_FORMAT, formatType });
const sortGrades = (columnName, direction) => ({ type: SORT_GRADES, columnName, direction });
const filterColumns = (filterType, exampleUser) => ({
type: FILTER_COLUMNS,
headings: headingMapper[filterType](exampleUser)
});
const filterColumns = (filterType, exampleUser) => (
dispatch => dispatch({
type: FILTER_COLUMNS,
headings: headingMapper(filterType)(dispatch, exampleUser),
})
);
const updateBanner = (showSuccess) => ({ type: UPDATE_BANNER, showSuccess });
const updateBanner = showSuccess => ({ type: UPDATE_BANNER, showSuccess });
const fetchGrades = (courseId, cohort, track, showSuccess) => (
(dispatch) => {
@@ -52,7 +70,14 @@ const fetchGrades = (courseId, cohort, track, showSuccess) => (
return LmsApiService.fetchGradebookData(courseId, null, cohort, track)
.then(response => response.data)
.then((data) => {
dispatch(gotGrades(data.results, cohort, track, headingMapper.all(data.results[0])));
dispatch(gotGrades(
data.results.sort(sortAlphaAsc),
cohort,
track,
headingMapper(defaultAssignmentFilter)(dispatch, data.results[0]),
data.previous,
data.next,
));
dispatch(finishedFetchingGrades());
dispatch(updateBanner(!!showSuccess));
})
@@ -62,13 +87,43 @@ const fetchGrades = (courseId, cohort, track, showSuccess) => (
}
);
const fetchMatchingUserGrades = (courseId, searchText, cohort, track) => (
const fetchMatchingUserGrades = (courseId, searchText, cohort, track, showSuccess) => (
(dispatch) => {
dispatch(startedFetchingGrades());
return LmsApiService.fetchGradebookData(courseId, searchText, cohort, track)
.then(response => response.data)
.then((data) => {
dispatch(gotGrades(data.results, cohort, track));
dispatch(gotGrades(
data.results.sort(sortAlphaAsc),
cohort,
track,
headingMapper(defaultAssignmentFilter)(dispatch, data.results[0]),
data.previous,
data.next,
));
dispatch(finishedFetchingGrades());
dispatch(updateBanner(showSuccess));
})
.catch(() => {
dispatch(errorFetchingGrades());
});
}
);
const fetchPrevNextGrades = (endpoint, cohort, track) => (
(dispatch) => {
dispatch(startedFetchingGrades());
return apiClient.get(endpoint)
.then(response => response.data)
.then((data) => {
dispatch(gotGrades(
data.results.sort(sortAlphaAsc),
cohort,
track,
headingMapper(defaultAssignmentFilter)(dispatch, data.results[0]),
data.previous,
data.next,
));
dispatch(finishedFetchingGrades());
})
.catch(() => {
@@ -77,14 +132,15 @@ const fetchMatchingUserGrades = (courseId, searchText, cohort, track) => (
}
);
const updateGrades = (courseId, updateData) => (
const updateGrades = (courseId, updateData, searchText, cohort, track) => (
(dispatch) => {
dispatch(gradeUpdateRequest());
return LmsApiService.updateGradebookData(courseId, updateData)
.then(response => response.data)
.then((data) => {
dispatch(gradeUpdateSuccess(data))
dispatch(fetchGrades(courseId, null, null, true))
dispatch(gradeUpdateSuccess(data));
dispatch(fetchMatchingUserGrades(courseId, searchText, cohort, track, true));
})
.catch((error) => {
dispatch(gradeUpdateFailure(error));
@@ -99,6 +155,7 @@ export {
gotGrades,
fetchGrades,
fetchMatchingUserGrades,
fetchPrevNextGrades,
gradeUpdateRequest,
gradeUpdateSuccess,
gradeUpdateFailure,

View File

@@ -0,0 +1,142 @@
import configureMockStore from 'redux-mock-store';
import MockAdapter from 'axios-mock-adapter';
import thunk from 'redux-thunk';
import apiClient from '../apiClient';
import { configuration } from '../../config';
import { fetchGrades } from './grades';
import {
STARTED_FETCHING_GRADES,
FINISHED_FETCHING_GRADES,
ERROR_FETCHING_GRADES,
GOT_GRADES,
UPDATE_BANNER,
} from '../constants/actionTypes/grades';
import { sortAlphaAsc } from './utils';
const mockStore = configureMockStore([thunk]);
const axiosMock = new MockAdapter(apiClient);
describe('actions', () => {
afterEach(() => {
axiosMock.reset();
});
describe('fetchGrades', () => {
const courseId = 'course-v1:edX+DemoX+Demo_Course';
const expectedCohort = 1;
const expectedTrack = 'verified';
const fetchGradesURL = `${configuration.LMS_BASE_URL}/api/grades/v1/gradebook/${courseId}/?page_size=10&cohort_id=${expectedCohort}&enrollment_mode=${expectedTrack}`;
const responseData = {
next: `${fetchGradesURL}&cursor=2344fda`,
previous: null,
results: [
{
course_id: courseId,
email: 'user1@example.com',
username: 'user1',
user_id: 1,
percent: 0.5,
letter_grade: null,
section_breakdown: [
{
subsection_name: 'Demo Course Overview',
score_earned: 0,
score_possible: 0,
percent: 0,
displayed_value: '0.00',
grade_description: '(0.00/0.00)',
},
{
subsection_name: 'Example Week 1: Getting Started',
score_earned: 1,
score_possible: 1,
percent: 1,
displayed_value: '1.00',
grade_description: '(0.00/0.00)',
},
],
},
{
course_id: courseId,
email: 'user22@example.com',
username: 'user22',
user_id: 22,
percent: 0,
letter_grade: null,
section_breakdown: [
{
subsection_name: 'Demo Course Overview',
score_earned: 0,
score_possible: 0,
percent: 0,
displayed_value: '0.00',
grade_description: '(0.00/0.00)',
},
{
subsection_name: 'Example Week 1: Getting Started',
score_earned: 1,
score_possible: 1,
percent: 0,
displayed_value: '0.00',
grade_description: '(0.00/0.00)',
},
],
}],
};
it('dispatches success action after fetching grades', () => {
const expectedActions = [
{ type: STARTED_FETCHING_GRADES },
{
type: GOT_GRADES,
grades: responseData.results.sort(sortAlphaAsc),
cohort: expectedCohort,
track: expectedTrack,
headings: [
{
columnSortable: true,
key: 'username',
label: 'Username',
onSort: expect.anything(),
},
{
columnSortable: true,
key: 'total',
label: 'Total',
onSort: expect.anything(),
},
],
prev: responseData.previous,
next: responseData.next,
},
{ type: FINISHED_FETCHING_GRADES },
{ type: UPDATE_BANNER, showSuccess: false },
];
const store = mockStore();
axiosMock.onGet(fetchGradesURL)
.replyOnce(200, JSON.stringify(responseData));
return store.dispatch(fetchGrades(courseId, expectedCohort, expectedTrack, false)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
it('dispatches failure action after fetching grades', () => {
const expectedActions = [
{ type: STARTED_FETCHING_GRADES },
{ type: ERROR_FETCHING_GRADES },
];
const store = mockStore();
axiosMock.onGet(fetchGradesURL)
.replyOnce(500, JSON.stringify({}));
return store.dispatch(fetchGrades(courseId, expectedCohort, expectedTrack, false)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
});
});

View File

@@ -1,46 +0,0 @@
import 'whatwg-fetch';
import {
STARTED_FETCHING_POSTS,
FINISHED_FETCHING_POSTS,
GET_POSTS,
} from '../constants/actionTypes/posts';
const startedFetchingPosts = () => (
{
type: STARTED_FETCHING_POSTS,
}
);
const finishedFetchingPosts = () => (
{
type: FINISHED_FETCHING_POSTS,
}
);
const getPosts = posts => (
{
type: GET_POSTS,
posts,
}
);
const fetchPosts = () => (
(dispatch) => {
dispatch(startedFetchingPosts());
return fetch('https://jsonplaceholder.typicode.com/posts')
// TODO: handle response error
.then(response => response.json())
.then((data) => {
dispatch(getPosts(data));
dispatch(finishedFetchingPosts());
});
}
);
export {
startedFetchingPosts,
finishedFetchingPosts,
getPosts,
fetchPosts,
};

View File

@@ -1,65 +0,0 @@
import configureMockStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import fetchMock from 'fetch-mock';
import {
startedFetchingPosts,
finishedFetchingPosts,
getPosts,
fetchPosts,
} from './posts';
import {
STARTED_FETCHING_POSTS,
GET_POSTS,
FINISHED_FETCHING_POSTS,
} from '../constants/actionTypes/posts';
const mockStore = configureMockStore([thunk]);
describe('actions', () => {
afterEach(() => {
fetchMock.reset();
fetchMock.restore();
});
it('sends started fetching post action', () => {
const expected = { type: STARTED_FETCHING_POSTS };
expect(startedFetchingPosts()).toEqual(expected);
});
it('sends finished fetching posts', () => {
const expected = { type: FINISHED_FETCHING_POSTS };
expect(finishedFetchingPosts()).toEqual(expected);
});
it('sends posts', () => {
const data = 'data';
const expected = { type: GET_POSTS, posts: data };
expect(getPosts(data)).toEqual(expected);
});
it('fetches posts', () => {
const posts = [
{
id: 1,
title: 'title',
body: 'body',
},
];
fetchMock.getOnce('https://jsonplaceholder.typicode.com/posts', {
body: JSON.stringify({ posts }),
headers: { 'content-type': 'application/json' },
});
const store = mockStore({ posts: [] });
const expectedActions = [
{ type: STARTED_FETCHING_POSTS },
{ type: GET_POSTS, posts: { posts } },
{ type: FINISHED_FETCHING_POSTS },
];
return store.dispatch(fetchPosts()).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
});

View File

@@ -17,7 +17,7 @@ const fetchTracks = courseId => (
.then((data) => {
dispatch(gotTracks(data.course_modes));
})
.catch((error) => {
.catch(() => {
dispatch(errorFetchingTracks());
});
}

View File

@@ -0,0 +1,80 @@
import configureMockStore from 'redux-mock-store';
import MockAdapter from 'axios-mock-adapter';
import thunk from 'redux-thunk';
import apiClient from '../apiClient';
import { configuration } from '../../config';
import { fetchTracks } from './tracks';
import {
STARTED_FETCHING_TRACKS,
GOT_TRACKS,
ERROR_FETCHING_TRACKS,
} from '../constants/actionTypes/tracks';
const mockStore = configureMockStore([thunk]);
const axiosMock = new MockAdapter(apiClient);
describe('actions', () => {
afterEach(() => {
axiosMock.reset();
});
describe('fetchTracks', () => {
const courseId = 'course-v1:edX+DemoX+Demo_Course';
it('dispatches success action after fetching tracks', () => {
const responseData = {
course_modes: [
{
slug: 'audit',
name: 'Audit',
min_price: 0,
suggested_prices: '',
currency: 'usd',
expiration_datetime: null,
description: null,
sku: '68EFFFF',
bulk_sku: null,
},
{
slug: 'verified',
name: 'Verified Certificate',
min_price: 100,
suggested_prices: '',
currency: 'usd',
expiration_datetime: '2021-05-04T18:08:12.644361Z',
description: null,
sku: '8CF08E5',
bulk_sku: 'A5B6DBE',
}],
};
const expectedActions = [
{ type: STARTED_FETCHING_TRACKS },
{ type: GOT_TRACKS, tracks: responseData.course_modes },
];
const store = mockStore();
axiosMock.onGet(`${configuration.LMS_BASE_URL}/api/enrollment/v1/course/${courseId}`)
.replyOnce(200, JSON.stringify(responseData));
return store.dispatch(fetchTracks(courseId)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
it('dispatches failure action after fetching tracks', () => {
const expectedActions = [
{ type: STARTED_FETCHING_TRACKS },
{ type: ERROR_FETCHING_TRACKS },
];
const store = mockStore();
axiosMock.onGet(`${configuration.LMS_BASE_URL}/api/enrollment/v1/course/${courseId}`)
.replyOnce(500, JSON.stringify({}));
return store.dispatch(fetchTracks(courseId)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
});
});

View File

@@ -1,5 +1,6 @@
import { sortGrades } from './grades';
const sortAlphaDesc = (gradeRowA, gradeRowB) => {
const sortAlphaAsc = (gradeRowA, gradeRowB) => {
const a = gradeRowA.username.toUpperCase();
const b = gradeRowB.username.toUpperCase();
if (a < b) {
@@ -11,7 +12,7 @@ const sortAlphaDesc = (gradeRowA, gradeRowB) => {
return 0;
};
const sortAlphaAsc = (gradeRowA, gradeRowB) => {
const sortAlphaDesc = (gradeRowA, gradeRowB) => {
const a = gradeRowA.username.toUpperCase();
const b = gradeRowB.username.toUpperCase();
if (a < b) {
@@ -24,40 +25,49 @@ const sortAlphaAsc = (gradeRowA, gradeRowB) => {
};
const sortNumerically = (colKey, direction) => {
function getPercents(gradeRowA, gradeRowB) {
if (colKey !== 'total') {
return {
a: gradeRowA.section_breakdown.find(x => x.label === colKey).percent,
b: gradeRowB.section_breakdown.find(x => x.label === colKey).percent,
};
}
return {
a: gradeRowA.percent,
b: gradeRowB.percent,
};
}
function sortNumAsc(gradeRowA, gradeRowB) {
if (gradeRowA[colKey] < gradeRowB[colKey]) {
return -1;
}
if (gradeRowA[colKey] > gradeRowB[colKey]) {
return 1;
}
return 0;
const { a, b } = getPercents(gradeRowA, gradeRowB);
return a - b;
}
function sortNumDesc(gradeRowA, gradeRowB) {
if (gradeRowA[colKey] < gradeRowB[colKey]) {
return 1;
}
if (gradeRowA[colKey] > gradeRowB[colKey]) {
return -1;
}
return 0;
const { a, b } = getPercents(gradeRowA, gradeRowB);
return b - a;
}
this.setState({ grades: [...this.state.grades].sort(direction === 'desc' ? sortNumDesc : sortNumAsc) });
return direction === 'desc' ? sortNumDesc : sortNumAsc;
};
const headingMapper = {
all: (entry) => {
function gradeSortMap(columnName, direction) {
if (columnName === 'username' && direction === 'desc') {
return sortAlphaDesc;
} else if (columnName === 'username') {
return sortAlphaAsc;
}
return sortNumerically(columnName, direction);
}
const headingMapper = (filterKey) => {
function all(dispatch, entry) {
if (entry) {
const results = [{
label: 'Username',
key: 'username',
columnSortable: true,
onSort: (direction) => {
this.setState({
grades: [...this.state.grades].sort(direction === 'desc' ? this.sortAlphaDesc : this.sortAlphaAsc),
});
},
onSort: (direction) => { dispatch(sortGrades('username', direction)); },
}];
const assignmentHeadings = entry.section_breakdown
@@ -66,34 +76,31 @@ const headingMapper = {
label: s.label,
key: s.label,
columnSortable: true,
onSort: (direction) => { this.sortNumerically(s.label, direction); },
onSort: direction => dispatch(sortGrades(s.label, direction)),
}));
const totals = [{
label: 'Total',
key: 'total',
columnSortable: true,
onSort: (direction) => { this.sortNumerically('total', direction); },
onSort: direction => dispatch(sortGrades('total', direction)),
}];
return results.concat(assignmentHeadings).concat(totals);
}
return [];
},
hw: (entry) => {
}
function some(dispatch, entry) {
const results = [{
label: 'Username',
key: 'username',
columnSortable: true,
onSort: (direction) => {
this.setState({
grades: [...this.state.grades].sort(direction === 'desc' ? this.sortAlphaDesc : this.sortAlphaAsc),
});
},
onSort: (direction) => { dispatch(sortGrades('username', direction)); },
}];
const assignmentHeadings = entry.section_breakdown
.filter(section => section.is_graded && section.label && section.category == 'Homework')
.filter(section => section.is_graded && section.label && section.category === filterKey)
.map(s => ({
label: s.label,
key: s.label,
@@ -101,31 +108,18 @@ const headingMapper = {
onSort: (direction) => { this.sortNumerically(s.label, direction); },
}));
return results.concat(assignmentHeadings);
},
exam: (entry) => {
const results = [{
label: 'Username',
key: 'username',
columnSortable: false,
onSort: (direction) => {
this.setState({
grades: [...this.state.grades].sort(direction === 'desc' ? this.sortAlphaDesc : this.sortAlphaAsc),
});
},
const totals = [{
label: 'Total',
key: 'total',
columnSortable: true,
onSort: direction => dispatch(sortGrades('total', direction)),
}];
const assignmentHeadings = entry.section_breakdown
.filter(section => section.is_graded && section.label && section.category == 'Exam')
.map(s => ({
label: s.label,
key: s.label,
columnSortable: false,
onSort: (direction) => { this.sortNumerically(s.label, direction); },
}));
return results.concat(assignmentHeadings).concat(totals);
}
return results.concat(assignmentHeadings);
},
return filterKey === 'All' ? all : some;
};
export { headingMapper };
export { headingMapper, gradeSortMap, sortAlphaAsc };

View File

@@ -6,6 +6,7 @@ const apiClient = getAuthenticatedAPIClient({
appBaseUrl: configuration.BASE_URL,
loginUrl: configuration.LOGIN_URL,
logoutUrl: configuration.LOGOUT_URL,
csrfTokenApiPath: process.env.CSRF_TOKEN_API_PATH,
refreshAccessTokenEndpoint: configuration.REFRESH_ACCESS_TOKEN_ENDPOINT,
accessTokenCookieName: configuration.ACCESS_TOKEN_COOKIE_NAME,
csrfCookieName: configuration.CSRF_COOKIE_NAME,

View File

@@ -0,0 +1,10 @@
const STARTED_FETCHING_ASSIGNMENT_TYPES = 'STARTED_FETCHING_ASSIGNMENT_TYPES';
const GOT_ASSIGNMENT_TYPES = 'GOT_ASSIGNMENT_TYPES';
const ERROR_FETCHING_ASSIGNMENT_TYPES = 'ERROR_FETCHING_ASSIGNMENT_TYPES';
export {
STARTED_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
};

View File

@@ -1,11 +0,0 @@
const STARTED_FETCHING_COMMENT = 'STARTED_FETCHING_COMMENT';
const FINISHED_FETCHING_COMMENT = 'FINISHED_FETCHING_COMMENT';
const ERROR_FETCHING_COMMENT = 'ERROR_FETCHING_COMMENT';
const GET_COMMENT = 'GET_COMMENT';
export {
STARTED_FETCHING_COMMENT,
FINISHED_FETCHING_COMMENT,
ERROR_FETCHING_COMMENT,
GET_COMMENT,
};

View File

@@ -1,9 +0,0 @@
const STARTED_FETCHING_POSTS = 'STARTED_FETCHING_POSTS';
const GET_POSTS = 'GET_POSTS';
const FINISHED_FETCHING_POSTS = 'FINISHED_FETCHING_POSTS';
export {
STARTED_FETCHING_POSTS,
GET_POSTS,
FINISHED_FETCHING_POSTS,
};

View File

@@ -0,0 +1,40 @@
import {
STARTED_FETCHING_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
} from '../constants/actionTypes/assignmentTypes';
const initialState = {
results: [],
startedFetching: false,
errorFetching: false,
};
const assignmentTypes = (state = initialState, action) => {
switch (action.type) {
case GOT_ASSIGNMENT_TYPES:
return {
...state,
results: action.assignmentTypes,
errorFetching: false,
finishedFetching: true,
};
case STARTED_FETCHING_ASSIGNMENT_TYPES:
return {
...state,
startedFetching: true,
};
case ERROR_FETCHING_ASSIGNMENT_TYPES:
return {
...state,
finishedFetching: true,
errorFetching: true,
};
default:
return state;
}
};
export default assignmentTypes;

View File

@@ -0,0 +1,54 @@
import assignmentTypes from './assignmentTypes';
import {
STARTED_FETCHING_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
} from '../constants/actionTypes/assignmentTypes';
const initialState = {
results: [],
startedFetching: false,
errorFetching: false,
};
const assignmentTypesData = ['Exam', 'Homework'];
describe('assignmentTypes reducer', () => {
it('has initial state', () => {
expect(assignmentTypes(undefined, {})).toEqual(initialState);
});
it('updates fetch assignmentTypes request state', () => {
const expected = {
...initialState,
startedFetching: true,
};
expect(assignmentTypes(undefined, {
type: STARTED_FETCHING_ASSIGNMENT_TYPES,
})).toEqual(expected);
});
it('updates fetch assignmentTypes success state', () => {
const expected = {
...initialState,
results: assignmentTypesData,
errorFetching: false,
finishedFetching: true,
};
expect(assignmentTypes(undefined, {
type: GOT_ASSIGNMENT_TYPES,
assignmentTypes: assignmentTypesData,
})).toEqual(expected);
});
it('updates fetch assignmentTypes failure state', () => {
const expected = {
...initialState,
errorFetching: true,
finishedFetching: true,
};
expect(assignmentTypes(undefined, {
type: ERROR_FETCHING_ASSIGNMENT_TYPES,
})).toEqual(expected);
});
});

View File

@@ -17,6 +17,7 @@ const cohorts = (state = initialState, action) => {
return {
...state,
results: action.cohorts,
finishedFetching: true,
errorFetching: false,
};
case STARTED_FETCHING_COHORTS:

View File

@@ -0,0 +1,70 @@
import cohorts from './cohorts';
import {
STARTED_FETCHING_COHORTS,
ERROR_FETCHING_COHORTS,
GOT_COHORTS,
} from '../constants/actionTypes/cohorts';
const initialState = {
results: [],
startedFetching: false,
errorFetching: false,
};
const cohortsData = [
{
assignment_type: 'manual',
group_id: null,
id: 1,
name: 'default_group',
user_count: 2,
user_partition_id: null,
},
{
assignment_type: 'auto',
group_id: null,
id: 2,
name: 'auto_group',
user_count: 5,
user_partition_id: null,
}];
describe('cohorts reducer', () => {
it('has initial state', () => {
expect(cohorts(undefined, {})).toEqual(initialState);
});
it('updates fetch cohorts request state', () => {
const expected = {
...initialState,
startedFetching: true,
};
expect(cohorts(undefined, {
type: STARTED_FETCHING_COHORTS,
})).toEqual(expected);
});
it('updates fetch cohorts success state', () => {
const expected = {
...initialState,
results: cohortsData,
errorFetching: false,
finishedFetching: true,
};
expect(cohorts(undefined, {
type: GOT_COHORTS,
cohorts: cohortsData,
})).toEqual(expected);
});
it('updates fetch cohorts failure state', () => {
const expected = {
...initialState,
errorFetching: true,
finishedFetching: true,
};
expect(cohorts(undefined, {
type: ERROR_FETCHING_COHORTS,
})).toEqual(expected);
});
});

View File

@@ -1,46 +0,0 @@
import {
STARTED_FETCHING_COMMENT,
ERROR_FETCHING_COMMENT,
GET_COMMENT,
} from '../constants/actionTypes/comment';
const initialState = {
details: {
id: null,
postId: null,
name: '',
email: 'example@example.com',
body: '',
},
startedFetching: false,
finishedFetching: false,
errorFetching: false,
};
const comment = (state = initialState, action) => {
switch (action.type) {
case GET_COMMENT:
return {
...state,
details: { ...action.comment },
finishedFetching: true,
errorFetching: false,
};
case STARTED_FETCHING_COMMENT:
return {
...state,
startedFetching: true,
finishedFetching: false,
};
case ERROR_FETCHING_COMMENT:
return {
...state,
finishedFetching: true,
errorFetching: true,
};
default:
return state;
}
};
export default comment;

View File

@@ -4,8 +4,8 @@ import {
GOT_GRADES,
TOGGLE_GRADE_FORMAT,
FILTER_COLUMNS,
GRADE_UPDATE_SUCCESS,
UPDATE_BANNER,
SORT_GRADES,
} from '../constants/actionTypes/grades';
const initialState = {
@@ -16,6 +16,9 @@ const initialState = {
errorFetching: false,
gradeFormat: 'percent',
showSuccess: false,
prevPage: null,
nextPage: null,
showSpinner: true,
};
const grades = (state = initialState, action) => {
@@ -29,12 +32,16 @@ const grades = (state = initialState, action) => {
errorFetching: false,
selectedTrack: action.track,
selectedCohort: action.cohort,
prevPage: action.prev,
nextPage: action.next,
showSpinner: false,
};
case STARTED_FETCHING_GRADES:
return {
...state,
startedFetching: true,
finishedFetching: false,
showSpinner: true,
};
case ERROR_FETCHING_GRADES:
return {
@@ -57,1009 +64,14 @@ const grades = (state = initialState, action) => {
...state,
showSuccess: action.showSuccess,
};
case SORT_GRADES:
return {
...state,
results: action.results,
};
default:
return state;
}
};
export default grades;
// Gradebook.defaultProps = {
// "results": [
// {
// "course_id": "course-v1:edX+DemoX+Demo_Course",
// "email": "honor@example.com",
// "user_id": 6,
// "username": "honor",
// "full_name": "",
// "passed": false,
// "percent": 0,
// "letter_grade": null,
// "progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/6/",
// "section_breakdown": [
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Introduction",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
// "subsection_name": "Demo Course Overview"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/3.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 3,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Lesson 1 - Getting Started"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/11.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 01",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 11,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Homework - Question Styles"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Lesson 2 - Let's Get Interactive!"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/5.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 02",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 5,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Labs and Demos"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/19.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 19,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Essays"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Lesson 3 - Be Social"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Homework - Find Your Study Buddy"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "More Ways to Connect"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Exam",
// "chapter_name": "About Exams and Certificates",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/6.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 6,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
// "subsection_name": "edX Exams"
// }
// ],
// "aggregates": {
// "Exam": {
// "score_possible": 6,
// "score_earned": 0
// },
// "Homework": {
// "score_possible": 16,
// "score_earned": 0
// }
// }
// },
// {
// "course_id": "course-v1:edX+DemoX+Demo_Course",
// "email": "audit@example.com",
// "user_id": 7,
// "username": "audit",
// "full_name": "",
// "passed": false,
// "percent": 0.17,
// "letter_grade": null,
// "progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/7/",
// "section_breakdown": [
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Introduction",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
// "subsection_name": "Demo Course Overview"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/3.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 3,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Lesson 1 - Getting Started"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.45",
// "is_graded": true,
// "grade_description": "(5.00/11.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 01",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
// "percent": 0.45,
// "score_earned": 5,
// "score_possible": 11,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Homework - Question Styles"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Lesson 2 - Let's Get Interactive!"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/5.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 02",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 5,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Labs and Demos"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/19.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 19,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Essays"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Lesson 3 - Be Social"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Homework - Find Your Study Buddy"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "More Ways to Connect"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Exam",
// "chapter_name": "About Exams and Certificates",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/6.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 6,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
// "subsection_name": "edX Exams"
// }
// ],
// "aggregates": {
// "Exam": {
// "score_possible": 6,
// "score_earned": 0
// },
// "Homework": {
// "score_possible": 16,
// "score_earned": 5
// }
// }
// },
// {
// "course_id": "course-v1:edX+DemoX+Demo_Course",
// "email": "verified@example.com",
// "user_id": 8,
// "username": "verified",
// "full_name": "",
// "passed": false,
// "percent": 0,
// "letter_grade": null,
// "progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/8/",
// "section_breakdown": [
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Introduction",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
// "subsection_name": "Demo Course Overview"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/3.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 3,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Lesson 1 - Getting Started"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/11.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 01",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 11,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Homework - Question Styles"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Lesson 2 - Let's Get Interactive!"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/5.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 02",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 5,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Labs and Demos"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/19.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 19,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Essays"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Lesson 3 - Be Social"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Homework - Find Your Study Buddy"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "More Ways to Connect"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Exam",
// "chapter_name": "About Exams and Certificates",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/6.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 6,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
// "subsection_name": "edX Exams"
// }
// ],
// "aggregates": {
// "Exam": {
// "score_possible": 6,
// "score_earned": 0
// },
// "Homework": {
// "score_possible": 16,
// "score_earned": 0
// }
// }
// },
// {
// "course_id": "course-v1:edX+DemoX+Demo_Course",
// "email": "staff@example.com",
// "user_id": 9,
// "username": "staff",
// "full_name": "",
// "passed": false,
// "percent": 0,
// "letter_grade": null,
// "progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/9/",
// "section_breakdown": [
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Introduction",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
// "subsection_name": "Demo Course Overview"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/3.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 3,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Lesson 1 - Getting Started"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 1: Getting Started",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/11.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 01",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 11,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
// "subsection_name": "Homework - Question Styles"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Lesson 2 - Let's Get Interactive!"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Homework",
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/5.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": "Ex 02",
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 5,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Labs and Demos"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 2: Get Interactive",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/19.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 19,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
// "subsection_name": "Homework - Essays"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Lesson 3 - Be Social"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "Homework - Find Your Study Buddy"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "Example Week 3: Be Social",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
// "subsection_name": "More Ways to Connect"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": "Exam",
// "chapter_name": "About Exams and Certificates",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": true,
// "grade_description": "(0.00/6.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 6,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
// "subsection_name": "edX Exams"
// },
// {
// "are_grades_published": true,
// "auto_grade": false,
// "category": null,
// "chapter_name": "holding section",
// "comment": "",
// "detail": "",
// "displayed_value": "0.00",
// "is_graded": false,
// "grade_description": "(0.00/0.00)",
// "is_ag": false,
// "is_average": false,
// "is_manually_graded": false,
// "label": null,
// "letter_grade": null,
// "module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@07bc32474380492cb34f76e5f9d9a135",
// "percent": 0,
// "score_earned": 0,
// "score_possible": 0,
// "section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@9fca584977d04885bc911ea76a9ef29e",
// "subsection_name": "New Subsection"
// }
// ],
// "aggregates": {
// "Exam": {
// "score_possible": 6,
// "score_earned": 0
// },
// "Homework": {
// "score_possible": 16,
// "score_earned": 0
// }
// }
// }
// ]
// };

View File

@@ -0,0 +1,186 @@
import grades from './grades';
import {
STARTED_FETCHING_GRADES,
ERROR_FETCHING_GRADES,
GOT_GRADES,
TOGGLE_GRADE_FORMAT,
FILTER_COLUMNS,
UPDATE_BANNER,
SORT_GRADES,
} from '../constants/actionTypes/grades';
const initialState = {
results: [],
headings: [],
startedFetching: false,
finishedFetching: false,
errorFetching: false,
gradeFormat: 'percent',
showSuccess: false,
prevPage: null,
nextPage: null,
showSpinner: true,
};
const courseId = 'course-v1:edX+DemoX+Demo_Course';
const headingsData = [
{ name: 'exam' },
{ name: 'homework2' },
];
const gradesData = [
{
course_id: courseId,
email: 'user1@example.com',
username: 'user1',
user_id: 1,
percent: 0.5,
letter_grade: null,
section_breakdown: [
{
subsection_name: 'Demo Course Overview',
score_earned: 0,
score_possible: 0,
percent: 0,
displayed_value: '0.00',
grade_description: '(0.00/0.00)',
},
{
subsection_name: 'Example Week 1: Getting Started',
score_earned: 1,
score_possible: 1,
percent: 1,
displayed_value: '1.00',
grade_description: '(0.00/0.00)',
},
],
},
{
course_id: courseId,
email: 'user22@example.com',
username: 'user22',
user_id: 22,
percent: 0,
letter_grade: null,
section_breakdown: [
{
subsection_name: 'Demo Course Overview',
score_earned: 0,
score_possible: 0,
percent: 0,
displayed_value: '0.00',
grade_description: '(0.00/0.00)',
},
{
subsection_name: 'Example Week 1: Getting Started',
score_earned: 1,
score_possible: 1,
percent: 0,
displayed_value: '0.00',
grade_description: '(0.00/0.00)',
},
],
}];
describe('grades reducer', () => {
it('has initial state', () => {
expect(grades(undefined, {})).toEqual(initialState);
});
it('updates fetch grades request state', () => {
const expected = {
...initialState,
startedFetching: true,
showSpinner: true,
};
expect(grades(undefined, {
type: STARTED_FETCHING_GRADES,
})).toEqual(expected);
});
it('updates fetch grades success state', () => {
const expectedPrev = 'testPrevUrl';
const expectedNext = 'testNextUrl';
const expectedTrack = 'verified';
const expectedCohortId = 2;
const expected = {
...initialState,
results: gradesData,
headings: headingsData,
errorFetching: false,
finishedFetching: true,
selectedTrack: expectedTrack,
selectedCohort: expectedCohortId,
prevPage: expectedPrev,
nextPage: expectedNext,
showSpinner: false,
};
expect(grades(undefined, {
type: GOT_GRADES,
grades: gradesData,
headings: headingsData,
prev: expectedPrev,
next: expectedNext,
track: expectedTrack,
cohort: expectedCohortId,
showSpinner: true,
})).toEqual(expected);
});
it('updates toggle grade format state success', () => {
const formatTypeData = 'percent';
const expected = {
...initialState,
gradeFormat: formatTypeData,
};
expect(grades(undefined, {
type: TOGGLE_GRADE_FORMAT,
formatType: formatTypeData,
})).toEqual(expected);
});
it('updates filter columns state success', () => {
const expectedHeadings = headingsData;
const expected = {
...initialState,
headings: expectedHeadings,
};
expect(grades(undefined, {
type: FILTER_COLUMNS,
headings: expectedHeadings,
})).toEqual(expected);
});
it('updates update_banner state success', () => {
const expectedShowSuccess = true;
const expected = {
...initialState,
showSuccess: expectedShowSuccess,
};
expect(grades(undefined, {
type: UPDATE_BANNER,
showSuccess: expectedShowSuccess,
})).toEqual(expected);
});
it('updates sort grades state success', () => {
const expected = {
...initialState,
results: gradesData,
};
expect(grades(undefined, {
type: SORT_GRADES,
results: gradesData,
})).toEqual(expected);
});
it('updates fetch grades failure state', () => {
const expected = {
...initialState,
errorFetching: true,
finishedFetching: true,
};
expect(grades(undefined, {
type: ERROR_FETCHING_GRADES,
})).toEqual(expected);
});
});

View File

@@ -3,11 +3,13 @@ import { combineReducers } from 'redux';
import cohorts from './cohorts';
import grades from './grades';
import tracks from './tracks';
import assignmentTypes from './assignmentTypes';
const rootReducer = combineReducers({
grades,
cohorts,
tracks,
assignmentTypes,
});
export default rootReducer;

View File

@@ -1,31 +0,0 @@
import {
GET_POSTS,
STARTED_FETCHING_POSTS,
FINISHED_FETCHING_POSTS,
} from '../constants/actionTypes/posts';
const posts = (state = { posts: [], startedFetching: false, finishedFetching: false }, action) => {
switch (action.type) {
case GET_POSTS:
return {
...state,
posts: action.posts,
};
case STARTED_FETCHING_POSTS:
return {
...state,
startedFetching: true,
finishedFetching: false,
};
case FINISHED_FETCHING_POSTS:
return {
...state,
startedFetching: false,
finishedFetching: true,
};
default:
return state;
}
};
export default posts;

View File

@@ -1,45 +0,0 @@
import posts from './posts';
import {
GET_POSTS,
STARTED_FETCHING_POSTS,
FINISHED_FETCHING_POSTS,
} from '../constants/actionTypes/posts';
const initialState = {
posts: [],
startedFetching: false,
finishedFetching: false,
};
describe('posts reducer', () => {
it('has initial state', () => {
expect(posts(undefined, {})).toEqual(initialState);
});
it('adds posts', () => {
const fetchedPosts = [1, 2, 3];
const expected = {
...initialState,
posts: fetchedPosts,
};
expect(posts(undefined, { type: GET_POSTS, posts: fetchedPosts })).toEqual(expected);
});
it('updates started fetching posts state', () => {
const expected = {
...initialState,
startedFetching: true,
finishedFetching: false,
};
expect(posts(undefined, { type: STARTED_FETCHING_POSTS })).toEqual(expected);
});
it('updates finished fetching posts state', () => {
const expected = {
...initialState,
startedFetching: false,
finishedFetching: true,
};
expect(posts(undefined, { type: FINISHED_FETCHING_POSTS })).toEqual(expected);
});
});

View File

@@ -18,6 +18,7 @@ const tracks = (state = initialState, action) => {
...state,
results: action.tracks,
errorFetching: false,
finishedFetching: true,
};
case STARTED_FETCHING_TRACKS:
return {

View File

@@ -0,0 +1,76 @@
import tracks from './tracks';
import {
STARTED_FETCHING_TRACKS,
ERROR_FETCHING_TRACKS,
GOT_TRACKS,
} from '../constants/actionTypes/tracks';
const initialState = {
results: [],
startedFetching: false,
errorFetching: false,
};
const tracksData = [
{
slug: 'audit',
name: 'Audit',
min_price: 0,
suggested_prices: '',
currency: 'usd',
expiration_datetime: null,
description: null,
sku: '68EFFFF',
bulk_sku: null,
},
{
slug: 'verified',
name: 'Verified Certificate',
min_price: 100,
suggested_prices: '',
currency: 'usd',
expiration_datetime: '2021-05-04T18:08:12.644361Z',
description: null,
sku: '8CF08E5',
bulk_sku: 'A5B6DBE',
}];
describe('tracks reducer', () => {
it('has initial state', () => {
expect(tracks(undefined, {})).toEqual(initialState);
});
it('updates fetch tracks request state', () => {
const expected = {
...initialState,
startedFetching: true,
};
expect(tracks(undefined, {
type: STARTED_FETCHING_TRACKS,
})).toEqual(expected);
});
it('updates fetch tracks success state', () => {
const expected = {
...initialState,
results: tracksData,
errorFetching: false,
finishedFetching: true,
};
expect(tracks(undefined, {
type: GOT_TRACKS,
tracks: tracksData,
})).toEqual(expected);
});
it('updates fetch tracks failure state', () => {
const expected = {
...initialState,
errorFetching: true,
finishedFetching: true,
};
expect(tracks(undefined, {
type: ERROR_FETCHING_TRACKS,
})).toEqual(expected);
});
});

View File

@@ -3,12 +3,12 @@ import { configuration } from '../../config';
class LmsApiService {
static baseUrl = configuration.LMS_BASE_URL;
static pageSize = 10
static fetchGradebookData(courseId, searchText, cohort, track) {
let gradebookUrl = `${LmsApiService.baseUrl}/api/grades/v1/gradebook/${courseId}/`;
if (searchText || track || cohort) {
gradebookUrl += '?';
}
gradebookUrl += `?page_size=${LmsApiService.pageSize}&`;
if (searchText) {
gradebookUrl += `username_contains=${searchText}&`;
}
@@ -44,7 +44,7 @@ class LmsApiService {
const gradebookUrl = `${LmsApiService.baseUrl}/api/grades/v1/gradebook/${courseId}/bulk-update`;
return apiClient.post(gradebookUrl, updateData);
}
static fetchTracks(courseId) {
const trackUrl = `${LmsApiService.baseUrl}/api/enrollment/v1/course/${courseId}`;
return apiClient.get(trackUrl);
@@ -54,6 +54,11 @@ class LmsApiService {
const cohortsUrl = `${LmsApiService.baseUrl}/courses/${courseId}/cohorts/`;
return apiClient.get(cohortsUrl);
}
static fetchAssignmentTypes(courseId) {
const assignmentTypesUrl = `${LmsApiService.baseUrl}/api/grades/v1/gradebook/${courseId}/grading-info?graded_only=true`;
return apiClient.get(assignmentTypesUrl);
}
}
export default LmsApiService;

View File

@@ -4,20 +4,27 @@ import ReactDOM from 'react-dom';
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
import { Provider } from 'react-redux';
import apiClient from './data/apiClient';
import GradebookPage from './containers/GradebookPage';
import Header from './components/Header';
import store from './data/store';
import './App.scss';
const App = () => (
<Provider store={store}>
<Router>
<main>
<Switch>
<Route exact path="/:courseId" component={GradebookPage} />
</Switch>
</main>
<div>
<Header />
<main>
<Switch>
<Route exact path="/:courseId" component={GradebookPage} />
</Switch>
</main>
</div>
</Router>
</Provider>
);
ReactDOM.render(<App />, document.getElementById('root'));
if (apiClient.ensurePublicOrAuthencationAndCookies(window.location.pathname)) {
ReactDOM.render(<App />, document.getElementById('root'));
}

View File

@@ -4,3 +4,7 @@ import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
Enzyme.configure({ adapter: new Adapter() });
// These configuration values are usually set in webpack's EnvironmentPlugin however
// Jest does not use webpack so we need to set these so for testing
process.env.LMS_BASE_URL = 'http://localhost:18000';