fix/AUT-2673/inline-figure-img #2279
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
jsconan
approved these changes
Nov 17, 2022
Codecov Report
@@ Coverage Diff @@
## develop #2279 +/- ##
=============================================
+ Coverage 15.88% 16.18% +0.30%
- Complexity 4194 4204 +10
=============================================
Files 387 388 +1
Lines 11700 11397 -303
=============================================
- Hits 1858 1845 -13
+ Misses 9842 9552 -290
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
This was referenced Nov 21, 2022
jsconan
reviewed
Nov 22, 2022
Comment on lines
30
to
36
| _.forEach(element['elements'], childElement => { | ||
| if (childElement.serial === serial) { | ||
| parent = element; | ||
| } else { | ||
| checkFigureInElement(childElement, serial); | ||
| } | ||
| }); |
There was a problem hiding this comment.
issue: the recursion looks useless as the returned value is not captured. You need to rewrite it using a local function.
suggestion: If you don't need to visit all nodes, you could optimize the algorithm by preventing a full visit of the tree as soon as you find the parent.
Suggested change
| _.forEach(element['elements'], childElement => { | |
| if (childElement.serial === serial) { | |
| parent = element; | |
| } else { | |
| checkFigureInElement(childElement, serial); | |
| } | |
| }); | |
| const searchRecurse = parentElement => { | |
| if (!parentElement) { | |
| return null; | |
| } | |
| if (parentElement.serial === serial) { | |
| return parentElement; | |
| } | |
| let found = null; | |
| _.some(parentElement['elements'], childElement => { | |
| if (childElement.serial === serial) { | |
| found = childElement; | |
| } else if (parentElement['elements']) { | |
| found = searchRecurse(childElement); | |
| } | |
| if (found) { | |
| return true; | |
| } | |
| }); | |
| return found; | |
| } | |
| const parent = searchRecurse(element) |
There was a problem hiding this comment.
Thanks for the suggestion :)
| @@ -26,6 +26,12 @@ define(['tpl!taoQtiItem/qtiXmlRenderer/tpl/element'], function (tpl) { | |||
| data.tag = `${ns.name}:figure`; | |||
| } | |||
|
|
|||
| if (!figure.attr('showFigure')) { | |||
| data.tag = 'img'; | |||
| const cleanImg = data.body.split('<qh5:figcaption >'); | |||
There was a problem hiding this comment.
question: Is it expected to have this space inside the tag? If it is an artifact of the browser, it might not be safe as it might not always be there.
bziondik
approved these changes
Nov 22, 2022
There was a problem hiding this comment.
- New code is covered by tests (if applicable)
- Tests are running successfully (old and new ones) on my local machine (if applicable)
- New code is respecting code style rules
- New code is respecting best practices
- New code is not subject to concurrency issues (if applicable)
- Feature is working correctly on playground (if applicable)
- Acceptance criteria are respected
- Pull request title and description are meaningful
Silvia-loza
reviewed
Nov 23, 2022
Silvia-loza
approved these changes
Nov 25, 2022
There was a problem hiding this comment.
Amazing job! 🎉🎉🎉
- New code is covered by tests (if applicable)
- Tests are running successfully (old and new ones) on my local machine (if applicable)
- New code is respecting code style rules
- New code is respecting best practices
- Pull request's target is not
master - Feature is working correctly on kitchen env (if applicable)
- Acceptance criteria are respected
- Pull request title and description are meaningful
Version
There are 0 BREAKING CHANGE, 0 feature, 23 fixes |
3 tasks
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.
Related to: AUT-2673
Changes:
Companion extensions:
How to check:
On Assets
On Items
On Tests
Check a test on Delivery.