Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: updated frontend-build & frontend-platform major versions #374

Merged
merged 19 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2a8eb01
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 May 5, 2023
e69e2d7
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 May 10, 2023
b317aee
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 May 30, 2023
a3f5413
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 Jul 4, 2023
c1a54f3
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 Jul 17, 2023
3ca2581
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 Oct 11, 2023
e2be4e5
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 Oct 12, 2023
f6901aa
feat: bumped frontend-platform to v6
BilalQamar95 Oct 25, 2023
5dd1080
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 Oct 25, 2023
ed82545
Merge branch 'master' of github.com:edx/frontend-app-gradebook
BilalQamar95 Dec 5, 2023
8df3df7
chore: bumped jest to v29
BilalQamar95 Dec 5, 2023
2b9702a
fix: updated snapshots for failing tests
BilalQamar95 Dec 5, 2023
e6bf750
Merge branches 'bilalqamar95/jest-v29-upgrade' and 'master' of github…
BilalQamar95 Apr 4, 2024
88cd1f2
refactor: updated frontend-build, updated snapshots
BilalQamar95 Apr 4, 2024
c764205
feat: updated build and platform major versions, along with edx packages
BilalQamar95 Apr 24, 2024
700c76e
refactor: updated index.test to resolve failing test
BilalQamar95 Apr 24, 2024
a54ccaa
refactor: major version upgrade for react-unit-test-utils
BilalQamar95 May 16, 2024
8637deb
Merge branch 'master' of github.com:openedx/frontend-app-gradebook in…
BilalQamar95 Jun 3, 2024
1c755d0
refactor: updated package-lock
BilalQamar95 Jun 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23,044 changes: 9,509 additions & 13,535 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
],
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-header": "^5.0.2",
"@edx/frontend-platform": "^7.1.0",
"@edx/frontend-component-header": "5.3.0",
"@edx/frontend-platform": "8.0.0",
"@edx/openedx-atlas": "^0.6.0",
"@edx/react-unit-test-utils": "^2.0.0",
"@openedx/frontend-plugin-framework": "^1.1.2",
"@edx/react-unit-test-utils": "^3.0.0",
"@openedx/frontend-plugin-framework": "^1.2.1",
"@openedx/frontend-slot-footer": "^1.0.2",
"@openedx/paragon": "^22.1.1",
"@edx/reactifex": "^2.1.1",
Expand Down Expand Up @@ -68,15 +68,15 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.1.1",
"@openedx/frontend-build": "^13.0.28",
"@openedx/frontend-build": "14.0.3",
"@testing-library/react": "12.1.5",
"axios": "0.21.2",
"axios-mock-adapter": "^1.17.0",
"es-check": "^2.3.0",
"fetch-mock": "^6.5.2",
"husky": "2.7.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^26.6.3",
"jest": "^29.7.0",
"react-dev-utils": "^12.0.1",
"react-test-renderer": "17.0.2",
"reactifex": "1.1.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`HistoryTable component snapshot history table data (from bulkManagementHistory.map(this.formatHistoryRow) snapshot: maps resultsSummay to ResultsSummary, wraps filename and user, forwards the rest 1`] = `
Array [
Object {
[
{
"filename": <span
className="wrap-text-in-cell"
>
Expand All @@ -20,7 +20,7 @@ Array [
Eifel
</span>,
},
Object {
{
"filename": <span
className="wrap-text-in-cell"
>
Expand All @@ -45,26 +45,26 @@ exports[`HistoryTable component snapshot snapshot - loads formatted table 1`] =
<DataTable
className="table-striped"
columns={
Array [
Object {
[
{
"Header": "Gradebook",
"accessor": "filename",
"columnSortable": false,
"width": "col-5",
},
Object {
{
"Header": "Download Summary",
"accessor": "resultsSummary",
"columnSortable": false,
"width": "col",
},
Object {
{
"Header": "Who",
"accessor": "user",
"columnSortable": false,
"width": "col-1",
},
Object {
{
"Header": "When",
"accessor": "timeUploaded",
"columnSortable": false,
Expand All @@ -73,8 +73,8 @@ exports[`HistoryTable component snapshot snapshot - loads formatted table 1`] =
]
}
data={
Array [
Object {
[
{
"filename": <span
className="wrap-text-in-cell"
>
Expand All @@ -92,7 +92,7 @@ exports[`HistoryTable component snapshot snapshot - loads formatted table 1`] =
Eifel
</span>,
},
Object {
{
"filename": <span
className="wrap-text-in-cell"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ exports[`ResultsSummary component snapshot - safe hyperlink with bulkGradesUrl w
<Hyperlink
destination="www.edx.org"
href={
Object {
"url": Object {
{
"url": {
"rowId": 42,
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exports[`AssignmentFilter component render snapshot 1`] = `
label="Assignment"
onChange={[MockFunction]}
options={
Array [
[
<option
value=""
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exports[`AssignmentFilterType component render snapshot 1`] = `
label="Assignment Types"
onChange={[MockFunction]}
options={
Array [
[
<option
value=""
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`StudentGroupsFilter component render snapshot 1`] = `
label="Tracks"
onChange={[MockFunction]}
options={
Array [
[
<option
value="Track-All"
>
Expand Down Expand Up @@ -43,7 +43,7 @@ exports[`StudentGroupsFilter component render snapshot 1`] = `
label="Cohorts"
onChange={[MockFunction]}
options={
Array [
[
<option
value="Cohort-All"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`BulkManagementControls render snapshot - show - network and import butt
>
<NetworkButton
label={
Object {
{
"defaultMessage": "Download Grades",
"description": "A labeled button that allows an admin user to download course grades all at once (in bulk).",
"id": "gradebook.GradesView.BulkManagementControls.bulkManagementLabel",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ exports[`OverrideTable component render snapshot 1`] = `
<DataTable
columns="test-columns"
data={
Array [
Object {
[
{
"test": "data",
},
Object {
{
"andOther": "test-data",
},
Object {
{
"adjustedGrade": <AdjustedGradeInput />,
"date": Object {
"date": {
"formatted": 2000-01-01T00:00:00.000Z,
},
"reason": <ReasonInput />,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ exports[`FilterBadge render do not hide value snapshot 1`] = `
aria-label="close"
className="btn-info"
onClick={
Object {
"handleClose": Array [
{
"handleClose": [
"some",
"filters",
],
Expand Down Expand Up @@ -55,8 +55,8 @@ exports[`FilterBadge render hide Value snapshot 1`] = `
aria-label="close"
className="btn-info"
onClick={
Object {
"handleClose": Array [
{
"handleClose": [
"some",
"filters",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
exports[`FilteredUsersLabel component render snapshot 1`] = `
<format-message-function
message={
Object {
{
"defaultMessage": "Showing {filteredUsers} of {totalUsers} total learners",
"description": "Users visibility label",
"id": "gradebook.GradesTab.usersVisibilityLabel",
}
}
values={
Object {
{
"filteredUsers": <BoldText
text={100}
/>,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@ exports[`Gradebook Table Fields Username with external_user_key snapshot 1`] = `
`;

exports[`Gradebook Table Fields Username with external_user_key wraps external user key and username 1`] = `
Object {
"children": Array [
Object {
"children": Array [
Object {
"children": Array [
{
"children": [
{
"children": [
{
"children": [
"MyNameFromHere",
],
"props": Object {},
"props": {},
"type": "div",
},
Object {
"children": Array [
{
"children": [
"My name from another land",
],
"props": Object {
"props": {
"className": "student-key",
},
"type": "div",
},
],
"props": Object {},
"props": {},
"type": "div",
},
],
"props": Object {
"props": {
"className": "wrap-text-in-cell",
},
"type": "span",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ exports[`LabelReplacements TotalGradeLabelReplacement snapshot 1`] = `
}
placement="left"
trigger={
Array [
[
"hover",
"focus",
]
Expand Down Expand Up @@ -84,7 +84,7 @@ exports[`snapshot left to right overlay placement 1`] = `
}
placement="right"
trigger={
Array [
[
"hover",
"focus",
]
Expand Down Expand Up @@ -118,7 +118,7 @@ exports[`snapshot right to left overlay placement 1`] = `
}
placement="left"
trigger={
Array [
[
"hover",
"focus",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ exports[`GradebookTable snapshot 1`] = `
<DataTable
RowStatusComponent={[MockFunction hooks.nullMethod]}
columns={
Array [
[
"some",
"columns",
]
}
data={
Array [
[
"some",
"data",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ exports[`ImportGradesButton component render snapshot 1`] = `
className="import-grades-btn"
import={true}
label={
Object {
{
"defaultMessage": "Import Grades",
"description": "A labeled button to import grades in the BulkManagement Tab File Upload Form",
"id": "gradebook.GradesView.importGradesBtnText",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`InterventionsReport component output snapshot 1`] = `
</div>
<NetworkButton
label={
Object {
{
"defaultMessage": "Download Interventions",
"description": "The labeled button to download the Intervention report from the Grades View",
"id": "gradebook.GradesView.InterventionsReport.downloadBtn",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`PageButtons component render snapshot 1`] = `
<div
className="d-flex justify-content-center"
style={
Object {
{
"paddingBottom": "20px",
}
}
Expand All @@ -13,7 +13,7 @@ exports[`PageButtons component render snapshot 1`] = `
disabled="prev-disabled"
onClick={[MockFunction hooks.prev.onClick]}
style={
Object {
{
"margin": "20px",
}
}
Expand All @@ -25,7 +25,7 @@ exports[`PageButtons component render snapshot 1`] = `
disabled="next-disabled"
onClick={[MockFunction hooks.next.onClick]}
style={
Object {
{
"margin": "20px",
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/NetworkButton/__snapshots__/test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ exports[`NetworkButton component snapshots snapshot 1`] = `
<StatefulButton
className="ml-2 test-class"
disabledStates={
Array [
[
"pending",
]
}
icons={
Object {
{
"default": <Icon
className="fa mr-2 fa-download"
/>,
Expand All @@ -19,7 +19,7 @@ exports[`NetworkButton component snapshots snapshot 1`] = `
}
}
labels={
Object {
{
"default": <FormattedMessage
defaultMessage="test button label"
description="test button label description"
Expand Down
Loading
Loading