Skip to content

Programming exercises: Improve integration of Monaco code editor and Athena Preliminary Feedback #10442

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

Open
wants to merge 61 commits into
base: feature/programming-exercises/choose-preliminary-feedback-model
Choose a base branch
from

Conversation

dmytropolityka
Copy link
Contributor

@dmytropolityka dmytropolityka commented Mar 5, 2025

Test only on ts3.

Checklist

General

Client

  • Important: I implemented the changes with a very good performance, prevented too many (unnecessary) REST calls and made sure the UI is responsive, even with large data (e.g. using paging).
  • I strictly followed the client coding and design guidelines.
  • Following the theming guidelines, I specified colors only in the theming variable files and checked that the changes look consistent in both the light and the dark theme.
  • I added multiple integration tests (Jest) related to the features (with a high test coverage), while following the test guidelines.
  • I documented the TypeScript code using JSDoc style.
  • I added multiple screenshots/screencasts of my UI changes.
  • I translated all newly inserted strings into English and German.

Motivation and Context

This PR addresses the need for better feedback handling in the code editor for programming exercises. It improves the feedback refresh mechanism and introduces a feature to reopen closed feedback directly from the file tree. These changes enhance usability and provide instructors and students with a more streamlined feedback experience.

Description

This PR introduces enhancements to the feedback management system in the programming exercise code editor. It focuses on improving the user experience when working with feedback items by implementing a feedback refresh mechanism and adding a "Reopen Feedback" button in the file tree. The changes aim to provide a more intuitive and seamless workflow for managing feedback, particularly during active programming assignments.

Steps for Testing

Prerequisites
1 Instructor
1 Student

A programming exercise with feedback enabled.
Testing Feedback Updates in the Programming Editor

  1. Log in to Artemis.
  2. Navigate to the programming exercise [link to exercise].
  3. Open the code editor for the exercise.
  4. Submit a change to the repository.
  5. Request feedback.

Verify that:

  1. Feedback updates are reflected in real-time in the code editor.
  2. The correct number of feedback badges appears in the file tree next to the relevant files.
  3. Close one or more feedback items.
  4. Use the "Reopen Feedback" button in the file tree to restore the closed feedback.
  5. Confirm that the feedback is restored in the code editor and matches the count indicated in the file tree.

Testing in Exam Mode

  1. Create or navigate to an exam with a programming exercise.
  2. Participate as a student.
    Verify that:
  3. The "Reopen Feedback" button and other related features are not accessible in exam mode.

Testserver States

Note

These badges show the state of the test servers.
Green = Currently available, Red = Currently locked
Click on the badges to get to the test servers.







Review Progress

Performance Review

  • I (as a reviewer) confirm that the client changes (in particular related to REST calls and UI responsiveness) are implemented with a very good performance even for very large courses with more than 2000 students.
  • I (as a reviewer) confirm that the server changes (in particular related to database calls) are implemented with a very good performance even for very large courses with more than 2000 students.

Code Review

  • Code Review 1
  • Code Review 2

Manual Tests

  • Test 1
  • Test 2

Exam Mode Test

  • Test 1
  • Test 2

Performance Tests

  • Test 1
  • Test 2

Screenshots

image
image

…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor

# Conflicts:
#	src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseCodeReviewFeedbackService.java
#	src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html
#	src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts
#	src/main/webapp/app/exercises/shared/result/updating-result.component.ts
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…g-exercises/athena-feedback-in-code-editor

# Conflicts:
#	src/main/webapp/app/exercises/modeling/manage/modeling-exercise.module.ts
#	src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-inline-feedback.component.ts
#	src/main/webapp/app/exercises/programming/shared/code-editor/container/code-editor-container.component.ts
#	src/main/webapp/app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser-node.component.ts
#	src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.module.ts
#	src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
#	src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.module.ts
#	src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
#	src/main/webapp/i18n/de/exercise.json
#	src/test/javascript/spec/component/code-editor/code-editor-file-browser.component.spec.ts
#	src/test/javascript/spec/component/exercises/shared/feedback/feedback-suggestion-option.component.spec.ts
#	src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts
#	src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
#	src/test/javascript/spec/component/overview/exercise-details/request-feedback-button/request-feedback-button.component.spec.ts
#	src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-inline-feedback.component.spec.ts
#	src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
#	src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts
#	src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor

# Conflicts:
#	src/main/webapp/app/exercises/shared/feedback-suggestion/exercise-feedback-suggestion-options.component.ts
#	src/main/webapp/app/exercises/shared/preliminary-feedback/exercise-preliminary-feedback-options.component.ts
#	src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
#	src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
@github-project-automation github-project-automation bot moved this to Work In Progress in Artemis Development Mar 5, 2025
@github-actions github-actions bot added tests server Pull requests that update Java code. (Added Automatically!) client Pull requests that update TypeScript code. (Added Automatically!) programming Pull requests that affect the corresponding module labels Mar 5, 2025
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
@dmytropolityka dmytropolityka changed the title Feature/programming exercises/athena feedback in code editor Programming exercises: Improve integration of Monaco code editor and Athena Preliminary Feedback Mar 5, 2025
@helios-aet helios-aet bot temporarily deployed to artemis-test3.artemis.cit.tum.de March 5, 2025 12:34 Inactive
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
Copy link

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.

…hena-feedback-in-code-editor' into feature/programming-exercises/athena-feedback-in-code-editor
@dmytropolityka dmytropolityka requested review from a team and krusche as code owners April 4, 2025 17:16
@github-actions github-actions bot added the assessment Pull requests that affect the corresponding module label Apr 4, 2025
dmytropolityka and others added 5 commits April 4, 2025 19:19
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
…hena-feedback-in-code-editor' into feature/programming-exercises/athena-feedback-in-code-editor
…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
Copy link

github-actions bot commented Apr 4, 2025

End-to-End (E2E) Test Results Summary

TestsPassed ☑️Skipped ⚠️Failed ❌️Time ⏱
End-to-End (E2E) Test Report201 ran197 passed3 skipped1 failed44m 20s 642ms
TestResultTime ⏱
End-to-End (E2E) Test Report
e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts
ts.Static code analysis tests › Configures SCA grading and makes a successful submission with SCA errors❌ failure1m 43s 580ms

Copy link

github-actions bot commented Apr 4, 2025

End-to-End (E2E) Test Results Summary

TestsPassed ☑️Skipped ⚠️Failed ❌️Time ⏱
End-to-End (E2E) Test Report201 ran197 passed3 skipped1 failed47m 9s 602ms
TestResultTime ⏱
End-to-End (E2E) Test Report
e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts
ts.Static code analysis tests › Configures SCA grading and makes a successful submission with SCA errors❌ failure1m 45s 878ms

…ck-model' into feature/programming-exercises/athena-feedback-in-code-editor
Copy link

github-actions bot commented Apr 4, 2025

End-to-End (E2E) Test Results Summary

TestsPassed ☑️Skipped ⚠️Failed ❌️Time ⏱
End-to-End (E2E) Test Report201 ran197 passed3 skipped1 failed46m 28s 875ms
TestResultTime ⏱
End-to-End (E2E) Test Report
e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts
ts.Static code analysis tests › Configures SCA grading and makes a successful submission with SCA errors❌ failure1m 44s 488ms

@github-actions github-actions bot removed the stale label Apr 5, 2025
…hena-feedback-in-code-editor' into feature/programming-exercises/athena-feedback-in-code-editor
Copy link

github-actions bot commented Apr 7, 2025

End-to-End (E2E) Test Results Summary

TestsPassed ☑️Skipped ⚠️Failed ❌️Time ⏱
End-to-End (E2E) Test Report201 ran197 passed3 skipped1 failed47m 30s 242ms
TestResultTime ⏱
End-to-End (E2E) Test Report
e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts
ts.Static code analysis tests › Configures SCA grading and makes a successful submission with SCA errors❌ failure1m 47s 82ms

Copy link

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.

@github-actions github-actions bot added the stale label Apr 17, 2025
Copy link
Member

@krusche krusche left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR has merge conflicts and for some reason deletes many files. I am pretty sure you made a mistake while resolving a merge conflict

@github-actions github-actions bot removed the stale label Apr 18, 2025
Copy link

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.

@github-actions github-actions bot added the stale label Apr 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assessment Pull requests that affect the corresponding module client Pull requests that update TypeScript code. (Added Automatically!) exercise Pull requests that affect the corresponding module programming Pull requests that affect the corresponding module server Pull requests that update Java code. (Added Automatically!) stale tests
Projects
Status: Ready For Review
Development

Successfully merging this pull request may close these issues.

8 participants