PORTALS-2651 - Evaluations #1535
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
nickgros
commented
Jan 30, 2025
nickgros
commented
- Remove react-bootstrap from Evaluations components
- Remove JestMockPromise
- Remove react-bootstrap from Evaluations components - Remove JestMockPromise
nickgros
commented
Jan 30, 2025
| @@ -207,7 +207,6 @@ | |||
| "jest-environment-jsdom": "^29.7.0", | |||
| "jest-fail-on-console": "^3.1.2", | |||
| "jest-html-reporter": "^3.10.2", | |||
| "jest-mock-promise": "^1.1.12", | |||
There was a problem hiding this comment.
Unnecessary dependency when Jest has mockResolvedValue/mockRejectedValue
- Fix lockfile
nickgros
commented
Jan 31, 2025
| @@ -72,26 +82,22 @@ export function EvaluationCard({ | |||
| } | |||
|
|
|||
| return ( | |||
| <div className="bootstrap-4-backport evaluation-card"> | |||
| <div className="evaluation-card"> | |||
nickgros
commented
Jan 31, 2025
| </div> | ||
| </Form> | ||
| </div> | ||
| <div className="evaluation-editor"> |
nickgros
commented
Jan 31, 2025
| @@ -245,46 +253,32 @@ export function EvaluationRoundEditor({ | |||
| evaluationRoundInput.roundStart, | |||
| ) | |||
|
|
|||
| // https://react-bootstrap.github.io/components/forms/#forms-validation-native | |||
| return ( | |||
| <div className="evaluation-round-editor"> | |||
nickgros
commented
Jan 31, 2025
| .advanced-limits-grid { | ||
| display: grid; | ||
| // We need a fixed size for the add-button | ||
| // or else the alignment will slightly change once the add-button disappears upon reaching the max number of rows | ||
| grid-template-columns: [limit-type] 1fr [spacer] 30px [limit-input] 1.8fr [remove-button] 30px [add-button] 30px [end]; | ||
| grid-template-columns: [limit-type] 1fr [spacer] 30px [limit-input] 1.8fr [remove-button] 50px [add-button] 50px [end]; |
nickgros
commented
Jan 31, 2025
| <EvaluationEditorDropdown onClick={onSave} onDelete={onDelete} /> | ||
| </Col> | ||
| </Row> | ||
| <Form> |
There was a problem hiding this comment.
Replace bootstrap form components with MUI form components
nickgros
commented
Jan 31, 2025
| @@ -237,27 +229,36 @@ function EvaluationEditorDropdown({ | |||
| confirmButtonColor="error" | |||
| /> | |||
| )} | |||
| <Dropdown className="float-right"> | |||
There was a problem hiding this comment.
Replace bootstrap dropdown with MUI IconButton + Menu popover
nickgros
commented
Jan 31, 2025
| return ( | ||
| <div className="evaluation-round-editor"> | ||
| <Card> | ||
| <Card.Body> |
There was a problem hiding this comment.
Replace bootstrap CardBody with MUI CardContent
nickgros
commented
Jan 31, 2025
Comment on lines
-254
to
-255
| <Row> | ||
| <Col> |
There was a problem hiding this comment.
Replace Bootstrap Grid with MUI Grid2
nickgros
commented
Jan 31, 2025
| @@ -1,6 +1,5 @@ | |||
| import { render, screen, within } from '@testing-library/react' | |||
| import { render, screen, waitFor, within } from '@testing-library/react' | |||
There was a problem hiding this comment.
Changes in all tests are minor, and are basically all
- replacing JestMockPromise with Jest builtin functionality
- Updating role queries to match the new MUI components
- Applying appropriate
findBy*andwaitFors to improve test reliability and remove warnings.
jay-hodgson
approved these changes
Feb 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.