-
Notifications
You must be signed in to change notification settings - Fork 287
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Quiz exercises
: Simplify drag-and-drop image upload
#6456
Conversation
There hasn't been any activity on this pull request recently. Therefore, this pull request has been automatically marked as stale and will be closed if no further activity occurs within seven days. Thank you for your contributions. |
ea45b65
to
9b02255
Compare
9b02255
to
88a1276
Compare
285f5ab
to
57c682b
Compare
Codecov Report
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. Additional details and impacted files@@ Coverage Diff @@
## develop #6456 +/- ##
=============================================
- Coverage 84.96% 80.42% -4.54%
- Complexity 13912 13952 +40
=============================================
Files 1156 2448 +1292
Lines 44886 93506 +48620
Branches 4623 13137 +8514
=============================================
+ Hits 38137 75203 +37066
- Misses 4225 10055 +5830
- Partials 2524 8248 +5724
... and 1281 files with indirect coverage changes
Continue to review full report in Codecov by Sentry.
|
f7e4bcb
to
54eae14
Compare
54eae14
to
23758aa
Compare
23758aa
to
b151674
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Retested on TS1,
both normal quiz and exam mode seems to be working as expected with imports.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code looks good to me
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Retested on ts4. Everything still seems to work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reapprove
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re approved!
The last changes do not change the behavior previously tested.
Quiz exercises
: Reimplement drag and drop image uploadDevelopment
: Reimplement drag-and-drop image upload
Development
: Reimplement drag-and-drop image uploadQuiz exercises
: Reimplement drag-and-drop image upload
Quiz exercises
: Reimplement drag-and-drop image uploadQuiz exercises
: Simplify drag-and-drop image upload
This reverts commit d8b419a. # Conflicts: # src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseIntegrationTest.java
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):
![1409d1ba0c797661134ab989845ec831](https://user-images.githubusercontent.com/64264938/236194771-7ce122f5-3992-4980-8709-11cbebadafd9.png)
![e050fc2202937de46c2976423242c873](https://private-user-images.githubusercontent.com/64264938/241323968-ae217fe2-4f89-4c77-b77a-c486eb482453.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjU5OTY2ODIsIm5iZiI6MTcyNTk5NjM4MiwicGF0aCI6Ii82NDI2NDkzOC8yNDEzMjM5NjgtYWUyMTdmZTItNGY4OS00Yzc3LWI3N2EtYzQ4NmViNDgyNDUzLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA5MTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwOTEwVDE5MjYyMlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTdlNDM0MGJlOTk3Mjc5ZjkzNDhkYzcxYjRkNDg1ZTFiZDMxZTgyNTA1MDgxNjNhZmIwNTkzNzFmYjVjMjU1N2ImWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.5bRHJxNimXojU9irXGnC2fRmmYIIb1KrUlD3r642L5g)
Upload Background before (after changes):
Upload background after (before changes):
![80251aeeb77554f93832507fce51ee06](https://user-images.githubusercontent.com/64264938/236194731-ef4a63fb-fde5-4215-9f9b-87f1f1e65aef.png)
![3557ddaac548194325b3defb284e7f34](https://private-user-images.githubusercontent.com/64264938/241324115-0f2bd869-2d43-44d5-9f07-53e16cca872c.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjU5OTY2ODIsIm5iZiI6MTcyNTk5NjM4MiwicGF0aCI6Ii82NDI2NDkzOC8yNDEzMjQxMTUtMGYyYmQ4NjktMmQ0My00NGQ1LTlmMDctNTNlMTZjY2E4NzJjLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA5MTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwOTEwVDE5MjYyMlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWJkNjBlZTI5MjBjY2I5OGRiNmE2YzBhOWEyMGU3YzllNWYzYzJmNTA1M2IyZTM3M2YzZjhhOTZkOWQzMWUwNDEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.MkHOtmeFrYxD05jHeLZUOIqzP5QSSg6O47HYCMMMUuQ)
Upload background after (after changes):
Upload picture drag item after (before changes):
![593948ae5992864d34e4832ef35d9341](https://user-images.githubusercontent.com/64264938/236194715-870e6a98-bb12-4faf-b407-fb28275ed08c.png)
![f7deccf1b245d6010fb76aa3a1abbff3](https://private-user-images.githubusercontent.com/64264938/241324219-b9c6b1be-164e-4e0a-bc66-a4a3c3602527.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjU5OTY2ODIsIm5iZiI6MTcyNTk5NjM4MiwicGF0aCI6Ii82NDI2NDkzOC8yNDEzMjQyMTktYjljNmIxYmUtMTY0ZS00ZTBhLWJjNjYtYTRhM2MzNjAyNTI3LnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDA5MTAlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwOTEwVDE5MjYyMlomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWIwYTZlZTE2MGJmOTYxYmY2M2IyN2U3MDAxMzNkZjY3NWZhNjk4NmZkYTBkMGE3YTFmMzhkM2NmOWFmNGEzZTEmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.I2KblpQcDemckHT59SHmnSgr7zcJDAS96_B6nt_x_qs)
Upload picture drag item after (after changes):