fix: setAssetToStaticUrl regex matcher #497
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #497 +/- ##
=======================================
Coverage 88.90% 88.90%
=======================================
Files 248 248
Lines 4552 4552
Branches 946 942 -4
=======================================
Hits 4047 4047
Misses 472 472
Partials 33 33 ☔ View full report in Codecov by Sentry. |
rayzhou-bit
reviewed
Jul 31, 2024
| const assetBlockName = src.substring(0, src.search(/("|")/)); | ||
| const dividedSrc = assetBlockName.split(/\/assets\/.+\/asset-v1:\S+[+]\S+[@]\S+[+]\S+\//); | ||
| const dividedSrc = assetBlockName.split(/\/asset-v1:\S+[+]\S+[@]\S+[+]\S+\//); |
There was a problem hiding this comment.
Should this not match the regex above?
There was a problem hiding this comment.
No because I want to catch all the cases were this appears. If you look at the description for the PR, the first and third bullet show the two ways that asset url can be format. The original regex only caught the first version, not the second and was causing the url tow be incorrectly converted.
rayzhou-bit
approved these changes
Aug 1, 2024
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.
Description
This PR fixes the error of relative asset urls incorrectly rewriting the conversion to the static url. The regex matcher was catching all relative asset url formats:
/assets/courseware/v1/hash/asset-v1:org+num+run+type@asset+block/image.jpeg/asset-v1:org+num+run+type@asset+block@image.jpeg/asset-v1:org+num+run+type@asset+block/image.jpegThis resulted in the first two version rewriting correctly as
/static/image.jpegand the third rewriting incorrectly as/static/assetblockimage.jpeg.Testing
Repeat the steps in the text editor and advanced problem editor. Also, test opening and save existing content for regular problem editor.