Quiz exercises: Simplify drag-and-drop image upload
#7003
Closed
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
github-actions
bot
added
tests
server
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -224,11 +250,11 @@ | |||
| public String copyExistingFileToTarget(String oldFilePath, String targetFolder, Long entityId) { | |||
| if (oldFilePath != null && !oldFilePath.contains("files/temp")) { | |||
| try { | |||
| Path source = Path.of(actualPathForPublicPath(oldFilePath)); | |||
| Path source = Path.of(actualPathForPublicPathOrThrow(oldFilePath)); | |||
Check failure
Code scanning / CodeQL
Uncontrolled data used in path expression
| // Need to copy the file and get a new path, otherwise two different questions would share the same image and would cause problems in case one was deleted | ||
| if (dndQuestion.getBackgroundFilePath() != null) { | ||
| String actualPath = fileService.actualPathForPublicPath(dndQuestion.getBackgroundFilePath()); | ||
| if (actualPath != null && Files.exists(Path.of(actualPath))) { |
Check failure
Code scanning / CodeQL
Uncontrolled data used in path expression
| continue; | ||
| } | ||
| String actualPath = fileService.actualPathForPublicPath(dragItem.getPictureFilePath()); | ||
| if (actualPath != null && Files.exists(Path.of(actualPath))) { |
Check failure
Code scanning / CodeQL
Uncontrolled data used in path expression
|
|
||
| // We need to ensure that we can access the store file and the stored file is the same as was passed to us in the request | ||
| final var storedFileHash = DigestUtils.md5Hex(Files.newInputStream(Path.of(savePath))); | ||
| final var storedFileHash = DigestUtils.md5Hex(Files.newInputStream(Path.of(newLocalPath))); |
Check failure
Code scanning / CodeQL
Uncontrolled data used in path expression
julian-christl
force-pushed
the
feature/reimplement-quiz-image-upload-2
branch
from
17318e8
to
179e5d0
Compare
julian-christl
force-pushed
the
feature/reimplement-quiz-image-upload-2
branch
from
179e5d0
to
e22ec06
Compare
|
Closed in favour of #7259 to recreate all build plans after inactivity |
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.
Checklist
General
Server
Client
Motivation and Context
Follow-up of #5733 and #5427 to replace the file upload before entity persistence with a multipart file and entity upload.
Description
The changes only affect the drag-and-drop section of the quizzes. But because the quiz editor allows creating all different types of quiz questions, I had to make the component saving the entity to retrieve the files from potential drag-and-drop question children and upload them together with the files.
It affects the Creation, Update, Re-evaluation and Import of quiz exercises. Additionally, it also affects the creation of drag-and-drop mode quizzes. However, those use the same creation endpoint.
I excluded one cypress tests that blocks this PR because it only fails on CI. It works locally and manual tests confirm that the functionality works. We try debugging and fixing this test in #6631 not further to block this PR.
Steps for Testing
We need to fully test the quiz functionalities, including:
During all of these five checks, it makes sense to work
Always check if the quiz gets rendered as expected.
Exam Mode Testing
Most of the changes are unrelated to the exam mode. I do not think testing is necessary to test the exam mode as extensively. However, it makes sense to just test the normal quiz exam workflow (creation and conduction) to be sure.
The only change that does require testing here is the import functionality of an existing exercise.
Review Progress
Code Review
Manual Tests
Exam Mode Tests
Test Coverage
Screenshots
Upload background before (before changes):
Upload Background before (after changes):
Upload background after (before changes):
Upload background after (after changes):
Upload picture drag item after (before changes):
Upload picture drag item after (after changes):