Merged
Conversation
- Add dependency. - Update model and to include . - Update services (, ) to send payload to the backend. - Create reusable component in with write/preview tabs and a strict tag whitelist (p, strong, em, ul, ol, li).
- Replace the standard text area in with the new . - Update Formik logic to bind to for the API payload. - Implement fallback logic to display legacy HTML description if no Markdown source exists. - Remove form component usage in the edit view.
…UI integration - Address persistent Jest by switching from the problematic library to the CJS-compatible . - Implement component overrides in to strictly block disallowed tags (H1-H6, links) and enforce the required basic formatting whitelist (p, strong, ul, ol, li). - Fix minor test logic error in to ensure accurate assertion of the new component's behavior.
- Replaced with to resolve persistent Jest/CJS SyntaxErrors - Implemented strict element stripping in MarkdownEditor: allowed only simple tags and the rest (h1-h6, a, img) are now rendered as plain text & spans. - Resolved errors in and . - Updated to align with the backend schema. - Increased Jest global timeout to 15s in package.json to try to limit flaky timeouts when testing.
# Conflicts: # package-lock.json # package.json
…de/master # Conflicts: # package-lock.json # package.json
Time assertions are commented out for now since the test can fail depending on the currently set timezone. This should be fixed properly in the future though.
# Conflicts: # package-lock.json # package.json
Collaborator
|
coverage: 74.753% (-0.7%) from 75.488% — feature/version-2.5 into master |
Also, refactor the variation component and extract it so that the variations for existing exercises can be edited as well.
# Conflicts: # src/components/Exercises/Detail/ExerciseDetailEdit.tsx # src/services/exercise.ts
This makes working with it a bit easier
The description field is computed from this one and is ignored by the API
# Conflicts: # src/components/Exercises/Add/Step2Variations.tsx # src/components/Exercises/Add/Step3Description.tsx # src/components/Exercises/Detail/ExerciseDetailEdit.tsx
rolandgeider
force-pushed
the
feature/version-2.5
branch
from
1fb4709 to
b70152d
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Proposed Changes
This pr collects all changes that need a new backend (2.5):