diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml index b2201cc36358..34ca1e28321c 100644 --- a/.github/issue-labeler.yml +++ b/.github/issue-labeler.yml @@ -10,6 +10,8 @@ assessment: athena: - athena + - ai feedback + - request (ai )?feedback - caseSensitive: false atlas: @@ -48,8 +50,6 @@ core: - authority - data export - migration - - user - - group - caseSensitive: false exam: @@ -79,20 +79,19 @@ iris: - iris - llm - chatbot - - ai + - \b(? if (result.resultType == TestResult.ResultType.FAILURE) { - String failedTest = "${descriptor.className}::${descriptor.name}" + var failedTest = "${descriptor.className}::${descriptor.name}" logger.debug("Adding " + failedTest + " to failedTests...") failedTests << [failedTest] } @@ -618,7 +634,7 @@ tasks.withType(Test).configureEach { } wrapper { - gradleVersion = "8.10.2" + gradleVersion = "8.11" } tasks.register("stage") { diff --git a/docker/playwright-E2E-tests-multi-node.yml b/docker/playwright-E2E-tests-multi-node.yml index bd8a0f52ff05..62b424023433 100644 --- a/docker/playwright-E2E-tests-multi-node.yml +++ b/docker/playwright-E2E-tests-multi-node.yml @@ -109,14 +109,6 @@ services: condition: service_healthy environment: PLAYWRIGHT_DB_TYPE: 'MySQL' - command: > - sh -c ' - cd /app/artemis/src/test/playwright && - chmod 777 /root && - npm ci && - npm run playwright:setup && - npm run playwright:test - ' networks: artemis: diff --git a/docker/playwright-E2E-tests-mysql-localci.yml b/docker/playwright-E2E-tests-mysql-localci.yml index aa501ae75192..cf677b01fec6 100644 --- a/docker/playwright-E2E-tests-mysql-localci.yml +++ b/docker/playwright-E2E-tests-mysql-localci.yml @@ -47,14 +47,6 @@ services: condition: service_healthy environment: PLAYWRIGHT_DB_TYPE: 'MySQL' - command: > - sh -c ' - cd /app/artemis/src/test/playwright && - chmod 777 /root && - npm ci && - npm run playwright:setup && - npm run playwright:test - ' networks: artemis: diff --git a/docker/playwright-E2E-tests-mysql.yml b/docker/playwright-E2E-tests-mysql.yml index c269ce9b206e..4b9f212ba2e2 100644 --- a/docker/playwright-E2E-tests-mysql.yml +++ b/docker/playwright-E2E-tests-mysql.yml @@ -44,14 +44,6 @@ services: condition: service_healthy environment: PLAYWRIGHT_DB_TYPE: 'MySQL' - command: > - sh -c ' - chmod 777 /root && - cd /app/artemis/src/test/playwright && - npm ci && - npm run playwright:setup && - npm run playwright:test - ' networks: artemis: diff --git a/docker/playwright-E2E-tests-postgres.yml b/docker/playwright-E2E-tests-postgres.yml index 92bde9b2cfe0..d1ca43a7bdcf 100644 --- a/docker/playwright-E2E-tests-postgres.yml +++ b/docker/playwright-E2E-tests-postgres.yml @@ -45,14 +45,6 @@ services: condition: service_healthy environment: PLAYWRIGHT_DB_TYPE: 'Postgres' - command: > - sh -c ' - chmod 777 /root && - cd /app/artemis/src/test/playwright && - npm ci && - npm run playwright:setup && - npm run playwright:test - ' networks: artemis: diff --git a/docker/playwright.yml b/docker/playwright.yml index e6ac4bb3748e..a27ba2f9d589 100644 --- a/docker/playwright.yml +++ b/docker/playwright.yml @@ -22,7 +22,17 @@ services: TEST_TIMEOUT_SECONDS: '${bamboo_test_timeout_seconds}' TEST_RETRIES: '${bamboo_test_retries}' TEST_WORKER_PROCESSES: '${bamboo_test_worker_processes}' - command: sh -c "cd /app/artemis/src/test/playwright && chmod 777 /root && npm ci && npm run playwright:test" + SLOW_TEST_TIMEOUT_SECONDS: '${bamboo_slow_test_timeout_seconds}' + FAST_TEST_TIMEOUT_SECONDS: '${bamboo_fast_test_timeout_seconds}' + command: > + sh -c ' + cd /app/artemis/src/test/playwright && + chmod 777 /root && + npm ci && + npm run playwright:setup && + npm run playwright:test; + rm ./test-reports/results-fast.xml ./test-reports/results-slow.xml + ' volumes: - ..:/app/artemis networks: diff --git a/docs/admin/cleanup-service.rst b/docs/admin/cleanup-service.rst new file mode 100644 index 000000000000..38cb74ad98f3 --- /dev/null +++ b/docs/admin/cleanup-service.rst @@ -0,0 +1,47 @@ +.. _cleanup: + +Cleanup Service +=============== + +Artemis provides a feature to delete data from older courses. + +.. _cleanup-menu: + +.. figure:: cleanup/cleanup-menu.png + :align: center + :alt: Cleanup view + +As shown in the image, administrators can delete the following data types: + +* Plagiarism results with an undecided outcome +* Orphaned data +* Non-rated results from older courses +* Rated results from older courses + +Since orphaned data has no connections to other data by nature, it is deleted without considering specific dates. +For other types, administrators can track the related exercises and courses. +When a cleanup operation is performed with specified "from" and "to" dates, all data associated with that type and related to courses that started after the "from" date and ended before the "to" date is deleted. + +Data Deletion by Operation Type +------------------------------------------ + +1. **Orphaned Data**: + - Long Feedback Text with feedback that has no results + - Text Block with feedback that has no results + - Feedback records without results + - Student and team scores where either a student or a team is specified + - Long Feedback Text where both participation and submission are missing + - Text Block where the referenced feedback has no associated participation or submission + - Feedback with no associated participation or submission + - All Ratings where the related result has no associated participation or submission + - Results without associated participation or submission + +2. **Plagiarism Results with an Undecided Outcome**: + - All plagiarism comparisons related to courses within the specified dates and marked as undecided. + +3. **Rated and Non-rated Results**: + - Both types follow the same logic, except for the rating status of results (rated vs. non-rated). + - For each type, only the latest valid result within a participation is retained, while all others are deleted. + - Because direct result deletion is restricted due to data integrity reasons, Artemis first removes associated data for results scheduled for deletion, including Long Feedback Text, Text Block, Feedback, Student Score, and Team Score. + +Artemis also records the date of the last cleanup operation, as seen in the last column of the table shown in the image. diff --git a/docs/admin/cleanup/cleanup-menu.png b/docs/admin/cleanup/cleanup-menu.png new file mode 100644 index 000000000000..59b00b1dc503 Binary files /dev/null and b/docs/admin/cleanup/cleanup-menu.png differ diff --git a/docs/dev/cypress.rst b/docs/dev/cypress.rst deleted file mode 100644 index c68afc351ec1..000000000000 --- a/docs/dev/cypress.rst +++ /dev/null @@ -1,325 +0,0 @@ -E2E Testing based on Cypress -============================ - -**Background** - -The Cypress test suite contains system tests verifying the most important features of Artemis. -System tests test the whole system and therefore require a complete deployment of Artemis first. -In order to prevent as many faults (bugs) as possible from being introduced into the develop branch, -we want to execute the Cypress test suite whenever new commits are pushed to a Git branch -(just like the unit and integration test suites). - -To accomplish this we need to be able to dynamically deploy multiple different instances of Artemis at the same time. -An ideal setup would be to deploy the whole Artemis system using Kubernetes. -However, this setup is too complex at the moment. -The main reason for the complexity is that it is very hard to automatically setup Docker containers for -the external services (e.g. Gitlab, Jenkins) and connect them directly with Artemis. - -Therefore, the current setup only dynamically deploys the Artemis server and configures it to connect to -the prelive system, which is already properly setup in the university data center. - - -Local Cypress Setup -------------------- -Sometimes developers need to set up Cypress locally, in order to debug failing E2E tests or write new tests. -Follow these steps to create your local cypress instance: - -1. Install dependencies - - First head into the cypress folder by using ``cd src/test/cypress``. Now run ``npm install``. - -2. Customize Cypress settings - - To connect cypress to our local Artemis instance, we need to adjust some configurations. - First we need to set the URL or IP of the Artemis instance in the ``cypress.config.ts`` file. - Adjust the ``baseUrl`` setting to fit your setup (e.g. ``baseUrl: 'http://localhost:9000',``) - -3. Adjust user settings - - We also need to adjust the user setting, which will determine the usernames and passwords, that cypress - will use. These settings are located within the ``cypress.env.json`` file. If you use the Atlassian setup, - the file should typically look like this: - - .. code-block:: json - - { - "username": "artemis_test_user_USERID", - "password": "artemis_test_user_USERID", - "adminUsername": "artemis_admin", - "adminPassword": "artemis_admin", - "allowGroupCustomization": true, - "studentGroupName": "students", - "tutorGroupName": "tutors", - "editorGroupName": "editors", - "instructorGroupName": "instructors", - "createUsers": false - } - - The ``USERID`` part will be automatically replaced by different user ids. These are set within the ``support/users.ts`` file. - By default the users 100-106 will be used by Cypress, if these users do not exist on your instance yet set ``createUsers`` to ``true``. - -4. Open Cypress browser - - If you want to use a different browser than chrome, you can set this within the ``package.json`` file - within the cypress subfolder like this ``"cypress:open": "cypress open --browser=edge",``. - To now run the test suites selectively instead of in full, we need to open the cypress - browser, which is by default chrome by running the following command ``npm run cypress:open``. - Now select ``E2E Testing``, followed by ``Start E2E testing in ...``. A new browser window - should open, which should look like this: - - .. figure:: cypress/cypress-open-screenshot.png - :align: center - :alt: Cypress cypress-open-screenshot - - You can now click on any test suite and it should run. - -.. warning:: - **IMPORTANT**: If you run the E2E tests for the first time, always run the ``ImportUsers.ts`` tests first, - since it will create the necessary users. - - -Debug using Sorry Cypress -------------------------- - -Since the E2E tests are sometimes hard to debug, we provide a dashboard, that allows to inspect the -CI run and even watch a video of the UI interaction with Artemis in that run. - -It's based on Sorry Cypress a open source and selfhostable alternative to the paid cypress cloud. - -The dashboard itself can be access here: https://sorry-cypress.ase.cit.tum.de/ - -To access it, you need these basic auth credentials (sorry cypress itself does not provide an auth -system, so we are forced to use nginx basic auth here). You can find these credentials on our confluence page: -https://confluence.ase.in.tum.de/display/ArTEMiS/Sorry+Cypress+Dashboard - -After that you will see the initial dashboard. - -You first have to select a project in the left sidebar (mysql or postgresql): - - .. figure:: cypress/sorry-cypress-dashboard.png - :align: center - :alt: Sorry Cypress dashboard - -Now you get a list of the last runs. In the top right you can enter your branch name to filter the runs. - - .. figure:: cypress/sorry-cypress-runs.png - :align: center - :alt: Sorry Cypress last runs - -The name of the run consists of the branch name followed by the run number. The last part is MySQL or -PostgreSQL depending on the run environment. If you are in the MySQL project, you will of course only see the MySQL runs. - -If you now click on the run, you can see detailed information about the test suites (corresponding -to components within Artemis). For each suite there is information about the run time, the successful/failed/flaky/skipped/ignored tests: - - .. figure:: cypress/sorry-cypress-run.png - :align: center - :alt: Sorry Cypress single run - -If you want to further debug one test suite, just click on it. - - .. figure:: cypress/sorry-cypress-test.png - :align: center - :alt: Sorry Cypress single test - -Here you can see the single tests on the left and a video on the right. This is a screen capture of -the actual run and can tremendously help debug failing E2E tests. - -Sometimes the video can be a little bit to fast to debug easily. Just download the video on your -computer and play it with a video player, that allows you to slow the video down. - -.. note:: - For maintenance reasons videos are deleted after 14 days. So if you have a failing test, debug - it before this period to get access to the video. - - -Best practice when writing new E2E tests ----------------------------------------- - -**Understanding the System and Requirements** - -Before writing tests, a deep understanding of the system and its requirements is crucial. -This understanding guides determining what needs testing and what defines a successful test. -The best way to understand is to consolidate the original system`s developer or a person actively working on this -component. - -**Identify Main Test Scenarios** - -Identify what are the main ways the component is supposed to be used. Try -the action with all involved user roles and test as many different inputs as -feasible. - -**Identify Edge Test Scenarios** - -Next to the main test scenarios, there are also edge case scenarios. These -tests include inputs/actions that are not supposed to be performed (e.g. enter -a too-long input into a field) and test the error-handling capabilities of the -platform. - -**Write Tests as Development Progresses** - -Rather than leaving testing until the end, write tests alongside each piece of -functionality. This approach ensures the code remains testable and makes -identifying and fixing issues as they arise easier. - -**Keep Tests Focused** - -Keep each test focused on one specific aspect of the code. If a test fails, it is -easier to identify the issue when it does not check multiple functionalities at -the same time. - -**Make Tests Independent** - -Tests should operate independently from each other and external factors like -the current date or time. Each test should be isolated. Use API calls for unrelated tasks, such as creating a -course, and UI interaction for the appropriate testing steps. This also involves -setting up a clean environment for every test suite. - -**Use Descriptive Test Names** - -Ensure each test name clearly describes what the test does. This strategy -makes the test suite easier to understand and quickly identifies which test -has failed. - -**Use Similar Test Setups** - -Avoid using different setups for each test suit. For example, always check -for the same HTTP response when deleting a course. - -**Do Not Ignore Failing Tests** - -If a test consistently fails, pay attention to it. Investigate as soon as possible -and fx the issue, or update the test if the requirements have changed. - -**Regularly Review and Refactor Your Tests** - -Tests, like code, can accumulate technical debt. Regular reviews for duplication, -unnecessary complexity, and other issues help maintain tests and enhance reliability. - -**Use HTML IDs instead of classes or other attributes** - -When searching for a single element within the DOM of an HTML page, try to use ID selectors as much as possible. -They are more reliable since there can only be one element with this ID on one single page according to the HTML - - -Artemis Deployment on Bamboo Build Agent ----------------------------------------- -Every execution of the Cypress test suite requires its own deployment of Artemis. -The easiest way to accomplish this is to deploy Artemis locally on the build agent, which executes the Cypress tests. -Using ``docker compose`` we can start a MySQL database and the Artemis server locally on the build agent and -connect it to the prelive system in the university data center. - -.. figure:: cypress/cypress_bamboo_deployment_diagram.svg - :align: center - :alt: Artemis Deployment on Bamboo Build Agent for Cypress - - Artemis Deployment on Bamboo Build Agent for Cypress - -In total there are three Docker containers started in the Bamboo build agent: - -1. MySQL - - This container starts a MySQL database and exposes it on port 3306. - The container automatically creates a new database 'Artemis' and configures it - with the recommended settings for Artemis. - The Cypress setup reuses the already existing - `MySQL docker image `__ - from the standard Artemis Docker setup. - -2. Artemis - - The Docker image for the Artemis container is created from the already existing - `Dockerfile `__. - When the Bamboo build of the Cypress test suite starts, it retrieves the Artemis executable (.war file) - from the `Artemis build plan `_. - Upon creation of the Artemis Docker image the executable is copied into the image together with configuration files - for the Artemis server. - - The main configuration of the Artemis server are contained in the - `Cypress environment configuration files `__. - However, those files do not contain any security relevant information. - Security relevant settings like the credentials to the Jira admin account in the prelive system are instead passed to - the Docker container via environment variables. - This information is accessible to the Bamboo build agent via - `Bamboo plan variables `__. - - The Artemis container is also configured to - `depend on `__ - the MySQL container and uses - `health checks `__ - to wait until the MySQL container is up and running. - -3. Cypress - - Cypress offers a `variety of docker images `__ - to execute Cypress tests. - We use an image which has the Cypress operating system dependencies and a Chrome browser installed. - However, Cypress itself is not installed in - `these images `__. - This is convenient for us because the image is smaller and the Artemis Cypress project requires - additional dependencies to fully function. - Therefore, the Artemis Cypress Docker container is configured to install all dependencies - (using :code:`npm ci`) upon start. This will also install Cypress itself. - Afterwards the Artemis Cypress test suite is executed. - - The necessary configuration for the Cypress test suite is also passed in via environment variables. - Furthermore, the Cypress container depends on the Artemis container and is only started - once Artemis has been fully booted. - -**Bamboo webhook** - -The Artemis instance deployed on the build agent is not publicly available to improve the security of this setup. -However, in order to get the build results for programming exercise submissions Artemis relies on a webhook from Bamboo -to send POST requests to Artemis. -To allow this, an extra rule has been added to the firewall allowing only the Bamboo instance in the prelive system -to connect to the Artemis instance in the build agent. - -**Timing** - -As mentioned above, we want the Cypress test suite to be executed whenever new commits are pushed to a Git branch. -This has been achieved by adding the -`Cypress Github build plan `__ -as a `child dependency `__ -to the `Artemis Build build plan `__. -The *Artemis Build* build plan is triggered whenever a new commit has been pushed to a branch. - -The Cypress build plan is only triggered after a successful build of the Artemis executable. -This does imply a delay (about 10 minutes on average) between the push of new commits and the execution -of the Cypress test suite, since the new Artemis executable first has to be built. - -**NOTE:** The Cypress test suite is only automatically executed for internal branches and pull requests -(requires access to this GitHub repository) **not** for external ones. -In case you need access rights, please contact the maintainer `Stephan Krusche `__. - -Artemis Deployment in Test Environment --------------------------------------- -There is another build plan on Bamboo which executes the Cypress test suite. -`This build plan `__ -deploys the latest Artemis executable of the develop branch on an already configured test environment (test server 3) -and executes the Cypress test suite against it. -This build plan is automatically executed every 8 hours and verifies that test server 3 is working properly. - -.. figure:: cypress/cypress_test_environment_deployment_diagram.svg - :align: center - :alt: Artemis Deployment on test environment for Cypress - - Artemis Deployment on test environment for Cypress - -The difference of this setup is that the Artemis server is deployed on a separate environment which already contains -the necessary configuration files for the Artemis server to connect to the prelive system. -The Docker image for the Cypress container should be exactly the same as the Cypress image used in -the *docker compose* file for the deployment on a Bamboo build agent. - -Maintenance ------------ -The Artemis Dockerfile as well as the MySQL image are already maintained because they are used in -other Artemis Docker setups. -Therefore, only Cypress and the Cypress Docker image require active maintenance. -Since the Cypress test suite simulates a real user, it makes sense to execute the test suite with -the latest Chrome browser. -The Cypress Docker image we use always has a specific Chrome version installed. -Therefore, the -`docker-compose file `__ -as well as the -`build plan configuration for the Cypress tests on test server 3 `__ -should be updated every month to make sure that the latest Cypress image for the Chrome browser is used. diff --git a/docs/dev/guidelines/client-design.rst b/docs/dev/guidelines/client-design.rst index 21f18733fb61..fd0aafc31b59 100644 --- a/docs/dev/guidelines/client-design.rst +++ b/docs/dev/guidelines/client-design.rst @@ -237,7 +237,7 @@ Example: .. code-block:: ts - this.themeService.applyThemeExplicitly(Theme.DARK); + this.themeService.applyThemePreference(Theme.DARK); diff --git a/docs/dev/setup/docker-compose.rst b/docs/dev/setup/docker-compose.rst index a655f44e6ab7..0ed185bab82f 100644 --- a/docs/dev/setup/docker-compose.rst +++ b/docs/dev/setup/docker-compose.rst @@ -21,7 +21,7 @@ Getting Started with Docker Compose Make sure that Docker Desktop has enough memory (~ 6GB). To adapt it, go to ``Settings -> Resources``. 2. Check that all local network ports used by Docker Compose are free (e.g. you haven't started a local MySQL server - when you would like to start a Docker Compose instance of mysql) + when you would like to start a Docker Compose instance of MySQL). 3. Run ``docker compose pull && docker compose up`` in the directory ``docker/`` 4. Open the Artemis instance in your browser at https://localhost 5. Run ``docker compose down`` in the directory ``docker/`` to stop and remove the docker containers @@ -62,13 +62,12 @@ Three example commands to run such setups: .. code:: bash - docker compose -f docker/atlassian.yml up docker compose -f docker/mysql.yml -f docker/gitlab-jenkins.yml up docker compose -f docker/artemis-dev-postgres.yml up .. tip:: There is also a single ``docker-compose.yml`` in the directory ``docker/`` which mirrors the setup of ``artemis-prod-mysql.yml``. - This should provide a quick way, without manual changes necessary, for new contributors to startup an Artemis instance. + This should provide a quick way, without manual changes necessary, for new contributors to start up an Artemis instance. If the documentation just mentions to run ``docker compose`` without a ``-f `` argument, it's assumed you are running the command from the ``docker/`` directory. @@ -82,7 +81,7 @@ is defined in the following files: * ``gitlab.yml``: **GitLab Service** * ``jenkins.yml``: **Jenkins Service** -For testing mails or SAML logins, you can append the following services to any setup with an artemis container: +For testing mails or SAML logins, you can append the following services to any setup with an Artemis container: * ``mailhog.yml``: **Mailhog Service** (email testing tool) * ``saml-test.yml``: **Saml-Test Service** (SAML Test Identity Provider for testing SAML features) @@ -145,7 +144,7 @@ Get a shell into the containers ``docker compose exec artemis-app bash`` or if the container is not yet running: ``docker compose run --rm artemis-app bash`` - mysql container: - ``docker compose exec mysql bash`` or directly into mysql ``docker compose exec mysql mysql`` + ``docker compose exec mysql bash`` or directly into MySQL ``docker compose exec mysql mysql`` Analog for other services. @@ -157,7 +156,7 @@ Other useful commands - Stop, remove containers and volumes: ``docker compose down -v`` - Remove Artemis-related volumes/state: ``docker volume rm artemis-data artemis-mysql-data`` - This is helpful in setups where you just want to delete the state of artemis + This is helpful in setups where you just want to delete the state of Artemis but not of Jenkins and GitLab for instance. - Stop a service: ``docker compose stop `` (restart via ``docker compose start ``) diff --git a/docs/dev/setup/jenkins-gitlab.rst b/docs/dev/setup/jenkins-gitlab.rst index 3adbbabac478..8f117cff3cca 100644 --- a/docs/dev/setup/jenkins-gitlab.rst +++ b/docs/dev/setup/jenkins-gitlab.rst @@ -890,7 +890,8 @@ and the corresponding Docker image can be found on .. code:: bash - docker compose -f docker/.yml up --build -d + docker compose -f docker/.yml build --no-cache + docker compose -f docker/.yml up -d 3. Build the new Docker image: diff --git a/docs/index.rst b/docs/index.rst index f4a7bc4cf449..0392e5286433 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -57,7 +57,6 @@ All these exercises are supposed to be run either live in the lecture with insta Guided Tour dev/testservers dev/docker - dev/cypress dev/playwright dev/open-source dev/local-moodle-setup-for-lti @@ -79,6 +78,7 @@ All these exercises are supposed to be run either live in the lecture with insta admin/knownIssues admin/benchmarking-tool admin/telemetry + admin/cleanup-service .. toctree:: diff --git a/docs/requirements.txt b/docs/requirements.txt index fdf26e7ee025..0edd5bbb03b7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,8 +1,9 @@ -Sphinx==7.4.7 -sphinx-rtd-theme==2.0.0 -sphinx-autobuild==2024.9.19 -sphinxcontrib-bibtex==2.6.3 +alabaster==1.0.0 +docutils==0.21.2 requests==2.32.3 -zipp==3.20.2 -docutils==0.20.1 +Sphinx==8.1.3 +sphinx-rtd-theme==3.0.2 +sphinx-autobuild==2024.10.3 +sphinxcontrib-bibtex==2.6.3 urllib3==2.2.3 +zipp==3.21.0 diff --git a/docs/user/exams/student/access_exam.png b/docs/user/exams/student/access_exam.png index 76a0dddd02f3..a3579e5fc874 100644 Binary files a/docs/user/exams/student/access_exam.png and b/docs/user/exams/student/access_exam.png differ diff --git a/docs/user/exams/student/buttons/exam_hand_in_early.png b/docs/user/exams/student/buttons/exam_hand_in_early.png index d443c4116554..266d30608fbf 100644 Binary files a/docs/user/exams/student/buttons/exam_hand_in_early.png and b/docs/user/exams/student/buttons/exam_hand_in_early.png differ diff --git a/docs/user/exams/student/buttons/save_exercise.png b/docs/user/exams/student/buttons/save_exercise.png new file mode 100644 index 000000000000..7e16a5f622b5 Binary files /dev/null and b/docs/user/exams/student/buttons/save_exercise.png differ diff --git a/docs/user/exams/student/buttons/upload.png b/docs/user/exams/student/buttons/upload.png new file mode 100644 index 000000000000..cbe7b44079f7 Binary files /dev/null and b/docs/user/exams/student/buttons/upload.png differ diff --git a/docs/user/exams/student/exam_bar.png b/docs/user/exams/student/exam_bar.png index d1a4728bcc57..02914123a784 100644 Binary files a/docs/user/exams/student/exam_bar.png and b/docs/user/exams/student/exam_bar.png differ diff --git a/docs/user/exams/student/exam_modeling_exercises.png b/docs/user/exams/student/exam_modeling_exercises.png index 037cb07283aa..8fdd0912935e 100644 Binary files a/docs/user/exams/student/exam_modeling_exercises.png and b/docs/user/exams/student/exam_modeling_exercises.png differ diff --git a/docs/user/exams/student/exam_navigation_sidebar.png b/docs/user/exams/student/exam_navigation_sidebar.png index e8455e426df5..f6a45add9523 100644 Binary files a/docs/user/exams/student/exam_navigation_sidebar.png and b/docs/user/exams/student/exam_navigation_sidebar.png differ diff --git a/docs/user/exams/student/exam_overview.png b/docs/user/exams/student/exam_overview.png index eab66ecf60a7..84a85532187c 100644 Binary files a/docs/user/exams/student/exam_overview.png and b/docs/user/exams/student/exam_overview.png differ diff --git a/docs/user/exams/student/exam_programming_exercises.png b/docs/user/exams/student/exam_programming_exercises.png index b2018403e57a..1956f4fd173d 100644 Binary files a/docs/user/exams/student/exam_programming_exercises.png and b/docs/user/exams/student/exam_programming_exercises.png differ diff --git a/docs/user/exams/student/exam_quiz_exercises.png b/docs/user/exams/student/exam_quiz_exercises.png index 32c8d3634610..0c4bed59d3f6 100644 Binary files a/docs/user/exams/student/exam_quiz_exercises.png and b/docs/user/exams/student/exam_quiz_exercises.png differ diff --git a/docs/user/exams/student/exam_text_exercises.png b/docs/user/exams/student/exam_text_exercises.png index f81591045eb6..d79126ed398f 100644 Binary files a/docs/user/exams/student/exam_text_exercises.png and b/docs/user/exams/student/exam_text_exercises.png differ diff --git a/docs/user/exams/students_guide.rst b/docs/user/exams/students_guide.rst index b38278b75d22..f56f5fa94894 100644 --- a/docs/user/exams/students_guide.rst +++ b/docs/user/exams/students_guide.rst @@ -105,6 +105,14 @@ Welcome Screen Welcome Screen, waiting for exam start +This video offers a detailed guide on accessing your exams: + +.. raw:: html + + + Exam Conduction ^^^^^^^^^^^^^^^ - Once the exam working time starts and you have confirmed your participation, the *Exercise Overview* screen will appear. This screen lists all exercises that are part of your exam with their respective amount of points, title and exercise type. The status column indicates the status of each exercise and whether you have a submission in them or not. @@ -132,6 +140,14 @@ Exam Conduction Exam Navigation Sidebar +- You have two options to save your changes for an exercise: + + 1. Click the |save_exercise| button to manually save and submit your changes. + 2. Select an exercise in the navigation sidebar (either the current one or a different exercise), which will automatically save and submit your changes. + + .. warning:: + The |save_exercise| button is only available for text, modeling, and quiz exercises. For file upload exercises, you need to manually click the |upload| button, and for programming exercises, you need to manually click the |submit| button to save and submit your changes. + - On the header, you will find the exam bar that includes the remaining time and the |exam_hand_in_early| button. If you click this button, you will be sent to the exam `End Screen`_. - The *time left* until the end of the exam is also shown next to the button. @@ -373,6 +389,14 @@ Summary Complaining about the Assessment of a Text Exercise +This video offers a detailed guide on participating in your exams: + +.. raw:: html + + + Example Solutions ^^^^^^^^^^^^^^^^^ - If the instructor sets the example solution publication date of the exam, the solutions will be available after that date. @@ -470,3 +494,5 @@ Grades .. |exam_no_results_found| image:: student/buttons/exam_no_results_found.png .. |exam_hand_in_early| image:: student/buttons/exam_hand_in_early.png .. |saved_exercises| image:: student/buttons/saved_exercises.png +.. |upload| image:: student/buttons/upload.png +.. |save_exercise| image:: student/buttons/save_exercise.png diff --git a/gradle.properties b/gradle.properties index 8e95ead2b4ff..b234044bcc8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ npm_version=10.8.0 # Dependency versions jhipster_dependencies_version=8.7.2 -spring_boot_version=3.3.5 -spring_security_version=6.3.4 +spring_boot_version=3.3.6 +spring_security_version=6.3.5 # TODO: upgrading to 6.6.0 currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code hibernate_version=6.4.10.Final # TODO: can we update to 5.x? @@ -25,18 +25,20 @@ jplag_version=5.1.0 # NOTE: we do not need to use the latest version 9.x here as long as Stanford CoreNLP does not reference it lucene_version=8.11.4 slf4j_version=2.0.16 -sentry_version=7.16.0 +sentry_version=7.18.0 liquibase_version=4.30.0 docker_java_version=3.4.0 logback_version=1.5.12 java_parser_version=3.26.2 byte_buddy_version=1.15.10 +netty_version=4.1.115.Final # testing # make sure both versions are compatible -junit_version=5.11.0 +junit_version=5.11.3 junit_platform_version=1.11.3 mockito_version=5.14.2 +testcontainer_version=1.20.4 # gradle plugin version diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8b91..e2847c820046 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/jest.config.js b/jest.config.js index 8fbf56f12e91..96eeb24f0890 100644 --- a/jest.config.js +++ b/jest.config.js @@ -105,10 +105,10 @@ module.exports = { coverageThreshold: { global: { // TODO: in the future, the following values should increase to at least 90% - statements: 87.55, - branches: 73.68, - functions: 82.12, - lines: 87.61, + statements: 87.66, + branches: 73.79, + functions: 82.17, + lines: 87.72, }, }, coverageReporters: ['clover', 'json', 'lcov', 'text-summary'], diff --git a/linting.sh b/linting.sh index 1bb19ae388e6..1fff1374d5be 100755 --- a/linting.sh +++ b/linting.sh @@ -1,16 +1,3 @@ #!/bin/sh -join_by () { - local IFS="$1"; - shift; - echo "$*"; -} -FILES=$(join_by "," "$@") - -if [[ "$OSTYPE" == "msys" ]]; then - # replace backslashes with double backslashes in Windows file paths when - # using MinGW (msys = lightweight shell and GNU utilities compiled for Windows (part of MinGW) - FILES=$(echo $FILES | sed 's/\\/\\\\/g') -fi - -./gradlew spotlessApply -PspotlessFiles="${FILES}" +./gradlew spotlessApply -PratchetFrom='develop' diff --git a/package-lock.json b/package-lock.json index 017c505d0dbd..eec4beaec47e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,41 +1,41 @@ { "name": "artemis", - "version": "7.7.0", + "version": "7.7.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "artemis", - "version": "7.7.0", + "version": "7.7.2", "hasInstallScript": true, "license": "MIT", "dependencies": { - "@angular/animations": "18.2.11", - "@angular/cdk": "18.2.12", - "@angular/common": "18.2.11", - "@angular/compiler": "18.2.11", - "@angular/core": "18.2.11", - "@angular/forms": "18.2.11", - "@angular/localize": "18.2.11", - "@angular/material": "18.2.12", - "@angular/platform-browser": "18.2.11", - "@angular/platform-browser-dynamic": "18.2.11", - "@angular/router": "18.2.11", - "@angular/service-worker": "18.2.11", + "@angular/animations": "18.2.12", + "@angular/cdk": "18.2.13", + "@angular/common": "18.2.12", + "@angular/compiler": "18.2.12", + "@angular/core": "18.2.12", + "@angular/forms": "18.2.12", + "@angular/localize": "18.2.12", + "@angular/material": "18.2.13", + "@angular/platform-browser": "18.2.12", + "@angular/platform-browser-dynamic": "18.2.12", + "@angular/router": "18.2.12", + "@angular/service-worker": "18.2.12", "@ctrl/ngx-emoji-mart": "9.2.0", "@danielmoncada/angular-datetime-picker": "18.1.0", "@fingerprintjs/fingerprintjs": "4.5.1", "@fortawesome/angular-fontawesome": "0.15.0", - "@fortawesome/fontawesome-svg-core": "6.6.0", - "@fortawesome/free-regular-svg-icons": "6.6.0", - "@fortawesome/free-solid-svg-icons": "6.6.0", + "@fortawesome/fontawesome-svg-core": "6.7.1", + "@fortawesome/free-regular-svg-icons": "6.7.1", + "@fortawesome/free-solid-svg-icons": "6.7.1", "@ls1intum/apollon": "3.3.15", "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "16.0.3", "@ngx-translate/http-loader": "16.0.0", - "@sentry/angular": "8.37.1", + "@sentry/angular": "8.39.0", "@siemens/ngx-datatable": "22.4.1", - "@swimlane/ngx-charts": "20.5.0", + "@swimlane/ngx-charts": "21.0.0", "@swimlane/ngx-graph": "8.4.0", "@vscode/codicons": "0.0.36", "@vscode/markdown-it-katex": "1.1.0", @@ -45,7 +45,7 @@ "crypto-js": "4.2.0", "dayjs": "1.11.13", "diff-match-patch-typescript": "1.1.0", - "dompurify": "3.1.7", + "dompurify": "3.2.1", "emoji-js": "3.8.0", "export-to-csv": "1.4.0", "fast-json-patch": "3.1.1", @@ -64,8 +64,9 @@ "ngx-infinite-scroll": "18.0.0", "ngx-webstorage": "18.0.0", "papaparse": "5.4.1", + "pdf-lib": "1.17.1", "pdfjs-dist": "4.8.69", - "posthog-js": "1.181.0", + "posthog-js": "1.187.2", "rxjs": "7.8.1", "simple-statistics": "7.8.7", "smoothscroll-polyfill": "0.4.4", @@ -74,23 +75,23 @@ "ts-cacheable": "1.0.10", "tslib": "2.8.1", "turndown": "7.2.0", - "uuid": "11.0.2", + "uuid": "11.0.3", "webstomp-client": "1.2.6", "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz", "zone.js": "0.14.10" }, "devDependencies": { "@angular-builders/jest": "18.0.0", - "@angular-devkit/build-angular": "18.2.11", - "@angular-eslint/builder": "18.4.0", - "@angular-eslint/eslint-plugin": "18.4.0", - "@angular-eslint/eslint-plugin-template": "18.4.0", - "@angular-eslint/schematics": "18.4.0", - "@angular-eslint/template-parser": "18.4.0", - "@angular/cli": "18.2.11", - "@angular/compiler-cli": "18.2.11", - "@angular/language-service": "18.2.11", - "@sentry/types": "8.37.1", + "@angular-devkit/build-angular": "18.2.12", + "@angular-eslint/builder": "18.4.1", + "@angular-eslint/eslint-plugin": "18.4.1", + "@angular-eslint/eslint-plugin-template": "18.4.1", + "@angular-eslint/schematics": "18.4.1", + "@angular-eslint/template-parser": "18.4.1", + "@angular/cli": "18.2.12", + "@angular/compiler-cli": "18.2.12", + "@angular/language-service": "18.2.12", + "@sentry/types": "8.39.0", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", @@ -98,35 +99,35 @@ "@types/jest": "29.5.14", "@types/lodash-es": "4.17.12", "@types/markdown-it": "14.1.2", - "@types/node": "22.9.0", + "@types/node": "22.9.1", "@types/papaparse": "5.3.15", "@types/smoothscroll-polyfill": "0.3.4", "@types/sockjs-client": "1.5.4", "@types/turndown": "5.0.5", "@types/uuid": "10.0.0", - "@typescript-eslint/eslint-plugin": "8.13.0", - "@typescript-eslint/parser": "8.13.0", - "eslint": "9.14.0", + "@typescript-eslint/eslint-plugin": "8.15.0", + "@typescript-eslint/parser": "8.15.0", + "eslint": "9.15.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-deprecation": "3.0.0", "eslint-plugin-jest": "28.9.0", "eslint-plugin-jest-extended": "2.4.0", "eslint-plugin-prettier": "5.2.1", "folder-hash": "4.0.4", - "husky": "9.1.6", + "husky": "9.1.7", "jest": "29.7.0", "jest-canvas-mock": "2.5.2", "jest-date-mock": "1.0.10", "jest-extended": "4.0.2", "jest-fail-on-console": "3.3.1", "jest-junit": "16.0.0", - "jest-preset-angular": "14.2.4", + "jest-preset-angular": "14.3.2", "lint-staged": "15.2.10", "ng-mocks": "14.13.1", "ngxtension": "4.1.0", "prettier": "3.3.3", "rimraf": "6.0.1", - "sass": "1.80.6", + "sass": "1.81.0", "ts-jest": "29.2.5", "typescript": "5.5.4", "weak-napi": "2.0.2" @@ -217,13 +218,13 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1802.11", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.11.tgz", - "integrity": "sha512-p+XIc/j51aI83ExNdeZwvkm1F4wkuKMGUUoj0MVUUi5E6NoiMlXYm6uU8+HbRvPBzGy5+3KOiGp3Fks0UmDSAA==", + "version": "0.1802.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.12.tgz", + "integrity": "sha512-bepVb2/GtJppYKaeW8yTGE6egmoWZ7zagFDsmBdbF+BYp+HmeoPsclARcdryBPVq68zedyTRdvhWSUTbw1AYuw==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.11", + "@angular-devkit/core": "18.2.12", "rxjs": "7.8.1" }, "engines": { @@ -233,17 +234,17 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.11.tgz", - "integrity": "sha512-09Ln3NAdlMw/wMLgnwYU5VgWV5TPBEHolZUIvE9D8b6SFWBCowk3B3RWeAMgg7Peuf9SKwqQHBz2b1C7RTP/8g==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.12.tgz", + "integrity": "sha512-quVUi7eqTq9OHumQFNl9Y8t2opm8miu4rlYnuF6rbujmmBDvdUvR6trFChueRczl2p5HWqTOr6NPoDGQm8AyNw==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.11", - "@angular-devkit/build-webpack": "0.1802.11", - "@angular-devkit/core": "18.2.11", - "@angular/build": "18.2.11", + "@angular-devkit/architect": "0.1802.12", + "@angular-devkit/build-webpack": "0.1802.12", + "@angular-devkit/core": "18.2.12", + "@angular/build": "18.2.12", "@babel/core": "7.25.2", "@babel/generator": "7.25.0", "@babel/helper-annotate-as-pure": "7.24.7", @@ -254,7 +255,7 @@ "@babel/preset-env": "7.25.3", "@babel/runtime": "7.25.0", "@discoveryjs/json-ext": "0.6.1", - "@ngtools/webpack": "18.2.11", + "@ngtools/webpack": "18.2.12", "@vitejs/plugin-basic-ssl": "1.1.0", "ansi-colors": "4.1.3", "autoprefixer": "10.4.20", @@ -361,6 +362,13 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/immutable": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true, + "license": "MIT" + }, "node_modules/@angular-devkit/build-angular/node_modules/sass": { "version": "1.77.6", "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", @@ -387,13 +395,13 @@ "license": "0BSD" }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1802.11", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.11.tgz", - "integrity": "sha512-G76rNsyn1iQk7qjyr+K4rnDzfalmEswmwXQorypSDGaHYzIDY1SZXMoP4225WMq5fJNBOJrk82FA0PSfnPE+zQ==", + "version": "0.1802.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.12.tgz", + "integrity": "sha512-0Z3fdbZVRnjYWE2/VYyfy+uieY+6YZyEp4ylzklVkc+fmLNsnz4Zw6cK1LzzcBqAwKIyh1IdW20Cg7o8b0sONA==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1802.11", + "@angular-devkit/architect": "0.1802.12", "rxjs": "7.8.1" }, "engines": { @@ -407,9 +415,9 @@ } }, "node_modules/@angular-devkit/core": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.11.tgz", - "integrity": "sha512-H9P1shRGigORWJHUY2BRa2YurT+DVminrhuaYHsbhXBRsPmgB2Dx/30YLTnC1s5XmR9QIRUCsg/d3kyT1wd5Zg==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.12.tgz", + "integrity": "sha512-NtB6ypsaDyPE6/fqWOdfTmACs+yK5RqfH5tStEzWFeeDsIEDYKsJ06ypuRep7qTjYus5Rmttk0Ds+cFgz8JdUQ==", "dev": true, "license": "MIT", "dependencies": { @@ -435,13 +443,13 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.11.tgz", - "integrity": "sha512-efRK3FotTFp4KD5u42jWfXpHUALXB9kJNsWiB4wEImKFH6CN+vjBspJQuLqk2oeBFh/7D2qRMc5P+2tZHM5hdw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.12.tgz", + "integrity": "sha512-mMea9txHbnCX5lXLHlo0RAgfhFHDio45/jMsREM2PA8UtVf2S8ltXz7ZwUrUyMQRv8vaSfn4ijDstF4hDMnRgQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.11", + "@angular-devkit/core": "18.2.12", "jsonc-parser": "3.3.1", "magic-string": "0.30.11", "ora": "5.4.1", @@ -454,9 +462,9 @@ } }, "node_modules/@angular-eslint/builder": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.0.tgz", - "integrity": "sha512-FOzGHX/nHSV1wSduSsabsx3aqC1nfde0opEpEDSOJhxExDxKCwoS1XPy1aERGyKip4ZVA6phC3dLtoBH3QMkVQ==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.1.tgz", + "integrity": "sha512-Ofkwd9Rg52K+AgvnV1RXYXVBGJvl5jD7+4dqwoprqXG7YKNTdHy5vqNZ5XDSMb26qjoZF7JC+IKruKFaON/ZaA==", "dev": true, "license": "MIT", "peerDependencies": { @@ -465,21 +473,21 @@ } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.0.tgz", - "integrity": "sha512-HlFHt2qgdd+jqyVIkCXmrjHauXo/XY3Rp0UNabk83ejGi/raM/6lEFI7iFWzHxLyiAKk4OgGI5W26giSQw991A==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.1.tgz", + "integrity": "sha512-gCQC0mgBO1bwHDXL9CUgHW+Rf1XGZCLAopoXnggwxGkBCx+oww507t+jrSOxdh+4OTKU4ZfmbtWd7Y8AeXns8w==", "dev": true, "license": "MIT" }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.0.tgz", - "integrity": "sha512-Saz9lkWPN3da7ZKW17UsOSN7DeY+TPh+wz/6GCNZCh67Uw2wvMC9agb+4hgpZNXYCP5+u7erqzxQmBoWnS/A+A==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.1.tgz", + "integrity": "sha512-FoHwj+AFo8ONKb8wEK5qpo6uefuyklZlDqErJxeC3fpNIJzDe8PWBcJsuZt7Wwm/HeggWgt0Au6h+3IEa0V3BQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0", - "@angular-eslint/utils": "18.4.0" + "@angular-eslint/bundled-angular-compiler": "18.4.1", + "@angular-eslint/utils": "18.4.1" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", @@ -488,14 +496,14 @@ } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.0.tgz", - "integrity": "sha512-n3uZFCy76DnggPqjSVFV3gYD1ik7jCG28o2/HO4kobcMNKnwW8XAlFUagQ4TipNQh7fQiAefsEqvv2quMsYDVw==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.1.tgz", + "integrity": "sha512-sofnKpi6wOZ6avVfYYqB7sCgGgWF2HgCZfW+IAp1MtVD2FBa1zTSbbfIZ1I8Akpd22UXa4LKJd0TLwm5XHHkiQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0", - "@angular-eslint/utils": "18.4.0", + "@angular-eslint/bundled-angular-compiler": "18.4.1", + "@angular-eslint/utils": "18.4.1", "aria-query": "5.3.2", "axobject-query": "4.1.0" }, @@ -507,15 +515,15 @@ } }, "node_modules/@angular-eslint/schematics": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.0.tgz", - "integrity": "sha512-ssqe+0YCfekbWIXNdCrHfoPK/bPZAWybs0Bn/b99dfd8h8uyXkERo9AzIOx4Uyj/08SkP9aPL/0uOOEHDsRGwQ==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.1.tgz", + "integrity": "sha512-1+gGodwh+UevtEx9mzZbzP1uY/9NAGEbsn8jisG1TEPDby2wKScQj6U6JwGxoW/Dd/4SIeSdilruZPALkqha7g==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/eslint-plugin": "18.4.0", - "@angular-eslint/eslint-plugin-template": "18.4.0", - "ignore": "5.3.2", + "@angular-eslint/eslint-plugin": "18.4.1", + "@angular-eslint/eslint-plugin-template": "18.4.1", + "ignore": "6.0.2", "semver": "7.6.3", "strip-json-comments": "3.1.1" }, @@ -524,14 +532,24 @@ "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0" } }, + "node_modules/@angular-eslint/schematics/node_modules/ignore": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz", + "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/@angular-eslint/template-parser": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.0.tgz", - "integrity": "sha512-VTep3Xd3IOaRIPL+JN/TV4/2DqUPbjtF3TNY15diD/llnrEhqFnmsvMihexbQyTqzOG+zU554oK44YfvAtHOrw==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.1.tgz", + "integrity": "sha512-LsStXVyso/89gQU5eiJebB/b1j+wrRtTLjk+ODVUTa7NGCCT7B7xI6ToTchkBEpSTHLT9pEQXHsHer3FymsQRQ==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0", + "@angular-eslint/bundled-angular-compiler": "18.4.1", "eslint-scope": "^8.0.2" }, "peerDependencies": { @@ -540,13 +558,13 @@ } }, "node_modules/@angular-eslint/utils": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.0.tgz", - "integrity": "sha512-At1yS8GRviGBoaupiQwEOL4/IcZJCE/+2vpXdItMWPGB1HWetxlKAUZTMmIBX/r5Z7CoXxl+LbqpGhrhyzIQAg==", + "version": "18.4.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.1.tgz", + "integrity": "sha512-F5UGE1J/CRmTbl8vjexQRwRglNqnJwdXCUejaG+qlGssSHoWcRB+ubbR/na3PdnzeJdBE6DkLYElXnOQZ6YKfg==", "dev": true, "license": "MIT", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0" + "@angular-eslint/bundled-angular-compiler": "18.4.1" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", @@ -555,9 +573,9 @@ } }, "node_modules/@angular/animations": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.11.tgz", - "integrity": "sha512-ghgXa2VhtyJJnTMuH2NYxCMsveQbZno44AZGygPqrcW8UQMQe9GulFaTXCH5s6/so2CLy2ZviIwSZQRgK0ZlDw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.12.tgz", + "integrity": "sha512-XcWH/VFQ1Rddhdqi/iU8lW3Qg96yVx1NPfrO5lhcSSvVUzYWTZ5r+jh3GqYqUgPWyEp1Kpw3FLsOgVcGcBWQkQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -566,18 +584,18 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.11" + "@angular/core": "18.2.12" } }, "node_modules/@angular/build": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.11.tgz", - "integrity": "sha512-AgirvSCmqUKiDE3C0rl3JA68OkOqQWDKUvjqRHXCkhxldLVOVoeIl87+jBYK/v9gcmk+K+ju+5wbGEfu1FjhiQ==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.12.tgz", + "integrity": "sha512-4Ohz+OSILoL+cCAQ4UTiCT5v6pctu3fXNoNpTEUK46OmxELk9jDITO5rNyNS7TxBn9wY69kjX5VcDf7MenquFQ==", "dev": true, "license": "MIT", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.11", + "@angular-devkit/architect": "0.1802.12", "@babel/core": "7.25.2", "@babel/helper-annotate-as-pure": "7.24.7", "@babel/helper-split-export-declaration": "7.24.7", @@ -638,6 +656,13 @@ } } }, + "node_modules/@angular/build/node_modules/immutable": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true, + "license": "MIT" + }, "node_modules/@angular/build/node_modules/sass": { "version": "1.77.6", "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", @@ -657,9 +682,9 @@ } }, "node_modules/@angular/cdk": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.12.tgz", - "integrity": "sha512-FOklA6KatPtb0yO0doRhBI/UVY23A8ZhOSws5VuZTQl/6r/jXEXGV9n5JQj4rm8t/6IrReO55hdyw9XfHfZFjQ==", + "version": "18.2.13", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.13.tgz", + "integrity": "sha512-yBKoqcOwmwXnc5phFMEEMO130/Bz9beQLJrKzIS87f6TXaGCeBs4xrPHq2i7Xx/2TqvMiOD9ucjmlVbtGvNG3w==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -674,18 +699,18 @@ } }, "node_modules/@angular/cli": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.11.tgz", - "integrity": "sha512-0JI1xjOLRemBPjdT/yVlabxc3Zkjqa/lhvVxxVC1XhKoW7yGxIGwNrQ4pka4CcQtCuktO6KPMmTGIu8YgC3cpw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.12.tgz", + "integrity": "sha512-xhuZ/b7IhqNw1MgXf+arWf4x+GfUSt/IwbdWU4+CO8A7h0Y46zQywouP/KUK3cMQZfVdHdciTBvlpF3vFacA6Q==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/architect": "0.1802.11", - "@angular-devkit/core": "18.2.11", - "@angular-devkit/schematics": "18.2.11", + "@angular-devkit/architect": "0.1802.12", + "@angular-devkit/core": "18.2.12", + "@angular-devkit/schematics": "18.2.12", "@inquirer/prompts": "5.3.8", "@listr2/prompt-adapter-inquirer": "2.0.15", - "@schematics/angular": "18.2.11", + "@schematics/angular": "18.2.12", "@yarnpkg/lockfile": "1.1.0", "ini": "4.1.3", "jsonc-parser": "3.3.1", @@ -708,9 +733,9 @@ } }, "node_modules/@angular/common": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.11.tgz", - "integrity": "sha512-bamJeISl2zUlvjPYebQWazUjhjXU9nrot42cQJng94SkvNENT9LTWfPYgc+Bd972Kg+31jG4H41rgFNs7zySmw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.12.tgz", + "integrity": "sha512-gI5o8Bccsi8ow8Wk2vG4Tw/Rw9LoHEA9j8+qHKNR/55SCBsz68Syg310dSyxy+sApJO2WiqIadr5VP36dlSUFw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -719,14 +744,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.11", + "@angular/core": "18.2.12", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.11.tgz", - "integrity": "sha512-PSVL1YXUhTzkgJNYXiWk9eAZxNV6laQJRGdj9++C1q9m2S9/GlehZGzkt5GtC5rlUweJucCNvBC1+2D5FAt9vA==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.12.tgz", + "integrity": "sha512-D5d5dLrjQal5DbAXJJNSsCC3UxzjOI2wbc+Iv+LOpRM1gpNwuYfZMX5W7cj62Ce4G2++78CJSppdKBp8D4HErQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -735,7 +760,7 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.11" + "@angular/core": "18.2.12" }, "peerDependenciesMeta": { "@angular/core": { @@ -744,9 +769,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.11.tgz", - "integrity": "sha512-YJlAOiXZUYP6/RK9isu5AOucmNZhFB9lpY/beMzkkWgDku+va8szm4BZbLJFz176IUteyLWF3IP4aE7P9OBlXw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.12.tgz", + "integrity": "sha512-IWimTNq5Q+i2Wxev6HLqnN4iYbPvLz04W1BBycT1LfGUsHcjFYLuUqbeUzHbk2snmBAzXkixgVpo8SF6P4Y5Pg==", "license": "MIT", "dependencies": { "@babel/core": "7.25.2", @@ -767,7 +792,7 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.11", + "@angular/compiler": "18.2.12", "typescript": ">=5.4 <5.6" } }, @@ -800,9 +825,9 @@ } }, "node_modules/@angular/core": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.11.tgz", - "integrity": "sha512-/AGAFyZN8KR+kW5FUFCCBCj3qHyDDum7G0lJe5otrT9AqF6+g7PjF8yLha/6wPkJG7ri5xGLhini1sEivVeq/g==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.12.tgz", + "integrity": "sha512-wCf/OObwS6bpM60rk6bpMpCRGp0DlMLB1WNAMtfcaPNyqimVV5Bm98mWRhkOuRyvU3fU7iHhM/10ePVaoyu9+A==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -816,9 +841,9 @@ } }, "node_modules/@angular/forms": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.11.tgz", - "integrity": "sha512-QjxayOxDTqsTJGBzfWd3nms1LZIXj2f1+wIPxxUNXyNS5ZaM7hBWkz2BTFYeewlD/HdNj0alNVCYK3M8ElLWYw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.12.tgz", + "integrity": "sha512-FsukBJEU6jfAmht7TrODTkct/o4iwCZvGozuThOp0tYUPD/E1rZZzuKjEyTnT5Azpfkf0Wqx1nmpz80cczELOQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -827,16 +852,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.11", - "@angular/core": "18.2.11", - "@angular/platform-browser": "18.2.11", + "@angular/common": "18.2.12", + "@angular/core": "18.2.12", + "@angular/platform-browser": "18.2.12", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/language-service": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.11.tgz", - "integrity": "sha512-kI36Wfvw3E01Xox/H535/rrSTiDfzQeXATFR5i5vqc94XWUdQG67e4X6ybnqFUrezXoLPTULHp+5Di896YFPzw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.12.tgz", + "integrity": "sha512-oaiVAnGzmPZvrXdGh8XnosaqfEPbZxO2225MxbbrD49XTqUgpaS2zrz1Uf5j42e8qytA2kj8tckLq7PAMm0D1w==", "dev": true, "license": "MIT", "engines": { @@ -844,9 +869,9 @@ } }, "node_modules/@angular/localize": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.11.tgz", - "integrity": "sha512-ZGemNURZmhZcZhc0i4SzAjyckkvf6Xv24U7DDJ/TpgHQWP9/pu5QExFa2OuGoJJcZRqUrzEmPrbu+4a/xggaQw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.12.tgz", + "integrity": "sha512-qC3cYFh3miR9revmHGlfbGvugcsK6nQud4QKBNyTUp1XZRrEE0yzPvvsnmbv2lHUOazrvTxQpfVZZKpiifgoLw==", "license": "MIT", "dependencies": { "@babel/core": "7.25.2", @@ -863,21 +888,21 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.11", - "@angular/compiler-cli": "18.2.11" + "@angular/compiler": "18.2.12", + "@angular/compiler-cli": "18.2.12" } }, "node_modules/@angular/material": { - "version": "18.2.12", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.12.tgz", - "integrity": "sha512-5q8Os6i3D1e3qN+RqP95UgIR+Kx3goncSSYDeT6yPNrdrcqcWdyDPXGK6UsZqTTx/CJee/I7ZxgVVK1YDoVASQ==", + "version": "18.2.13", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.13.tgz", + "integrity": "sha512-Gxyyo6G+IXJwgf6zDTjPfFJ2PnjC2YXWKGkKKG2oR0jfiYiovDvNR4oXxhsztTwkaxLwck/gscoVTSQXMkU5fg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/animations": "^18.0.0 || ^19.0.0", - "@angular/cdk": "18.2.12", + "@angular/cdk": "18.2.13", "@angular/common": "^18.0.0 || ^19.0.0", "@angular/core": "^18.0.0 || ^19.0.0", "@angular/forms": "^18.0.0 || ^19.0.0", @@ -886,9 +911,9 @@ } }, "node_modules/@angular/platform-browser": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.11.tgz", - "integrity": "sha512-bzcP0QdPT/ncTxOx0t7901z5m0wDmkraTo/es4g8reV6VK9Ptv0QDuD8aDvrHh7sLCX5VgwDF9ohc6S2TpYUCA==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.12.tgz", + "integrity": "sha512-DRSMznuxuecrs+v5BRyd60/R4vjkQtuYUEPfzdo+rqxM83Dmr3PGtnqPRgd5oAFUbATxf02hQXijRD27K7rZRg==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -897,9 +922,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "18.2.11", - "@angular/common": "18.2.11", - "@angular/core": "18.2.11" + "@angular/animations": "18.2.12", + "@angular/common": "18.2.12", + "@angular/core": "18.2.12" }, "peerDependenciesMeta": { "@angular/animations": { @@ -908,9 +933,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.11.tgz", - "integrity": "sha512-a30U4ZdTZSvL17xWwOq6xh9ToCDP2K7/j1HTJFREObbuAtZTa/6IVgBUM6oOMNQ43kHkT6Mr9Emkgf9iGtWwfw==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.12.tgz", + "integrity": "sha512-dv1QEjYpcFno6+oUeGEDRWpB5g2Ufb0XkUbLJQIgrOk1Qbyzb8tmpDpTjok8jcKdquigMRWolr6Y1EOicfRlLw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -919,16 +944,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.11", - "@angular/compiler": "18.2.11", - "@angular/core": "18.2.11", - "@angular/platform-browser": "18.2.11" + "@angular/common": "18.2.12", + "@angular/compiler": "18.2.12", + "@angular/core": "18.2.12", + "@angular/platform-browser": "18.2.12" } }, "node_modules/@angular/router": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.11.tgz", - "integrity": "sha512-xh4+t4pNBWxeH1a6GIoEGVSRZO4NDKK8q6b+AzB5GBgKsYgOz2lc74RXIPA//pK3aHrS9qD4sJLlodwgE/1+bA==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.12.tgz", + "integrity": "sha512-cz/1YWOZadAT35PPPYmpK3HSzKOE56nlUHue5bFkw73VSZr2iBn03ALLpd9YKzWgRmx3y7DqnlQtCkDu9JPGKQ==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -937,16 +962,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.11", - "@angular/core": "18.2.11", - "@angular/platform-browser": "18.2.11", + "@angular/common": "18.2.12", + "@angular/core": "18.2.12", + "@angular/platform-browser": "18.2.12", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/service-worker": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.11.tgz", - "integrity": "sha512-FZ1yHCAmmbg+NYNFtvrZE8RzgsSnWgsL2ef+mvlfC/fxyu4pyoZT4+ZshwN7k55L++6M/RgdV7cZevPN4qGNrA==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.12.tgz", + "integrity": "sha512-rgztA+Eduo69y6cvSDtAXC5lMTWjgowSSreiyM4ssyjwd8vD6h2TZp/3slr8Tt6+Lh9J4bK+UdcqMIjIdDxwSw==", "license": "MIT", "dependencies": { "tslib": "^2.3.0" @@ -958,8 +983,8 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.11", - "@angular/core": "18.2.11" + "@angular/common": "18.2.12", + "@angular/core": "18.2.12" } }, "node_modules/@babel/code-frame": { @@ -1145,9 +1170,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz", - "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz", + "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==", "dev": true, "license": "MIT", "dependencies": { @@ -3412,9 +3437,9 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz", - "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.0.tgz", + "integrity": "sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -3451,9 +3476,9 @@ } }, "node_modules/@eslint/core": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz", - "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.9.0.tgz", + "integrity": "sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -3461,9 +3486,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz", - "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz", + "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==", "dev": true, "license": "MIT", "dependencies": { @@ -3546,9 +3571,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz", - "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.15.0.tgz", + "integrity": "sha512-tMTqrY+EzbXmKJR5ToI8lxu7jaN5EdmrBFJpQk5JmSlyLsx6o4t27r883K5xsLuCYCpfKBCGswMSWXsM+jB7lg==", "dev": true, "license": "MIT", "engines": { @@ -3566,9 +3591,9 @@ } }, "node_modules/@eslint/plugin-kit": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.2.tgz", - "integrity": "sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz", + "integrity": "sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -3601,45 +3626,45 @@ } }, "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.6.0.tgz", - "integrity": "sha512-xyX0X9mc0kyz9plIyryrRbl7ngsA9jz77mCZJsUkLl+ZKs0KWObgaEBoSgQiYWAsSmjz/yjl0F++Got0Mdp4Rw==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.1.tgz", + "integrity": "sha512-gbDz3TwRrIPT3i0cDfujhshnXO9z03IT1UKRIVi/VEjpNHtSBIP2o5XSm+e816FzzCFEzAxPw09Z13n20PaQJQ==", "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.6.0.tgz", - "integrity": "sha512-KHwPkCk6oRT4HADE7smhfsKudt9N/9lm6EJ5BVg0tD1yPA5hht837fB87F8pn15D8JfTqQOjhKTktwmLMiD7Kg==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.1.tgz", + "integrity": "sha512-8dBIHbfsKlCk2jHQ9PoRBg2Z+4TwyE3vZICSnoDlnsHA6SiMlTwfmW6yX0lHsRmWJugkeb92sA0hZdkXJhuz+g==", "license": "MIT", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.6.0" + "@fortawesome/fontawesome-common-types": "6.7.1" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-regular-svg-icons": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.6.0.tgz", - "integrity": "sha512-Yv9hDzL4aI73BEwSEh20clrY8q/uLxawaQ98lekBx6t9dQKDHcDzzV1p2YtBGTtolYtNqcWdniOnhzB+JPnQEQ==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.1.tgz", + "integrity": "sha512-e13cp+bAx716RZOTQ59DhqikAgETA9u1qTBHO3e3jMQQ+4H/N1NC1ZVeFYt1V0m+Th68BrEL1/X6XplISutbXg==", "license": "(CC-BY-4.0 AND MIT)", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.6.0" + "@fortawesome/fontawesome-common-types": "6.7.1" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.6.0.tgz", - "integrity": "sha512-IYv/2skhEDFc2WGUcqvFJkeK39Q+HyPf5GHUrT/l2pKbtgEIv1al1TKd6qStR5OIwQdN1GZP54ci3y4mroJWjA==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.1.tgz", + "integrity": "sha512-BTKc0b0mgjWZ2UDKVgmwaE0qt0cZs6ITcDgjrti5f/ki7aF5zs+N91V6hitGo3TItCFtnKg6cUVGdTmBFICFRg==", "license": "(CC-BY-4.0 AND MIT)", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.6.0" + "@fortawesome/fontawesome-common-types": "6.7.1" }, "engines": { "node": ">=6" @@ -3819,9 +3844,9 @@ } }, "node_modules/@inquirer/figures": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.7.tgz", - "integrity": "sha512-m+Trk77mp54Zma6xLkLuY+mvanPxlE4A7yNKs2HBiyZ4UkVs28Mv5c/pgWrHeInx+USHeX/WEPzjrWrcJiQgjw==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.8.tgz", + "integrity": "sha512-tKd+jsmhq21AP1LhexC0pPwsCxEhGgAkg28byjJAd+xhmIs8LUX8JbUc3vBf3PhLxWiB5EvyBE5X7JSPAqMAqg==", "dev": true, "license": "MIT", "engines": { @@ -5023,9 +5048,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.11.tgz", - "integrity": "sha512-iTdUGJ5O7yMm1DyCzyoMDMxBJ68emUSSXPWbQzEEdcqmtifRebn+VAq4vHN8OmtGM1mtuKeLEsbiZP8ywrw7Ug==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.12.tgz", + "integrity": "sha512-FFJAwtWbtpncMOVNuULPBwFJB7GSjiUwO93eGTzRp8O4EPQ8lCQeFbezQm/NP34+T0+GBLGzPSuQT+muob8YKw==", "dev": true, "license": "MIT", "engines": { @@ -5352,9 +5377,9 @@ } }, "node_modules/@nx/devkit": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.0.12.tgz", - "integrity": "sha512-HsaDoAmzLPE2vHal2eNYvH7x6NCfHjUblm8WDD12Q/uCdTBvDTZqd7P+bukEH+2FhY89Dn/1fy59vKkA+rcB/g==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-20.1.1.tgz", + "integrity": "sha512-sqihJhJQERCTl0KmKmpRFxWxuTnH8yRqdo8T5uGGaHzTNiMdIp5smTF2dBs7/OMkZDxcJc4dKvcFWfreZr8XNw==", "dev": true, "license": "MIT", "dependencies": { @@ -5398,9 +5423,9 @@ } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.0.12.tgz", - "integrity": "sha512-iwEDUTKx0n2S6Nz9gc9ShrfBw0MG87U0YIu2x/09tKOSkcsw90QKy54qN/6WNoFIE41Kt3U+dYtWi+NdLRE9kw==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.1.1.tgz", + "integrity": "sha512-Ah0ShPQaMfvzVfhsyuI6hNB0bmwLHJqqrWldZeF97SFPhv6vfKdcdlZmSnask+V4N5z9TOCUmCMu2asMQa7+kw==", "cpu": [ "arm64" ], @@ -5415,9 +5440,9 @@ } }, "node_modules/@nx/nx-darwin-x64": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.0.12.tgz", - "integrity": "sha512-JYFNf0yPReejaooQAAIMsjWDGENT777wDXj45e7JQUMM4t6NOMpGBj4qUFyc6a/jXT+/bCGEj4N7VDZDZiogGA==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.1.1.tgz", + "integrity": "sha512-TmdX6pbzclvPGsttTTaZhdF46HV1vfvYSHJaSMsYJX68l3gcQnAJ1ZRDksEgkYeAy+O9KrPimD84NM5W/JvqcQ==", "cpu": [ "x64" ], @@ -5432,9 +5457,9 @@ } }, "node_modules/@nx/nx-freebsd-x64": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.0.12.tgz", - "integrity": "sha512-892n8o7vxdmE7pol3ggV78YHlP25p6Y/Z2x69nnC3BBTpWmesyd6lbEmamANofD5KcKCmT1HquC3m6rCT7akHw==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.1.1.tgz", + "integrity": "sha512-7/7f3GbUbdvtTFOb/8wcaSQYkhVIxcC4UzFJM5yEyXPJmIrglk+RX3SLuOFRBFJnO+Z7D6jLUnLOBHKCGfqLVw==", "cpu": [ "x64" ], @@ -5449,9 +5474,9 @@ } }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.0.12.tgz", - "integrity": "sha512-ZPcdYIVAc5JMtmvroJOloI9CJgtwBOGr7E7mO1eT44zs5av0j/QMIj6GSDdvJ7fx+I7TmT4mDiu3s6rLO+/JjA==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.1.1.tgz", + "integrity": "sha512-VxpMz5jCZ5gnk1gP2jDBCheYs7qOwQoJmzGbEB8hNy0CwRH/G8pL4RRo4Sz+4aiF6Z+9eax5RM2/Syh+bS0uJw==", "cpu": [ "arm" ], @@ -5466,9 +5491,9 @@ } }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.0.12.tgz", - "integrity": "sha512-TadGwwUKS5WQg2YOMb2WuuVG1k14miSdB9qJOcAX5MGdOiQ1fpV00ph+kMWZSsCCo6N7sKxmvXXXdsUUFSDGjg==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.1.1.tgz", + "integrity": "sha512-8T2+j4KvsWb6ljW1Y2s/uCSt4Drtlsr3GSrGdvcETW0IKaTfKZAJlxTLAWQHEF88hP6GAJRGxNrgmUHMr8HwUA==", "cpu": [ "arm64" ], @@ -5483,9 +5508,9 @@ } }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.0.12.tgz", - "integrity": "sha512-EE2HQjgY87/s9+PQ27vbYyDEXFZ4Qot+O8ThVDVuMI/2dosmWs6C4+YEm3VYG+CT31MVwe/vHKXbDlZgkROMuA==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.1.1.tgz", + "integrity": "sha512-TI964w+HFUqG6elriKwQPRX7QRxVRMz5YKdNPgf4+ab4epQ379kwJQEHlyOHR72ir8Tl46z3BoPjvmaLylrT4Q==", "cpu": [ "arm64" ], @@ -5500,9 +5525,9 @@ } }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.0.12.tgz", - "integrity": "sha512-gITJ2g6dH2qvGrI2CHHRyd3soVrJyQQGkqtJnWq04ge+YDy/KniXR2ThQ93LI/QLAxKrKOe3qmIIaNdcdDYnjA==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.1.1.tgz", + "integrity": "sha512-Sg2tQ0v3KP9cAqQST16YR+dT/NbirPts6by+A4vhOtaBrZFVqm9P89K9UdcJf4Aj1CaGbs84lotp2aM4E4bQPA==", "cpu": [ "x64" ], @@ -5517,9 +5542,9 @@ } }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.0.12.tgz", - "integrity": "sha512-vOoCrjL44nFZ5N8a4UAIYELnf/tq1dRaLEhSV+P0hKTEtwONj4k8crfU/2HifG1iU7p3AWJLEyaddMoINhB/2g==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.1.1.tgz", + "integrity": "sha512-ekKvuIMRJRhZnkWIWEr4TRVEAyKVDgEMwqk83ilB0Mqpj2RoOKbw7jZFvWcxJWI4kSeZjTea3xCWGNPa1GfCww==", "cpu": [ "x64" ], @@ -5534,9 +5559,9 @@ } }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.0.12.tgz", - "integrity": "sha512-gKdaul23bdRnh493iAd6pSLPSW54VBuEv2zPL86cgprLOcEZiGM5BLJWQguKHCib6dYKaIP4CUIs7i7vhEID+A==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.1.1.tgz", + "integrity": "sha512-JRycFkk6U8A1sXaDmSFA2HMKT2js3HK/+nI+auyITRqVbV79/r6ir/oFSgIjKth8j/vVbGDL8I4E3nEQ7leZYw==", "cpu": [ "arm64" ], @@ -5551,9 +5576,9 @@ } }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.0.12.tgz", - "integrity": "sha512-R1pz4kAG0Ok0EDxXhHwKM3ZZcK2nLycuR9SDrq2Ldp2knvbFf4quSjWyAQaiofJXo179+noa7o5tZDZbNjBYMw==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.1.1.tgz", + "integrity": "sha512-VwxmJU7o8KqTZ+KYk7atoWOUykKd8D4hdgKqqltdq/UBfsAWD/JCFt5OB/VFvrGDbK6I6iKpMvXWlHy4gkXQiw==", "cpu": [ "x64" ], @@ -5899,6 +5924,24 @@ "license": "MIT", "optional": true }, + "node_modules/@pdf-lib/standard-fonts": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@pdf-lib/standard-fonts/-/standard-fonts-1.0.0.tgz", + "integrity": "sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==", + "license": "MIT", + "dependencies": { + "pako": "^1.0.6" + } + }, + "node_modules/@pdf-lib/upng": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@pdf-lib/upng/-/upng-1.0.1.tgz", + "integrity": "sha512-dQK2FUMQtowVP00mtIksrlZhdFXQZPC+taih1q4CvPZ5vqdxR/LKBaFg0oAfzd1GlHZXXSPdQfzQnt+ViGvEIQ==", + "license": "MIT", + "dependencies": { + "pako": "^1.0.10" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -6215,14 +6258,14 @@ ] }, "node_modules/@schematics/angular": { - "version": "18.2.11", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.11.tgz", - "integrity": "sha512-jT54mc9+hPOwie9bji/g2krVuK1kkNh2PNFGwfgCg3Ofmt3hcyOBai1DKuot5uLTX4VCCbvfwiVR/hJniQl2SA==", + "version": "18.2.12", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.12.tgz", + "integrity": "sha512-sIoeipsisK5eTLW3XuNZYcal83AfslBbgI7LnV+3VrXwpasKPGHwo2ZdwhCd2IXAkuJ02Iyu7MyV0aQRM9i/3g==", "dev": true, "license": "MIT", "dependencies": { - "@angular-devkit/core": "18.2.11", - "@angular-devkit/schematics": "18.2.11", + "@angular-devkit/core": "18.2.12", + "@angular-devkit/schematics": "18.2.12", "jsonc-parser": "3.3.1" }, "engines": { @@ -6232,73 +6275,73 @@ } }, "node_modules/@sentry-internal/browser-utils": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.37.1.tgz", - "integrity": "sha512-OSR/V5GCsSCG7iapWtXCT/y22uo3HlawdEgfM1NIKk1mkP15UyGQtGEzZDdih2H+SNuX1mp9jQLTjr5FFp1A5w==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.39.0.tgz", + "integrity": "sha512-5jcO3os1aQIMNZptniMUCCkZ3KOvyUPSyrQeGB7NxhJoieIwmopo5qIXyeRLHu0htL7H7A1gPYln6Ji3d/KUUA==", "license": "MIT", "dependencies": { - "@sentry/core": "8.37.1", - "@sentry/types": "8.37.1", - "@sentry/utils": "8.37.1" + "@sentry/core": "8.39.0", + "@sentry/types": "8.39.0", + "@sentry/utils": "8.39.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/feedback": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.37.1.tgz", - "integrity": "sha512-Se25NXbSapgS2S+JssR5YZ48b3OY4UGmAuBOafgnMW91LXMxRNWRbehZuNUmjjHwuywABMxjgu+Yp5uJDATX+g==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.39.0.tgz", + "integrity": "sha512-V5J/tnzAK8bXdXQzY7lnlYMqfTKgI+9BD7L7oHxQnDUzlShsV14xFGZVhEbPsjYficdIN9wpoYIyWDxwrFX1Qg==", "license": "MIT", "dependencies": { - "@sentry/core": "8.37.1", - "@sentry/types": "8.37.1", - "@sentry/utils": "8.37.1" + "@sentry/core": "8.39.0", + "@sentry/types": "8.39.0", + "@sentry/utils": "8.39.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.37.1.tgz", - "integrity": "sha512-E/Plhisk/pXJjOdOU12sg8m/APTXTA21iEniidP6jW3/+O0tD/H/UovEqa4odNTqxPMa798xHQSQNt5loYiaLA==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.39.0.tgz", + "integrity": "sha512-1IEXhg2XuKC1hx/Pf5p2L7McKjQPfVOWyQhjNUH2mHWbpOyvc1BhZoZKCgbbspwOAVuvj4n40PvOVyjfzU5Yew==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.37.1", - "@sentry/core": "8.37.1", - "@sentry/types": "8.37.1", - "@sentry/utils": "8.37.1" + "@sentry-internal/browser-utils": "8.39.0", + "@sentry/core": "8.39.0", + "@sentry/types": "8.39.0", + "@sentry/utils": "8.39.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry-internal/replay-canvas": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.37.1.tgz", - "integrity": "sha512-1JLAaPtn1VL5vblB0BMELFV0D+KUm/iMGsrl4/JpRm0Ws5ESzQl33DhXVv1IX/ZAbx9i14EjR7MG9+Hj70tieQ==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.39.0.tgz", + "integrity": "sha512-NCp4E60SFfg9pXdMgcdpctYENFOvJ58UPGllGjO3xpYoMkd4DGZQp947Tgw9hATTCDnyYNIy5v/zYbDV4Wbw3w==", "license": "MIT", "dependencies": { - "@sentry-internal/replay": "8.37.1", - "@sentry/core": "8.37.1", - "@sentry/types": "8.37.1", - "@sentry/utils": "8.37.1" + "@sentry-internal/replay": "8.39.0", + "@sentry/core": "8.39.0", + "@sentry/types": "8.39.0", + "@sentry/utils": "8.39.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/angular": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.37.1.tgz", - "integrity": "sha512-N6IdxEUwVlB5qqd7UR0fiEvWoJrNA4rcdKot0W9uN3G9lqmff5EB3EUIvw9xFZJgZ695WNVZ1f+irvqXt+rYJA==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.39.0.tgz", + "integrity": "sha512-yke0NULFosz4Fap9NGKTVzRKoJRx8+sAC8jA2qdU49SUtxon+L3LN5D6QbE402kdMWEscxKa1cHrgfIvJfOZZA==", "license": "MIT", "dependencies": { - "@sentry/browser": "8.37.1", - "@sentry/core": "8.37.1", - "@sentry/types": "8.37.1", - "@sentry/utils": "8.37.1", + "@sentry/browser": "8.39.0", + "@sentry/core": "8.39.0", + "@sentry/types": "8.39.0", + "@sentry/utils": "8.39.0", "tslib": "^2.4.1" }, "engines": { @@ -6312,52 +6355,52 @@ } }, "node_modules/@sentry/browser": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.37.1.tgz", - "integrity": "sha512-5ym+iGiIpjIKKpMWi9S3/tXh9xneS+jqxwRTJqed3cb8i4ydfMAAP8sM3U8xMCWWABpWyIUW+fpewC0tkhE1aQ==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.39.0.tgz", + "integrity": "sha512-Xpqh84MnqoFID0owbugTeq/3QXgNwc3EdHAN/HFUdxEAyJS4j7Wi1DIBXN+ZRzMYX3m2QHOAymCWjnFtv+H8WQ==", "license": "MIT", "dependencies": { - "@sentry-internal/browser-utils": "8.37.1", - "@sentry-internal/feedback": "8.37.1", - "@sentry-internal/replay": "8.37.1", - "@sentry-internal/replay-canvas": "8.37.1", - "@sentry/core": "8.37.1", - "@sentry/types": "8.37.1", - "@sentry/utils": "8.37.1" + "@sentry-internal/browser-utils": "8.39.0", + "@sentry-internal/feedback": "8.39.0", + "@sentry-internal/replay": "8.39.0", + "@sentry-internal/replay-canvas": "8.39.0", + "@sentry/core": "8.39.0", + "@sentry/types": "8.39.0", + "@sentry/utils": "8.39.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/core": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.37.1.tgz", - "integrity": "sha512-82csXby589iDupM3VgCHJeWZagUyEEaDnbFcoZ/Z91QX2Sjq8FcF5OsforoXjw09i0XTFqlkFAnQVpDBmMXcpQ==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.39.0.tgz", + "integrity": "sha512-rg2mHtwdCaedqub7bd+ht08vZgtwPO7el5m5sPNeb7V75GcQwSziu6G02vGxCBCsAHpoFn1A+0JLEajaYzZI7w==", "license": "MIT", "dependencies": { - "@sentry/types": "8.37.1", - "@sentry/utils": "8.37.1" + "@sentry/types": "8.39.0", + "@sentry/utils": "8.39.0" }, "engines": { "node": ">=14.18" } }, "node_modules/@sentry/types": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.37.1.tgz", - "integrity": "sha512-ryMOTROLSLINKFEbHWvi7GigNrsQhsaScw2NddybJGztJQ5UhxIGESnxGxWCufBmWFDwd7+5u0jDPCVUJybp7w==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.39.0.tgz", + "integrity": "sha512-/n1bGkbJcSLZQpzd1Oksi8LFAMbcO8j/d+N8mcXS74GuhGgkxQiEwHF2CKTz6SHt8J4hrlyzqIwVzCevUOxZ2Q==", "license": "MIT", "engines": { "node": ">=14.18" } }, "node_modules/@sentry/utils": { - "version": "8.37.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.37.1.tgz", - "integrity": "sha512-Qtn2IfpII12K17txG/ZtTci35XYjYi4CxbQ3j7nXY7toGv/+MqPXwV5q2i9g94XaSXlE5Wy9/hoCZoZpZs/djA==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.39.0.tgz", + "integrity": "sha512-pIBnr/cROds92CcYWBW3z1zFH4uJkMPL2AxEv/ZcLg/NTb1Okz/ZaDP+NMzUfzriYvFBOFk0wPk0h5sYx6Umqw==", "license": "MIT", "dependencies": { - "@sentry/types": "8.37.1" + "@sentry/types": "8.39.0" }, "engines": { "node": ">=14.18" @@ -6499,36 +6542,47 @@ } }, "node_modules/@swimlane/ngx-charts": { - "version": "20.5.0", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-20.5.0.tgz", - "integrity": "sha512-PNBIHdu/R3ceD7jnw1uCBVOj4k3T6IxfdW6xsDsglGkZyoWMEEq4tLoEurjLEKzmDtRv9c35kVNOXy0lkOuXeA==", + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-21.0.0.tgz", + "integrity": "sha512-4YQNWevbVPekiuLz6w3wLdJY9rD2Pk21xskTUtfpUirUFXdkKZdUByJkSUlup+F8UPvkeZIEC5bhBtOr0yTktA==", "license": "MIT", "dependencies": { - "d3-array": "^3.1.1", + "d3-array": "^3.2.0", "d3-brush": "^3.0.0", "d3-color": "^3.1.0", "d3-ease": "^3.0.1", "d3-format": "^3.1.0", - "d3-hierarchy": "^3.1.0", + "d3-hierarchy": "^3.1.2", "d3-interpolate": "^3.0.1", "d3-sankey": "^0.12.3", "d3-scale": "^4.0.2", "d3-selection": "^3.0.0", "d3-shape": "^3.2.0", - "d3-time-format": "^3.0.0", + "d3-time-format": "^4.1.0", "d3-transition": "^3.0.1", - "rfdc": "^1.3.0", - "tslib": "^2.0.0" + "tslib": "^2.3.1" }, "peerDependencies": { - "@angular/animations": ">=12.0.0", - "@angular/cdk": ">=12.0.0", - "@angular/common": ">=12.0.0", - "@angular/core": ">=12.0.0", - "@angular/forms": ">=12.0.0", - "@angular/platform-browser": ">=12.0.0", - "@angular/platform-browser-dynamic": ">=12.0.0", - "rxjs": "^6.5.3 || ^7.4.0" + "@angular/animations": "17.x || 18.x", + "@angular/cdk": "17.x || 18.x", + "@angular/common": "17.x || 18.x", + "@angular/core": "17.x || 18.x", + "@angular/forms": "17.x || 18.x", + "@angular/platform-browser": "17.x || 18.x", + "@angular/platform-browser-dynamic": "17.x || 18.x", + "rxjs": "7.x" + } + }, + "node_modules/@swimlane/ngx-charts/node_modules/d3-time-format": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", + "license": "ISC", + "dependencies": { + "d3-time": "1 - 3" + }, + "engines": { + "node": ">=12" } }, "node_modules/@swimlane/ngx-graph": { @@ -6567,12 +6621,6 @@ "internmap": "^1.0.0" } }, - "node_modules/@swimlane/ngx-graph/node_modules/d3-dispatch": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz", - "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==", - "license": "BSD-3-Clause" - }, "node_modules/@swimlane/ngx-graph/node_modules/d3-ease": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz", @@ -6622,12 +6670,6 @@ "d3-array": "2" } }, - "node_modules/@swimlane/ngx-graph/node_modules/d3-timer": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz", - "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==", - "license": "BSD-3-Clause" - }, "node_modules/@swimlane/ngx-graph/node_modules/internmap": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", @@ -7049,9 +7091,9 @@ } }, "node_modules/@types/node": { - "version": "22.9.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz", - "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==", + "version": "22.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.1.tgz", + "integrity": "sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==", "dev": true, "license": "MIT", "dependencies": { @@ -7197,7 +7239,7 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/@types/turndown": { @@ -7255,17 +7297,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.13.0.tgz", - "integrity": "sha512-nQtBLiZYMUPkclSeC3id+x4uVd1SGtHuElTxL++SfP47jR0zfkZBJHc+gL4qPsgTuypz0k8Y2GheaDYn6Gy3rg==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.15.0.tgz", + "integrity": "sha512-+zkm9AR1Ds9uLWN3fkoeXgFppaQ+uEVtfOV62dDmsy9QCNqlRHWNEck4yarvRNrvRcHQLGfqBNui3cimoz8XAg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.13.0", - "@typescript-eslint/type-utils": "8.13.0", - "@typescript-eslint/utils": "8.13.0", - "@typescript-eslint/visitor-keys": "8.13.0", + "@typescript-eslint/scope-manager": "8.15.0", + "@typescript-eslint/type-utils": "8.15.0", + "@typescript-eslint/utils": "8.15.0", + "@typescript-eslint/visitor-keys": "8.15.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -7289,16 +7331,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.13.0.tgz", - "integrity": "sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.15.0.tgz", + "integrity": "sha512-7n59qFpghG4uazrF9qtGKBZXn7Oz4sOMm8dwNWDQY96Xlm2oX67eipqcblDj+oY1lLCbf1oltMZFpUso66Kl1A==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "8.13.0", - "@typescript-eslint/types": "8.13.0", - "@typescript-eslint/typescript-estree": "8.13.0", - "@typescript-eslint/visitor-keys": "8.13.0", + "@typescript-eslint/scope-manager": "8.15.0", + "@typescript-eslint/types": "8.15.0", + "@typescript-eslint/typescript-estree": "8.15.0", + "@typescript-eslint/visitor-keys": "8.15.0", "debug": "^4.3.4" }, "engines": { @@ -7318,14 +7360,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz", - "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.15.0.tgz", + "integrity": "sha512-QRGy8ADi4J7ii95xz4UoiymmmMd/zuy9azCaamnZ3FM8T5fZcex8UfJcjkiEZjJSztKfEBe3dZ5T/5RHAmw2mA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.13.0", - "@typescript-eslint/visitor-keys": "8.13.0" + "@typescript-eslint/types": "8.15.0", + "@typescript-eslint/visitor-keys": "8.15.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7336,14 +7378,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.13.0.tgz", - "integrity": "sha512-Rqnn6xXTR316fP4D2pohZenJnp+NwQ1mo7/JM+J1LWZENSLkJI8ID8QNtlvFeb0HnFSK94D6q0cnMX6SbE5/vA==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.15.0.tgz", + "integrity": "sha512-UU6uwXDoI3JGSXmcdnP5d8Fffa2KayOhUUqr/AiBnG1Gl7+7ut/oyagVeSkh7bxQ0zSXV9ptRh/4N15nkCqnpw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.13.0", - "@typescript-eslint/utils": "8.13.0", + "@typescript-eslint/typescript-estree": "8.15.0", + "@typescript-eslint/utils": "8.15.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -7354,6 +7396,9 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0" + }, "peerDependenciesMeta": { "typescript": { "optional": true @@ -7361,9 +7406,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz", - "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.15.0.tgz", + "integrity": "sha512-n3Gt8Y/KyJNe0S3yDCD2RVKrHBC4gTUcLTebVBXacPy091E6tNspFLKRXlk3hwT4G55nfr1n2AdFqi/XMxzmPQ==", "dev": true, "license": "MIT", "engines": { @@ -7375,14 +7420,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz", - "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.15.0.tgz", + "integrity": "sha512-1eMp2JgNec/niZsR7ioFBlsh/Fk0oJbhaqO0jRyQBMgkz7RrFfkqF9lYYmBoGBaSiLnu8TAPQTwoTUiSTUW9dg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "8.13.0", - "@typescript-eslint/visitor-keys": "8.13.0", + "@typescript-eslint/types": "8.15.0", + "@typescript-eslint/visitor-keys": "8.15.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -7404,16 +7449,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.13.0.tgz", - "integrity": "sha512-A1EeYOND6Uv250nybnLZapeXpYMl8tkzYUxqmoKAWnI4sei3ihf2XdZVd+vVOmHGcp3t+P7yRrNsyyiXTvShFQ==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.15.0.tgz", + "integrity": "sha512-k82RI9yGhr0QM3Dnq+egEpz9qB6Un+WLYhmoNcvl8ltMEededhh7otBVVIDDsEEttauwdY/hQoSsOv13lxrFzQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.13.0", - "@typescript-eslint/types": "8.13.0", - "@typescript-eslint/typescript-estree": "8.13.0" + "@typescript-eslint/scope-manager": "8.15.0", + "@typescript-eslint/types": "8.15.0", + "@typescript-eslint/typescript-estree": "8.15.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7424,17 +7469,22 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz", - "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.15.0.tgz", + "integrity": "sha512-h8vYOulWec9LhpwfAdZf2bjr8xIp0KNKnpgqSz0qqYYKAW/QZKw3ktRndbiAtUz4acH4QLQavwZBYCc0wulA/Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.13.0", - "eslint-visitor-keys": "^3.4.3" + "@typescript-eslint/types": "8.15.0", + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7444,6 +7494,19 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@vitejs/plugin-basic-ssl": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz", @@ -8267,14 +8330,14 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", - "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==", + "version": "0.4.12", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz", + "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==", "dev": true, "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.6.2", + "@babel/helper-define-polyfill-provider": "^0.6.3", "semver": "^6.3.1" }, "peerDependencies": { @@ -8296,13 +8359,13 @@ } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz", - "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz", + "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.6.2" + "@babel/helper-define-polyfill-provider": "^0.6.3" }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -8798,9 +8861,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001679", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001679.tgz", - "integrity": "sha512-j2YqID/YwpLnKzCmBOS4tlZdWprXm3ZmQLBH9ZBXFOhoxLA46fwyBvx6toCBWBmnuwUY/qB3kEU6gFx8qgCroA==", + "version": "1.0.30001680", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz", + "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==", "funding": [ { "type": "opencollective", @@ -9702,13 +9765,10 @@ } }, "node_modules/d3-dispatch": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz", - "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==", - "license": "ISC", - "engines": { - "node": ">=12" - } + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz", + "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==", + "license": "BSD-3-Clause" }, "node_modules/d3-drag": { "version": "3.0.0", @@ -9744,18 +9804,6 @@ "d3-timer": "1" } }, - "node_modules/d3-force/node_modules/d3-dispatch": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz", - "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==", - "license": "BSD-3-Clause" - }, - "node_modules/d3-force/node_modules/d3-timer": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz", - "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==", - "license": "BSD-3-Clause" - }, "node_modules/d3-format": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz", @@ -9924,13 +9972,10 @@ "license": "ISC" }, "node_modules/d3-timer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", - "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", - "license": "ISC", - "engines": { - "node": ">=12" - } + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz", + "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==", + "license": "BSD-3-Clause" }, "node_modules/d3-transition": { "version": "3.0.1", @@ -10308,10 +10353,13 @@ } }, "node_modules/dompurify": { - "version": "3.1.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz", - "integrity": "sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==", - "license": "(MPL-2.0 OR Apache-2.0)" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.1.tgz", + "integrity": "sha512-NBHEsc0/kzRYQd+AY6HR6B/IgsqzBABrqJbpCDQII/OK6h7B7LXzweZTDsqSW2LkTRpoxf18YUP+YjGySk6B3w==", + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } }, "node_modules/domutils": { "version": "3.1.0", @@ -10342,13 +10390,13 @@ } }, "node_modules/dotenv-expand": { - "version": "11.0.6", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz", - "integrity": "sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==", + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", + "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "dotenv": "^16.4.4" + "dotenv": "^16.4.5" }, "engines": { "node": ">=12" @@ -10388,9 +10436,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.55", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.55.tgz", - "integrity": "sha512-6maZ2ASDOTBtjt9FhqYPRnbvKU5tjG0IN9SztUOWYw2AzNDNpKJYLJmlK0/En4Hs/aiWnB+JZ+gW19PIGszgKg==", + "version": "1.5.60", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.60.tgz", + "integrity": "sha512-HcraRUkTKJ+8yA3b10i9qvhUlPBRDlKjn1XGek1zDGVfAKcvi8TsUnImGqLiEm9j6ZulxXIWWIo9BmbkbCTGgA==", "license": "ISC" }, "node_modules/emittery": { @@ -10689,27 +10737,27 @@ } }, "node_modules/eslint": { - "version": "9.14.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.14.0.tgz", - "integrity": "sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==", + "version": "9.15.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.15.0.tgz", + "integrity": "sha512-7CrWySmIibCgT1Os28lUU6upBshZ+GxybLOrmRzi08kS8MBuO8QA7pXEgYgY5W8vK3e74xv0lpjo9DbaGU9Rkw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.18.0", - "@eslint/core": "^0.7.0", - "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.14.0", - "@eslint/plugin-kit": "^0.2.0", + "@eslint/config-array": "^0.19.0", + "@eslint/core": "^0.9.0", + "@eslint/eslintrc": "^3.2.0", + "@eslint/js": "9.15.0", + "@eslint/plugin-kit": "^0.2.3", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.0", + "@humanwhocodes/retry": "^0.4.1", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.5", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.2.0", @@ -10728,8 +10776,7 @@ "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" @@ -12653,9 +12700,9 @@ } }, "node_modules/husky": { - "version": "9.1.6", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", - "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "license": "MIT", "bin": { @@ -12769,9 +12816,9 @@ "license": "MIT" }, "node_modules/immutable": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", - "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz", + "integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==", "dev": true, "license": "MIT" }, @@ -13856,9 +13903,9 @@ } }, "node_modules/jest-preset-angular": { - "version": "14.2.4", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-14.2.4.tgz", - "integrity": "sha512-xyhkaiBdn3keBgxxkcbqZu/my3ADU9NcDrz6DaMuGRaxz/bf6ZC1qxZ1eQuz5V1WuA3/rD64VA3Kke8P6E9qNg==", + "version": "14.3.2", + "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-14.3.2.tgz", + "integrity": "sha512-Aoei1O/o7x1I6bSCpU08jGqtQ2RBq7HvNbMIo/vHHbM50v4HX1gF3sWZTkM0U0KorNkdwZeONjMsPNwHyUAKqA==", "dev": true, "license": "MIT", "dependencies": { @@ -16035,9 +16082,9 @@ } }, "node_modules/node-gyp-build": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", - "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.3.tgz", + "integrity": "sha512-EMS95CMJzdoSKoIiXo8pxKoL8DYxwIZXYlLmgPb8KUv794abpnLK6ynsCAWNliOjREKruYKdzbh76HHYUHX7nw==", "dev": true, "license": "MIT", "bin": { @@ -16330,9 +16377,9 @@ "license": "MIT" }, "node_modules/nx": { - "version": "20.0.12", - "resolved": "https://registry.npmjs.org/nx/-/nx-20.0.12.tgz", - "integrity": "sha512-pQ7Rwb2Qlhr+fEamd0qc4VsL/aKjVJ0MXPsosuhdZobLJQOKHefe+nXSSZ1Jy19VM3RRpxUKFneD/V2jvs3qDA==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/nx/-/nx-20.1.1.tgz", + "integrity": "sha512-bLDEDBUuAvFC5b74QUnmJxUHTRa0mkc2wRPmb2rN3d1VlTFjzKTT9ClJTR1emp/DDO620zyAmVCDVKmnSZNFoQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -16375,16 +16422,16 @@ "nx-cloud": "bin/nx-cloud.js" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "20.0.12", - "@nx/nx-darwin-x64": "20.0.12", - "@nx/nx-freebsd-x64": "20.0.12", - "@nx/nx-linux-arm-gnueabihf": "20.0.12", - "@nx/nx-linux-arm64-gnu": "20.0.12", - "@nx/nx-linux-arm64-musl": "20.0.12", - "@nx/nx-linux-x64-gnu": "20.0.12", - "@nx/nx-linux-x64-musl": "20.0.12", - "@nx/nx-win32-arm64-msvc": "20.0.12", - "@nx/nx-win32-x64-msvc": "20.0.12" + "@nx/nx-darwin-arm64": "20.1.1", + "@nx/nx-darwin-x64": "20.1.1", + "@nx/nx-freebsd-x64": "20.1.1", + "@nx/nx-linux-arm-gnueabihf": "20.1.1", + "@nx/nx-linux-arm64-gnu": "20.1.1", + "@nx/nx-linux-arm64-musl": "20.1.1", + "@nx/nx-linux-x64-gnu": "20.1.1", + "@nx/nx-linux-x64-musl": "20.1.1", + "@nx/nx-win32-arm64-msvc": "20.1.1", + "@nx/nx-win32-x64-msvc": "20.1.1" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -16817,9 +16864,9 @@ } }, "node_modules/p-retry": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz", - "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz", + "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==", "dev": true, "license": "MIT", "dependencies": { @@ -17113,6 +17160,24 @@ "node": ">=6" } }, + "node_modules/pdf-lib": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/pdf-lib/-/pdf-lib-1.17.1.tgz", + "integrity": "sha512-V/mpyJAoTsN4cnP31vc0wfNA1+p20evqqnap0KLoRUN0Yk/p3wN52DOEsL4oBFcLdb76hlpKPtzJIgo67j/XLw==", + "license": "MIT", + "dependencies": { + "@pdf-lib/standard-fonts": "^1.0.0", + "@pdf-lib/upng": "^1.0.1", + "pako": "^1.0.11", + "tslib": "^1.11.1" + } + }, + "node_modules/pdf-lib/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "license": "0BSD" + }, "node_modules/pdfjs-dist": { "version": "4.8.69", "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.8.69.tgz", @@ -17404,14 +17469,14 @@ } }, "node_modules/postcss-modules-local-by-default": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", - "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz", + "integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==", "dev": true, "license": "MIT", "dependencies": { "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", + "postcss-selector-parser": "^7.0.0", "postcss-value-parser": "^4.1.0" }, "engines": { @@ -17422,13 +17487,13 @@ } }, "node_modules/postcss-modules-scope": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", - "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz", + "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==", "dev": true, "license": "ISC", "dependencies": { - "postcss-selector-parser": "^6.0.4" + "postcss-selector-parser": "^7.0.0" }, "engines": { "node": "^10 || ^12 || >= 14" @@ -17454,9 +17519,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz", + "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==", "dev": true, "license": "MIT", "dependencies": { @@ -17474,9 +17539,9 @@ "license": "MIT" }, "node_modules/posthog-js": { - "version": "1.181.0", - "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.181.0.tgz", - "integrity": "sha512-bI+J+f4E8x4JwbGtG6LReQv1Xvss01F6cs7UDlvffHySpVhNq4ptkNjV88B92IVEsrCtNYhy/TjFnGxk6RN0Qw==", + "version": "1.187.2", + "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.187.2.tgz", + "integrity": "sha512-IGKsZ7M4AYACm5I6gGGFrv9kR/MOnVYw11XFYCLk363n0nq+ghwenoW1jJVL9gZLGKiMsConUR8rG2DD2OMKyg==", "license": "MIT", "dependencies": { "core-js": "^3.38.1", @@ -18398,6 +18463,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", + "dev": true, "license": "MIT" }, "node_modules/rimraf": { @@ -18631,14 +18697,14 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.80.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz", - "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==", + "version": "1.81.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.81.0.tgz", + "integrity": "sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==", "dev": true, "license": "MIT", "dependencies": { "chokidar": "^4.0.0", - "immutable": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -20116,13 +20182,6 @@ "node": "*" } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true, - "license": "MIT" - }, "node_modules/thingies": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz", @@ -20150,22 +20209,22 @@ "license": "MIT" }, "node_modules/tldts": { - "version": "6.1.59", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.59.tgz", - "integrity": "sha512-472ilPxsRuqBBpn+KuRBHJvZhk6tTo4yTVsmODrLBNLwRYJPkDfMEHivgNwp5iEl+cbrZzzRtLKRxZs7+QKkRg==", + "version": "6.1.61", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.61.tgz", + "integrity": "sha512-rv8LUyez4Ygkopqn+M6OLItAOT9FF3REpPQDkdMx5ix8w4qkuE7Vo2o/vw1nxKQYmJDV8JpAMJQr1b+lTKf0FA==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^6.1.59" + "tldts-core": "^6.1.61" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.1.59", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.59.tgz", - "integrity": "sha512-EiYgNf275AQyVORl8HQYYe7rTVnmLb4hkWK7wAk/12Ksy5EiHpmUmTICa4GojookBPC8qkLMBKKwCmzNA47ZPQ==", + "version": "6.1.61", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.61.tgz", + "integrity": "sha512-In7VffkDWUPgwa+c9picLUxvb0RltVwTkSgMNFgvlGSWveCzGBemBqTsgJCL4EDFWZ6WH0fKTsot6yNhzy3ZzQ==", "dev": true, "license": "MIT" }, @@ -20801,9 +20860,9 @@ } }, "node_modules/uuid": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.2.tgz", - "integrity": "sha512-14FfcOJmqdjbBPdDjFQyk/SdT4NySW4eM0zcG+HqbHP5jzuH56xO3J1DGhgs/cEMCfwYi3HQI1gnTO62iaG+tQ==", + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz", + "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==", "funding": [ "https://github.com/sponsors/broofa", "https://github.com/sponsors/ctavan" @@ -20874,9 +20933,9 @@ } }, "node_modules/vite": { - "version": "5.4.10", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz", - "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==", + "version": "5.4.11", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", + "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", "dev": true, "license": "MIT", "dependencies": { @@ -21465,12 +21524,6 @@ "d3-timer": "^1.0.5" } }, - "node_modules/webcola/node_modules/d3-dispatch": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz", - "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==", - "license": "BSD-3-Clause" - }, "node_modules/webcola/node_modules/d3-drag": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz", @@ -21496,12 +21549,6 @@ "d3-path": "1" } }, - "node_modules/webcola/node_modules/d3-timer": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz", - "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==", - "license": "BSD-3-Clause" - }, "node_modules/webidl-conversions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", diff --git a/package.json b/package.json index 6ffc53b8f45f..06aa6ac1cfe0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "artemis", - "version": "7.7.0", + "version": "7.7.2", "description": "Interactive Learning with Individual Feedback", "private": true, "license": "MIT", @@ -13,32 +13,32 @@ "node_modules" ], "dependencies": { - "@angular/animations": "18.2.11", - "@angular/cdk": "18.2.12", - "@angular/common": "18.2.11", - "@angular/compiler": "18.2.11", - "@angular/core": "18.2.11", - "@angular/forms": "18.2.11", - "@angular/localize": "18.2.11", - "@angular/material": "18.2.12", - "@angular/platform-browser": "18.2.11", - "@angular/platform-browser-dynamic": "18.2.11", - "@angular/router": "18.2.11", - "@angular/service-worker": "18.2.11", + "@angular/animations": "18.2.12", + "@angular/cdk": "18.2.13", + "@angular/common": "18.2.12", + "@angular/compiler": "18.2.12", + "@angular/core": "18.2.12", + "@angular/forms": "18.2.12", + "@angular/localize": "18.2.12", + "@angular/material": "18.2.13", + "@angular/platform-browser": "18.2.12", + "@angular/platform-browser-dynamic": "18.2.12", + "@angular/router": "18.2.12", + "@angular/service-worker": "18.2.12", "@ctrl/ngx-emoji-mart": "9.2.0", "@danielmoncada/angular-datetime-picker": "18.1.0", "@fingerprintjs/fingerprintjs": "4.5.1", "@fortawesome/angular-fontawesome": "0.15.0", - "@fortawesome/fontawesome-svg-core": "6.6.0", - "@fortawesome/free-regular-svg-icons": "6.6.0", - "@fortawesome/free-solid-svg-icons": "6.6.0", + "@fortawesome/fontawesome-svg-core": "6.7.1", + "@fortawesome/free-regular-svg-icons": "6.7.1", + "@fortawesome/free-solid-svg-icons": "6.7.1", "@ls1intum/apollon": "3.3.15", "@ng-bootstrap/ng-bootstrap": "17.0.1", "@ngx-translate/core": "16.0.3", "@ngx-translate/http-loader": "16.0.0", - "@sentry/angular": "8.37.1", + "@sentry/angular": "8.39.0", "@siemens/ngx-datatable": "22.4.1", - "@swimlane/ngx-charts": "20.5.0", + "@swimlane/ngx-charts": "21.0.0", "@swimlane/ngx-graph": "8.4.0", "@vscode/codicons": "0.0.36", "@vscode/markdown-it-katex": "1.1.0", @@ -48,7 +48,7 @@ "crypto-js": "4.2.0", "dayjs": "1.11.13", "diff-match-patch-typescript": "1.1.0", - "dompurify": "3.1.7", + "dompurify": "3.2.1", "emoji-js": "3.8.0", "export-to-csv": "1.4.0", "fast-json-patch": "3.1.1", @@ -67,8 +67,9 @@ "ngx-infinite-scroll": "18.0.0", "ngx-webstorage": "18.0.0", "papaparse": "5.4.1", + "pdf-lib": "1.17.1", "pdfjs-dist": "4.8.69", - "posthog-js": "1.181.0", + "posthog-js": "1.187.2", "rxjs": "7.8.1", "simple-statistics": "7.8.7", "smoothscroll-polyfill": "0.4.4", @@ -77,7 +78,7 @@ "ts-cacheable": "1.0.10", "tslib": "2.8.1", "turndown": "7.2.0", - "uuid": "11.0.2", + "uuid": "11.0.3", "webstomp-client": "1.2.6", "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz", "zone.js": "0.14.10" @@ -91,14 +92,14 @@ "d3-transition": "^3.0.1" }, "@typescript-eslint/utils": { - "eslint": "^9.14.0" + "eslint": "^9.15.0" }, "braces": "3.0.3", "cookie": "1.0.1", "critters": "0.0.25", "debug": "4.3.7", "eslint-plugin-deprecation": { - "eslint": "^9.14.0" + "eslint": "^9.15.0" }, "express": "5.0.1", "jsdom": "25.0.1", @@ -106,7 +107,7 @@ "rimraf": "6.0.1", "semver": "7.6.3", "tough-cookie": "5.0.0", - "vite": "5.4.10", + "vite": "5.4.11", "webpack-dev-middleware": "7.4.2", "webpack-dev-server": "5.1.0", "word-wrap": "1.2.5", @@ -115,16 +116,16 @@ }, "devDependencies": { "@angular-builders/jest": "18.0.0", - "@angular-devkit/build-angular": "18.2.11", - "@angular-eslint/builder": "18.4.0", - "@angular-eslint/eslint-plugin": "18.4.0", - "@angular-eslint/eslint-plugin-template": "18.4.0", - "@angular-eslint/schematics": "18.4.0", - "@angular-eslint/template-parser": "18.4.0", - "@angular/cli": "18.2.11", - "@angular/compiler-cli": "18.2.11", - "@angular/language-service": "18.2.11", - "@sentry/types": "8.37.1", + "@angular-devkit/build-angular": "18.2.12", + "@angular-eslint/builder": "18.4.1", + "@angular-eslint/eslint-plugin": "18.4.1", + "@angular-eslint/eslint-plugin-template": "18.4.1", + "@angular-eslint/schematics": "18.4.1", + "@angular-eslint/template-parser": "18.4.1", + "@angular/cli": "18.2.12", + "@angular/compiler-cli": "18.2.12", + "@angular/language-service": "18.2.12", + "@sentry/types": "8.39.0", "@types/crypto-js": "4.2.2", "@types/d3-shape": "3.1.6", "@types/dompurify": "3.0.5", @@ -132,35 +133,35 @@ "@types/jest": "29.5.14", "@types/lodash-es": "4.17.12", "@types/markdown-it": "14.1.2", - "@types/node": "22.9.0", + "@types/node": "22.9.1", "@types/papaparse": "5.3.15", "@types/smoothscroll-polyfill": "0.3.4", "@types/sockjs-client": "1.5.4", "@types/turndown": "5.0.5", "@types/uuid": "10.0.0", - "@typescript-eslint/eslint-plugin": "8.13.0", - "@typescript-eslint/parser": "8.13.0", - "eslint": "9.14.0", + "@typescript-eslint/eslint-plugin": "8.15.0", + "@typescript-eslint/parser": "8.15.0", + "eslint": "9.15.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-deprecation": "3.0.0", "eslint-plugin-jest": "28.9.0", "eslint-plugin-jest-extended": "2.4.0", "eslint-plugin-prettier": "5.2.1", "folder-hash": "4.0.4", - "husky": "9.1.6", + "husky": "9.1.7", "jest": "29.7.0", "jest-canvas-mock": "2.5.2", "jest-date-mock": "1.0.10", "jest-extended": "4.0.2", "jest-fail-on-console": "3.3.1", "jest-junit": "16.0.0", - "jest-preset-angular": "14.2.4", + "jest-preset-angular": "14.3.2", "lint-staged": "15.2.10", "ngxtension": "4.1.0", "ng-mocks": "14.13.1", "prettier": "3.3.3", "rimraf": "6.0.1", - "sass": "1.80.6", + "sass": "1.81.0", "ts-jest": "29.2.5", "typescript": "5.5.4", "weak-napi": "2.0.2" diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java new file mode 100644 index 000000000000..71c6b73a208f --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAffectedStudentDTO.java @@ -0,0 +1,4 @@ +package de.tum.cit.aet.artemis.assessment.dto; + +public record FeedbackAffectedStudentDTO(long courseId, long participationId, String firstName, String lastName, String login, String repositoryURI) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java index d913f0c96e3f..e56722f079cf 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackAnalysisResponseDTO.java @@ -1,11 +1,13 @@ package de.tum.cit.aet.artemis.assessment.dto; import java.util.List; +import java.util.Set; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackAnalysisResponseDTO(SearchResultPageDTO feedbackDetails, long totalItems, int totalAmountOfTasks, List testCaseNames) { +public record FeedbackAnalysisResponseDTO(SearchResultPageDTO feedbackDetails, long totalItems, Set taskNames, List testCaseNames, + List errorCategories) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java index 7b3fd09ad57d..d22a036e7489 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackDetailDTO.java @@ -1,7 +1,16 @@ package de.tum.cit.aet.artemis.assessment.dto; +import java.util.Arrays; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record FeedbackDetailDTO(long count, double relativeCount, String detailText, String testCaseName, String taskNumber, String errorCategory) { +public record FeedbackDetailDTO(List concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, + String errorCategory) { + + public FeedbackDetailDTO(String concatenatedFeedbackIds, long count, double relativeCount, String detailText, String testCaseName, String taskName, String errorCategory) { + this(Arrays.stream(concatenatedFeedbackIds.split(",")).map(Long::valueOf).toList(), count, relativeCount, detailText, testCaseName, taskName, errorCategory); + } + } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackPageableDTO.java b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackPageableDTO.java index c63f9b5540f7..b65d09545fc2 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackPageableDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/dto/FeedbackPageableDTO.java @@ -14,6 +14,8 @@ public class FeedbackPageableDTO extends PageableSearchDTO { private String searchTerm; + private List filterErrorCategories; + public List getFilterTasks() { return filterTasks; } @@ -45,4 +47,12 @@ public String getSearchTerm() { public void setSearchTerm(String searchTerm) { this.searchTerm = searchTerm; } + + public List getFilterErrorCategories() { + return filterErrorCategories; + } + + public void setFilterErrorCategories(List filterErrorCategories) { + this.filterErrorCategories = filterErrorCategories; + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java index 627bae47f858..4903913b1775 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ComplaintRepository.java @@ -256,7 +256,6 @@ SELECT COUNT(c) @EntityGraph(type = LOAD, attributePaths = { "result.participation", "result.submission", "result.assessor" }) List getAllByResult_Assessor_IdAndResult_Participation_Exercise_Course_Id(Long assessorId, Long courseId); - // Valid JPQL syntax. Only SCA fails to properly detect the types. /** * Get the number of Complaints for all tutors of a course * @@ -267,8 +266,8 @@ SELECT COUNT(c) SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintsDTO( r.assessor.id, COUNT(c), - SUM( CASE WHEN (c.accepted = TRUE ) THEN 1L ELSE 0L END), - SUM( CASE WHEN (c.accepted = TRUE) THEN e.maxPoints ELSE 0.0 END) + SUM(CASE WHEN c.accepted = TRUE THEN 1L ELSE 0L END), + CAST(SUM(CASE WHEN c.accepted = TRUE THEN e.maxPoints ELSE 0.0 END) AS double) ) FROM Complaint c JOIN c.result r @@ -282,7 +281,6 @@ SELECT COUNT(c) """) List findTutorLeaderboardComplaintsByCourseId(@Param("courseId") long courseId); - // Valid JPQL syntax. Only SCA fails to properly detect the types. /** * Get the number of Complaints for all tutors of an exercise * @@ -293,8 +291,8 @@ SELECT COUNT(c) SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintsDTO( r.assessor.id, COUNT(c), - SUM( CASE WHEN (c.accepted = TRUE ) THEN 1L ELSE 0L END), - SUM( CASE WHEN (c.accepted = TRUE) THEN e.maxPoints ELSE 0.0 END) + SUM(CASE WHEN c.accepted = TRUE THEN 1L ELSE 0L END), + CAST(SUM(CASE WHEN c.accepted = TRUE THEN e.maxPoints ELSE 0.0 END) AS double) ) FROM Complaint c JOIN c.result r @@ -308,7 +306,6 @@ SELECT COUNT(c) """) List findTutorLeaderboardComplaintsByExerciseId(@Param("exerciseId") long exerciseId); - // Valid JPQL syntax. Only SCA fails to properly detect the types. /** * Get the number of Complaints for all tutors of an exam * @@ -319,8 +316,8 @@ SELECT COUNT(c) SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintsDTO( r.assessor.id, COUNT(c), - SUM( CASE WHEN (c.accepted = TRUE ) THEN 1L ELSE 0L END), - SUM( CASE WHEN (c.accepted = TRUE) THEN e.maxPoints ELSE 0.0 END) + SUM(CASE WHEN c.accepted = TRUE THEN 1L ELSE 0L END), + CAST(SUM(CASE WHEN c.accepted = TRUE THEN e.maxPoints ELSE 0.0 END) AS double) ) FROM Complaint c JOIN c.result r @@ -345,7 +342,7 @@ SELECT COUNT(c) SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardComplaintResponsesDTO( cr.reviewer.id, COUNT(c), - SUM(e.maxPoints) + SUM(CAST(e.maxPoints AS double)) ) FROM Complaint c JOIN c.complaintResponse cr @@ -422,8 +419,8 @@ SELECT COUNT(c) SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequestsDTO( r.assessor.id, COUNT(c), - SUM( CASE WHEN (c.accepted IS NULL) THEN 1L ELSE 0L END), - SUM( CASE WHEN (c.accepted IS NULL) THEN e.maxPoints ELSE 0.0 END) + SUM(CASE WHEN c.accepted IS NULL THEN 1L ELSE 0L END), + CAST(SUM(CASE WHEN c.accepted IS NULL THEN e.maxPoints ELSE 0.0 END) AS double) ) FROM Complaint c JOIN c.result r @@ -447,8 +444,8 @@ SELECT COUNT(c) SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardMoreFeedbackRequestsDTO( r.assessor.id, COUNT(c), - SUM( CASE WHEN (c.accepted IS NULL) THEN 1L ELSE 0L END), - SUM( CASE WHEN (c.accepted IS NULL) THEN e.maxPoints ELSE 0.0 END) + SUM(CASE WHEN c.accepted IS NULL THEN 1L ELSE 0L END), + CAST(SUM(CASE WHEN c.accepted IS NULL THEN e.maxPoints ELSE 0.0 END) AS double) ) FROM Complaint c JOIN c.result r diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java index 12f4e658b7fc..5d42abe8f971 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/FeedbackRepository.java @@ -32,8 +32,8 @@ public interface FeedbackRepository extends ArtemisJpaRepository @Query(""" SELECT feedback - FROM Feedback feedback - WHERE feedback.gradingInstruction.id IN :gradingInstructionsIds + FROM Feedback feedback + WHERE feedback.gradingInstruction.id IN :gradingInstructionsIds """) List findFeedbackByGradingInstructionIds(@Param("gradingInstructionsIds") List gradingInstructionsIds); diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java index 14598bad30b1..24636efc2330 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ParticipantScoreRepository.java @@ -44,10 +44,6 @@ public interface ParticipantScoreRepository extends ArtemisJpaRepository findAllOutdated(); - @Override - @EntityGraph(type = LOAD, attributePaths = { "exercise", "lastResult", "lastRatedResult" }) - List findAll(); - @EntityGraph(type = LOAD, attributePaths = { "exercise", "lastResult", "lastRatedResult" }) List findAllByExercise(Exercise exercise); diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java index 5a7b75e82de5..5e70f4c83668 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/ResultRepository.java @@ -618,7 +618,6 @@ else if (Boolean.FALSE.equals(ratedCount.rated())) { """) List findTutorLeaderboardAssessmentByExerciseId(@Param("exerciseId") long exerciseId); - // Valid JPQL syntax, only SCA is not able to parse it due to mixing primitive and object types @Query(""" SELECT new de.tum.cit.aet.artemis.assessment.dto.tutor.TutorLeaderboardAssessmentsDTO( r.assessor.id, diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java index dbf32eb37bad..51cc56a015da 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/StudentScoreRepository.java @@ -69,4 +69,5 @@ public interface StudentScoreRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link Feedback} entries where the associated {@link Result} has no submission and no participation. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + // Subquery ok + @Query(""" + DELETE FROM Feedback f + WHERE f.result IN ( + SELECT r + FROM Result r + WHERE r.submission IS NULL + AND r.participation IS NULL + ) + """) + int deleteFeedbackForOrphanResults(); + + /** + * Deletes {@link Feedback} entries with a {@code null} result. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM Feedback f + WHERE f.result IS NULL + """) + int deleteOrphanFeedback(); + + /** + * Deletes {@link Feedback} entries associated with rated {@link Result} that are not the latest rated result + * for a {@link Participation}, within courses conducted between the specified date range. + * This query removes old feedback entries that are not part of the latest rated results, for courses whose + * end date is before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM Feedback f + WHERE f.result IN ( + SELECT r + FROM Result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE r.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = TRUE + ) + AND r.rated = TRUE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteOldFeedbackThatAreNotLatestRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); + + /** + * Deletes non-rated {@link Feedback} entries that are not the latest non-rated result, where the associated course's start and end dates + * are between the specified date range. + * This query removes old feedback entries that are not part of the latest non-rated result within courses whose end date is before + * {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM Feedback f + WHERE f.result IN ( + SELECT r + FROM Result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE r.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + ) + AND r.rated = FALSE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteOldNonRatedFeedbackWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/LongFeedbackTextCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/LongFeedbackTextCleanupRepository.java new file mode 100644 index 000000000000..09dbf01baff2 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/LongFeedbackTextCleanupRepository.java @@ -0,0 +1,131 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.time.ZonedDateTime; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; + +/** + * Spring Data JPA repository for cleaning up old and orphaned long feedback text entries. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface LongFeedbackTextCleanupRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link LongFeedbackText} entries linked to {@link Feedback} where the associated + * {@link Result} has no participation and no submission. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM LongFeedbackText lft + WHERE lft.feedback.id IN ( + SELECT f.id + FROM Feedback f + WHERE f.result.participation IS NULL + AND f.result.submission IS NULL + ) + """) + int deleteLongFeedbackTextForOrphanResult(); + + /** + * Deletes {@link LongFeedbackText} linked to {@link Feedback} with a {@code null} result. + * + * @return the number of deleted {@link LongFeedbackText} entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM LongFeedbackText lft + WHERE lft.feedback IN ( + SELECT f + FROM Feedback f + WHERE f.result IS NULL + ) + """) + int deleteLongFeedbackTextForOrphanedFeedback(); + + /** + * Deletes {@link LongFeedbackText} entries associated with rated {@link Result} that are not the latest rated result + * for a {@link Participation}, within courses conducted between the specified date range. + * This query removes old long feedback text that is not part of the latest rated results, for courses whose + * end date is before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM LongFeedbackText lft + WHERE lft.feedback IN ( + SELECT f + FROM Feedback f + LEFT JOIN f.result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE f.result.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = TRUE + ) + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + AND r.rated = TRUE + ) + """) + int deleteLongFeedbackTextForRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); + + /** + * Deletes {@link LongFeedbackText} entries linked to non-rated {@link Feedback} that are not the latest non-rated result where the associated course's start + * and end dates are between the specified date range. + * This query deletes long feedback text for feedback associated with non-rated results, within courses whose + * end date is before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM LongFeedbackText lft + WHERE lft.feedback IN ( + SELECT f + FROM Feedback f + LEFT JOIN f.result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE f.result.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = FALSE + ) + AND r.rated = FALSE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteLongFeedbackTextForNonRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/ParticipantScoreCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/ParticipantScoreCleanupRepository.java new file mode 100644 index 000000000000..50fcdd5b14b3 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/ParticipantScoreCleanupRepository.java @@ -0,0 +1,158 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.time.ZonedDateTime; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.assessment.domain.ParticipantScore; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; + +/** + * Spring Data JPA repository for cleaning up old and orphaned participant scores. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface ParticipantScoreCleanupRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link ParticipantScore} entries where the associated {@link Result} is not the latest rated result + * for a {@link Participation}, within courses conducted between the specified date range. + * This query removes participant scores linked to results that are not the most recent rated results, for courses + * whose end date is before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM ParticipantScore ps + WHERE ps.lastResult IN ( + SELECT r + FROM Result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE r.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = TRUE + ) + AND r.rated = TRUE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteParticipantScoresForNonLatestLastResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); + + /** + * Deletes {@link ParticipantScore} entries where the associated last rated {@link Result} is not the latest rated result + * for a {@link Participation}, within courses conducted between the specified date range. + * This query removes participant scores linked to rated results that are not the most recent rated results, for courses + * whose end date is before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM ParticipantScore ps + WHERE ps.lastRatedResult IN ( + SELECT r + FROM Result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE r.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = TRUE + ) + AND r.rated = TRUE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteParticipantScoresForNonLatestLastRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); + + /** + * Deletes {@link ParticipantScore} entries where the associated {@link Result} is not the latest result and is non-rated, + * and the course's start and end dates are between the specified date range. + * This query deletes participant scores for non-rated results within courses whose end date is before + * {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM ParticipantScore ps + WHERE ps.lastResult IN ( + SELECT r + FROM Result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE r.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = FALSE + ) + AND r.rated = FALSE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom ) + """) + int deleteParticipantScoresForLatestNonRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); + + /** + * Deletes {@link ParticipantScore} entries where the associated {@link Result} is not latest and is non-rated, even though + * it is marked as the last rated result, to prevent potential integrity violations. + * The deletion is based on courses whose start and end dates fall within the specified range. + * This scenario should not normally occur, as non-rated results cannot be marked as rated, but the + * method ensures cleanup in case of any potential integrity issues. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM ParticipantScore ps + WHERE ps.lastRatedResult IN ( + SELECT r + FROM Result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE r.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = FALSE + ) + AND r.rated = FALSE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteParticipantScoresForNonRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/PlagiarismComparisonCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/PlagiarismComparisonCleanupRepository.java new file mode 100644 index 000000000000..a93ba9604223 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/PlagiarismComparisonCleanupRepository.java @@ -0,0 +1,91 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.time.ZonedDateTime; +import java.util.List; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; + +/** + * Spring Data JPA repository for cleaning up old plagiarism comparison entries. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface PlagiarismComparisonCleanupRepository extends ArtemisJpaRepository, Long> { + + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE + FROM PlagiarismComparison pc + WHERE pc.id IN :ids + """) + int deleteByIdsIn(@Param("ids") List ids); + + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE + FROM PlagiarismSubmissionElement e + WHERE e.plagiarismSubmission.plagiarismComparison.id IN :ids + """) + int deletePlagiarismSubmissionElementsByComparisonIdsIn(@Param("ids") List ids); + + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE + FROM PlagiarismSubmission s + WHERE s.plagiarismComparison.id IN :ids + """) + int deletePlagiarismSubmissionsByComparisonIdsIn(@Param("ids") List ids); + + @Modifying + @Transactional // ok because of modifying + @Query(""" + UPDATE PlagiarismComparison pc + SET pc.submissionA = NULL, pc.submissionB = NULL + WHERE pc.id IN :ids + """) + int setPlagiarismSubmissionsToNullInComparisonsWithIds(@Param("ids") List ids); + + @Modifying + @Transactional // ok because of delete + @Query(nativeQuery = true, value = """ + DELETE + FROM plagiarism_comparison_matches m + WHERE m.plagiarism_comparison_id IN :ids + """) + int deletePlagiarismComparisonMatchesByComparisonIdsIn(@Param("ids") List ids); + + /** + * Retrieves a list of unnecessary plagiarism comparison IDs based on the associated course's date range. + * A plagiarism comparison is considered unnecessary if its status is 'NONE' and the related course's + * start and end dates fall within the provided range. Also deletes orphan objects. + * + * @param deleteFrom The start of the date range for filtering unnecessary plagiarism comparisons. + * @param deleteTo The end of the date range for filtering unnecessary plagiarism comparisons. + * @return A list of Long values representing the IDs of unnecessary plagiarism comparisons. + */ + @Query(""" + SELECT pc.id + FROM PlagiarismComparison pc + LEFT JOIN pc.plagiarismResult pr + LEFT JOIN pr.exercise ex + LEFT JOIN ex.course c + WHERE pc.status = de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.NONE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + """) + List findPlagiarismComparisonIdWithStatusNoneThatBelongToCourseWithDates(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/RatingCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/RatingCleanupRepository.java new file mode 100644 index 000000000000..07f10ec6d3d3 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/RatingCleanupRepository.java @@ -0,0 +1,41 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.assessment.domain.Rating; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; + +/** + * Spring Data JPA repository for cleaning up old and orphaned ratings. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface RatingCleanupRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link Rating} entries where the associated {@link Result} has no submission and no participation. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE + FROM Rating rt + WHERE rt.result IN ( + SELECT r + FROM Result r + WHERE r.submission IS NULL + AND r.participation IS NULL + ) + """) + int deleteOrphanRating(); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/ResultCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/ResultCleanupRepository.java new file mode 100644 index 000000000000..7d9e413aa5e7 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/ResultCleanupRepository.java @@ -0,0 +1,115 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.time.ZonedDateTime; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.exercise.domain.Exercise; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; + +/** + * Spring Data JPA repository for cleaning up old and orphaned results. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface ResultCleanupRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link Result} entries that have no participation and no submission. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE + FROM Result r + WHERE r.participation IS NULL + AND r.submission IS NULL + """) + int deleteResultWithoutParticipationAndSubmission(); + + /** + * Deletes non-rated {@link Result} entries that are not the latest result where the associated {@link Participation} and {@link Exercise} are not null, + * and the course's start and end dates fall between the specified date range. + * This query deletes non-rated results associated with exercises within courses whose end date is before + * {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM Result r + WHERE r.rated = FALSE + AND r.participation IS NOT NULL + AND r.participation.exercise IS NOT NULL + AND EXISTS ( + SELECT 1 + FROM Course c + LEFT JOIN c.exercises e + WHERE e = r.participation.exercise + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + AND r.id NOT IN ( + SELECT max_id + FROM ( + SELECT MAX(r2.id) AS max_id + FROM Result r2 + WHERE r2.rated = FALSE + GROUP BY r2.participation.id + ) + ) + """) + int deleteNonLatestNonRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); + + /** + * Deletes rated {@link Result} entries that are not the latest rated result for a {@link Participation}, within courses + * conducted between the specified date range. + * This query removes rated results that are not the most recent for a participation, for courses whose end date is + * before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM Result r + WHERE r.rated = TRUE + AND r.participation IS NOT NULL + AND r.participation.exercise IS NOT NULL + AND EXISTS ( + SELECT 1 + FROM Course c + LEFT JOIN c.exercises e + WHERE e = r.participation.exercise + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + AND r.id NOT IN ( + SELECT max_id + FROM ( + SELECT MAX(r2.id) AS max_id + FROM Result r2 + WHERE r2.rated = TRUE + GROUP BY r2.participation.id + ) + ) + """) + int deleteNonLatestRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/StudentScoreCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/StudentScoreCleanupRepository.java new file mode 100644 index 000000000000..d45bf8243e50 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/StudentScoreCleanupRepository.java @@ -0,0 +1,34 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.assessment.domain.StudentScore; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; + +/** + * Spring Data JPA repository for cleaning up old and orphaned student score entries. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface StudentScoreCleanupRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link StudentScore} entries where the associated user is {@code null}. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM StudentScore ps + WHERE ps.user IS NULL + """) + int deleteOrphanStudentScore(); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/TeamScoreCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/TeamScoreCleanupRepository.java new file mode 100644 index 000000000000..2c1009f481b8 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/TeamScoreCleanupRepository.java @@ -0,0 +1,34 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.assessment.domain.TeamScore; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; + +/** + * Spring Data JPA repository for cleaning up old and orphaned team score entries. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface TeamScoreCleanupRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link TeamScore} entries where the associated team is {@code null}. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM TeamScore ps + WHERE ps.team IS NULL + """) + int deleteOrphanTeamScore(); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/TextBlockCleanupRepository.java b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/TextBlockCleanupRepository.java new file mode 100644 index 000000000000..132fcc4f9726 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/repository/cleanup/TextBlockCleanupRepository.java @@ -0,0 +1,133 @@ +package de.tum.cit.aet.artemis.assessment.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.time.ZonedDateTime; + +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; +import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; +import de.tum.cit.aet.artemis.text.domain.TextBlock; + +/** + * Spring Data JPA repository for cleaning up old and orphaned text block entries. + * THE FOLLOWING METHODS ARE USED FOR CLEANUP PURPOSES AND SHOULD NOT BE USED IN OTHER CASES + */ +@Profile(PROFILE_CORE) +@Repository +public interface TextBlockCleanupRepository extends ArtemisJpaRepository { + + /** + * Deletes {@link TextBlock} entries linked to {@link Feedback} where the associated {@link Result} + * has no submission and no participation. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM TextBlock tb + WHERE tb.feedback IN ( + SELECT f + FROM Feedback f + LEFT JOIN f.result r + WHERE r.submission IS NULL + AND r.participation IS NULL + ) + """) + int deleteTextBlockForOrphanResults(); + + /** + * Deletes {@link TextBlock} entries linked to {@link Feedback} with a {@code null} result. + * + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM TextBlock tb + WHERE tb.feedback IN ( + SELECT f + FROM Feedback f + WHERE f.result IS NULL + ) + """) + int deleteTextBlockForEmptyFeedback(); + + /** + * Deletes {@link TextBlock} entries associated with rated {@link Result} that are not the latest rated result + * for a {@link Participation}, within courses conducted between the specified date range. + * This query removes old text blocks that are not part of the latest rated results, for courses whose + * end date is before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM TextBlock tb + WHERE tb.feedback IN ( + SELECT f + FROM Feedback f + LEFT JOIN f.result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE f.result.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = TRUE + ) + AND r.rated = TRUE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteTextBlockForRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); + + /** + * Deletes {@link TextBlock} entries linked to non-rated {@link Result} that are not the latest non-rated result + * for a {@link Participation}, where the associated course's start and end dates + * are between the specified date range. + * This query deletes text blocks for feedback associated with results that are not rated, within the courses + * whose end date is before {@code deleteTo} and start date is after {@code deleteFrom}. + * + * @param deleteFrom the start date for selecting courses + * @param deleteTo the end date for selecting courses + * @return the number of deleted entities + */ + @Modifying + @Transactional // ok because of delete + @Query(""" + DELETE FROM TextBlock tb + WHERE tb.feedback IN ( + SELECT f + FROM Feedback f + LEFT JOIN f.result r + LEFT JOIN r.participation p + LEFT JOIN p.exercise e + LEFT JOIN e.course c + WHERE f.result.id NOT IN ( + SELECT MAX(r2.id) + FROM Result r2 + WHERE r2.participation.id = p.id + AND r2.rated = FALSE + ) + AND r.rated = FALSE + AND c.endDate < :deleteTo + AND c.startDate > :deleteFrom + ) + """) + int deleteTextBlockForNonRatedResultsWhereCourseDateBetween(@Param("deleteFrom") ZonedDateTime deleteFrom, @Param("deleteTo") ZonedDateTime deleteTo); +} diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java index 21cfc87c6c31..50576953916b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/service/ResultService.java @@ -4,6 +4,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.HashMap; @@ -24,6 +25,7 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; @@ -31,6 +33,7 @@ import de.tum.cit.aet.artemis.assessment.domain.FeedbackType; import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackAnalysisResponseDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackPageableDTO; @@ -46,6 +49,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; @@ -547,73 +551,85 @@ private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) { } /** - * Retrieves paginated and filtered aggregated feedback details for a given exercise. + * Retrieves paginated and filtered aggregated feedback details for a given exercise, including the count of each unique feedback detail text, + * test case name, task name, and error category. *
* For each feedback detail: - * 1. The relative count is calculated as a percentage of the total number of distinct results for the exercise. - * 2. The task numbers are assigned based on the associated test case names. A mapping between test cases and tasks is created using the set of tasks retrieved from the - * database. + * 1. The relative count is calculated as a percentage of the total distinct results for the exercise. + * 2. Task names are assigned based on associated test case names, with a mapping created between test cases and tasks from the exercise database. + * Feedback items not assigned to any task are labeled as "Not assigned to a task." + * 3. Error categories are classified as one of "Student Error," "Ares Error," or "AST Error," based on feedback content. *
- * Filtering: - * - **Search term**: Filters feedback details by the search term (case-insensitive). - * - **Test case names**: Filters feedback based on specific test case names (if provided). - * - **Task names**: Maps provided task numbers to task names and filters feedback based on the test cases associated with those tasks. - * - **Occurrences**: Filters feedback where the number of occurrences (COUNT) is between the provided minimum and maximum values (inclusive). + * It supports filtering by: + * - Search term: Case-insensitive filtering on feedback detail text. + * - Test case names: Filters feedback based on specific test case names. Only active test cases are included in the filtering options. + * - Task names: Filters feedback based on specified task names and includes unassigned tasks if "Not assigned to a task" is selected. + * - Occurrence range: Filters feedback where the number of occurrences (COUNT) is within the specified minimum and maximum range. + * - Error categories: Filters feedback based on selected error categories, such as "Student Error," "Ares Error," and "AST Error." *
* Pagination and sorting: * - Sorting is applied based on the specified column and order (ascending or descending). - * - The result is paginated based on the provided page number and page size. + * - The result is paginated according to the provided page number and page size. * * @param exerciseId The ID of the exercise for which feedback details should be retrieved. - * @param data The {@link FeedbackPageableDTO} containing page number, page size, search term, sorting options, and filtering parameters (task names, test cases, - * occurrence range). + * @param data The {@link FeedbackPageableDTO} containing page number, page size, search term, sorting options, and filtering parameters + * (task names, test cases, occurrence range, error categories). * @return A {@link FeedbackAnalysisResponseDTO} object containing: * - A {@link SearchResultPageDTO} of paginated feedback details. * - The total number of distinct results for the exercise. - * - The total number of tasks associated with the feedback. - * - A list of test case names included in the feedback. + * - A set of task names, including "Not assigned to a task" if applicable. + * - A list of active test case names used in the feedback. + * - A list of predefined error categories ("Student Error," "Ares Error," "AST Error") available for filtering. */ public FeedbackAnalysisResponseDTO getFeedbackDetailsOnPage(long exerciseId, FeedbackPageableDTO data) { // 1. Fetch programming exercise with associated test cases ProgrammingExercise programmingExercise = programmingExerciseRepository.findWithTestCasesByIdElseThrow(exerciseId); + // 2. Get the distinct count of results for calculating relative feedback counts long distinctResultCount = studentParticipationRepository.countDistinctResultsByExerciseId(exerciseId); - // 2. Extract test case names using streams - List testCaseNames = programmingExercise.getTestCases().stream().map(ProgrammingExerciseTestCase::getTestName).toList(); + // 3. Extract only active test case names for use in filtering options + List activeTestCaseNames = programmingExercise.getTestCases().stream().filter(ProgrammingExerciseTestCase::isActive).map(ProgrammingExerciseTestCase::getTestName) + .toList(); + // 4. Retrieve all tasks associated with the exercise and map their names List tasks = programmingExerciseTaskService.getTasksWithUnassignedTestCases(exerciseId); + Set taskNames = tasks.stream().map(ProgrammingExerciseTask::getTaskName).collect(Collectors.toSet()); - // 3. Generate filter task names directly - List filterTaskNames = data.getFilterTasks().stream().map(index -> { - int idx = Integer.parseInt(index); - return (idx > 0 && idx <= tasks.size()) ? tasks.get(idx - 1).getTaskName() : null; - }).filter(Objects::nonNull).toList(); + // 5. Include unassigned tasks if specified by the filter; otherwise, only include specified tasks + List includeUnassignedTasks = new ArrayList<>(taskNames); + if (!data.getFilterTasks().isEmpty()) { + includeUnassignedTasks.removeAll(data.getFilterTasks()); + } + else { + includeUnassignedTasks.clear(); + } - // 4. Set minOccurrence and maxOccurrence based on filterOccurrence + // 6. Define the occurrence range based on filter parameters long minOccurrence = data.getFilterOccurrence().length == 2 ? Long.parseLong(data.getFilterOccurrence()[0]) : 0; long maxOccurrence = data.getFilterOccurrence().length == 2 ? Long.parseLong(data.getFilterOccurrence()[1]) : Integer.MAX_VALUE; - // 5. Create pageable object for pagination + // 7. Define the error categories to filter based on user selection + List filterErrorCategories = data.getFilterErrorCategories(); + + // 8. Set up pagination and sorting based on input data final var pageable = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.FEEDBACK_ANALYSIS); - // 6. Fetch filtered feedback from the repository + // 9. Query the database to retrieve paginated and filtered feedback final Page feedbackDetailPage = studentParticipationRepository.findFilteredFeedbackByExerciseId(exerciseId, - StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), filterTaskNames, minOccurrence, maxOccurrence, - pageable); - - // 7. Process feedback details - // Map to index (+1 for 1-based indexing) - List processedDetails = feedbackDetailPage.getContent().stream().map(detail -> { - String taskIndex = tasks.stream().filter(task -> task.getTaskName().equals(detail.taskNumber())).findFirst().map(task -> String.valueOf(tasks.indexOf(task) + 1)) - .orElse("0"); - return new FeedbackDetailDTO(detail.count(), (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), taskIndex, "StudentError"); - }).toList(); - - // 8. Return the response DTO containing feedback details, total elements, and test case/task info - return new FeedbackAnalysisResponseDTO(new SearchResultPageDTO<>(processedDetails, feedbackDetailPage.getTotalPages()), feedbackDetailPage.getTotalElements(), tasks.size(), - testCaseNames); + StringUtils.isBlank(data.getSearchTerm()) ? "" : data.getSearchTerm().toLowerCase(), data.getFilterTestCases(), includeUnassignedTasks, minOccurrence, + maxOccurrence, filterErrorCategories, pageable); + + // 10. Process and map feedback details, calculating relative count and assigning task names + List processedDetails = feedbackDetailPage.getContent().stream().map(detail -> new FeedbackDetailDTO(detail.concatenatedFeedbackIds(), detail.count(), + (detail.count() * 100.00) / distinctResultCount, detail.detailText(), detail.testCaseName(), detail.taskName(), detail.errorCategory())).toList(); + // 11. Predefined error categories available for filtering on the client side + final List ERROR_CATEGORIES = List.of("Student Error", "Ares Error", "AST Error"); + + // 12. Return response containing processed feedback details, task names, active test case names, and error categories + return new FeedbackAnalysisResponseDTO(new SearchResultPageDTO<>(processedDetails, feedbackDetailPage.getTotalPages()), feedbackDetailPage.getTotalElements(), taskNames, + activeTestCaseNames, ERROR_CATEGORIES); } /** @@ -629,6 +645,25 @@ public long getMaxCountForExercise(long exerciseId) { return studentParticipationRepository.findMaxCountForExercise(exerciseId); } + /** + * Retrieves a paginated list of students affected by specific feedback entries for a given exercise. + *
+ * This method filters students based on feedback IDs and returns participation details for each affected student. It uses + * pagination and sorting (order based on the {@link PageUtil.ColumnMapping#AFFECTED_STUDENTS}) to allow efficient retrieval and sorting of the results, thus supporting large + * datasets. + *
+ * + * @param exerciseId for which the affected student participation data is requested. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. + */ + public Page getAffectedStudentsWithFeedbackId(long exerciseId, String feedbackIds, PageableSearchDTO data) { + List feedbackIdLongs = Arrays.stream(feedbackIds.split(",")).map(Long::valueOf).toList(); + PageRequest pageRequest = PageUtil.createDefaultPageRequest(data, PageUtil.ColumnMapping.AFFECTED_STUDENTS); + return studentParticipationRepository.findAffectedStudentsByFeedbackId(exerciseId, feedbackIdLongs, pageRequest); + } + /** * Deletes long feedback texts for the provided list of feedback items to prevent duplicate entries in the {@link LongFeedbackTextRepository}. *
diff --git a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java index 5e28aa48b288..431fb66373e8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/assessment/web/ResultResource.java @@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; +import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -22,12 +23,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackAnalysisResponseDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackPageableDTO; import de.tum.cit.aet.artemis.assessment.dto.ResultWithPointsPerGradingCriterionDTO; @@ -36,13 +39,14 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; +import de.tum.cit.aet.artemis.core.dto.pageablesearch.PageableSearchDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; -import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.util.HeaderUtil; import de.tum.cit.aet.artemis.exam.domain.Exam; @@ -283,39 +287,52 @@ public ResponseEntity createResultForExternalSubmission(@PathVariable Lo } /** - * GET /exercises/{exerciseId}/feedback-details : Retrieves paginated and filtered aggregated feedback details for a given exercise. - * The feedback details include counts and relative counts of feedback occurrences, test case names, and task numbers. - * The method allows filtering by a search term and sorting by various fields. + * GET /exercises/{exerciseId}/feedback-details : Retrieves paginated and filtered aggregated feedback details for a specified exercise. *
- * Pagination is applied based on the provided query parameters, including page number, page size, sorting order, and search term. - * Sorting is applied by the specified sorted column and sorting order. If the provided sorted column is not valid for sorting (e.g., "taskNumber" or "errorCategory"), - * the sorting defaults to "count". + * This endpoint provides detailed feedback analytics, including: + * - The count and relative count (percentage) of each unique feedback entry. + * - Associated test case names. + * - Task names, mapped from test cases. *
- * Filtering is applied based on: - * - Task numbers (mapped to task names) - * - Test case names - * - Occurrence range (minimum and maximum occurrences) - *
- * The response contains both the paginated feedback details and the total count of distinct results for the exercise. + * Pagination, sorting, and filtering options allow flexible data retrieval: + *
    + *
  • Pagination: Based on page number and page size, as specified in the request.
    • + *
  • Sorting: By column (e.g., "count" or "detailText") and sorting order (ASCENDING or DESCENDING). + * If the specified column is not valid for sorting, the default sorting column is "count".
    • + *
  • Filtering: + *
      + *
    • Task names: Filters feedback entries by specific task names, including "Not assigned to task" if unassigned feedback is requested.
      • + *
    • Test case names: Filters feedback by specified test cases, using only active test cases from the exercise.
      • + *
    • Occurrence range: Filters by the minimum and maximum number of occurrences (inclusive).
      • + *
    • Search term: Case-insensitive filter applied to feedback detail text.
      • + *
    • Error categories: Filters feedback entries by specified error categories (e.g., "Student Error," "Ares Error," and "AST Error").
      • + *
    + *
    • + *
* - * @param exerciseId The ID of the exercise for which feedback details should be retrieved. - * @param data A {@link FeedbackPageableDTO} object containing pagination and filtering parameters, such as: - * - Page number - * - Page size - * - Search term (optional) - * - Sorting order (ASCENDING or DESCENDING) - * - Sorted column - * - Filter task numbers (optional) - * - Filter test case names (optional) - * - Occurrence range (optional) + * @param exerciseId The unique identifier of the exercise for which feedback details are requested. + * @param data A {@link FeedbackPageableDTO} object containing pagination, sorting, and filtering parameters, including: + *
    + *
  • Page number and page size
    • + *
  • Search term (optional)
    • + *
  • Sorting order (ASCENDING or DESCENDING)
    • + *
  • Sorted column
    • + *
  • Filter task names (optional)
    • + *
  • Filter test case names (optional)
    • + *
  • Occurrence range (optional)
    • + *
  • Error categories (optional)
    • + *
* @return A {@link ResponseEntity} containing a {@link FeedbackAnalysisResponseDTO}, which includes: - * - {@link SearchResultPageDTO < FeedbackDetailDTO >} feedbackDetails: Paginated feedback details for the exercise. - * - long totalItems: The total number of feedback items (used for pagination). - * - int totalAmountOfTasks: The total number of tasks associated with the feedback. - * - List testCaseNames: A list of test case names included in the feedback. + *
    + *
  • {@link SearchResultPageDTO < FeedbackDetailDTO >} feedbackDetails: Paginated and filtered feedback details for the exercise.
    • + *
  • long totalItems: The total count of feedback entries (for pagination).
    • + *
  • Set taskNames: A set of task names relevant to the feedback items, including "Not assigned to task" if applicable.
    • + *
  • List testCaseNames: A list of active test case names used in the feedback.
    • + *
  • List errorCategories: The list of error categories included in the feedback details, such as "Student Error," "Ares Error," and "AST Error".
    • + *
*/ @GetMapping("exercises/{exerciseId}/feedback-details") - @EnforceAtLeastInstructorInExercise + @EnforceAtLeastEditorInExercise public ResponseEntity getFeedbackDetailsPaged(@PathVariable long exerciseId, @ModelAttribute FeedbackPageableDTO data) { FeedbackAnalysisResponseDTO response = resultService.getFeedbackDetailsOnPage(exerciseId, data); return ResponseEntity.ok(response); @@ -330,9 +347,30 @@ public ResponseEntity getFeedbackDetailsPaged(@Path * @return A {@link ResponseEntity} containing the maximum count of feedback occurrences (long). */ @GetMapping("exercises/{exerciseId}/feedback-details-max-count") - @EnforceAtLeastInstructorInExercise + @EnforceAtLeastEditorInExercise public ResponseEntity getMaxCount(@PathVariable long exerciseId) { long maxCount = resultService.getMaxCountForExercise(exerciseId); return ResponseEntity.ok(maxCount); } + + /** + * GET /exercises/{exerciseId}/feedback-details-participation : Retrieves paginated details of students affected by specific feedback entries for a specified exercise. + * This endpoint returns details of students whose submissions were impacted by specified feedback entries, including student information + * and participation details. + *
+ * + * @param exerciseId for which the participation data is requested. + * @param feedbackIdsHeader to filter affected students by specific feedback entries. + * @param data A {@link PageableSearchDTO} object containing pagination and sorting parameters. + * @return A {@link ResponseEntity} containing a {@link Page} of {@link FeedbackAffectedStudentDTO}, each representing a student affected by the feedback entries. + */ + @GetMapping("exercises/{exerciseId}/feedback-details-participation") + @EnforceAtLeastEditorInExercise + public ResponseEntity> getAffectedStudentsWithFeedback(@PathVariable long exerciseId, @RequestHeader("feedbackIds") String feedbackIdsHeader, + @ModelAttribute PageableSearchDTO data) { + + Page participation = resultService.getAffectedStudentsWithFeedbackId(exerciseId, feedbackIdsHeader, data); + + return ResponseEntity.ok(participation); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java index bf7a95437789..e719a74d131b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/athena/service/AthenaRepositoryExportService.java @@ -89,12 +89,8 @@ public File exportRepository(long exerciseId, Long submissionId, RepositoryType var programmingExercise = programmingExerciseRepository.findByIdElseThrow(exerciseId); checkFeedbackSuggestionsOrAutomaticFeedbackEnabledElseThrow(programmingExercise); - var exportOptions = new RepositoryExportOptionsDTO(); - exportOptions.setAnonymizeRepository(true); - exportOptions.setExportAllParticipants(false); - exportOptions.setFilterLateSubmissions(true); - exportOptions.setFilterLateSubmissionsDate(programmingExercise.getDueDate()); - exportOptions.setFilterLateSubmissionsIndividualDueDate(false); // Athena currently does not support individual due dates + // Athena currently does not support individual due dates + var exportOptions = new RepositoryExportOptionsDTO(false, true, false, programmingExercise.getDueDate(), false, false, false, true, false); if (!Files.exists(repoDownloadClonePath)) { Files.createDirectories(repoDownloadClonePath); diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyExerciseLinkRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyExerciseLinkRepository.java index d19675ca6412..8622daff5490 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyExerciseLinkRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CompetencyExerciseLinkRepository.java @@ -2,7 +2,11 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; +import java.util.List; + import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyExerciseLink; @@ -12,4 +16,10 @@ @Repository public interface CompetencyExerciseLinkRepository extends ArtemisJpaRepository { + @Query(""" + SELECT cel FROM CompetencyExerciseLink cel + LEFT JOIN FETCH cel.competency + WHERE cel.exercise.id = :exerciseId + """) + List findByExerciseIdWithCompetency(@Param("exerciseId") long exerciseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java index fee3ca1e82f2..bba103f436d9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/repository/CourseCompetencyRepository.java @@ -126,7 +126,7 @@ CASE WHEN TYPE(e) = ProgrammingExercise THEN TRUE ELSE FALSE END, LEFT JOIN TeamScore tS ON tS.exercise = e AND :user MEMBER OF tS.team.students WHERE c.id = :competencyId AND e IS NOT NULL - GROUP BY e.id, e.maxPoints, e.difficulty, TYPE(e), sS.lastScore, tS.lastScore, sS.lastPoints, tS.lastPoints, sS.lastModifiedDate, tS.lastModifiedDate + GROUP BY e.id, e.maxPoints, e.difficulty, TYPE(e), el.weight, sS.lastScore, tS.lastScore, sS.lastPoints, tS.lastPoints, sS.lastModifiedDate, tS.lastModifiedDate """) Set findAllExerciseInfoByCompetencyIdAndUser(@Param("competencyId") long competencyId, @Param("user") User user); diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java index 9c11f0f33fdc..3b0a4bc083c9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CompetencyService.java @@ -2,19 +2,20 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; +import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyLectureUnitLink; import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportOptionsDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; +import de.tum.cit.aet.artemis.atlas.repository.CompetencyExerciseLinkRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyLectureUnitLinkRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; @@ -27,6 +28,8 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; +import de.tum.cit.aet.artemis.lecture.domain.ExerciseUnit; +import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.repository.LectureUnitCompletionRepository; import de.tum.cit.aet.artemis.lecture.service.LectureUnitService; @@ -39,15 +42,18 @@ public class CompetencyService extends CourseCompetencyService { private final CompetencyRepository competencyRepository; + private final CompetencyExerciseLinkRepository competencyExerciseLinkRepository; + public CompetencyService(CompetencyRepository competencyRepository, AuthorizationCheckService authCheckService, CompetencyRelationRepository competencyRelationRepository, LearningPathService learningPathService, CompetencyProgressService competencyProgressService, LectureUnitService lectureUnitService, CompetencyProgressRepository competencyProgressRepository, LectureUnitCompletionRepository lectureUnitCompletionRepository, StandardizedCompetencyRepository standardizedCompetencyRepository, CourseCompetencyRepository courseCompetencyRepository, ExerciseService exerciseService, - LearningObjectImportService learningObjectImportService, CompetencyLectureUnitLinkRepository competencyLectureUnitLinkRepository, CourseRepository courseRepository) { + LearningObjectImportService learningObjectImportService, CompetencyLectureUnitLinkRepository competencyLectureUnitLinkRepository, CourseRepository courseRepository, + CompetencyExerciseLinkRepository competencyExerciseLinkRepository) { super(competencyProgressRepository, courseCompetencyRepository, competencyRelationRepository, competencyProgressService, exerciseService, lectureUnitService, - learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository, learningObjectImportService, - competencyLectureUnitLinkRepository, courseRepository); + learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository, learningObjectImportService, courseRepository); this.competencyRepository = competencyRepository; + this.competencyExerciseLinkRepository = competencyExerciseLinkRepository; } /** @@ -59,17 +65,7 @@ public CompetencyService(CompetencyRepository competencyRepository, Authorizatio * @return The set of imported competencies, each also containing the relations it is the tail competency for. */ public Set importCompetencies(Course course, Collection competencies, CompetencyImportOptionsDTO importOptions) { - var idToImportedCompetency = new HashMap(); - - for (var competency : competencies) { - Competency importedCompetency = new Competency(competency); - importedCompetency.setCourse(course); - - importedCompetency = competencyRepository.save(importedCompetency); - idToImportedCompetency.put(competency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>())); - } - - return importCourseCompetencies(course, competencies, idToImportedCompetency, importOptions); + return importCourseCompetencies(course, competencies, importOptions, Competency::new); } /** @@ -121,4 +117,26 @@ public List findCompetenciesWithProgressForUserByCourseId(Long cours List competencies = competencyRepository.findByCourseIdOrderById(courseId); return findProgressForCompetenciesAndUser(competencies, userId); } + + /** + * Creates competency links for exercise units of the lecture. + *

+ * As exercise units can not be linked to competencies but only via the exercise itself, we add temporary links to the exercise units. + * Although they can not be persisted, this makes it easier to display the linked competencies in the client consistently across all lecture unit type. + * + * @param lecture the lecture to augment the exercise unit links for + */ + public void addCompetencyLinksToExerciseUnits(Lecture lecture) { + var exerciseUnits = lecture.getLectureUnits().stream().filter(unit -> unit instanceof ExerciseUnit); + exerciseUnits.forEach(unit -> { + var exerciseUnit = (ExerciseUnit) unit; + var exercise = exerciseUnit.getExercise(); + if (exercise != null) { + var competencyExerciseLinks = competencyExerciseLinkRepository.findByExerciseIdWithCompetency(exercise.getId()); + var competencyLectureUnitLinks = competencyExerciseLinks.stream().map(link -> new CompetencyLectureUnitLink(link.getCompetency(), exerciseUnit, link.getWeight())) + .collect(Collectors.toSet()); + exerciseUnit.setCompetencyLinks(competencyLectureUnitLinks); + } + }); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java index 8e47f7443297..88cad15f1000 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/CourseCompetencyService.java @@ -8,7 +8,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.function.Function; @@ -31,7 +30,6 @@ import de.tum.cit.aet.artemis.atlas.dto.CompetencyRelationDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.atlas.dto.UpdateCourseCompetencyRelationDTO; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyLectureUnitLinkRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyProgressRepository; import de.tum.cit.aet.artemis.atlas.repository.CompetencyRelationRepository; import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; @@ -84,15 +82,13 @@ public class CourseCompetencyService { private final LearningObjectImportService learningObjectImportService; - private final CompetencyLectureUnitLinkRepository competencyLectureUnitLinkRepository; - private final CourseRepository courseRepository; public CourseCompetencyService(CompetencyProgressRepository competencyProgressRepository, CourseCompetencyRepository courseCompetencyRepository, CompetencyRelationRepository competencyRelationRepository, CompetencyProgressService competencyProgressService, ExerciseService exerciseService, LectureUnitService lectureUnitService, LearningPathService learningPathService, AuthorizationCheckService authCheckService, StandardizedCompetencyRepository standardizedCompetencyRepository, LectureUnitCompletionRepository lectureUnitCompletionRepository, - LearningObjectImportService learningObjectImportService, CompetencyLectureUnitLinkRepository competencyLectureUnitLinkRepository, CourseRepository courseRepository) { + LearningObjectImportService learningObjectImportService, CourseRepository courseRepository) { this.competencyProgressRepository = competencyProgressRepository; this.courseCompetencyRepository = courseCompetencyRepository; this.competencyRelationRepository = competencyRelationRepository; @@ -104,7 +100,6 @@ public CourseCompetencyService(CompetencyProgressRepository competencyProgressRe this.standardizedCompetencyRepository = standardizedCompetencyRepository; this.lectureUnitCompletionRepository = lectureUnitCompletionRepository; this.learningObjectImportService = learningObjectImportService; - this.competencyLectureUnitLinkRepository = competencyLectureUnitLinkRepository; this.courseRepository = courseRepository; } @@ -213,34 +208,39 @@ public void filterOutLearningObjectsThatUserShouldNotSee(CourseCompetency compet * @return The set of imported course competencies, each also containing the relations it is the tail competency for. */ public Set importCourseCompetencies(Course course, Collection courseCompetencies, CompetencyImportOptionsDTO importOptions) { - var idToImportedCompetency = new HashMap(); - - for (var courseCompetency : courseCompetencies) { - CourseCompetency importedCompetency = switch (courseCompetency) { - case Competency competency -> new Competency(competency); - case Prerequisite prerequisite -> new Prerequisite(prerequisite); - default -> throw new IllegalStateException("Unexpected value: " + courseCompetency); - }; - importedCompetency.setCourse(course); - - importedCompetency = courseCompetencyRepository.save(importedCompetency); - idToImportedCompetency.put(courseCompetency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>())); - } + Function createNewCourseCompetency = courseCompetency -> switch (courseCompetency) { + case Competency competency -> new Competency(competency); + case Prerequisite prerequisite -> new Prerequisite(prerequisite); + default -> throw new IllegalStateException("Unexpected value: " + courseCompetency); + }; - return importCourseCompetencies(course, courseCompetencies, idToImportedCompetency, importOptions); + return importCourseCompetencies(course, courseCompetencies, importOptions, createNewCourseCompetency); } /** * Imports the given competencies and relations into a course * - * @param course the course to import into - * @param competenciesToImport the source competencies that were imported - * @param idToImportedCompetency map of original competency id to imported competency - * @param importOptions the import options + * @param course the course to import into + * @param competenciesToImport the source competencies that were imported + * @param importOptions the import options + * @param createNewCourseCompetency the function that creates new course competencies * @return The set of imported competencies, each also containing the relations it is the tail competency for. */ public Set importCourseCompetencies(Course course, Collection competenciesToImport, - Map idToImportedCompetency, CompetencyImportOptionsDTO importOptions) { + CompetencyImportOptionsDTO importOptions, Function createNewCourseCompetency) { + var idToImportedCompetency = new HashMap(); + + Set competenciesInCourse = courseCompetencyRepository.findAllForCourse(course.getId()); + + for (var courseCompetency : competenciesToImport) { + Optional existingCompetency = competenciesInCourse.stream().filter(competency -> competency.getTitle().equals(courseCompetency.getTitle())) + .filter(competency -> competency.getType().equals(courseCompetency.getType())).findFirst(); + CourseCompetency importedCompetency = existingCompetency.orElse(createNewCourseCompetency.apply(courseCompetency)); + importedCompetency.setCourse(course); + idToImportedCompetency.put(courseCompetency.getId(), new CompetencyWithTailRelationDTO(importedCompetency, new ArrayList<>())); + } + courseCompetencyRepository.saveAll(idToImportedCompetency.values().stream().map(CompetencyWithTailRelationDTO::competency).toList()); + if (course.getLearningPathsEnabled()) { var importedCompetencies = idToImportedCompetency.values().stream().map(CompetencyWithTailRelationDTO::competency).toList(); learningPathService.linkCompetenciesToLearningPathsOfCourse(importedCompetencies, course.getId()); diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java index 996ebd7d4385..96a68280f334 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/PrerequisiteService.java @@ -2,9 +2,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; -import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; import java.util.Set; @@ -45,8 +43,7 @@ public PrerequisiteService(PrerequisiteRepository prerequisiteRepository, Author StandardizedCompetencyRepository standardizedCompetencyRepository, CourseCompetencyRepository courseCompetencyRepository, ExerciseService exerciseService, LearningObjectImportService learningObjectImportService, CompetencyLectureUnitLinkRepository competencyLectureUnitLinkRepository, CourseRepository courseRepository) { super(competencyProgressRepository, courseCompetencyRepository, competencyRelationRepository, competencyProgressService, exerciseService, lectureUnitService, - learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository, learningObjectImportService, - competencyLectureUnitLinkRepository, courseRepository); + learningPathService, authCheckService, standardizedCompetencyRepository, lectureUnitCompletionRepository, learningObjectImportService, courseRepository); this.prerequisiteRepository = prerequisiteRepository; } @@ -59,17 +56,7 @@ public PrerequisiteService(PrerequisiteRepository prerequisiteRepository, Author * @return The set of imported prerequisites, each also containing the relations for which it is the tail prerequisite for. */ public Set importPrerequisites(Course course, Collection prerequisites, CompetencyImportOptionsDTO importOptions) { - var idToImportedPrerequisite = new HashMap(); - - for (var prerequisite : prerequisites) { - Prerequisite importedPrerequisite = new Prerequisite(prerequisite); - importedPrerequisite.setCourse(course); - - importedPrerequisite = prerequisiteRepository.save(importedPrerequisite); - idToImportedPrerequisite.put(prerequisite.getId(), new CompetencyWithTailRelationDTO(importedPrerequisite, new ArrayList<>())); - } - - return importCourseCompetencies(course, prerequisites, idToImportedPrerequisite, importOptions); + return importCourseCompetencies(course, prerequisites, importOptions, Prerequisite::new); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java index 47a4bd801e8e..55999666aea5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/service/competency/StandardizedCompetencyService.java @@ -191,6 +191,7 @@ public void importStandardizedCompetencyCatalog(StandardizedCompetencyCatalogDTO */ public String exportStandardizedCompetencyCatalog() { List knowledgeAreas = getAllForTreeView(); + // TODO: we should avoid using findAll() here, as it might return a huge amount of data List sources = sourceRepository.findAll(); var catalog = StandardizedCompetencyCatalogDTO.of(knowledgeAreas, sources); diff --git a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java index 9bfb3a92acfe..1bc5b2202aeb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/atlas/web/CompetencyResource.java @@ -337,8 +337,12 @@ private void checkCompetencyAttributesForUpdate(Competency competency) { } private void checkCompetencyAttributes(Competency competency) { - if (competency.getTitle() == null || competency.getTitle().trim().isEmpty() || competency.getMasteryThreshold() < 1 || competency.getMasteryThreshold() > 100) { - throw new BadRequestAlertException("The attributes of the competency are invalid!", ENTITY_NAME, "invalidPrerequisiteAttributes"); + if (competency.getTitle() == null || competency.getTitle().trim().isEmpty()) { + throw new BadRequestAlertException("The title of a competency is invalid!", ENTITY_NAME, "invalidCompetencyTitle"); + } + if (competency.getMasteryThreshold() < 1 || competency.getMasteryThreshold() > 100) { + throw new BadRequestAlertException("The mastery threshold of the competency '" + competency.getTitle() + "' is invalid!", ENTITY_NAME, + "invalidCompetencyMasteryThreshold"); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java index 21b3dfac0b81..2952c5213432 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java @@ -137,21 +137,4 @@ default Post findMessagePostByIdElseThrow(Long postId) throws EntityNotFoundExce WHERE p.id = :postId AND answer.author = cp.user """) Set findUsersWhoRepliedInMessage(@Param("postId") Long postId); - - /** - * Finds tags of course-wide messages - * - * @param courseId the course - * @return list of tags - */ - // TODO: unused, delete - @Query(""" - SELECT DISTINCT tag - FROM Post post - LEFT JOIN post.tags tag - LEFT JOIN Channel channel ON channel.id = post.conversation.id - WHERE channel.course.id = :courseId - AND channel.isCourseWide = TRUE - """) - List findPostTagsForCourse(@Param("courseId") Long courseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java index cfdd5f71443e..aae587022c93 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/CustomPostRepositoryImpl.java @@ -1,6 +1,8 @@ package de.tum.cit.aet.artemis.communication.repository; +import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedHashSet; import java.util.List; import jakarta.persistence.EntityManager; @@ -50,6 +52,8 @@ public Page findPostIdsWithSpecification(Specification specification query.setMaxResults(pageable.getPageSize()); List postIds = query.getResultList(); + // removes all duplicates from the answer posts + List uniquePostIds = new ArrayList<>(new LinkedHashSet<>(postIds)); // Count query CriteriaQuery countQuery = builder.createQuery(Long.class); @@ -66,6 +70,6 @@ public Page findPostIdsWithSpecification(Specification specification Long countResult = entityManager.createQuery(countQuery).getSingleResult(); long count = countResult != null ? countResult : 0L; - return new PageImpl<>(postIds, pageable, count); + return new PageImpl<>(uniquePostIds, pageable, count); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/FaqRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/FaqRepository.java index 19063ed66a09..f1912c85c795 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/repository/FaqRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/repository/FaqRepository.java @@ -40,7 +40,7 @@ public interface FaqRepository extends ArtemisJpaRepository { Set findAllByCourseIdAndFaqState(Long courseId, FaqState faqState); - @Transactional + @Transactional // ok because of delete @Modifying void deleteAllByCourseId(Long courseId); } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java index 0020deca7faf..a54058431b76 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java @@ -3,8 +3,6 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.time.ZonedDateTime; -import java.util.Comparator; -import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; @@ -24,8 +22,6 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.google.common.collect.Lists; - import de.tum.cit.aet.artemis.communication.domain.ConversationNotificationRecipientSummary; import de.tum.cit.aet.artemis.communication.domain.CreatedConversationMessage; import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; @@ -49,7 +45,6 @@ import de.tum.cit.aet.artemis.communication.service.conversation.auth.ChannelAuthorizationService; import de.tum.cit.aet.artemis.communication.service.notifications.ConversationNotificationService; import de.tum.cit.aet.artemis.communication.service.notifications.GroupNotificationService; -import de.tum.cit.aet.artemis.communication.service.similarity.PostSimilarityComparisonStrategy; import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; @@ -66,8 +61,6 @@ @Service public class ConversationMessagingService extends PostingService { - private static final int TOP_K_SIMILARITY_RESULTS = 5; - private static final Logger log = LoggerFactory.getLogger(ConversationMessagingService.class); private final ConversationService conversationService; @@ -82,14 +75,11 @@ public class ConversationMessagingService extends PostingService { private final SingleUserNotificationRepository singleUserNotificationRepository; - private final PostSimilarityComparisonStrategy postContentCompareStrategy; - protected ConversationMessagingService(CourseRepository courseRepository, ExerciseRepository exerciseRepository, LectureRepository lectureRepository, ConversationMessageRepository conversationMessageRepository, AuthorizationCheckService authorizationCheckService, WebsocketMessagingService websocketMessagingService, UserRepository userRepository, ConversationService conversationService, ConversationParticipantRepository conversationParticipantRepository, ConversationNotificationService conversationNotificationService, ChannelAuthorizationService channelAuthorizationService, - GroupNotificationService groupNotificationService, SingleUserNotificationRepository singleUserNotificationRepository, - PostSimilarityComparisonStrategy postContentCompareStrategy) { + GroupNotificationService groupNotificationService, SingleUserNotificationRepository singleUserNotificationRepository) { super(courseRepository, userRepository, exerciseRepository, lectureRepository, authorizationCheckService, websocketMessagingService, conversationParticipantRepository); this.conversationService = conversationService; this.conversationMessageRepository = conversationMessageRepository; @@ -97,7 +87,6 @@ protected ConversationMessagingService(CourseRepository courseRepository, Exerci this.channelAuthorizationService = channelAuthorizationService; this.groupNotificationService = groupNotificationService; this.singleUserNotificationRepository = singleUserNotificationRepository; - this.postContentCompareStrategy = postContentCompareStrategy; } /** @@ -433,41 +422,6 @@ private Conversation mayUpdateOrDeleteMessageElseThrow(Post existingMessagePost, } } - /** - * Calculates k similar posts based on the underlying content comparison strategy - * - * @param courseId id of the course in which similar posts are searched for - * @param post post that is to be created and check for similar posts beforehand - * @return list of similar posts - */ - // TODO: unused, remove - public List getSimilarPosts(Long courseId, Post post) { - PostContextFilterDTO postContextFilter = new PostContextFilterDTO(courseId, null, null, null, null, false, false, false, null, null); - List coursePosts = this.getCourseWideMessages(Pageable.unpaged(), postContextFilter, userRepository.getUser(), courseId).stream() - .sorted(Comparator.comparing(coursePost -> postContentCompareStrategy.performSimilarityCheck(post, coursePost))).toList(); - - // sort course posts by calculated similarity scores - setAuthorRoleOfPostings(coursePosts, courseId); - return Lists.reverse(coursePosts).stream().limit(TOP_K_SIMILARITY_RESULTS).toList(); - } - - /** - * Checks course and user validity, - * retrieves all tags for posts in a certain course - * - * @param courseId id of the course the tags belongs to - * @return tags of all posts that belong to the course - */ - // TODO: unused, delete - public List getAllCourseTags(Long courseId) { - final User user = userRepository.getUserWithGroupsAndAuthorities(); - final Course course = courseRepository.findByIdElseThrow(courseId); - - // checks - preCheckUserAndCourseForCommunicationOrMessaging(user, course); - return conversationMessageRepository.findPostTagsForCourse(courseId); - } - @Override public String getEntityName() { return METIS_POST_ENTITY_NAME; diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java index d009074927b2..cf5cc2c67cc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/ConversationNotificationService.java @@ -41,11 +41,15 @@ public class ConversationNotificationService { private final SingleUserNotificationRepository singleUserNotificationRepository; + private final SingleUserNotificationService singleUserNotificationService; + public ConversationNotificationService(ConversationNotificationRepository conversationNotificationRepository, - GeneralInstantNotificationService generalInstantNotificationService, SingleUserNotificationRepository singleUserNotificationRepository) { + GeneralInstantNotificationService generalInstantNotificationService, SingleUserNotificationRepository singleUserNotificationRepository, + SingleUserNotificationService singleUserNotificationService) { this.conversationNotificationRepository = conversationNotificationRepository; this.generalInstantNotificationService = generalInstantNotificationService; this.singleUserNotificationRepository = singleUserNotificationRepository; + this.singleUserNotificationService = singleUserNotificationService; } /** @@ -83,7 +87,7 @@ public ConversationNotification createNotification(Post createdMessage, Conversa String[] placeholders = createPlaceholdersNewMessageChannelText(course.getTitle(), createdMessage.getContent(), createdMessage.getCreationDate().toString(), conversationName, createdMessage.getAuthor().getName(), conversationType); ConversationNotification notification = createConversationMessageNotification(course.getId(), createdMessage, notificationType, notificationText, true, placeholders); - save(notification, mentionedUsers, placeholders); + save(notification, mentionedUsers, placeholders, createdMessage); return notification; } @@ -93,11 +97,12 @@ public static String[] createPlaceholdersNewMessageChannelText(String courseTitl return new String[] { courseTitle, messageContent, messageCreationDate, conversationName, authorName, conversationType }; } - private void save(ConversationNotification notification, Set mentionedUsers, String[] placeHolders) { + private void save(ConversationNotification notification, Set mentionedUsers, String[] placeHolders, Post createdMessage) { conversationNotificationRepository.save(notification); - Set mentionedUserNotifications = mentionedUsers.stream().map(mentionedUser -> SingleUserNotificationFactory - .createNotification(notification.getMessage(), NotificationType.CONVERSATION_USER_MENTIONED, notification.getText(), placeHolders, mentionedUser)) + Set mentionedUserNotifications = singleUserNotificationService + .filterAllowedRecipientsInMentionedUsers(mentionedUsers, createdMessage.getConversation()).map(mentionedUser -> SingleUserNotificationFactory + .createNotification(notification.getMessage(), NotificationType.CONVERSATION_USER_MENTIONED, notification.getText(), placeHolders, mentionedUser)) .collect(Collectors.toSet()); singleUserNotificationRepository.saveAll(mentionedUserNotifications); } diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java index 4e242f93e0fb..33def5698b9f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/service/notifications/SingleUserNotificationService.java @@ -443,23 +443,34 @@ public void notifyInvolvedUsersAboutNewMessageReply(Post post, SingleUserNotific usersInvolved.add(post.getAuthor()); } - mentionedUsers.stream().filter(user -> { - boolean isChannelAndCourseWide = post.getConversation() instanceof Channel channel && channel.getIsCourseWide(); - boolean isChannelVisibleToStudents = !(post.getConversation() instanceof Channel channel) || conversationService.isChannelVisibleToStudents(channel); - boolean isChannelVisibleToMentionedUser = isChannelVisibleToStudents - || authorizationCheckService.isAtLeastTeachingAssistantInCourse(post.getConversation().getCourse(), user); - - // Only send a notification to the mentioned user if... - // (for course-wide channels) ...the course-wide channel is visible - // (for all other cases) ...the user is a member of the conversation - return (isChannelAndCourseWide && isChannelVisibleToMentionedUser) || conversationService.isMember(post.getConversation().getId(), user.getId()); - }).forEach(mentionedUser -> notifyUserAboutNewMessageReply(savedAnswerMessage, notification, mentionedUser, author, CONVERSATION_USER_MENTIONED)); + filterAllowedRecipientsInMentionedUsers(mentionedUsers, post.getConversation()) + .forEach(mentionedUser -> notifyUserAboutNewMessageReply(savedAnswerMessage, notification, mentionedUser, author, CONVERSATION_USER_MENTIONED)); Conversation conv = conversationService.getConversationById(post.getConversation().getId()); usersInvolved.stream().filter(userInvolved -> !mentionedUsers.contains(userInvolved)) .forEach(userInvolved -> notifyUserAboutNewMessageReply(savedAnswerMessage, notification, userInvolved, author, getAnswerMessageNotificationType(conv))); } + /** + * Filters which of the mentioned users are permitted to receive a notification + * + * @param mentionedUsers users mentioned in the answer message + * @param conversation the conversation of the created post/notification, used for filtering + * @return the stream of mentioned users which are permitted to receive the notification for the given conversation + */ + public Stream filterAllowedRecipientsInMentionedUsers(Set mentionedUsers, Conversation conversation) { + return mentionedUsers.stream().filter(user -> { + boolean isChannelAndCourseWide = conversation instanceof Channel channel && channel.getIsCourseWide(); + boolean isChannelVisibleToStudents = !(conversation instanceof Channel channel) || conversationService.isChannelVisibleToStudents(channel); + boolean isChannelVisibleToMentionedUser = isChannelVisibleToStudents || authorizationCheckService.isAtLeastTeachingAssistantInCourse(conversation.getCourse(), user); + + // Only send a notification to the mentioned user if... + // (for course-wide channels) ...the course-wide channel is visible + // (for all other cases) ...the user is a member of the conversation + return (isChannelAndCourseWide && isChannelVisibleToMentionedUser) || conversationService.isMember(conversation.getId(), user.getId()); + }); + } + /** * Saves the given notification in database and sends it to the client via websocket. * Also creates and sends an instant notification. diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/PostSimilarityComparisonStrategy.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/PostSimilarityComparisonStrategy.java deleted file mode 100644 index 93ca9de0c9f9..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/PostSimilarityComparisonStrategy.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.tum.cit.aet.artemis.communication.service.similarity; - -import de.tum.cit.aet.artemis.communication.domain.Post; - -/** - * This interface offers a method that performs a similarity check on two posts that are compared to each other. - * Every strategy that implements this interface has to provide this method in order to be applicable as post similarity comparison strategy, that can be interchanged easily. - */ -public interface PostSimilarityComparisonStrategy { - - /** - * Method implemented by every strategy; compares two posts using any suitable algorithm to determine similarity - * - * @param post1 first post object that is compared against - * @param post2 second post object that is compared against - * @return the calculated similarity score - */ - Double performSimilarityCheck(Post post1, Post post2); -} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/TitleJaccardSimilarityCompareStrategy.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/TitleJaccardSimilarityCompareStrategy.java deleted file mode 100644 index 53e7285cd41b..000000000000 --- a/src/main/java/de/tum/cit/aet/artemis/communication/service/similarity/TitleJaccardSimilarityCompareStrategy.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.tum.cit.aet.artemis.communication.service.similarity; - -import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; - -import org.apache.commons.text.similarity.JaccardSimilarity; -import org.springframework.context.annotation.Primary; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Component; - -import de.tum.cit.aet.artemis.communication.domain.Post; - -/** - * Implementation of a PostSimilarityComparisonStrategy to be used when searching for duplicates during post creation. - * Jaccard Similarity is a common proximity measurement used to compute the similarity between two objects, such as two text documents; - * In the context of post comparison, the TitleJaccardSimilarityCompareStrategy determines the similarity between two titles (i.e. document) using the number of terms used in both - * documents. - * We use the JaccardSimilarity implementation provided by the org.apache.commons.text.similarity package. - */ -@Profile(PROFILE_CORE) -@Primary -@Component -public class TitleJaccardSimilarityCompareStrategy implements PostSimilarityComparisonStrategy { - - @Override - public Double performSimilarityCheck(Post post1, Post post2) { - JaccardSimilarity jaccardSimilarity = new JaccardSimilarity(); - Double similarityScore = 0.0; - - // we only compute a similarity score if the title of both posts are defined - if (post1.getTitle() != null && post2.getTitle() != null) { - similarityScore = jaccardSimilarity.apply(post1.getTitle().toLowerCase(), post2.getTitle().toLowerCase()); - } - return similarityScore; - } -} diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java index 5031332a8862..bfa04d53cc5f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/communication/web/ConversationMessageResource.java @@ -201,34 +201,4 @@ public ResponseEntity updateDisplayPriority(@PathVariable Long courseId, @ Post postWithUpdatedDisplayPriority = conversationMessagingService.changeDisplayPriority(courseId, postId, displayPriority); return ResponseEntity.ok().body(postWithUpdatedDisplayPriority); } - - /** - * POST /courses/{courseId}/messages/similarity-check : trigger a similarity check for post to be created - * - * @param courseId id of the course the post should be published in - * @param post post to create - * @return ResponseEntity with status 200 (OK) - */ - @PostMapping("courses/{courseId}/messages/similarity-check") - @EnforceAtLeastStudent - // TODO: unused, remove - public ResponseEntity> computeSimilarityScoresWitCoursePosts(@PathVariable Long courseId, @RequestBody Post post) { - List similarPosts = conversationMessagingService.getSimilarPosts(courseId, post); - return ResponseEntity.ok().body(similarPosts); - } - - /** - * GET /courses/{courseId}/posts/tags : Get all tags for posts in a certain course - * - * @param courseId id of the course the post belongs to - * @return the ResponseEntity with status 200 (OK) and with body all tags for posts in that course, - * or 400 (Bad Request) if the checks on user or course validity fail - */ - @GetMapping("courses/{courseId}/messages/tags") - // TODO: unused, delete - @EnforceAtLeastStudent - public ResponseEntity> getAllPostTagsForCourse(@PathVariable Long courseId) { - List tags = conversationMessagingService.getAllCourseTags(courseId); - return new ResponseEntity<>(tags, null, HttpStatus.OK); - } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java b/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java index baacbfd73966..fbd88e0b323b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/SecurityConfiguration.java @@ -207,6 +207,7 @@ public SecurityFilterChain filterChain(HttpSecurity http, SecurityProblemSupport // Websocket and other specific endpoints allowed without authentication. .requestMatchers("/websocket/**").permitAll() .requestMatchers("/.well-known/jwks.json").permitAll() + .requestMatchers("/.well-known/assetlinks.json").permitAll() // Prometheus endpoint protected by IP address. .requestMatchers("/management/prometheus/**").access((authentication, context) -> new AuthorizationDecision(monitoringIpAddresses.contains(context.getRequest().getRemoteAddr()))); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java b/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java index 646fa942e7e0..e79b1de3939c 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/config/WebConfigurer.java @@ -24,6 +24,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; import org.springframework.http.MediaType; +import org.springframework.util.CollectionUtils; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; @@ -117,7 +118,7 @@ private String resolvePathPrefix() { public CorsFilter corsFilter() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = jHipsterProperties.getCors(); - if (config.getAllowedOrigins() != null && !config.getAllowedOrigins().isEmpty()) { + if (!CollectionUtils.isEmpty(config.getAllowedOrigins()) || !CollectionUtils.isEmpty(config.getAllowedOriginPatterns())) { log.debug("Registering CORS filter"); source.registerCorsConfiguration("/api/**", config); source.registerCorsConfiguration("/management/**", config); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/CleanupJobExecution.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/CleanupJobExecution.java new file mode 100644 index 000000000000..66a3880056a6 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/CleanupJobExecution.java @@ -0,0 +1,67 @@ +package de.tum.cit.aet.artemis.core.domain; + +import java.time.ZonedDateTime; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@Entity +@Table(name = "cleanup_job_execution") +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class CleanupJobExecution extends DomainObject { + + @Column(name = "delete_from") + private ZonedDateTime deleteFrom; + + @Column(name = "delete_to") + private ZonedDateTime deleteTo; + + @Column(name = "deleted_at") + @NotNull + private ZonedDateTime deletionTimestamp; + + @Enumerated(EnumType.STRING) + @Column(name = "operation_type") + private CleanupJobType cleanupJobType; + + public CleanupJobExecution() { + } + + public ZonedDateTime getDeleteFrom() { + return deleteFrom; + } + + public void setDeleteFrom(ZonedDateTime deleteFrom) { + this.deleteFrom = deleteFrom; + } + + public ZonedDateTime getDeleteTo() { + return deleteTo; + } + + public void setDeleteTo(ZonedDateTime deleteTo) { + this.deleteTo = deleteTo; + } + + public ZonedDateTime getDeletionTimestamp() { + return deletionTimestamp; + } + + public void setDeletionTimestamp(ZonedDateTime deletionTimestamp) { + this.deletionTimestamp = deletionTimestamp; + } + + public CleanupJobType getCleanupJobType() { + return cleanupJobType; + } + + public void setCleanupJobType(CleanupJobType cleanupJobType) { + this.cleanupJobType = cleanupJobType; + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/domain/CleanupJobType.java b/src/main/java/de/tum/cit/aet/artemis/core/domain/CleanupJobType.java new file mode 100644 index 000000000000..206e01c3fff6 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/domain/CleanupJobType.java @@ -0,0 +1,22 @@ +package de.tum.cit.aet.artemis.core.domain; + +public enum CleanupJobType { + + ORPHANS("deleteOrphans"), PLAGIARISM_COMPARISONS("deletePlagiarismComparisons"), NON_RATED_RESULTS("deleteNonRatedResults"), RATED_RESULTS("deleteRatedResults"), + SUBMISSION_VERSIONS("deleteSubmissionVersions"), FEEDBACK("deleteFeedback"); + + private final String label; + + CleanupJobType(String name) { + this.label = name; + } + + public String label() { + return label; + } + + @Override + public String toString() { + return this.name(); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CleanupServiceExecutionRecordDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CleanupServiceExecutionRecordDTO.java new file mode 100644 index 000000000000..34936c669c22 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CleanupServiceExecutionRecordDTO.java @@ -0,0 +1,21 @@ +package de.tum.cit.aet.artemis.core.dto; + +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.cit.aet.artemis.core.domain.CleanupJobExecution; + +/** + * DTO representing a record of a cleanup service execution. + * This DTO contains information about the execution date and the type of the job that was executed. + * The JSON serialization will include non-empty fields only. + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record CleanupServiceExecutionRecordDTO(ZonedDateTime executionDate, String jobType) { + + public static CleanupServiceExecutionRecordDTO of(CleanupJobExecution cleanupJobExecution) { + return new CleanupServiceExecutionRecordDTO(cleanupJobExecution.getDeletionTimestamp(), cleanupJobExecution.getCleanupJobType().label()); + } + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseGroupsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseGroupsDTO.java new file mode 100644 index 000000000000..3aa5bce0b285 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/CourseGroupsDTO.java @@ -0,0 +1,7 @@ +package de.tum.cit.aet.artemis.core.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record CourseGroupsDTO(String instructorGroupName, String editorGroupName, String teachingAssistantGroupName, String studentGroupName) { +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/dto/RepositoryExportOptionsDTO.java b/src/main/java/de/tum/cit/aet/artemis/core/dto/RepositoryExportOptionsDTO.java index 5d9bb8eb0847..2ea1300ef635 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/dto/RepositoryExportOptionsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/dto/RepositoryExportOptionsDTO.java @@ -8,96 +8,21 @@ * This is a dto for the repository export options. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -// TODO: convert into a Record -public class RepositoryExportOptionsDTO { +public record RepositoryExportOptionsDTO(boolean exportAllParticipants, boolean filterLateSubmissions, boolean filterLateSubmissionsIndividualDueDate, + ZonedDateTime filterLateSubmissionsDate, boolean excludePracticeSubmissions, boolean addParticipantName, boolean combineStudentCommits, boolean anonymizeRepository, + boolean normalizeCodeStyle) { - private boolean exportAllParticipants; - - private boolean filterLateSubmissions; - - private boolean filterLateSubmissionsIndividualDueDate; - - private ZonedDateTime filterLateSubmissionsDate; - - private boolean excludePracticeSubmissions; - - private boolean addParticipantName; - - private boolean combineStudentCommits; - - private boolean anonymizeRepository; - - private boolean normalizeCodeStyle; - - public boolean isExportAllParticipants() { - return exportAllParticipants; - } - - public void setExportAllParticipants(boolean exportAllParticipants) { - this.exportAllParticipants = exportAllParticipants; - } - - public boolean isFilterLateSubmissions() { - return filterLateSubmissions; - } - - public void setFilterLateSubmissions(boolean filterLateSubmissions) { - this.filterLateSubmissions = filterLateSubmissions; - } - - public boolean isFilterLateSubmissionsIndividualDueDate() { - return filterLateSubmissionsIndividualDueDate; - } - - public void setFilterLateSubmissionsIndividualDueDate(boolean filterLateSubmissionsIndividualDueDate) { - this.filterLateSubmissionsIndividualDueDate = filterLateSubmissionsIndividualDueDate; - } - - public ZonedDateTime getFilterLateSubmissionsDate() { - return filterLateSubmissionsDate; - } - - public void setFilterLateSubmissionsDate(ZonedDateTime filterLateSubmissionsDate) { - this.filterLateSubmissionsDate = filterLateSubmissionsDate; - } - - public boolean isExcludePracticeSubmissions() { - return excludePracticeSubmissions; - } - - public void setExcludePracticeSubmissions(boolean excludePracticeSubmissions) { - this.excludePracticeSubmissions = excludePracticeSubmissions; - } - - public boolean isAddParticipantName() { - return addParticipantName; - } - - public void setAddParticipantName(boolean addParticipantName) { - this.addParticipantName = addParticipantName; - } - - public boolean isCombineStudentCommits() { - return combineStudentCommits; - } - - public void setCombineStudentCommits(boolean combineStudentCommits) { - this.combineStudentCommits = combineStudentCommits; - } - - public boolean isAnonymizeRepository() { - return anonymizeRepository; - } - - public void setAnonymizeRepository(boolean anonymizeRepository) { - this.anonymizeRepository = anonymizeRepository; + public RepositoryExportOptionsDTO() { + this(false, false, false, null, false, false, false, false, false); } - public boolean isNormalizeCodeStyle() { - return normalizeCodeStyle; + public RepositoryExportOptionsDTO copyWith(boolean filterLateSubmissionsIndividualDueDate, ZonedDateTime filterLateSubmissionsDate) { + return new RepositoryExportOptionsDTO(exportAllParticipants, filterLateSubmissions, filterLateSubmissionsIndividualDueDate, filterLateSubmissionsDate, + excludePracticeSubmissions, addParticipantName, combineStudentCommits, anonymizeRepository, normalizeCodeStyle); } - public void setNormalizeCodeStyle(boolean normalizeCodeStyle) { - this.normalizeCodeStyle = normalizeCodeStyle; + public RepositoryExportOptionsDTO copyWithAnonymizeRepository(boolean anonymizeRepository) { + return new RepositoryExportOptionsDTO(exportAllParticipants, filterLateSubmissions, filterLateSubmissionsIndividualDueDate, filterLateSubmissionsDate, + excludePracticeSubmissions, addParticipantName, combineStudentCommits, anonymizeRepository, normalizeCodeStyle); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java index b7b34537848d..8d9aa0c09df5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/CourseRepository.java @@ -26,6 +26,7 @@ import de.tum.cit.aet.artemis.core.domain.Organization; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.CourseForArchiveDTO; +import de.tum.cit.aet.artemis.core.dto.CourseGroupsDTO; import de.tum.cit.aet.artemis.core.dto.StatisticsEntry; import de.tum.cit.aet.artemis.core.exception.EntityNotFoundException; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; @@ -323,14 +324,6 @@ GROUP BY SUBSTRING(CAST(s.submissionDate AS string), 1, 10), p.student.login """) List findAllNotEndedCoursesByManagementGroupNames(@Param("now") ZonedDateTime now, @Param("userGroups") List userGroups); - @Query(""" - SELECT COUNT(DISTINCT ug.userId) - FROM Course c - JOIN UserGroup ug ON c.studentGroupName = ug.group - WHERE c.id = :courseId - """) - int countCourseStudents(@Param("courseId") long courseId); - /** * Counts the number of members of a course, i.e. users that are a member of the course's student, tutor, editor or instructor group. * Users that are part of multiple groups are NOT counted multiple times. @@ -569,4 +562,23 @@ SELECT COUNT(c) > 0 Set findInactiveCoursesForUserRolesWithNonNullSemester(@Param("isAdmin") boolean isAdmin, @Param("groups") Set groups, @Param("now") ZonedDateTime now); + @Query(""" + SELECT new de.tum.cit.aet.artemis.core.dto.CourseGroupsDTO( + c.instructorGroupName, + c.editorGroupName, + c.teachingAssistantGroupName, + c.studentGroupName + ) FROM Course c + """) + Set findAllCourseGroups(); + + @Query(""" + SELECT c + FROM Course c + WHERE c.teachingAssistantGroupName IN :userGroups + OR c.editorGroupName IN :userGroups + OR c.instructorGroupName IN :userGroups + OR :isAdmin = TRUE + """) + List findCoursesForAtLeastTutorWithGroups(@Param("userGroups") Set userGroups, @Param("isAdmin") boolean isAdmin); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java index a39e6207f4bd..127dc533aef9 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/StatisticsRepository.java @@ -121,7 +121,7 @@ OR EXISTS (SELECT c FROM Course c WHERE submission.participation.exercise.course * * @param startDate the minimum submission date * @param endDate the maximum submission date - * @return a list of active users + * @return a count of active users */ @Query(""" SELECT COUNT(DISTINCT p.student.id) diff --git a/src/main/java/de/tum/cit/aet/artemis/core/repository/cleanup/CleanupJobExecutionRepository.java b/src/main/java/de/tum/cit/aet/artemis/core/repository/cleanup/CleanupJobExecutionRepository.java new file mode 100644 index 000000000000..e67b3c90f9d7 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/repository/cleanup/CleanupJobExecutionRepository.java @@ -0,0 +1,21 @@ +package de.tum.cit.aet.artemis.core.repository.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Repository; + +import de.tum.cit.aet.artemis.core.domain.CleanupJobExecution; +import de.tum.cit.aet.artemis.core.domain.CleanupJobType; +import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; + +/** + * Spring Data JPA repository for the CleanupJobExecution entity. + */ +@Profile(PROFILE_CORE) +@Repository +public interface CleanupJobExecutionRepository extends ArtemisJpaRepository { + + CleanupJobExecution findTopByCleanupJobTypeOrderByDeletionTimestampDesc(CleanupJobType jobType); + +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java index a286744dbe8a..81aa6a27f6b0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/CourseService.java @@ -678,6 +678,7 @@ public List getAllCoursesForManagementOverview(boolean onlyActive) { var user = userRepository.getUserWithGroupsAndAuthorities(); boolean isAdmin = authCheckService.isAdmin(user); if (isAdmin && !onlyActive) { + // TODO: we should avoid using findAll() here, as it might return a huge amount of data return courseRepository.findAll(); } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java index f9089d6e5cb8..f36dbb8ed243 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/DataExportScheduleService.java @@ -72,25 +72,26 @@ public void createDataExportsAndDeleteOldOnes() throws InterruptedException { log.info("Creating data exports and deleting old ones"); Set successfulDataExports = Collections.synchronizedSet(new HashSet<>()); var dataExportsToBeCreated = dataExportRepository.findAllToBeCreated(); - ExecutorService executor = Executors.newFixedThreadPool(10); - dataExportsToBeCreated.forEach(dataExport -> executor.execute(() -> createDataExport(dataExport, successfulDataExports))); - executor.shutdown(); - ZonedDateTime thresholdDate = ZonedDateTime.now().minusDays(7); - var dataExportsToBeDeleted = dataExportRepository.findAllToBeDeleted(thresholdDate); - dataExportsToBeDeleted.forEach(this::deleteDataExport); - Optional admin = userService.findInternalAdminUser(); - if (admin.isEmpty()) { - log.warn("No internal admin user found. Cannot send email to admin about successful creation of data exports."); - return; - } - // This job runs at 4 am by default and the next scheduled job runs at 5 am, so we should allow 60 minutes for the creation. - // If the creation doesn't finish within 60 minutes, all pending exports will be picked up when the job runs the next time. - if (!executor.awaitTermination(60, java.util.concurrent.TimeUnit.MINUTES)) { - log.info("Not all pending data exports could be created within 60 minutes."); - executor.shutdownNow(); - } - if (!successfulDataExports.isEmpty()) { - mailService.sendSuccessfulDataExportsEmailToAdmin(admin.get(), successfulDataExports); + try (ExecutorService executor = Executors.newFixedThreadPool(10)) { + dataExportsToBeCreated.forEach(dataExport -> executor.execute(() -> createDataExport(dataExport, successfulDataExports))); + executor.shutdown(); + ZonedDateTime thresholdDate = ZonedDateTime.now().minusDays(7); + var dataExportsToBeDeleted = dataExportRepository.findAllToBeDeleted(thresholdDate); + dataExportsToBeDeleted.forEach(this::deleteDataExport); + Optional admin = userService.findInternalAdminUser(); + if (admin.isEmpty()) { + log.warn("No internal admin user found. Cannot send email to admin about successful creation of data exports."); + return; + } + // This job runs at 4 am by default and the next scheduled job runs at 5 am, so we should allow 60 minutes for the creation. + // If the creation doesn't finish within 60 minutes, all pending exports will be picked up when the job runs the next time. + if (!executor.awaitTermination(60, java.util.concurrent.TimeUnit.MINUTES)) { + log.info("Not all pending data exports could be created within 60 minutes."); + executor.shutdownNow(); + } + if (!successfulDataExports.isEmpty()) { + mailService.sendSuccessfulDataExportsEmailToAdmin(admin.get(), successfulDataExports); + } } } diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/cleanup/DataCleanupService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/cleanup/DataCleanupService.java new file mode 100644 index 000000000000..2ed93c8d8926 --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/cleanup/DataCleanupService.java @@ -0,0 +1,236 @@ +package de.tum.cit.aet.artemis.core.service.cleanup; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.time.ZonedDateTime; +import java.util.Arrays; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import de.tum.cit.aet.artemis.assessment.repository.cleanup.FeedbackCleanupRepository; +import de.tum.cit.aet.artemis.assessment.repository.cleanup.LongFeedbackTextCleanupRepository; +import de.tum.cit.aet.artemis.assessment.repository.cleanup.PlagiarismComparisonCleanupRepository; +import de.tum.cit.aet.artemis.assessment.repository.cleanup.RatingCleanupRepository; +import de.tum.cit.aet.artemis.assessment.repository.cleanup.ResultCleanupRepository; +import de.tum.cit.aet.artemis.assessment.repository.cleanup.StudentScoreCleanupRepository; +import de.tum.cit.aet.artemis.assessment.repository.cleanup.TeamScoreCleanupRepository; +import de.tum.cit.aet.artemis.assessment.repository.cleanup.TextBlockCleanupRepository; +import de.tum.cit.aet.artemis.core.domain.CleanupJobExecution; +import de.tum.cit.aet.artemis.core.domain.CleanupJobType; +import de.tum.cit.aet.artemis.core.dto.CleanupServiceExecutionRecordDTO; +import de.tum.cit.aet.artemis.core.repository.cleanup.CleanupJobExecutionRepository; + +@Profile(PROFILE_CORE) +@Service +public class DataCleanupService { + + private static final Logger log = LoggerFactory.getLogger(DataCleanupService.class); + + private final CleanupJobExecutionRepository cleanupJobExecutionRepository; + + private final PlagiarismComparisonCleanupRepository plagiarismComparisonCleanupRepository; + + private final ResultCleanupRepository resultCleanupRepository; + + private final RatingCleanupRepository ratingCleanupRepository; + + private final FeedbackCleanupRepository feedbackCleanupRepository; + + private final TextBlockCleanupRepository textBlockCleanupRepository; + + private final LongFeedbackTextCleanupRepository longFeedbackTextCleanupRepository; + + private final StudentScoreCleanupRepository studentScoreCleanupRepository; + + private final TeamScoreCleanupRepository teamScoreCleanupRepository; + + public DataCleanupService(CleanupJobExecutionRepository cleanupJobExecutionRepository, PlagiarismComparisonCleanupRepository plagiarismComparisonCleanupRepository, + ResultCleanupRepository resultCleanupRepository, RatingCleanupRepository ratingCleanupRepository, FeedbackCleanupRepository feedbackCleanupRepository, + TextBlockCleanupRepository textBlockCleanupRepository, LongFeedbackTextCleanupRepository longFeedbackTextCleanupRepository, + StudentScoreCleanupRepository studentScoreCleanupRepository, TeamScoreCleanupRepository teamScoreCleanupRepository) { + this.resultCleanupRepository = resultCleanupRepository; + this.ratingCleanupRepository = ratingCleanupRepository; + this.feedbackCleanupRepository = feedbackCleanupRepository; + this.textBlockCleanupRepository = textBlockCleanupRepository; + this.longFeedbackTextCleanupRepository = longFeedbackTextCleanupRepository; + this.studentScoreCleanupRepository = studentScoreCleanupRepository; + this.teamScoreCleanupRepository = teamScoreCleanupRepository; + this.cleanupJobExecutionRepository = cleanupJobExecutionRepository; + this.plagiarismComparisonCleanupRepository = plagiarismComparisonCleanupRepository; + } + + // TODO: offer the possibility to delete old submission versions + + /** + * Deletes orphaned entities that are no longer associated with valid results or participations. + * This includes feedback, text blocks, and scores that reference null results, participations, or submissions. + * + * @return a {@link CleanupServiceExecutionRecordDTO} representing the execution record of the cleanup job + */ + public CleanupServiceExecutionRecordDTO deleteOrphans() { + int deletedLongFeedbackTexts = longFeedbackTextCleanupRepository.deleteLongFeedbackTextForOrphanedFeedback(); + log.info("Deleted {} orphaned long feedback texts", deletedLongFeedbackTexts); + + int deletedTextBlocks = textBlockCleanupRepository.deleteTextBlockForEmptyFeedback(); + log.info("Deleted {} text blocks for empty feedback", deletedTextBlocks); + + int deletedOrphanFeedback = feedbackCleanupRepository.deleteOrphanFeedback(); + log.info("Deleted {} orphaned feedback entries", deletedOrphanFeedback); + + int deletedOrphanStudentScores = studentScoreCleanupRepository.deleteOrphanStudentScore(); + log.info("Deleted {} orphaned student scores", deletedOrphanStudentScores); + + int deletedOrphanTeamScores = teamScoreCleanupRepository.deleteOrphanTeamScore(); + log.info("Deleted {} orphaned team scores", deletedOrphanTeamScores); + + int deletedLongFeedbackTextsForOrphanResult = longFeedbackTextCleanupRepository.deleteLongFeedbackTextForOrphanResult(); + log.info("Deleted {} long feedback texts for orphan results", deletedLongFeedbackTextsForOrphanResult); + + int deletedTextBlocksForOrphanResults = textBlockCleanupRepository.deleteTextBlockForOrphanResults(); + log.info("Deleted {} text blocks for orphan results", deletedTextBlocksForOrphanResults); + + int deletedFeedbackForOrphanResults = feedbackCleanupRepository.deleteFeedbackForOrphanResults(); + log.info("Deleted {} feedback entries for orphan results", deletedFeedbackForOrphanResults); + + int deletedOrphanRatings = ratingCleanupRepository.deleteOrphanRating(); + log.info("Deleted {} orphan ratings", deletedOrphanRatings); + + int deletedResultsWithoutParticipation = resultCleanupRepository.deleteResultWithoutParticipationAndSubmission(); + log.info("Deleted {} results without participation and submission", deletedResultsWithoutParticipation); + + return CleanupServiceExecutionRecordDTO.of(createCleanupJobExecution(CleanupJobType.ORPHANS, null, null)); + } + + /** + * Deletes plagiarism comparisons with a status of "None" that belong to courses within the specified date range. + * It retrieves the IDs of the plagiarism comparisons matching the criteria, deletes them, and records the execution of the cleanup job. + * + * @param deleteFrom the start date for selecting plagiarism comparisons + * @param deleteTo the end date for selecting plagiarism comparisons + * @return a {@link CleanupServiceExecutionRecordDTO} representing the execution record of the cleanup job + */ + public CleanupServiceExecutionRecordDTO deletePlagiarismComparisons(ZonedDateTime deleteFrom, ZonedDateTime deleteTo) { + var pcIds = plagiarismComparisonCleanupRepository.findPlagiarismComparisonIdWithStatusNoneThatBelongToCourseWithDates(deleteFrom, deleteTo); + log.info("Deleting {} plagiarism comparisons with status 'None' between {} and {}", pcIds.size(), deleteFrom, deleteTo); + + // NOTE: we first need to delete related data to avoid foreign key constraints + // Delete all plagiarism elements that are part of the plagiarism submissions + int deletedPlagiarismElements = plagiarismComparisonCleanupRepository.deletePlagiarismSubmissionElementsByComparisonIdsIn(pcIds); + log.info("Deleted {} plagiarism elements that are part of the plagiarism submissions", deletedPlagiarismElements); + + // NOTE: we need to set submissionA and submissionB to null first to avoid foreign key constraints + int updatedPlagiarismComparisons = plagiarismComparisonCleanupRepository.setPlagiarismSubmissionsToNullInComparisonsWithIds(pcIds); + log.info("Updated {} plagiarism comparisons to set plagiarism submissions to null", updatedPlagiarismComparisons); + + // Delete all plagiarism submissions that reference plagiarism comparisons + int deletedPlagiarismSubmissions = plagiarismComparisonCleanupRepository.deletePlagiarismSubmissionsByComparisonIdsIn(pcIds); + log.info("Deleted {} plagiarism submissions that reference plagiarism comparisons", deletedPlagiarismSubmissions); + + // Delete all plagiarism comparison matches that reference plagiarism comparisons + int deletedPlagiarismComparisonMatches = plagiarismComparisonCleanupRepository.deletePlagiarismComparisonMatchesByComparisonIdsIn(pcIds); + log.info("Deleted {} plagiarism comparison matches that reference plagiarism comparisons", deletedPlagiarismComparisonMatches); + + int deletedPCs = plagiarismComparisonCleanupRepository.deleteByIdsIn(pcIds); + log.info("Deleted {} plagiarism comparisons with status 'None'", deletedPCs); + return CleanupServiceExecutionRecordDTO.of(createCleanupJobExecution(CleanupJobType.PLAGIARISM_COMPARISONS, deleteFrom, deleteTo)); + } + + /** + * Deletes non-rated results, excluding the latest non-rated result for each participation(to be able to compute Competencies Scores), within the specified date range, along + * with associated long feedback texts, + * text blocks, feedback items, and participant scores. + * + * @param deleteFrom The start of the date range for deleting non-rated results. + * @param deleteTo The end of the date range for deleting non-rated results. + * @return a {@link CleanupServiceExecutionRecordDTO} representing the execution record of the cleanup job + */ + public CleanupServiceExecutionRecordDTO deleteNonLatestNonRatedResultsFeedback(ZonedDateTime deleteFrom, ZonedDateTime deleteTo) { + int deletedLongFeedbackTexts = longFeedbackTextCleanupRepository.deleteLongFeedbackTextForNonRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + log.info("Deleted {} long feedback texts for non-rated results between {} and {}", deletedLongFeedbackTexts, deleteFrom, deleteTo); + + int deletedTextBlocks = textBlockCleanupRepository.deleteTextBlockForNonRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + log.info("Deleted {} text blocks for non-rated results between {} and {}", deletedTextBlocks, deleteFrom, deleteTo); + + int deletedFeedback = feedbackCleanupRepository.deleteOldNonRatedFeedbackWhereCourseDateBetween(deleteFrom, deleteTo); + log.info("Deleted {} feedback entries for non-rated results between {} and {}", deletedFeedback, deleteFrom, deleteTo); + + // TODO: old results and participant scores should not be deleted automatically: if at all this could be offered as an option for the admin + // int deletedParticipantScoresForLatest = participantScoreCleanupRepository.deleteParticipantScoresForLatestNonRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + // log.info("Deleted {} participant scores for latest non-rated results between {} and {}", deletedParticipantScoresForLatest, deleteFrom, deleteTo); + // + // int deletedParticipantScores = participantScoreCleanupRepository.deleteParticipantScoresForNonRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + // log.info("Deleted {} participant scores for non-rated results between {} and {}", deletedParticipantScores, deleteFrom, deleteTo); + + // int deletedNonLatestNonRatedResults = resultCleanupRepository.deleteNonLatestNonRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + // log.info("Deleted {} non-latest non-rated results between {} and {}", deletedNonLatestNonRatedResults, deleteFrom, deleteTo); + + return CleanupServiceExecutionRecordDTO.of(createCleanupJobExecution(CleanupJobType.NON_RATED_RESULTS, deleteFrom, deleteTo)); + } + + /** + * Deletes rated results, excluding the latest rated result for each participation, for courses conducted within the specified date range. + * Also deletes associated long feedback texts, text blocks, feedback items, and participant scores. + * + * @param deleteFrom The start of the date range for deleting rated results. + * @param deleteTo The end of the date range for deleting rated results. + * @return a {@link CleanupServiceExecutionRecordDTO} representing the execution record of the cleanup job + */ + public CleanupServiceExecutionRecordDTO deleteNonLatestRatedResultsFeedback(ZonedDateTime deleteFrom, ZonedDateTime deleteTo) { + int deletedLongFeedbackTexts = longFeedbackTextCleanupRepository.deleteLongFeedbackTextForRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + log.info("Deleted {} long feedback texts for rated results between {} and {}", deletedLongFeedbackTexts, deleteFrom, deleteTo); + + int deletedTextBlocks = textBlockCleanupRepository.deleteTextBlockForRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + log.info("Deleted {} text blocks for rated results between {} and {}", deletedTextBlocks, deleteFrom, deleteTo); + + int deletedFeedback = feedbackCleanupRepository.deleteOldFeedbackThatAreNotLatestRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + log.info("Deleted {} feedback entries for rated results between {} and {}", deletedFeedback, deleteFrom, deleteTo); + + // TODO: old results and participant scores should not be deleted automatically: if at all this could be offered as an option for the admin + // int deletedParticipantScoresForNonLatest = participantScoreCleanupRepository.deleteParticipantScoresForNonLatestLastResultsWhereCourseDateBetween(deleteFrom, deleteTo); + // log.info("Deleted {} participant scores for non-latest rated results between {} and {}", deletedParticipantScoresForNonLatest, deleteFrom, deleteTo); + // + // int deletedParticipantScoresForNonLatestLast = participantScoreCleanupRepository.deleteParticipantScoresForNonLatestLastRatedResultsWhereCourseDateBetween(deleteFrom, + // deleteTo); + // log.info("Deleted {} participant scores for non-latest last rated results between {} and {}", deletedParticipantScoresForNonLatestLast, deleteFrom, deleteTo); + + // int deletedNonLatestRatedResults = resultCleanupRepository.deleteNonLatestRatedResultsWhereCourseDateBetween(deleteFrom, deleteTo); + // log.info("Deleted {} non-latest rated results between {} and {}", deletedNonLatestRatedResults, deleteFrom, deleteTo); + + return CleanupServiceExecutionRecordDTO.of(createCleanupJobExecution(CleanupJobType.RATED_RESULTS, deleteFrom, deleteTo)); + } + + /** + * Retrieves the last execution record for each cleanup job type. + * This method returns the most recent execution of each cleanup job type by querying + * the {@link CleanupJobExecutionRepository} for the latest execution based on the + * deletion timestamp. If no execution is found for a job type, a default + * {@link CleanupServiceExecutionRecordDTO} with a {@code null} execution and the job + * type's label is returned. + * + * @return a list of {@link CleanupServiceExecutionRecordDTO} objects representing + * the last execution record for each cleanup job type + */ + public List getLastExecutions() { + return Arrays.stream(CleanupJobType.values()).map(jobType -> { + CleanupJobExecution lastExecution = cleanupJobExecutionRepository.findTopByCleanupJobTypeOrderByDeletionTimestampDesc(jobType); + return lastExecution != null ? CleanupServiceExecutionRecordDTO.of(lastExecution) : new CleanupServiceExecutionRecordDTO(null, jobType.label()); + }).toList(); + } + + private CleanupJobExecution createCleanupJobExecution(CleanupJobType cleanupJobType, ZonedDateTime deleteFrom, ZonedDateTime deleteTo) { + var entry = new CleanupJobExecution(); + entry.setCleanupJobType(cleanupJobType); + if (deleteFrom != null) { + entry.setDeleteFrom(deleteFrom); + } + if (deleteTo != null) { + entry.setDeleteTo(deleteTo); + } + entry.setDeletionTimestamp(ZonedDateTime.now()); + return cleanupJobExecutionRepository.save(entry); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java index 83921300956c..ce1d32cb50c8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/export/DataExportExerciseCreationService.java @@ -155,13 +155,6 @@ public void createProgrammingExerciseExport(ProgrammingExercise programmingExerc } createSubmissionsResultsExport(programmingExercise, exerciseDir, user); RepositoryExportOptionsDTO repositoryExportOptions = new RepositoryExportOptionsDTO(); - repositoryExportOptions.setExportAllParticipants(false); - repositoryExportOptions.setAnonymizeRepository(false); - repositoryExportOptions.setFilterLateSubmissions(false); - repositoryExportOptions.setCombineStudentCommits(false); - repositoryExportOptions.setFilterLateSubmissionsIndividualDueDate(false); - repositoryExportOptions.setExcludePracticeSubmissions(false); - repositoryExportOptions.setNormalizeCodeStyle(false); var listOfProgrammingExerciseParticipations = programmingExercise.getStudentParticipations().stream() .filter(studentParticipation -> studentParticipation instanceof ProgrammingExerciseStudentParticipation) .map(studentParticipation -> (ProgrammingExerciseStudentParticipation) studentParticipation).toList(); diff --git a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java index c883f774dcad..d06ecfec87af 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/service/user/UserService.java @@ -832,7 +832,7 @@ public List importUsers(List userDtos) { * @return the users participation vcs access token, or throws an exception if it does not exist */ public ParticipationVCSAccessToken getParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(User user, Long participationId) { - return participationVCSAccessTokenService.findByUserIdAndParticipationIdOrElseThrow(user.getId(), participationId); + return participationVCSAccessTokenService.findByUserAndParticipationIdOrElseThrow(user, participationId); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java index b1d3aaf5c20e..88f7bb7302e6 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/util/PageUtil.java @@ -74,7 +74,17 @@ public enum ColumnMapping { FEEDBACK_ANALYSIS(Map.of( "count", "COUNT(f.id)", "detailText", "f.detailText", - "testCaseName", "f.testCase.testName" + "testCaseName", "f.testCase.testName", + "taskName", """ + COALESCE(( + SELECT MAX(t.taskName) + FROM ProgrammingExerciseTask t + JOIN t.testCases tct + WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName + ), '')""" + )), + AFFECTED_STUDENTS(Map.of( + "participationId", "p.id" )); // @formatter:on diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java index 37a9e088f5f6..a33d12d0ea38 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/AccountResource.java @@ -17,7 +17,6 @@ import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; @@ -61,9 +60,6 @@ public class AccountResource { public static final String ENTITY_NAME = "user"; - @Value("${jhipster.clientApp.name}") - private String applicationName; - private static final Logger log = LoggerFactory.getLogger(AccountResource.class); private final UserRepository userRepository; @@ -280,7 +276,7 @@ public ResponseEntity getVcsAccessToken(@RequestParam("participationId") } /** - * PUT account/participation-vcs-access-token : get the vcsToken for of a user for a participation + * PUT account/participation-vcs-access-token : add a vcsToken for of a user for a participation * * @param participationId the participation for which the access token should be fetched * diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java index 16b7dd554842..ba364d0c4fb5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/CourseResource.java @@ -21,7 +21,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; import jakarta.validation.constraints.NotNull; @@ -99,6 +98,7 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastStudent; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastTutor; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.core.service.CourseService; import de.tum.cit.aet.artemis.core.service.FilePathService; @@ -117,7 +117,6 @@ import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.exercise.service.ExerciseService; import de.tum.cit.aet.artemis.exercise.service.SubmissionService; -import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; import de.tum.cit.aet.artemis.programming.service.ci.CIUserManagementService; import de.tum.cit.aet.artemis.programming.service.vcs.VcsUserManagementService; @@ -255,16 +254,10 @@ public ResponseEntity updateCourse(@PathVariable Long courseId, @Request // this is important, otherwise someone could put himself into the instructor group of the updated course authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, existingCourse, user); - Set existingGroupNames = new HashSet<>(List.of(existingCourse.getStudentGroupName(), existingCourse.getTeachingAssistantGroupName(), - existingCourse.getEditorGroupName(), existingCourse.getInstructorGroupName())); - Set newGroupNames = new HashSet<>(List.of(courseUpdate.getStudentGroupName(), courseUpdate.getTeachingAssistantGroupName(), courseUpdate.getEditorGroupName(), - courseUpdate.getInstructorGroupName())); - Set changedGroupNames = new HashSet<>(newGroupNames); - changedGroupNames.removeAll(existingGroupNames); - if (!authCheckService.isAdmin(user)) { // this means the user must be an instructor, who has NO Admin rights. // instructors are not allowed to change group names, because this would lead to security problems + final var changedGroupNames = getChangedGroupNames(courseUpdate, existingCourse); if (!changedGroupNames.isEmpty()) { throw new BadRequestAlertException("You are not allowed to change the group names of a course", Course.ENTITY_NAME, "groupNamesCannotChange", true); } @@ -367,48 +360,14 @@ else if (courseUpdate.getCourseIcon() == null && existingCourse.getCourseIcon() return ResponseEntity.ok(result); } - /** - * PUT courses/:courseId/online-course-configuration : Updates the onlineCourseConfiguration for the given course. - * - * @param courseId the id of the course to update - * @param onlineCourseConfiguration the online course configuration to update - * @return the ResponseEntity with status 200 (OK) and with body the updated online course configuration - */ - // TODO: move into LTIResource - @PutMapping("courses/{courseId}/online-course-configuration") - @EnforceAtLeastInstructor - @Profile(PROFILE_LTI) - public ResponseEntity updateOnlineCourseConfiguration(@PathVariable Long courseId, - @RequestBody OnlineCourseConfiguration onlineCourseConfiguration) { - log.debug("REST request to update the online course configuration for Course : {}", courseId); - - Course course = courseRepository.findByIdWithEagerOnlineCourseConfigurationElseThrow(courseId); - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, course, null); - - if (!course.isOnlineCourse()) { - throw new BadRequestAlertException("Course must be online course", Course.ENTITY_NAME, "courseMustBeOnline"); - } - - if (!course.getOnlineCourseConfiguration().getId().equals(onlineCourseConfiguration.getId())) { - throw new BadRequestAlertException("The onlineCourseConfigurationId does not match the id of the course's onlineCourseConfiguration", - OnlineCourseConfiguration.ENTITY_NAME, "idMismatch"); - } - - if (onlineCourseConfigurationService.isPresent()) { - onlineCourseConfigurationService.get().validateOnlineCourseConfiguration(onlineCourseConfiguration); - course.setOnlineCourseConfiguration(onlineCourseConfiguration); - try { - onlineCourseConfigurationService.get().addOnlineCourseConfigurationToLtiConfigurations(onlineCourseConfiguration); - } - catch (Exception ex) { - log.error("Failed to add online course configuration to LTI configurations", ex); - throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Error when adding online course configuration to LTI configurations", ex); - } - } - - courseRepository.save(course); - - return ResponseEntity.ok(onlineCourseConfiguration); + private static Set getChangedGroupNames(Course courseUpdate, Course existingCourse) { + Set existingGroupNames = new HashSet<>(List.of(existingCourse.getStudentGroupName(), existingCourse.getTeachingAssistantGroupName(), + existingCourse.getEditorGroupName(), existingCourse.getInstructorGroupName())); + Set newGroupNames = new HashSet<>(List.of(courseUpdate.getStudentGroupName(), courseUpdate.getTeachingAssistantGroupName(), courseUpdate.getEditorGroupName(), + courseUpdate.getInstructorGroupName())); + Set changedGroupNames = new HashSet<>(newGroupNames); + changedGroupNames.removeAll(existingGroupNames); + return changedGroupNames; } /** @@ -479,17 +438,20 @@ public ResponseEntity> unenrollFromCourse(@PathVariable Long courseI @GetMapping("courses") @EnforceAtLeastTutor public ResponseEntity> getCourses(@RequestParam(defaultValue = "false") boolean onlyActive) { - log.debug("REST request to get all Courses the user has access to"); + log.debug("REST request to get all courses the user has access to"); User user = userRepository.getUserWithGroupsAndAuthorities(); - // TODO: we should avoid findAll() and instead try to filter this directly in the database, in case of admins, we should load batches of courses, e.g. per semester - List courses = courseRepository.findAll(); - Stream userCourses = courses.stream().filter(course -> user.getGroups().contains(course.getTeachingAssistantGroupName()) - || user.getGroups().contains(course.getInstructorGroupName()) || authCheckService.isAdmin(user)); + List courses = getCoursesForTutors(user, onlyActive); + return ResponseEntity.ok(courses); + } + + private List getCoursesForTutors(User user, boolean onlyActive) { + List userCourses = courseRepository.findCoursesForAtLeastTutorWithGroups(user.getGroups(), authCheckService.isAdmin(user)); if (onlyActive) { // only include courses that have NOT been finished - userCourses = userCourses.filter(course -> course.getEndDate() == null || course.getEndDate().isAfter(ZonedDateTime.now())); + final var now = ZonedDateTime.now(); + userCourses = userCourses.stream().filter(course -> course.getEndDate() == null || course.getEndDate().isAfter(now)).toList(); } - return ResponseEntity.ok(userCourses.toList()); + return userCourses; } /** @@ -536,8 +498,9 @@ public ResponseEntity> getCoursesWithQuizExercises() { @EnforceAtLeastTutor public ResponseEntity> getCoursesWithUserStats(@RequestParam(defaultValue = "false") boolean onlyActive) { log.debug("get courses with user stats, only active: {}", onlyActive); - // TODO: we should avoid using an endpoint in such cases and instead call a service method - List courses = getCourses(onlyActive).getBody(); + + User user = userRepository.getUserWithGroupsAndAuthorities(); + List courses = getCoursesForTutors(user, onlyActive); for (Course course : courses) { course.setNumberOfInstructors(userRepository.countUserInGroup(course.getInstructorGroupName())); course.setNumberOfTeachingAssistants(userRepository.countUserInGroup(course.getTeachingAssistantGroupName())); @@ -645,11 +608,11 @@ public ResponseEntity getCourseForDashboard(@PathVariable } courseService.fetchParticipationsWithSubmissionsAndResultsForCourses(List.of(course), user, true); - log.debug("courseService.fetchParticipationsWithSubmissionsAndResultsForCourses done"); + log.debug("courseService.fetchParticipationsWithSubmissionsAndResultsForCourses done in getCourseForDashboard"); courseService.fetchPlagiarismCasesForCourseExercises(course.getExercises(), user.getId()); - log.debug("courseService.fetchPlagiarismCasesForCourseExercises done"); + log.debug("courseService.fetchPlagiarismCasesForCourseExercises done in getCourseForDashboard"); GradingScale gradingScale = gradingScaleRepository.findByCourseId(course.getId()).orElse(null); - log.debug("gradingScaleRepository.findByCourseId done"); + log.debug("gradingScaleRepository.findByCourseId done in getCourseForDashboard"); CourseForDashboardDTO courseForDashboardDTO = courseScoreCalculationService.getScoresAndParticipationResults(course, gradingScale, user.getId()); logDuration(List.of(course), user, timeNanoStart, "courses/" + courseId + "/for-dashboard (single course)"); return ResponseEntity.ok(courseForDashboardDTO); @@ -748,16 +711,15 @@ public ResponseEntity> getCoursesForNotifications() { * @return data about a course including all exercises, plus some data for the tutor as tutor status for assessment */ @GetMapping("courses/{courseId}/for-assessment-dashboard") - @EnforceAtLeastTutor + @EnforceAtLeastTutorInCourse public ResponseEntity getCourseForAssessmentDashboard(@PathVariable long courseId) { log.debug("REST request /courses/{courseId}/for-assessment-dashboard"); - // TODO: use ...ElseThrow below in case the course cannot be found - Course course = courseRepository.findWithEagerExercisesById(courseId); - User user = userRepository.getUserWithGroupsAndAuthorities(); - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.TEACHING_ASSISTANT, course, user); + Course course = courseRepository.findByIdWithEagerExercisesElseThrow(courseId); Set interestingExercises = courseRepository.filterInterestingExercisesForAssessmentDashboards(course.getExercises()); course.setExercises(interestingExercises); + + User user = userRepository.getUser(); List tutorParticipations = tutorParticipationRepository.findAllByAssessedExercise_Course_IdAndTutor_Id(course.getId(), user.getId()); assessmentDashboardService.generateStatisticsForExercisesForAssessmentDashboard(course.getExercises(), tutorParticipations, false); return ResponseEntity.ok(course); @@ -790,7 +752,7 @@ public ResponseEntity getStatsForAssessmentDashboard(@Path @GetMapping("courses/{courseId}") @EnforceAtLeastStudent public ResponseEntity getCourse(@PathVariable Long courseId) { - log.debug("REST request to get Course : {}", courseId); + log.debug("REST request to get course {} for students", courseId); Course course = courseRepository.findByIdElseThrow(courseId); User user = userRepository.getUserWithGroupsAndAuthorities(); @@ -822,7 +784,7 @@ else if (authCheckService.isAtLeastTeachingAssistantInCourse(course, user)) { @GetMapping("courses/{courseId}/with-exercises") @EnforceAtLeastTutor public ResponseEntity getCourseWithExercises(@PathVariable Long courseId) { - log.debug("REST request to get Course : {}", courseId); + log.debug("REST request to get course {} for tutors", courseId); Course course = courseRepository.findWithEagerExercisesById(courseId); authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.TEACHING_ASSISTANT, course, null); return ResponseEntity.ok(course); @@ -1069,20 +1031,9 @@ public ResponseEntity> searchUsersInCourse(@PathVariable if (loginOrName.length() < 3 && requestedRoles.contains(Role.STUDENT)) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Query param 'loginOrName' must be three characters or longer if you search for students."); } - var groups = new HashSet(); - if (requestedRoles.contains(Role.STUDENT)) { - groups.add(course.getStudentGroupName()); - } - if (requestedRoles.contains(Role.TEACHING_ASSISTANT)) { - groups.add(course.getTeachingAssistantGroupName()); - // searching for tutors also searches for editors - groups.add(course.getEditorGroupName()); - } - if (requestedRoles.contains(Role.INSTRUCTOR)) { - groups.add(course.getInstructorGroupName()); - } + final var relevantCourseGroupNames = getRelevantCourseGroupNames(requestedRoles, course); User searchingUser = userRepository.getUser(); - var originalPage = userRepository.searchAllWithGroupsByLoginOrNameInGroupsNotUserId(PageRequest.of(0, 25), loginOrName, groups, searchingUser.getId()); + var originalPage = userRepository.searchAllWithGroupsByLoginOrNameInGroupsNotUserId(PageRequest.of(0, 25), loginOrName, relevantCourseGroupNames, searchingUser.getId()); var resultDTOs = new ArrayList(); for (var user : originalPage) { @@ -1097,6 +1048,22 @@ public ResponseEntity> searchUsersInCourse(@PathVariable return new ResponseEntity<>(dtoPage.getContent(), headers, HttpStatus.OK); } + private static HashSet getRelevantCourseGroupNames(Set requestedRoles, Course course) { + var groups = new HashSet(); + if (requestedRoles.contains(Role.STUDENT)) { + groups.add(course.getStudentGroupName()); + } + if (requestedRoles.contains(Role.TEACHING_ASSISTANT)) { + groups.add(course.getTeachingAssistantGroupName()); + // searching for tutors also searches for editors + groups.add(course.getEditorGroupName()); + } + if (requestedRoles.contains(Role.INSTRUCTOR)) { + groups.add(course.getInstructorGroupName()); + } + return groups; + } + /** * GET /courses/:courseId/tutors : Returns all users that belong to the tutor group of the course * diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java index 5b73b836b9ad..27332e5343a7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/FileResource.java @@ -219,7 +219,7 @@ public ResponseEntity getMarkdownFileForConversation(@PathVariable Long public ResponseEntity getMarkdownFile(@PathVariable String filename) { log.debug("REST request to get file : {}", filename); sanitizeFilenameElseThrow(filename); - return buildFileResponse(FilePathService.getMarkdownFilePath(), filename); + return buildFileResponse(FilePathService.getMarkdownFilePath(), filename, false); } /** @@ -416,11 +416,12 @@ public ResponseEntity getExamUserImage(@PathVariable Long examUserId) { @GetMapping("files/attachments/lecture/{lectureId}/{filename}") @EnforceAtLeastStudent public ResponseEntity getLectureAttachment(@PathVariable Long lectureId, @PathVariable String filename) { - log.debug("REST request to get file : {}", filename); - sanitizeFilenameElseThrow(filename); + log.debug("REST request to get lecture attachment : {}", filename); + String fileNameWithoutSpaces = filename.replaceAll(" ", "_"); + sanitizeFilenameElseThrow(fileNameWithoutSpaces); List lectureAttachments = attachmentRepository.findAllByLectureId(lectureId); - Attachment attachment = lectureAttachments.stream().filter(lectureAttachment -> filename.equals(Path.of(lectureAttachment.getLink()).getFileName().toString())).findAny() + Attachment attachment = lectureAttachments.stream().filter(lectureAttachment -> lectureAttachment.getLink().endsWith(fileNameWithoutSpaces)).findAny() .orElseThrow(() -> new EntityNotFoundException("Attachment", filename)); // get the course for a lecture attachment @@ -430,25 +431,7 @@ public ResponseEntity getLectureAttachment(@PathVariable Long lectureId, // check if the user is authorized to access the requested attachment unit checkAttachmentAuthorizationOrThrow(course, attachment); - return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false); - } - - /** - * GET /files/courses/{courseId}/attachments/{attachmentId} : Returns the file associated with the - * given attachment ID as a downloadable resource - * - * @param courseId The ID of the course that the Attachment belongs to - * @param attachmentId the ID of the attachment to retrieve - * @return ResponseEntity containing the file as a resource - */ - @GetMapping("files/courses/{courseId}/attachments/{attachmentId}") - @EnforceAtLeastEditorInCourse - public ResponseEntity getAttachmentFile(@PathVariable Long courseId, @PathVariable Long attachmentId) { - Attachment attachment = attachmentRepository.findByIdElseThrow(attachmentId); - Course course = courseRepository.findByIdElseThrow(courseId); - checkAttachmentExistsInCourseOrThrow(course, attachment); - - return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false); + return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), Optional.of(attachment.getName())); } /** @@ -487,6 +470,7 @@ public ResponseEntity getLecturePdfAttachmentsMerged(@PathVariable Long /** * GET files/attachments/attachment-unit/:attachmentUnitId/:filename : Get the lecture unit attachment + * Accesses to this endpoint are created by the server itself in the FilePathService * * @param attachmentUnitId ID of the attachment unit, the attachment belongs to * @return The requested file, 403 if the logged-in user is not allowed to access it, or 404 if the file doesn't exist @@ -494,7 +478,7 @@ public ResponseEntity getLecturePdfAttachmentsMerged(@PathVariable Long @GetMapping("files/attachments/attachment-unit/{attachmentUnitId}/*") @EnforceAtLeastStudent public ResponseEntity getAttachmentUnitAttachment(@PathVariable Long attachmentUnitId) { - log.debug("REST request to get file for attachment unit : {}", attachmentUnitId); + log.debug("REST request to get the file for attachment unit {} for students", attachmentUnitId); AttachmentUnit attachmentUnit = attachmentUnitRepository.findByIdElseThrow(attachmentUnitId); // get the course for a lecture's attachment unit @@ -503,12 +487,11 @@ public ResponseEntity getAttachmentUnitAttachment(@PathVariable Long att // check if the user is authorized to access the requested attachment unit checkAttachmentAuthorizationOrThrow(course, attachment); - - return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false); + return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), Optional.of(attachment.getName())); } /** - * GET files/courses/{courseId}/attachment-units/{attachmenUnitId} : Returns the file associated with the + * GET files/courses/{courseId}/attachment-units/{attachmentUnitId} : Returns the file associated with the * given attachmentUnit ID as a downloadable resource * * @param courseId The ID of the course that the Attachment belongs to @@ -518,7 +501,7 @@ public ResponseEntity getAttachmentUnitAttachment(@PathVariable Long att @GetMapping("files/courses/{courseId}/attachment-units/{attachmentUnitId}") @EnforceAtLeastEditorInCourse public ResponseEntity getAttachmentUnitFile(@PathVariable Long courseId, @PathVariable Long attachmentUnitId) { - log.debug("REST request to get file for attachment unit : {}", attachmentUnitId); + log.debug("REST request to get the file for attachment unit {} for editors", attachmentUnitId); AttachmentUnit attachmentUnit = attachmentUnitRepository.findByIdElseThrow(attachmentUnitId); Course course = courseRepository.findByIdElseThrow(courseId); Attachment attachment = attachmentUnit.getAttachment(); @@ -527,6 +510,25 @@ public ResponseEntity getAttachmentUnitFile(@PathVariable Long courseId, return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false); } + /** + * GET /files/courses/{courseId}/attachments/{attachmentId} : Returns the file associated with the + * given attachment ID as a downloadable resource + * + * @param courseId The ID of the course that the Attachment belongs to + * @param attachmentId the ID of the attachment to retrieve + * @return ResponseEntity containing the file as a resource + */ + @GetMapping("files/courses/{courseId}/attachments/{attachmentId}") + @EnforceAtLeastEditorInCourse + public ResponseEntity getAttachmentFile(@PathVariable Long courseId, @PathVariable Long attachmentId) { + log.debug("REST request to get attachment file : {}", attachmentId); + Attachment attachment = attachmentRepository.findByIdElseThrow(attachmentId); + Course course = courseRepository.findByIdElseThrow(courseId); + checkAttachmentExistsInCourseOrThrow(course, attachment); + + return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false); + } + /** * GET files/attachments/attachment-unit/{attachmentUnitId}/slide/{slideNumber} : Get the lecture unit attachment slide by slide number * @@ -564,36 +566,49 @@ public ResponseEntity getAttachmentUnitAttachmentSlide(@PathVariable Lon } /** - * Builds the response with headers, body and content type for specified path and file name + * Builds the response with headers, body and content type for specified path containing the file name * - * @param path to the file - * @param filename the name of the file + * @param path to the file including the file name + * @param cache true if the response should contain a header that allows caching; false otherwise * @return response entity */ - private ResponseEntity buildFileResponse(Path path, String filename) { - return buildFileResponse(path, filename, false); + private ResponseEntity buildFileResponse(Path path, boolean cache) { + return buildFileResponse(path.getParent(), path.getFileName().toString(), Optional.empty(), cache); } /** * Builds the response with headers, body and content type for specified path containing the file name * - * @param path to the file including the file name - * @param cache true if the response should contain a header that allows caching; false otherwise + * @param path to the file including the file name + * @param filename the name of the file + * @param cache true if the response should contain a header that allows caching; false otherwise * @return response entity */ - private ResponseEntity buildFileResponse(Path path, boolean cache) { - return buildFileResponse(path.getParent(), path.getFileName().toString(), cache); + private ResponseEntity buildFileResponse(Path path, String filename, boolean cache) { + return buildFileResponse(path, filename, Optional.empty(), cache); } /** * Builds the response with headers, body and content type for specified path and file name * - * @param path to the file - * @param filename the name of the file - * @param cache true if the response should contain a header that allows caching; false otherwise + * @param path to the file + * @param replaceFilename replaces the downloaded file's name, if provided * @return response entity */ - private ResponseEntity buildFileResponse(Path path, String filename, boolean cache) { + private ResponseEntity buildFileResponse(Path path, Optional replaceFilename) { + return buildFileResponse(path.getParent(), path.getFileName().toString(), replaceFilename, false); + } + + /** + * Builds the response with headers, body and content type for specified path and file name + * + * @param path to the file + * @param filename the name of the file + * @param replaceFilename replaces the downloaded file's name, if provided + * @param cache true if the response should contain a header that allows caching; false otherwise + * @return response entity + */ + private ResponseEntity buildFileResponse(Path path, String filename, Optional replaceFilename, boolean cache) { try { Path actualPath = path.resolve(filename); byte[] file = fileService.getFileForPath(actualPath); @@ -608,7 +623,7 @@ private ResponseEntity buildFileResponse(Path path, String filename, boo String contentType = lowerCaseFilename.endsWith("htm") || lowerCaseFilename.endsWith("html") || lowerCaseFilename.endsWith("svg") || lowerCaseFilename.endsWith("svgz") ? "attachment" : "inline"; - headers.setContentDisposition(ContentDisposition.builder(contentType).filename(filename).build()); + headers.setContentDisposition(ContentDisposition.builder(contentType).filename(replaceFilename.orElse(filename)).build()); var response = ResponseEntity.ok().headers(headers).contentType(getMediaTypeFromFilename(filename)).header("filename", filename); if (cache) { diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCleanupResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCleanupResource.java new file mode 100644 index 000000000000..60d865abdb0d --- /dev/null +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCleanupResource.java @@ -0,0 +1,112 @@ +package de.tum.cit.aet.artemis.core.web.admin; + +import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; + +import java.time.ZonedDateTime; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import de.tum.cit.aet.artemis.core.dto.CleanupServiceExecutionRecordDTO; +import de.tum.cit.aet.artemis.core.security.annotations.EnforceAdmin; +import de.tum.cit.aet.artemis.core.service.cleanup.DataCleanupService; + +/** + * REST controller for managing old data cleanup operations in Artemis. + * Provides endpoints for administrators to clean up old or orphaned data in the database. + */ +@Profile(PROFILE_CORE) +@RestController +@RequestMapping("api/admin/cleanup/") +@EnforceAdmin +public class AdminCleanupResource { + + private static final Logger log = LoggerFactory.getLogger(AdminCleanupResource.class); + + private final DataCleanupService dataCleanupService; + + public AdminCleanupResource(DataCleanupService dataCleanupService) { + this.dataCleanupService = dataCleanupService; + } + + /** + * DELETE admin/cleanup/orphans + * Deletes orphaned data in the Artemis database. + * + * @return a {@link ResponseEntity} containing the result of the cleanup operation + */ + @DeleteMapping("orphans") + public ResponseEntity deleteOrphans() { + log.info("REST request to delete orphaned data in Artemis database"); + CleanupServiceExecutionRecordDTO result = dataCleanupService.deleteOrphans(); + return ResponseEntity.ok().body(result); + } + + /** + * DELETE admin/cleanup/plagiarism-comparisons + * Deletes plagiarism comparisons within the specified date range. + * + * @param deleteFrom the start date of the deletion range + * @param deleteTo the end date of the deletion range + * @return a {@link ResponseEntity} containing the result of the cleanup operation + */ + @DeleteMapping("plagiarism-comparisons") + public ResponseEntity deletePlagiarismComparisons(@RequestParam("deleteFrom") ZonedDateTime deleteFrom, + @RequestParam("deleteTo") ZonedDateTime deleteTo) { + log.info("REST request to delete plagiarism comparisons between {} and {}", deleteFrom, deleteTo); + CleanupServiceExecutionRecordDTO result = dataCleanupService.deletePlagiarismComparisons(deleteFrom, deleteTo); + return ResponseEntity.ok().body(result); + } + + /** + * DELETE admin/cleanup/non-rated-results + * Deletes non-rated results within the specified date range. + * + * @param deleteFrom the start date of the deletion range + * @param deleteTo the end date of the deletion range + * @return a {@link ResponseEntity} containing the result of the cleanup operation + */ + @DeleteMapping("non-rated-results") + public ResponseEntity deleteNonRatedResults(@RequestParam("deleteFrom") ZonedDateTime deleteFrom, + @RequestParam("deleteTo") ZonedDateTime deleteTo) { + log.info("REST request to delete non-rated results between {} and {}", deleteFrom, deleteTo); + CleanupServiceExecutionRecordDTO result = dataCleanupService.deleteNonLatestNonRatedResultsFeedback(deleteFrom, deleteTo); + return ResponseEntity.ok().body(result); + } + + /** + * DELETE admin/cleanup/old-rated-results + * Deletes old rated results within the specified date range. + * + * @param deleteFrom the start date of the deletion range + * @param deleteTo the end date of the deletion range + * @return a {@link ResponseEntity} containing the result of the cleanup operation + */ + @DeleteMapping("old-rated-results") + public ResponseEntity deleteOldRatedResults(@RequestParam("deleteFrom") ZonedDateTime deleteFrom, + @RequestParam("deleteTo") ZonedDateTime deleteTo) { + log.info("REST request to delete old rated results between {} and {}", deleteFrom, deleteTo); + CleanupServiceExecutionRecordDTO result = dataCleanupService.deleteNonLatestRatedResultsFeedback(deleteFrom, deleteTo); + return ResponseEntity.ok().body(result); + } + + /** + * GET admin/cleanup/last-executions + * Retrieves the last execution records of the data cleanup operations. + * + * @return a {@link ResponseEntity} containing a list of execution records + */ + @GetMapping("last-executions") + public ResponseEntity> getLastExecutions() { + List result = dataCleanupService.getLastExecutions(); + return ResponseEntity.ok().body(result); + } +} diff --git a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java index 6c26cab4798f..2ac600477861 100644 --- a/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/core/web/admin/AdminCourseResource.java @@ -6,7 +6,7 @@ import java.net.URISyntaxException; import java.nio.file.Path; import java.util.Arrays; -import java.util.LinkedHashSet; +import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Set; @@ -35,6 +35,7 @@ import de.tum.cit.aet.artemis.core.domain.Course; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.CourseDeletionSummaryDTO; +import de.tum.cit.aet.artemis.core.dto.CourseGroupsDTO; import de.tum.cit.aet.artemis.core.exception.BadRequestAlertException; import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; @@ -94,14 +95,14 @@ public AdminCourseResource(UserRepository userRepository, CourseService courseSe @GetMapping("courses/groups") public ResponseEntity> getAllGroupsForAllCourses() { log.debug("REST request to get all Groups for all Courses"); - List courses = courseRepository.findAll(); - Set groups = new LinkedHashSet<>(); - for (Course course : courses) { - groups.add(course.getInstructorGroupName()); - groups.add(course.getEditorGroupName()); - groups.add(course.getTeachingAssistantGroupName()); - groups.add(course.getStudentGroupName()); - } + Set courseGroups = courseRepository.findAllCourseGroups(); + Set groups = new HashSet<>(); + courseGroups.forEach(courseGroup -> { + groups.add(courseGroup.instructorGroupName()); + groups.add(courseGroup.editorGroupName()); + groups.add(courseGroup.teachingAssistantGroupName()); + groups.add(courseGroup.studentGroupName()); + }); return ResponseEntity.ok().body(groups); } diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java index 18f4f98a3c0f..ccf79d0bbf0f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/repository/ExamLiveEventRepository.java @@ -41,6 +41,6 @@ public interface ExamLiveEventRepository extends ArtemisJpaRepository getAllIndividualExamEndDates(Long examId) { * @param exam the exam * @return a set of all end dates. May return an empty set, if the exam has no start/end date or student exams cannot be found. */ + @Nullable public Set getAllIndividualExamEndDates(Exam exam) { if (exam.getStartDate() == null) { return null; @@ -184,13 +186,24 @@ public Set getAllIndividualExamEndDates(Exam exam) { return workingTimes.stream().map(timeInSeconds -> exam.getStartDate().plusSeconds(timeInSeconds)).collect(Collectors.toSet()); } + /** + * Returns the unlock date for the exam programming exercise. + *

+ * The unlock date is the exam start date minus a certain amount of time to ensure that the exam is unlocked before the start date. + * + * @param exercise the programming exercise + * @return the unlock date or null if the exercise is not an exam exercise + */ + @Nullable public static ZonedDateTime getExamProgrammingExerciseUnlockDate(ProgrammingExercise exercise) { + // TODO: can we guarantee that this is an exam exercise to avoid the null check and return? if (!exercise.isExamExercise()) { return null; } return getExamProgrammingExerciseUnlockDate(exercise.getExerciseGroup().getExam()); } + @NotNull public static ZonedDateTime getExamProgrammingExerciseUnlockDate(Exam exam) { // using start date minus 5 minutes here because unlocking will take some time. return exam.getStartDate().minusMinutes(EXAM_START_WAIT_TIME_MINUTES); diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java index fa48e0c1a09c..31ee3dbf9e80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/ExamLiveEventsService.java @@ -8,7 +8,6 @@ import de.tum.cit.aet.artemis.communication.service.WebsocketMessagingService; import de.tum.cit.aet.artemis.core.domain.User; -import de.tum.cit.aet.artemis.core.repository.UserRepository; import de.tum.cit.aet.artemis.exam.domain.Exam; import de.tum.cit.aet.artemis.exam.domain.StudentExam; import de.tum.cit.aet.artemis.exam.domain.event.ExamAttendanceCheckEvent; @@ -55,14 +54,11 @@ public class ExamLiveEventsService { private final StudentExamRepository studentExamRepository; - private final UserRepository userRepository; - - public ExamLiveEventsService(WebsocketMessagingService websocketMessagingService, ExamLiveEventRepository examLiveEventRepository, StudentExamRepository studentExamRepository, - UserRepository userRepository) { + public ExamLiveEventsService(WebsocketMessagingService websocketMessagingService, ExamLiveEventRepository examLiveEventRepository, + StudentExamRepository studentExamRepository) { this.websocketMessagingService = websocketMessagingService; this.examLiveEventRepository = examLiveEventRepository; this.studentExamRepository = studentExamRepository; - this.userRepository = userRepository; } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java index a2898a9df5ff..41757da8eddd 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exam/service/StudentExamService.java @@ -283,46 +283,50 @@ private void saveSubmission(User currentUser, List existin submissionFromClient.setParticipation(studentParticipationFromClient); submissionFromClient.submissionDate(ZonedDateTime.now()); submissionFromClient.submitted(true); - if (exercise instanceof QuizExercise) { - // recreate pointers back to submission in each submitted answer - for (SubmittedAnswer submittedAnswer : ((QuizSubmission) submissionFromClient).getSubmittedAnswers()) { - submittedAnswer.setSubmission(((QuizSubmission) submissionFromClient)); - if (submittedAnswer instanceof DragAndDropSubmittedAnswer) { - ((DragAndDropSubmittedAnswer) submittedAnswer).getMappings() - .forEach(dragAndDropMapping -> dragAndDropMapping.setSubmittedAnswer(((DragAndDropSubmittedAnswer) submittedAnswer))); + switch (exercise) { + case QuizExercise ignored -> { + // recreate pointers back to submission in each submitted answer + for (SubmittedAnswer submittedAnswer : ((QuizSubmission) submissionFromClient).getSubmittedAnswers()) { + submittedAnswer.setSubmission(((QuizSubmission) submissionFromClient)); + if (submittedAnswer instanceof DragAndDropSubmittedAnswer) { + ((DragAndDropSubmittedAnswer) submittedAnswer).getMappings() + .forEach(dragAndDropMapping -> dragAndDropMapping.setSubmittedAnswer(((DragAndDropSubmittedAnswer) submittedAnswer))); + } + else if (submittedAnswer instanceof ShortAnswerSubmittedAnswer) { + ((ShortAnswerSubmittedAnswer) submittedAnswer).getSubmittedTexts() + .forEach(submittedText -> submittedText.setSubmittedAnswer(((ShortAnswerSubmittedAnswer) submittedAnswer))); + } } - else if (submittedAnswer instanceof ShortAnswerSubmittedAnswer) { - ((ShortAnswerSubmittedAnswer) submittedAnswer).getSubmittedTexts() - .forEach(submittedText -> submittedText.setSubmittedAnswer(((ShortAnswerSubmittedAnswer) submittedAnswer))); - } - } - // load quiz submissions for existing participation to be able to compare them in saveSubmission - // 5. DB Call: read - submittedAnswerRepository.loadQuizSubmissionsSubmittedAnswers(List.of(existingParticipationInDatabase)); + // load quiz submissions for existing participation to be able to compare them in saveSubmission + // 5. DB Call: read + submittedAnswerRepository.loadQuizSubmissionsSubmittedAnswers(List.of(existingParticipationInDatabase)); - QuizSubmission existingSubmissionInDatabase = (QuizSubmission) existingParticipationInDatabase.findLatestSubmission().orElse(null); - QuizSubmission quizSubmissionFromClient = (QuizSubmission) submissionFromClient; + QuizSubmission existingSubmissionInDatabase = (QuizSubmission) existingParticipationInDatabase.findLatestSubmission().orElse(null); + QuizSubmission quizSubmissionFromClient = (QuizSubmission) submissionFromClient; - if (!isContentEqualTo(existingSubmissionInDatabase, quizSubmissionFromClient)) { - quizSubmissionRepository.save(quizSubmissionFromClient); - saveSubmissionVersion(currentUser, submissionFromClient); + if (!isContentEqualTo(existingSubmissionInDatabase, quizSubmissionFromClient)) { + quizSubmissionRepository.save(quizSubmissionFromClient); + saveSubmissionVersion(currentUser, submissionFromClient); + } } - } - else if (exercise instanceof TextExercise) { - TextSubmission existingSubmissionInDatabase = (TextSubmission) existingParticipationInDatabase.findLatestSubmission().orElse(null); - TextSubmission textSubmissionFromClient = (TextSubmission) submissionFromClient; - if (!isContentEqualTo(existingSubmissionInDatabase, textSubmissionFromClient)) { - textSubmissionRepository.save(textSubmissionFromClient); - saveSubmissionVersion(currentUser, submissionFromClient); + case TextExercise ignored -> { + TextSubmission existingSubmissionInDatabase = (TextSubmission) existingParticipationInDatabase.findLatestSubmission().orElse(null); + TextSubmission textSubmissionFromClient = (TextSubmission) submissionFromClient; + if (!isContentEqualTo(existingSubmissionInDatabase, textSubmissionFromClient)) { + textSubmissionRepository.save(textSubmissionFromClient); + saveSubmissionVersion(currentUser, submissionFromClient); + } } - } - else if (exercise instanceof ModelingExercise) { - ModelingSubmission existingSubmissionInDatabase = (ModelingSubmission) existingParticipationInDatabase.findLatestSubmission().orElse(null); - ModelingSubmission modelingSubmissionFromClient = (ModelingSubmission) submissionFromClient; - if (!isContentEqualTo(existingSubmissionInDatabase, modelingSubmissionFromClient)) { - modelingSubmissionRepository.save(modelingSubmissionFromClient); - saveSubmissionVersion(currentUser, submissionFromClient); + case ModelingExercise ignored -> { + ModelingSubmission existingSubmissionInDatabase = (ModelingSubmission) existingParticipationInDatabase.findLatestSubmission().orElse(null); + ModelingSubmission modelingSubmissionFromClient = (ModelingSubmission) submissionFromClient; + if (!isContentEqualTo(existingSubmissionInDatabase, modelingSubmissionFromClient)) { + modelingSubmissionRepository.save(modelingSubmissionFromClient); + saveSubmissionVersion(currentUser, submissionFromClient); + } + } + default -> { } } } @@ -726,24 +730,25 @@ public CompletableFuture startExercises(Long examId) { var lock = new ReentrantLock(); sendAndCacheExercisePreparationStatus(examId, 0, 0, studentExams.size(), 0, startedAt, lock); - var threadPool = Executors.newFixedThreadPool(10); - var futures = studentExams.stream() - .map(studentExam -> CompletableFuture.runAsync(() -> setUpExerciseParticipationsAndSubmissions(studentExam, generatedParticipations), threadPool) - .thenRun(() -> sendAndCacheExercisePreparationStatus(examId, finishedExamsCounter.incrementAndGet(), failedExamsCounter.get(), studentExams.size(), - generatedParticipations.size(), startedAt, lock)) - .exceptionally(throwable -> { - log.error("Exception while preparing exercises for student exam {}", studentExam.getId(), throwable); - sendAndCacheExercisePreparationStatus(examId, finishedExamsCounter.get(), failedExamsCounter.incrementAndGet(), studentExams.size(), - generatedParticipations.size(), startedAt, lock); - return null; - })) - .toArray(CompletableFuture[]::new); - return CompletableFuture.allOf(futures).thenApply((emtpy) -> { - threadPool.shutdown(); - sendAndCacheExercisePreparationStatus(examId, finishedExamsCounter.get(), failedExamsCounter.get(), studentExams.size(), generatedParticipations.size(), startedAt, - lock); - return generatedParticipations.size(); - }); + try (var threadPool = Executors.newFixedThreadPool(10)) { + var futures = studentExams.stream() + .map(studentExam -> CompletableFuture.runAsync(() -> setUpExerciseParticipationsAndSubmissions(studentExam, generatedParticipations), threadPool) + .thenRun(() -> sendAndCacheExercisePreparationStatus(examId, finishedExamsCounter.incrementAndGet(), failedExamsCounter.get(), studentExams.size(), + generatedParticipations.size(), startedAt, lock)) + .exceptionally(throwable -> { + log.error("Exception while preparing exercises for student exam {}", studentExam.getId(), throwable); + sendAndCacheExercisePreparationStatus(examId, finishedExamsCounter.get(), failedExamsCounter.incrementAndGet(), studentExams.size(), + generatedParticipations.size(), startedAt, lock); + return null; + })) + .toArray(CompletableFuture[]::new); + return CompletableFuture.allOf(futures).thenApply((emtpy) -> { + threadPool.shutdown(); + sendAndCacheExercisePreparationStatus(examId, finishedExamsCounter.get(), failedExamsCounter.get(), studentExams.size(), generatedParticipations.size(), startedAt, + lock); + return generatedParticipations.size(); + }); + } } private void sendAndCacheExercisePreparationStatus(Long examId, int finished, int failed, int overall, int participations, ZonedDateTime startTime, ReentrantLock lock) { diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java index 499818ace8a2..1101f94d4708 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/repository/StudentParticipationRepository.java @@ -29,6 +29,7 @@ import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO; import de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.repository.base.ArtemisJpaRepository; @@ -417,7 +418,7 @@ default List findByExerciseIdWithManualResultAndFeedbacksA LEFT JOIN FETCH p.submissions WHERE p.exercise.id = :exerciseId AND p.student.id = :studentId - """) + """) List findByExerciseIdAndStudentIdWithEagerResultsAndSubmissions(@Param("exerciseId") long exerciseId, @Param("studentId") long studentId); @Query(""" @@ -455,12 +456,11 @@ default List findByExerciseIdWithManualResultAndFeedbacksA """) List findByExerciseIdAndTeamIdWithEagerResultsAndLegalSubmissionsAndTeamStudents(@Param("exerciseId") long exerciseId, @Param("teamId") long teamId); + // NOTE: we should not fetch too elements here so we leave out feedback and test cases, otherwise the query will be very slow @Query(""" SELECT DISTINCT p FROM StudentParticipation p LEFT JOIN FETCH p.results r - LEFT JOIN FETCH r.feedbacks f - LEFT JOIN FETCH f.testCase LEFT JOIN FETCH r.submission s WHERE p.exercise.id = :exerciseId AND p.student.id = :studentId @@ -487,13 +487,12 @@ Optional findByExerciseIdAndStudentIdAndTestRunWithLatestR * @param exerciseId the exercise id the participations should belong to * @return a list of participations including their submitted submissions that do not have a manual result */ + // NOTE: we should not fetch too elements here so we leave out feedback and test cases, otherwise the query will be very slow @Query(""" SELECT DISTINCT p FROM StudentParticipation p LEFT JOIN FETCH p.submissions submission LEFT JOIN FETCH submission.results result - LEFT JOIN FETCH result.feedbacks feedbacks - LEFT JOIN FETCH feedbacks.testCase LEFT JOIN FETCH result.assessor WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE @@ -503,7 +502,8 @@ SELECT COUNT(r2) WHERE r2.assessor IS NOT NULL AND (r2.rated IS NULL OR r2.rated = FALSE) AND r2.submission = submission - ) AND :correctionRound = ( + ) + AND :correctionRound = ( SELECT COUNT(r) FROM Result r WHERE r.assessor IS NOT NULL @@ -514,14 +514,16 @@ AND r.assessmentType IN ( de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL, de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) AND (p.exercise.dueDate IS NULL OR r.submission.submissionDate <= p.exercise.dueDate) - ) AND :correctionRound = ( + ) + AND :correctionRound = ( SELECT COUNT(prs) FROM p.results prs WHERE prs.assessmentType IN ( de.tum.cit.aet.artemis.assessment.domain.AssessmentType.MANUAL, de.tum.cit.aet.artemis.assessment.domain.AssessmentType.SEMI_AUTOMATIC ) - ) AND submission.submitted = TRUE + ) + AND submission.submitted = TRUE AND submission.id = (SELECT MAX(s.id) FROM p.submissions s) """) List findByExerciseIdWithLatestSubmissionWithoutManualResultsAndIgnoreTestRunParticipation(@Param("exerciseId") long exerciseId, @@ -529,13 +531,12 @@ List findByExerciseIdWithLatestSubmissionWithoutManualResu Set findDistinctAllByExerciseIdInAndStudentId(Set exerciseIds, Long studentId); + // NOTE: we should not fetch too elements here so we leave out feedback and test cases, otherwise the query will be very slow @Query(""" SELECT DISTINCT p FROM Participation p LEFT JOIN FETCH p.submissions s LEFT JOIN FETCH s.results r - LEFT JOIN FETCH r.feedbacks f - LEFT JOIN FETCH f.testCase WHERE p.exercise.id = :exerciseId AND (p.individualDueDate IS NULL OR p.individualDueDate <= :now) AND p.testRun = FALSE @@ -1016,7 +1017,7 @@ default List findByStudentExamWithEagerSubmissions(Student * Get a mapping of participation ids to the number of submission for each participation. * * @param exerciseId the id of the exercise for which to consider participations - * @return the number of submissions per participation in the given exercise + * @return a map of submissions per participation in the given exercise */ default Map countSubmissionsPerParticipationByExerciseIdAsMap(long exerciseId) { return convertListOfCountsIntoMap(countSubmissionsPerParticipationByExerciseId(exerciseId)); @@ -1027,7 +1028,7 @@ default Map countSubmissionsPerParticipationByExerciseIdAsMap(lon * * @param courseId the id of the course for which to consider participations * @param teamShortName the short name of the team for which to consider participations - * @return the number of submissions per participation in the given course for the team + * @return a map of submissions per participation in the given course for the team */ default Map countLegalSubmissionsPerParticipationByCourseIdAndTeamShortNameAsMap(long courseId, String teamShortName) { return convertListOfCountsIntoMap(countLegalSubmissionsPerParticipationByCourseIdAndTeamShortName(courseId, teamShortName)); @@ -1199,68 +1200,86 @@ SELECT COALESCE(AVG(p.presentationScore), 0) double getAvgPresentationScoreByCourseId(@Param("courseId") long courseId); /** - * Retrieves aggregated feedback details for a given exercise, including the count of each unique feedback detail text, test case name, and task. + * Retrieves aggregated feedback details for a given exercise, including the count of each unique feedback detail text, + * test case name, task, and error category. *
* The query calculates: * - The number of occurrences of each feedback detail (COUNT). * - The relative count as a percentage of the total distinct results. * - The corresponding task name for each feedback item by checking if the feedback test case name is associated with a task. + * If a feedback item is not assigned to a task, it is labeled as "Not assigned to task." + * - The error category for each feedback item, classified as one of "Student Error", "Ares Error", or "AST Error". *
* It supports filtering by: * - Search term: Case-insensitive filtering on feedback detail text. - * - Test case names: Filters feedback based on specific test case names. + * - Test case names: Filters feedback based on specific test case names (optional). * - Task names: Filters feedback based on specific task names by mapping them to their associated test cases. - * - Occurrence range: Filters feedback based on the count of occurrences between the specified minimum and maximum values (inclusive). + * If "Not assigned to task" is specified, only feedback items without an associated task will be included. + * - Occurrence range: Filters feedback where the number of occurrences (COUNT) is between the specified minimum and maximum values (inclusive). + * - Error categories: Filters feedback based on error categories, which can be "Student Error", "Ares Error", or "AST Error". *
- * Grouping is done by feedback detail text and test case name. The occurrence count is filtered using the HAVING clause. + * Grouping is done by feedback detail text, test case name and error category. The occurrence count is filtered using the HAVING clause. * - * @param exerciseId The ID of the exercise for which feedback details should be retrieved. - * @param searchTerm The search term used for filtering the feedback detail text (optional). - * @param filterTestCases List of test case names to filter the feedback results (optional). - * @param filterTaskNames List of task names to filter feedback results based on the associated test cases (optional). - * @param minOccurrence The minimum number of occurrences to include in the results. - * @param maxOccurrence The maximum number of occurrences to include in the results. - * @param pageable Pagination information to apply. + * @param exerciseId The ID of the exercise for which feedback details should be retrieved. + * @param searchTerm The search term used for filtering the feedback detail text (optional). + * @param filterTestCases List of active test case names to filter the feedback results (optional). + * @param filterTaskNames List of task names to filter feedback results based on the associated test cases (optional). + * If "Not assigned to task" is specified, only feedback entries without an associated task will be returned. + * @param minOccurrence The minimum number of occurrences to include in the results. + * @param maxOccurrence The maximum number of occurrences to include in the results. + * @param filterErrorCategories List of error categories to filter the feedback results. Supported categories include "Student Error", + * "Ares Error", and "AST Error". + * @param pageable Pagination information to apply. * @return A page of {@link FeedbackDetailDTO} objects representing the aggregated feedback details. */ @Query(""" - SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( - COUNT(f.id), - 0, - f.detailText, - f.testCase.testName, - COALESCE(( - SELECT t.taskName - FROM ProgrammingExerciseTask t - JOIN t.testCases tct - WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName - ), ''), - '' - ) - FROM StudentParticipation p - JOIN p.results r ON r.id = ( - SELECT MAX(pr.id) - FROM p.results pr - WHERE pr.participation.id = p.id - ) - JOIN r.feedbacks f - WHERE p.exercise.id = :exerciseId - AND p.testRun = FALSE - AND f.positive = FALSE - AND (:searchTerm = '' OR LOWER(f.detailText) LIKE LOWER(CONCAT('%', REPLACE(REPLACE(:searchTerm, '%', '\\%'), '_', '\\_'), '%')) ESCAPE '\\') - AND (:#{#filterTestCases != NULL && #filterTestCases.size() < 1} = TRUE OR f.testCase.testName IN (:filterTestCases)) - AND (:#{#filterTaskNames != NULL && #filterTaskNames.size() < 1} = TRUE OR f.testCase.testName IN ( - SELECT tct.testName - FROM ProgrammingExerciseTask t - JOIN t.testCases tct - WHERE t.taskName IN (:filterTaskNames) - )) - GROUP BY f.detailText, f.testCase.testName - HAVING COUNT(f.id) BETWEEN :minOccurrence AND :maxOccurrence + SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackDetailDTO( + LISTAGG(CAST(f.id AS string), ',') WITHIN GROUP (ORDER BY f.id), + COUNT(f.id), + 0, + f.detailText, + f.testCase.testName, + COALESCE(( + SELECT MAX(t.taskName) + FROM ProgrammingExerciseTask t + LEFT JOIN t.testCases tct + WHERE t.exercise.id = :exerciseId AND tct.testName = f.testCase.testName + ), 'Not assigned to task'), + CASE + WHEN f.detailText LIKE 'ARES Security Error%' THEN 'Ares Error' + WHEN f.detailText LIKE 'Unwanted Statement found%' THEN 'AST Error' + ELSE 'Student Error' + END + ) + FROM StudentParticipation p + LEFT JOIN p.results r ON r.id = ( + SELECT MAX(pr.id) + FROM p.results pr + WHERE pr.participation.id = p.id + ) + LEFT JOIN r.feedbacks f + WHERE p.exercise.id = :exerciseId + AND p.testRun = FALSE + AND f.positive = FALSE + AND (:searchTerm = '' OR LOWER(f.detailText) LIKE LOWER(CONCAT('%', REPLACE(REPLACE(:searchTerm, '%', '\\%'), '_', '\\_'), '%')) ESCAPE '\\') + AND (:#{#filterTestCases != NULL && #filterTestCases.size() < 1} = TRUE OR f.testCase.testName IN (:filterTestCases)) + AND (:#{#filterTaskNames != NULL && #filterTaskNames.size() < 1} = TRUE OR f.testCase.testName NOT IN ( + SELECT tct.testName + FROM ProgrammingExerciseTask t + LEFT JOIN t.testCases tct + WHERE t.taskName IN (:filterTaskNames) + )) + AND (:#{#filterErrorCategories != NULL && #filterErrorCategories.size() < 1} = TRUE OR CASE + WHEN f.detailText LIKE 'ARES Security Error%' THEN 'Ares Error' + WHEN f.detailText LIKE 'Unwanted Statement found%' THEN 'AST Error' + ELSE 'Student Error' + END IN (:filterErrorCategories)) + GROUP BY f.detailText, f.testCase.testName + HAVING COUNT(f.id) BETWEEN :minOccurrence AND :maxOccurrence """) Page findFilteredFeedbackByExerciseId(@Param("exerciseId") long exerciseId, @Param("searchTerm") String searchTerm, @Param("filterTestCases") List filterTestCases, @Param("filterTaskNames") List filterTaskNames, @Param("minOccurrence") long minOccurrence, - @Param("maxOccurrence") long maxOccurrence, Pageable pageable); + @Param("maxOccurrence") long maxOccurrence, @Param("filterErrorCategories") List filterErrorCategories, Pageable pageable); /** * Counts the distinct number of latest results for a given exercise, excluding those in practice mode. @@ -1273,7 +1292,7 @@ Page findFilteredFeedbackByExerciseId(@Param("exerciseId") lo @Query(""" SELECT COUNT(DISTINCT r.id) FROM StudentParticipation p - JOIN p.results r ON r.id = ( + LEFT JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id @@ -1294,17 +1313,18 @@ SELECT MAX(pr.id) * @param exerciseId The ID of the exercise for which the maximum feedback count is to be retrieved. * @return The maximum count of feedback occurrences for the given exercise. */ + // TODO: move this query to a more appropriate repository, either feedbackRepository or exerciseRepository @Query(""" SELECT MAX(feedbackCounts.feedbackCount) FROM ( SELECT COUNT(f.id) AS feedbackCount FROM StudentParticipation p - JOIN p.results r ON r.id = ( + LEFT JOIN p.results r ON r.id = ( SELECT MAX(pr.id) FROM p.results pr WHERE pr.participation.id = p.id ) - JOIN r.feedbacks f + LEFT JOIN r.feedbacks f WHERE p.exercise.id = :exerciseId AND p.testRun = FALSE AND f.positive = FALSE @@ -1312,4 +1332,33 @@ SELECT MAX(pr.id) ) AS feedbackCounts """) long findMaxCountForExercise(@Param("exerciseId") long exerciseId); + + /** + * Retrieves a paginated list of students affected by specific feedback entries for a given programming exercise. + *
+ * + * @param exerciseId for which the affected student participation data is requested. + * @param feedbackIds used to filter the participation to only those affected by specific feedback entries. + * @param pageable A {@link Pageable} object to control pagination and sorting of the results, specifying page number, page size, and sort order. + * @return A {@link Page} of {@link FeedbackAffectedStudentDTO} objects, each representing a student affected by the feedback. + */ + @Query(""" + SELECT new de.tum.cit.aet.artemis.assessment.dto.FeedbackAffectedStudentDTO( + p.exercise.course.id, + p.id, + p.student.firstName, + p.student.lastName, + p.student.login, + p.repositoryUri + ) + FROM ProgrammingExerciseStudentParticipation p + LEFT JOIN p.submissions s + LEFT JOIN s.results r + LEFT JOIN r.feedbacks f + WHERE p.exercise.id = :exerciseId + AND f.id IN :feedbackIds + AND p.testRun = FALSE + ORDER BY p.student.firstName ASC + """) + Page findAffectedStudentsByFeedbackId(@Param("exerciseId") long exerciseId, @Param("feedbackIds") List feedbackIds, Pageable pageable); } diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java index 24da1af374d9..36b7e99fedd0 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/ExerciseDeletionService.java @@ -17,7 +17,6 @@ import de.tum.cit.aet.artemis.assessment.repository.TutorParticipationRepository; import de.tum.cit.aet.artemis.assessment.service.ExampleSubmissionService; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyExerciseLink; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyExerciseLinkRepository; import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyProgressService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; @@ -81,8 +80,6 @@ public class ExerciseDeletionService { private final CompetencyProgressService competencyProgressService; - private final CompetencyExerciseLinkRepository competencyExerciseLinkRepository; - private final Optional irisSettingsService; public ExerciseDeletionService(ExerciseRepository exerciseRepository, ExerciseUnitRepository exerciseUnitRepository, ParticipationService participationService, @@ -90,7 +87,7 @@ public ExerciseDeletionService(ExerciseRepository exerciseRepository, ExerciseUn TutorParticipationRepository tutorParticipationRepository, ExampleSubmissionService exampleSubmissionService, StudentExamRepository studentExamRepository, LectureUnitService lectureUnitService, PlagiarismResultRepository plagiarismResultRepository, TextExerciseService textExerciseService, ChannelRepository channelRepository, ChannelService channelService, CompetencyProgressService competencyProgressService, - CompetencyExerciseLinkRepository competencyExerciseLinkRepository, Optional irisSettingsService) { + Optional irisSettingsService) { this.exerciseRepository = exerciseRepository; this.participationService = participationService; this.programmingExerciseService = programmingExerciseService; @@ -106,7 +103,6 @@ public ExerciseDeletionService(ExerciseRepository exerciseRepository, ExerciseUn this.channelRepository = channelRepository; this.channelService = channelService; this.competencyProgressService = competencyProgressService; - this.competencyExerciseLinkRepository = competencyExerciseLinkRepository; this.irisSettingsService = irisSettingsService; } @@ -125,21 +121,22 @@ public void cleanup(Long exerciseId, boolean deleteRepositories) { } // Cleanup in parallel to speedup the process - var threadPool = Executors.newFixedThreadPool(10); - var futures = exercise.getStudentParticipations().stream().map(participation -> CompletableFuture.runAsync(() -> { - try { - participationService.cleanupBuildPlan((ProgrammingExerciseStudentParticipation) participation); - if (!deleteRepositories) { - return; // in this case, we are done with the participation + try (var threadPool = Executors.newFixedThreadPool(10)) { + var futures = exercise.getStudentParticipations().stream().map(participation -> CompletableFuture.runAsync(() -> { + try { + participationService.cleanupBuildPlan((ProgrammingExerciseStudentParticipation) participation); + if (!deleteRepositories) { + return; // in this case, we are done with the participation + } + participationService.cleanupRepository((ProgrammingExerciseStudentParticipation) participation); } - participationService.cleanupRepository((ProgrammingExerciseStudentParticipation) participation); - } - catch (Exception exception) { - log.error("Failed to clean the student participation {} for programming exercise {}", participation.getId(), exerciseId); - } - }, threadPool).toCompletableFuture()).toArray(CompletableFuture[]::new); - // wait until all operations finish before returning - CompletableFuture.allOf(futures).thenRun(threadPool::shutdown).join(); + catch (Exception exception) { + log.error("Failed to clean the student participation {} for programming exercise {}", participation.getId(), exerciseId); + } + }, threadPool).toCompletableFuture()).toArray(CompletableFuture[]::new); + // wait until all operations finish before returning + CompletableFuture.allOf(futures).thenRun(threadPool::shutdown).join(); + } } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java index 2669e856337f..006d52ac1eb7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/exercise/service/SubmissionService.java @@ -203,10 +203,13 @@ public List getAllSubmissionsAssessedByTutorForCorrect } protected List getAssessableSubmissions(Exercise exercise, boolean examMode, int correctionRound) { + // TODO: it really does not make sense to fetch these submissions with all related data from the database just to select one submission afterwards + // it would be better to fetch them with minimal related data (so we can select one) and then afterwards fetch the selected one with all related data + final List participations; if (examMode) { // Get all participations of submissions that are submitted and do not already have a manual result or belong to test run submissions. - // No manual result means that no user has started an assessment for the corresponding submission yet. + // No manual result means that no tutor has started an assessment for the corresponding submission yet. participations = studentParticipationRepository.findByExerciseIdWithLatestSubmissionWithoutManualResultsAndIgnoreTestRunParticipation(exercise.getId(), correctionRound); } @@ -218,17 +221,21 @@ protected List getAssessableSubmissions(Exercise exercise, boolean e ZonedDateTime.now()); } - List submissionsWithoutResult = participations.stream().map(Participation::findLatestLegalOrIllegalSubmission).filter(Optional::isPresent).map(Optional::get) - .toList(); + // TODO: we could move the ILLEGAL check into the database + var submissionsWithoutResult = participations.stream().map(Participation::findLatestLegalOrIllegalSubmission).filter(Optional::isPresent).map(Optional::get).toList(); if (correctionRound > 0) { // remove submission if user already assessed first correction round // if disabled, please switch tutorAssessUnique within the tests - submissionsWithoutResult = submissionsWithoutResult.stream() - .filter(submission -> !submission.getResultForCorrectionRound(correctionRound - 1).getAssessor().equals(userRepository.getUser())).toList(); + // TODO: we could move this check into the database call of the if clause above (examMode == true) to avoid fetching all results and assessors + final var user = userRepository.getUser(); + submissionsWithoutResult = submissionsWithoutResult.stream().filter(submission -> { + final var resultForCorrectionRound = submission.getResultForCorrectionRound(correctionRound - 1); + return resultForCorrectionRound != null && !resultForCorrectionRound.getAssessor().equals(user); + }).toList(); } - if (exercise.getDueDate() != null) { + if (!examMode && exercise.getDueDate() != null) { submissionsWithoutResult = selectOnlySubmissionsBeforeDueDate(submissionsWithoutResult); } diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java index ce3cc4b157d6..80d732be3981 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/service/FileUploadSubmissionService.java @@ -255,9 +255,11 @@ public FileUploadSubmission lockAndGetFileUploadSubmission(Long submissionId, Fi * @return a locked file upload submission that needs an assessment */ public FileUploadSubmission lockAndGetFileUploadSubmissionWithoutResult(FileUploadExercise fileUploadExercise, boolean ignoreTestRunParticipations, int correctionRound) { - FileUploadSubmission fileUploadSubmission = getRandomFileUploadSubmissionEligibleForNewAssessment(fileUploadExercise, ignoreTestRunParticipations, correctionRound) + var submission = getRandomFileUploadSubmissionEligibleForNewAssessment(fileUploadExercise, ignoreTestRunParticipations, correctionRound) .orElseThrow(() -> new EntityNotFoundException("File upload submission for exercise " + fileUploadExercise.getId() + " could not be found")); - lockSubmission(fileUploadSubmission, correctionRound); - return fileUploadSubmission; + // NOTE: we load the feedback for the submission eagerly to avoid org.hibernate.LazyInitializationException + submission = fileUploadSubmissionRepository.findByIdWithEagerResultAndFeedbackAndAssessorAndAssessmentNoteAndParticipationResultsElseThrow(submission.getId()); + lockSubmission(submission, correctionRound); + return submission; } } diff --git a/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadSubmissionResource.java index 0d7c4a23280f..d036f978e157 100644 --- a/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/fileupload/web/FileUploadSubmissionResource.java @@ -6,7 +6,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import java.util.Set; import jakarta.validation.constraints.NotNull; @@ -26,7 +25,6 @@ import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; -import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.GradingCriterionRepository; import de.tum.cit.aet.artemis.assessment.service.ResultService; @@ -256,18 +254,18 @@ public ResponseEntity getFileUploadSubmissionWithoutAssess if (!(fileUploadExercise instanceof FileUploadExercise)) { throw new BadRequestAlertException("The requested exercise was not found.", "exerciseId", "400"); } - Set gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(exerciseId); - fileUploadExercise.setGradingCriteria(gradingCriteria); - final User user = userRepository.getUserWithGroupsAndAuthorities(); - + final var user = userRepository.getUserWithGroupsAndAuthorities(); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.TEACHING_ASSISTANT, fileUploadExercise, user); // Check if tutors can start assessing the students submission - this.fileUploadSubmissionService.checkIfExerciseDueDateIsReached(fileUploadExercise); + fileUploadSubmissionService.checkIfExerciseDueDateIsReached(fileUploadExercise); // Check if the limit of simultaneously locked submissions has been reached fileUploadSubmissionService.checkSubmissionLockLimit(fileUploadExercise.getCourseViaExerciseGroupOrCourseMember().getId()); + final var gradingCriteria = gradingCriterionRepository.findByExerciseIdWithEagerGradingCriteria(exerciseId); + fileUploadExercise.setGradingCriteria(gradingCriteria); + final FileUploadSubmission submission; if (lockSubmission) { submission = fileUploadSubmissionService.lockAndGetFileUploadSubmissionWithoutResult((FileUploadExercise) fileUploadExercise, fileUploadExercise.isExamExercise(), @@ -284,7 +282,7 @@ public ResponseEntity getFileUploadSubmissionWithoutAssess final StudentParticipation studentParticipation = (StudentParticipation) submission.getParticipation(); studentParticipation.setExercise(fileUploadExercise); submission.getParticipation().getExercise().setGradingCriteria(gradingCriteria); - this.fileUploadSubmissionService.hideDetails(submission, user); + fileUploadSubmissionService.hideDetails(submission, user); } return ResponseEntity.ok(submission); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java index 9e736ce8c358..3f2a0bdb6ab7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisExerciseChatSessionResource.java @@ -101,7 +101,7 @@ public ResponseEntity getCurrentSessionOrCreateIfNotExi @EnforceAtLeastStudentInExercise public ResponseEntity> getAllSessions(@PathVariable Long exerciseId) { var exercise = exerciseRepository.findByIdElseThrow(exerciseId); - ProgrammingExercise programmingExercise = validateExercise(exercise); + validateExercise(exercise); irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.CHAT, exercise); var user = userRepository.getUserWithGroupsAndAuthorities(); diff --git a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java index 4f2c5416211d..5392b3b6845d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/iris/web/IrisSettingsResource.java @@ -13,14 +13,13 @@ import de.tum.cit.aet.artemis.core.repository.CourseRepository; import de.tum.cit.aet.artemis.core.repository.UserRepository; -import de.tum.cit.aet.artemis.core.security.Role; import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; -import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastInstructorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastStudentInCourse; -import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInCourse.EnforceAtLeastTutorInCourse; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastInstructorInExercise; import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastStudentInExercise; +import de.tum.cit.aet.artemis.core.security.annotations.enforceRoleInExercise.EnforceAtLeastTutorInExercise; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.exercise.repository.ExerciseRepository; import de.tum.cit.aet.artemis.iris.domain.settings.IrisCourseSettings; @@ -75,7 +74,7 @@ public ResponseEntity getGlobalSettings() { * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the settings, or with status {@code 404 (Not Found)} if the course could not be found. */ @GetMapping("courses/{courseId}/raw-iris-settings") - @EnforceAtLeastEditorInCourse + @EnforceAtLeastTutorInCourse public ResponseEntity getRawCourseSettings(@PathVariable Long courseId) { var course = courseRepository.findByIdElseThrow(courseId); var irisSettings = irisSettingsService.getRawIrisSettingsFor(course); @@ -89,12 +88,9 @@ public ResponseEntity getRawCourseSettings(@PathVariable Long cour * @return the {@link ResponseEntity} with status {@code 200 (Ok)} and with body the settings, or with status {@code 404 (Not Found)} if the exercise could not be found. */ @GetMapping("exercises/{exerciseId}/raw-iris-settings") - @EnforceAtLeastEditorInExercise + @EnforceAtLeastTutorInExercise public ResponseEntity getRawExerciseSettings(@PathVariable Long exerciseId) { var exercise = exerciseRepository.findByIdElseThrow(exerciseId); - var user = userRepository.getUserWithGroupsAndAuthorities(); - authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.STUDENT, exercise, user); - var combinedIrisSettings = irisSettingsService.getRawIrisSettingsFor(exercise); return ResponseEntity.ok(combinedIrisSettings); } diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java index c609a9f7b049..8b7be910e689 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/domain/ExerciseUnit.java @@ -11,12 +11,14 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.PrePersist; import jakarta.persistence.PreUpdate; +import jakarta.persistence.Transient; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyLectureUnitLink; import de.tum.cit.aet.artemis.exercise.domain.Exercise; @@ -32,6 +34,13 @@ public class ExerciseUnit extends LectureUnit { @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) private Exercise exercise; + // Competency links are not persisted in this entity but only in the exercise itself + @Transient + @JsonSerialize + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonIgnoreProperties("lectureUnit") + private Set competencyLinks = new HashSet<>(); + public Exercise getExercise() { return exercise; } @@ -66,15 +75,16 @@ public void setReleaseDate(ZonedDateTime releaseDate) { } @Override - @JsonIgnore + @JsonSerialize + @JsonInclude(JsonInclude.Include.NON_EMPTY) + @JsonIgnoreProperties("lectureUnit") public Set getCompetencyLinks() { - // Set the links in the associated exercise instead - return new HashSet<>(); + return competencyLinks; } @Override public void setCompetencyLinks(Set competencyLinks) { - // Retrieve the link in the associated exercise instead" + this.competencyLinks = competencyLinks; } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java index 61f268d75b95..f43d8a101af5 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/repository/AttachmentUnitRepository.java @@ -3,6 +3,7 @@ import static de.tum.cit.aet.artemis.core.config.Constants.PROFILE_CORE; import java.util.List; +import java.util.Optional; import jakarta.validation.constraints.NotNull; @@ -62,5 +63,9 @@ default List findAllByLectureIdAndAttachmentTypeElseThrow(Long l LEFT JOIN FETCH cl.competency WHERE attachmentUnit.id = :attachmentUnitId """) - AttachmentUnit findOneWithSlidesAndCompetencies(@Param("attachmentUnitId") long attachmentUnitId); + Optional findWithSlidesAndCompetenciesById(@Param("attachmentUnitId") long attachmentUnitId); + + default AttachmentUnit findWithSlidesAndCompetenciesByIdElseThrow(long attachmentUnitId) { + return getValueElseThrow(findWithSlidesAndCompetenciesById(attachmentUnitId), attachmentUnitId); + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/AttachmentUnitService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/AttachmentUnitService.java index e86d7c22e7f5..83d3ffdf6751 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/AttachmentUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/AttachmentUnitService.java @@ -117,6 +117,7 @@ public AttachmentUnit updateAttachmentUnit(AttachmentUnit existingAttachmentUnit existingAttachmentUnit.setDescription(updateUnit.getDescription()); existingAttachmentUnit.setName(updateUnit.getName()); existingAttachmentUnit.setReleaseDate(updateUnit.getReleaseDate()); + existingAttachmentUnit.setCompetencyLinks(updateUnit.getCompetencyLinks()); AttachmentUnit savedAttachmentUnit = lectureUnitService.saveWithCompetencyLinks(existingAttachmentUnit, attachmentUnitRepository::saveAndFlush); diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java index 793752998f29..bda282499738 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/service/LectureUnitService.java @@ -253,7 +253,7 @@ public T saveWithCompetencyLinks(T lectureUnit, Function T savedLectureUnit = saveFunction.apply(lectureUnit); - if (Hibernate.isInitialized(links) && !links.isEmpty()) { + if (Hibernate.isInitialized(links) && links != null && !links.isEmpty()) { savedLectureUnit.setCompetencyLinks(links); reconnectCompetencyLectureUnitLinks(savedLectureUnit); savedLectureUnit.setCompetencyLinks(new HashSet<>(competencyLectureUnitLinkRepository.saveAll(links))); diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java index 3b5e44b6ac2f..6c280a0ce0be 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentResource.java @@ -92,7 +92,7 @@ public ResponseEntity createAttachment(@RequestPart Attachment attac attachment.setId(null); Path basePath = FilePathService.getLectureAttachmentFilePath().resolve(attachment.getLecture().getId().toString()); - Path savePath = fileService.saveFile(file, basePath, false); + Path savePath = fileService.saveFile(file, basePath, true); attachment.setLink(FilePathService.publicPathForActualPath(savePath, attachment.getLecture().getId()).toString()); Attachment result = attachmentRepository.save(attachment); @@ -123,7 +123,7 @@ public ResponseEntity updateAttachment(@PathVariable Long attachment if (file != null) { Path basePath = FilePathService.getLectureAttachmentFilePath().resolve(originalAttachment.getLecture().getId().toString()); - Path savePath = fileService.saveFile(file, basePath, false); + Path savePath = fileService.saveFile(file, basePath, true); attachment.setLink(FilePathService.publicPathForActualPath(savePath, originalAttachment.getLecture().getId()).toString()); // Delete the old file URI oldPath = URI.create(originalAttachment.getLink()); diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java index 0c7c2996e162..83aa9f8ebefb 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/AttachmentUnitResource.java @@ -100,7 +100,7 @@ public AttachmentUnitResource(AttachmentUnitRepository attachmentUnitRepository, @EnforceAtLeastEditor public ResponseEntity getAttachmentUnit(@PathVariable Long attachmentUnitId, @PathVariable Long lectureId) { log.debug("REST request to get AttachmentUnit : {}", attachmentUnitId); - AttachmentUnit attachmentUnit = attachmentUnitRepository.findByIdElseThrow(attachmentUnitId); + AttachmentUnit attachmentUnit = attachmentUnitRepository.findWithSlidesAndCompetenciesByIdElseThrow(attachmentUnitId); checkAttachmentUnitCourseAndLecture(attachmentUnit, lectureId); authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, attachmentUnit.getLecture().getCourse(), null); @@ -125,7 +125,7 @@ public ResponseEntity updateAttachmentUnit(@PathVariable Long le @RequestPart Attachment attachment, @RequestPart(required = false) MultipartFile file, @RequestParam(defaultValue = "false") boolean keepFilename, @RequestParam(value = "notificationText", required = false) String notificationText) { log.debug("REST request to update an attachment unit : {}", attachmentUnit); - AttachmentUnit existingAttachmentUnit = attachmentUnitRepository.findOneWithSlidesAndCompetencies(attachmentUnitId); + AttachmentUnit existingAttachmentUnit = attachmentUnitRepository.findWithSlidesAndCompetenciesByIdElseThrow(attachmentUnitId); checkAttachmentUnitCourseAndLecture(existingAttachmentUnit, lectureId); authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, existingAttachmentUnit.getLecture().getCourse(), null); diff --git a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java index df85a54b6675..baecd6cd7c57 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lecture/web/LectureResource.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import de.tum.cit.aet.artemis.atlas.service.competency.CompetencyService; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; import de.tum.cit.aet.artemis.communication.repository.conversation.ChannelRepository; import de.tum.cit.aet.artemis.communication.service.conversation.ChannelService; @@ -66,6 +67,8 @@ public class LectureResource { private static final String ENTITY_NAME = "lecture"; + private final CompetencyService competencyService; + @Value("${jhipster.clientApp.name}") private String applicationName; @@ -89,7 +92,7 @@ public class LectureResource { public LectureResource(LectureRepository lectureRepository, LectureService lectureService, LectureImportService lectureImportService, CourseRepository courseRepository, UserRepository userRepository, AuthorizationCheckService authCheckService, ExerciseService exerciseService, ChannelService channelService, - ChannelRepository channelRepository) { + ChannelRepository channelRepository, CompetencyService competencyService) { this.lectureRepository = lectureRepository; this.lectureService = lectureService; this.lectureImportService = lectureImportService; @@ -99,6 +102,7 @@ public LectureResource(LectureRepository lectureRepository, LectureService lectu this.exerciseService = exerciseService; this.channelService = channelService; this.channelRepository = channelRepository; + this.competencyService = competencyService; } /** @@ -300,6 +304,7 @@ public ResponseEntity ingestLectures(@PathVariable Long courseId, @Requ public ResponseEntity getLectureWithDetails(@PathVariable Long lectureId) { log.debug("REST request to get lecture {} with details", lectureId); Lecture lecture = lectureRepository.findByIdWithAttachmentsAndPostsAndLectureUnitsAndCompetenciesAndCompletionsElseThrow(lectureId); + competencyService.addCompetencyLinksToExerciseUnits(lecture); Course course = lecture.getCourse(); if (course == null) { return ResponseEntity.badRequest().build(); @@ -326,9 +331,10 @@ public ResponseEntity getLectureWithDetailsAndSlides(@PathVariable long if (course == null) { return ResponseEntity.badRequest().build(); } - authCheckService.checkIsAllowedToSeeLectureElseThrow(lecture, userRepository.getUserWithGroupsAndAuthorities()); - User user = userRepository.getUserWithGroupsAndAuthorities(); + authCheckService.checkIsAllowedToSeeLectureElseThrow(lecture, user); + + competencyService.addCompetencyLinksToExerciseUnits(lecture); lectureService.filterActiveAttachmentUnits(lecture); lectureService.filterActiveAttachments(lecture, user); return ResponseEntity.ok(lecture); diff --git a/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java b/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java index 1dbfede94a83..cb27da1cf735 100644 --- a/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/lti/web/LtiResource.java @@ -18,9 +18,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import com.fasterxml.jackson.databind.ObjectMapper; @@ -34,8 +37,10 @@ import de.tum.cit.aet.artemis.core.security.annotations.EnforceAtLeastInstructor; import de.tum.cit.aet.artemis.core.service.AuthorizationCheckService; import de.tum.cit.aet.artemis.lti.domain.LtiPlatformConfiguration; +import de.tum.cit.aet.artemis.lti.domain.OnlineCourseConfiguration; import de.tum.cit.aet.artemis.lti.repository.LtiPlatformConfigurationRepository; import de.tum.cit.aet.artemis.lti.service.LtiDeepLinkingService; +import de.tum.cit.aet.artemis.lti.service.OnlineCourseConfigurationService; import tech.jhipster.web.util.PaginationUtil; /** @@ -50,6 +55,8 @@ public class LtiResource { private final LtiDeepLinkingService ltiDeepLinkingService; + private final OnlineCourseConfigurationService onlineCourseConfigurationService; + private final CourseRepository courseRepository; private final AuthorizationCheckService authCheckService; @@ -64,13 +71,55 @@ public class LtiResource { * @param ltiDeepLinkingService Service for LTI deep linking. */ public LtiResource(CourseRepository courseRepository, AuthorizationCheckService authCheckService, LtiDeepLinkingService ltiDeepLinkingService, - LtiPlatformConfigurationRepository ltiPlatformConfigurationRepository) { + OnlineCourseConfigurationService onlineCourseConfigurationService, LtiPlatformConfigurationRepository ltiPlatformConfigurationRepository) { this.courseRepository = courseRepository; this.authCheckService = authCheckService; this.ltiDeepLinkingService = ltiDeepLinkingService; + this.onlineCourseConfigurationService = onlineCourseConfigurationService; this.ltiPlatformConfigurationRepository = ltiPlatformConfigurationRepository; } + /** + * PUT courses/:courseId/online-course-configuration : Updates the onlineCourseConfiguration for the given course. + * + * @param courseId the id of the course to update + * @param onlineCourseConfiguration the online course configuration to update + * @return the ResponseEntity with status 200 (OK) and with body the updated online course configuration + */ + @PutMapping("courses/{courseId}/online-course-configuration") + @EnforceAtLeastInstructor + @Profile(PROFILE_LTI) + public ResponseEntity updateOnlineCourseConfiguration(@PathVariable Long courseId, + @RequestBody OnlineCourseConfiguration onlineCourseConfiguration) { + log.debug("REST request to update the online course configuration for Course : {}", courseId); + + Course course = courseRepository.findByIdWithEagerOnlineCourseConfigurationElseThrow(courseId); + authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, course, null); + + if (!course.isOnlineCourse()) { + throw new BadRequestAlertException("Course must be online course", Course.ENTITY_NAME, "courseMustBeOnline"); + } + + if (!course.getOnlineCourseConfiguration().getId().equals(onlineCourseConfiguration.getId())) { + throw new BadRequestAlertException("The onlineCourseConfigurationId does not match the id of the course's onlineCourseConfiguration", + OnlineCourseConfiguration.ENTITY_NAME, "idMismatch"); + } + + onlineCourseConfigurationService.validateOnlineCourseConfiguration(onlineCourseConfiguration); + course.setOnlineCourseConfiguration(onlineCourseConfiguration); + try { + onlineCourseConfigurationService.addOnlineCourseConfigurationToLtiConfigurations(onlineCourseConfiguration); + } + catch (Exception ex) { + log.error("Failed to add online course configuration to LTI configurations", ex); + throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Error when adding online course configuration to LTI configurations", ex); + } + + courseRepository.save(course); + + return ResponseEntity.ok(onlineCourseConfiguration); + } + /** * Handles the HTTP POST request for LTI 1.3 Deep Linking. This endpoint is used for deep linking of LTI links * for exercises within a course. The method populates content items with the provided course and exercise identifiers, diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java index 07eb0e37c28e..70f9b42ba4f7 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/repository/ModelingSubmissionRepository.java @@ -39,7 +39,7 @@ public interface ModelingSubmissionRepository extends ArtemisJpaRepository findWithResultsFeedbacksAssessorAssessmentNoteAndParticipationResultsById(Long submissionId); @Query(""" diff --git a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java index c8b4285de3b9..4172456a0a81 100644 --- a/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/modeling/service/ModelingSubmissionService.java @@ -90,18 +90,17 @@ public ModelingSubmissionService(ModelingSubmissionRepository modelingSubmission * @return the locked modeling submission */ public ModelingSubmission lockAndGetModelingSubmission(Long submissionId, ModelingExercise modelingExercise, int correctionRound) { - ModelingSubmission modelingSubmission = modelingSubmissionRepository - .findByIdWithEagerResultAndFeedbackAndAssessorAndAssessmentNoteAndParticipationResultsElseThrow(submissionId); + var submission = modelingSubmissionRepository.findByIdWithEagerResultAndFeedbackAndAssessorAndAssessmentNoteAndParticipationResultsElseThrow(submissionId); - if (modelingSubmission.getLatestResult() == null || modelingSubmission.getLatestResult().getAssessor() == null) { + if (submission.getLatestResult() == null || submission.getLatestResult().getAssessor() == null) { checkSubmissionLockLimit(modelingExercise.getCourseViaExerciseGroupOrCourseMember().getId()); if (compassService.isSupported(modelingExercise) && correctionRound == 0L) { - modelingSubmission = assignResultWithFeedbackSuggestionsToSubmission(modelingSubmission, modelingExercise); + submission = assignResultWithFeedbackSuggestionsToSubmission(submission, modelingExercise); } } - lockSubmission(modelingSubmission, correctionRound); - return modelingSubmission; + lockSubmission(submission, correctionRound); + return submission; } /** @@ -196,27 +195,18 @@ public Optional findRandomSubmissionWithoutExistingAssessmen return Optional.empty(); } - ModelingSubmission modelingSubmission = (ModelingSubmission) submissionWithoutResult.get(); + // NOTE: we load the feedback for the submission eagerly to avoid org.hibernate.LazyInitializationException + var submissionId = submissionWithoutResult.get().getId(); + var submission = modelingSubmissionRepository.findByIdWithEagerResultAndFeedbackAndAssessorAndAssessmentNoteAndParticipationResultsElseThrow(submissionId); if (lockSubmission) { if (compassService.isSupported(modelingExercise) && correctionRound == 0L) { - modelingSubmission = assignResultWithFeedbackSuggestionsToSubmission(modelingSubmission, modelingExercise); - setNumberOfAffectedSubmissionsPerElement(modelingSubmission); + submission = assignResultWithFeedbackSuggestionsToSubmission(submission, modelingExercise); + setNumberOfAffectedSubmissionsPerElement(submission); } - lockSubmission(modelingSubmission, correctionRound); + lockSubmission(submission, correctionRound); } - return Optional.of(modelingSubmission); - } - - /** - * Soft lock the submission to prevent other tutors from receiving and assessing it. We remove the model from the models waiting for assessment in Compass to prevent other - * tutors from retrieving it in the first place. Additionally, we set the assessor and save the result to soft lock the assessment in the client, i.e. the client will not allow - * tutors to assess a model when an assessor is already assigned. If no result exists for this submission we create one first. - * - * @param modelingSubmission the submission to lock - */ - private void lockSubmission(ModelingSubmission modelingSubmission, int correctionRound) { - super.lockSubmission(modelingSubmission, correctionRound); + return Optional.of(submission); } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java index 8ad0058fa678..079b71276e72 100644 --- a/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/plagiarism/repository/PlagiarismComparisonRepository.java @@ -74,7 +74,7 @@ default PlagiarismComparison findByIdWithSubmissionsStudentsAndElementsBElseT Optional>> findBySubmissionA_SubmissionIdOrSubmissionB_SubmissionId(long submissionA_submissionId, long submissionB_submissionId); @Modifying - @Transactional // ok because of modifying query + @Transactional // ok because of delete void deletePlagiarismComparisonsByPlagiarismResultIdAndStatus(Long plagiarismResultId, PlagiarismStatus plagiarismStatus); // we can't simply call save() on plagiarismComparisons because the plagiarismComparisonMatches have no id @@ -90,4 +90,5 @@ default PlagiarismComparison findByIdWithSubmissionsStudentsAndElementsBElseT void updatePlagiarismComparisonStatus(@Param("plagiarismComparisonId") Long plagiarismComparisonId, @Param("status") PlagiarismStatus status); Set> findAllByPlagiarismResultExerciseId(long exerciseId); + } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/dto/BuildLogStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/BuildLogStatisticsDTO.java index 00908d9d94d1..8103861bbc41 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/dto/BuildLogStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/BuildLogStatisticsDTO.java @@ -1,8 +1,46 @@ package de.tum.cit.aet.artemis.programming.dto; +import jakarta.validation.constraints.NotNull; + import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record BuildLogStatisticsDTO(Long buildCount, Double agentSetupDuration, Double testDuration, Double scaDuration, Double totalJobDuration, Double dependenciesDownloadedCount) { + + @NotNull + @Override + public Long buildCount() { + return buildCount != null ? buildCount : 0; + } + + @NotNull + @Override + public Double agentSetupDuration() { + return agentSetupDuration != null ? agentSetupDuration : 0.0; + } + + @NotNull + @Override + public Double testDuration() { + return testDuration != null ? testDuration : 0.0; + } + + @NotNull + @Override + public Double scaDuration() { + return scaDuration != null ? scaDuration : 0.0; + } + + @NotNull + @Override + public Double totalJobDuration() { + return totalJobDuration != null ? totalJobDuration : 0.0; + } + + @NotNull + @Override + public Double dependenciesDownloadedCount() { + return dependenciesDownloadedCount != null ? dependenciesDownloadedCount : 0.0; + } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseGradingStatisticsDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseGradingStatisticsDTO.java index b08a53caf6ba..36da5c64d2ee 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseGradingStatisticsDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseGradingStatisticsDTO.java @@ -2,101 +2,29 @@ import java.util.HashMap; import java.util.Map; -import java.util.Objects; import com.fasterxml.jackson.annotation.JsonInclude; -import de.tum.cit.aet.artemis.assessment.domain.Feedback; - /** * This is a dto for providing statistics for the programming exercise test cases & sca categories. + * + * @param numParticipations number of the participations with a result + * @param testCaseStatsMap statistics for each test case + * @param categoryIssuesMap statistics for each category */ -// TODO: convert to Record @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class ProgrammingExerciseGradingStatisticsDTO { - - // number of the participations with a result - private Integer numParticipations; - - // statistics for each test case - private Map testCaseStatsMap = new HashMap<>(); - - // statistics for each category - private Map> categoryIssuesMap = new HashMap<>(); - - public void setNumParticipations(Integer numParticipations) { - this.numParticipations = numParticipations; - } - - public Integer getNumParticipations() { - return numParticipations; - } - - public void setTestCaseStatsMap(Map testCaseStatsMap) { - this.testCaseStatsMap = testCaseStatsMap; - } - - public Map getTestCaseStatsMap() { - return testCaseStatsMap; - } - - public void setCategoryIssuesMap(Map> categoryIssuesMap) { - this.categoryIssuesMap = categoryIssuesMap; - } - - public Map> getCategoryIssuesMap() { - return categoryIssuesMap; - } - - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public static class TestCaseStats { - - private Integer numPassed; +public record ProgrammingExerciseGradingStatisticsDTO(int numParticipations, Map testCaseStatsMap, Map> categoryIssuesMap) { - private Integer numFailed; - - public TestCaseStats(Integer passed, Integer failed) { - this.numPassed = passed; - this.numFailed = failed; - } - - public Integer getNumPassed() { - return numPassed; + public ProgrammingExerciseGradingStatisticsDTO { + if (testCaseStatsMap == null) { + testCaseStatsMap = new HashMap<>(); } - - public Integer getNumFailed() { - return numFailed; - } - - /** - * Updates the statistics accordingly for a positive or negative feedback. - * - * @param feedback that should be considered in the statistics. - */ - public void updateWithFeedback(final Feedback feedback) { - if (Boolean.TRUE.equals(feedback.isPositive())) { - numPassed++; - } - else { - numFailed++; - } - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null || getClass() != obj.getClass()) { - return false; - } - TestCaseStats that = (TestCaseStats) obj; - return Objects.equals(numPassed, that.numPassed) && Objects.equals(numFailed, that.numFailed); + if (categoryIssuesMap == null) { + categoryIssuesMap = new HashMap<>(); } + } - @Override - public int hashCode() { - return Objects.hash(numPassed, numFailed); - } + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public record TestCaseStats(int numPassed, int numFailed) { } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseTestCaseDTO.java b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseTestCaseDTO.java index 95e6bae99dd0..c5b963061986 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseTestCaseDTO.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/dto/ProgrammingExerciseTestCaseDTO.java @@ -5,61 +5,10 @@ import de.tum.cit.aet.artemis.assessment.domain.Visibility; /** - * This is a dto for updating a programming exercise test case. + * This is a DTO for updating a programming exercise test case. * It is only allowed to alter the weight, bonus multiplier, bonus points and visibility flag of a test case from an * endpoint, the other attributes are generated automatically. */ -// TODO: convert to Record @JsonInclude(JsonInclude.Include.NON_EMPTY) -public class ProgrammingExerciseTestCaseDTO { - - private Long id; - - private Double weight; - - private Double bonusMultiplier; - - private Double bonusPoints; - - private Visibility visibility; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public Double getWeight() { - return weight; - } - - public void setWeight(Double weight) { - this.weight = weight; - } - - public Visibility getVisibility() { - return visibility; - } - - public void setVisibility(Visibility visibility) { - this.visibility = visibility; - } - - public Double getBonusMultiplier() { - return bonusMultiplier; - } - - public void setBonusMultiplier(Double bonusMultiplier) { - this.bonusMultiplier = bonusMultiplier; - } - - public Double getBonusPoints() { - return bonusPoints; - } - - public void setBonusPoints(Double bonusPoints) { - this.bonusPoints = bonusPoints; - } +public record ProgrammingExerciseTestCaseDTO(Long id, Double weight, Double bonusMultiplier, Double bonusPoints, Visibility visibility) { } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java index b653d693bbf2..11f34865096b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildLogStatisticsEntryRepository.java @@ -23,6 +23,20 @@ @Repository public interface BuildLogStatisticsEntryRepository extends ArtemisJpaRepository { + @Query(""" + SELECT new de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO( + COUNT(b.id), + AVG(b.agentSetupDuration), + AVG(b.testDuration), + AVG(b.scaDuration), + AVG(b.totalJobDuration), + AVG(b.dependenciesDownloadedCount) + ) + FROM BuildLogStatisticsEntry b + WHERE b.programmingSubmission.participation.exercise = :exercise + """) + BuildLogStatisticsDTO findAverageStudentBuildLogStatistics(@Param("exercise") ProgrammingExercise exercise); + @Query(""" SELECT new de.tum.cit.aet.artemis.programming.dto.BuildLogStatisticsDTO( COUNT(b.id), @@ -35,16 +49,34 @@ public interface BuildLogStatisticsEntryRepository extends ArtemisJpaRepository< FROM BuildLogStatisticsEntry b LEFT JOIN b.programmingSubmission s LEFT JOIN s.participation p - WHERE p.exercise = :exercise - OR p.id = :templateParticipationId + WHERE p.id = :templateParticipationId OR p.id = :solutionParticipationId """) - BuildLogStatisticsDTO findAverageBuildLogStatistics(@Param("exercise") ProgrammingExercise exercise, @Param("templateParticipationId") Long templateParticipationId, + BuildLogStatisticsDTO findAverageExerciseBuildLogStatistics(@Param("templateParticipationId") Long templateParticipationId, @Param("solutionParticipationId") Long solutionParticipationId); + /** + * Find the average build log statistics for the given exercise. If the exercise has a template or solution participation, the statistics are also calculated for these + * NOTE: we cannot calculate this within one query, this would be way too slow, therefore, we split it into multiple queries and combine the result + * + * @param exercise the exercise for which the statistics should be calculated + * @return the average build log statistics + */ default BuildLogStatisticsDTO findAverageBuildLogStatistics(ProgrammingExercise exercise) { - return findAverageBuildLogStatistics(exercise, exercise.getTemplateParticipation() != null ? exercise.getTemplateParticipation().getId() : null, + var studentStatistics = findAverageStudentBuildLogStatistics(exercise); + var exerciseStatistics = findAverageExerciseBuildLogStatistics(exercise.getTemplateParticipation() != null ? exercise.getTemplateParticipation().getId() : null, exercise.getSolutionParticipation() != null ? exercise.getSolutionParticipation().getId() : null); + // build the average of two values based on the count + var studentCount = studentStatistics.buildCount(); + var exerciseCount = exerciseStatistics.buildCount(); + var count = studentCount + exerciseCount; + return new BuildLogStatisticsDTO(count, + count == 0 ? 0.0 : (studentStatistics.agentSetupDuration() * studentCount + exerciseStatistics.agentSetupDuration() * exerciseCount) / count, + count == 0 ? 0.0 : (studentStatistics.testDuration() * studentCount + exerciseStatistics.testDuration() * exerciseCount) / count, + count == 0 ? 0.0 : (studentStatistics.scaDuration() * studentCount + exerciseStatistics.scaDuration() * exerciseCount) / count, + count == 0 ? 0.0 : (studentStatistics.totalJobDuration() * studentCount + exerciseStatistics.totalJobDuration() * exerciseCount) / count, + count == 0 ? 0.0 : (studentStatistics.dependenciesDownloadedCount() * studentCount + exerciseStatistics.dependenciesDownloadedCount() * exerciseCount) / count); + } @Transactional // ok because of delete diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java index 9e9c996a8e37..949ad5435b80 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/BuildPlanRepository.java @@ -41,7 +41,7 @@ public interface BuildPlanRepository extends ArtemisJpaRepository findByProgrammingExercises_Id(@Param("exerciseId") long exerciseId); default BuildPlan findByProgrammingExercises_IdWithProgrammingExercisesElseThrow(final long exerciseId) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java index 7d67f91ed418..4f9e61fda04d 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/ProgrammingExerciseRepository.java @@ -338,11 +338,6 @@ Optional findByIdWithEagerTestCasesStaticCodeAnalysisCatego Optional findByIdWithEagerBuildConfigTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndSolutionEntriesAndBuildConfig( @Param("exerciseId") long exerciseId); - default ProgrammingExercise findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndBuildConfigElseThrow(long exerciseId) - throws EntityNotFoundException { - return getValueElseThrow(findByIdWithEagerTestCasesStaticCodeAnalysisCategoriesHintsAndTemplateAndSolutionParticipationsAndAuxReposAndBuildConfig(exerciseId), exerciseId); - } - @Query(""" SELECT p FROM ProgrammingExercise p diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/repository/VcsAccessLogRepository.java b/src/main/java/de/tum/cit/aet/artemis/programming/repository/VcsAccessLogRepository.java index 628019f34eaa..76722cfd5eea 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/repository/VcsAccessLogRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/repository/VcsAccessLogRepository.java @@ -39,7 +39,7 @@ public interface VcsAccessLogRepository extends ArtemisJpaRepository findNewestByParticipationId(@Param("participationId") long participationId); /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java index 7c41d9f8452d..bbcdc1d5624b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ParticipationVcsAccessTokenService.java @@ -8,7 +8,10 @@ import org.springframework.stereotype.Service; import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.exception.AccessForbiddenException; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; import de.tum.cit.aet.artemis.programming.domain.ParticipationVCSAccessToken; import de.tum.cit.aet.artemis.programming.repository.ParticipationVCSAccessTokenRepository; import de.tum.cit.aet.artemis.programming.repository.ProgrammingExerciseStudentParticipationRepository; @@ -24,10 +27,13 @@ public class ParticipationVcsAccessTokenService { private final ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository; + private final TeamRepository teamRepository; + public ParticipationVcsAccessTokenService(ParticipationVCSAccessTokenRepository participationVCSAccessTokenRepository, - ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository) { + ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository, TeamRepository teamRepository) { this.participationVcsAccessTokenRepository = participationVCSAccessTokenRepository; this.programmingExerciseStudentParticipationRepository = programmingExerciseStudentParticipationRepository; + this.teamRepository = teamRepository; } /** @@ -46,18 +52,25 @@ public ParticipationVCSAccessToken createParticipationVCSAccessToken(User user, } /** - * Retrieves the participationVCSAccessToken for a User,Participation pair if it exists + * Retrieves the participationVCSAccessToken for a User,Participation pair if it exists and if the user owns the participation * - * @param userId the user's id which is owner of the token + * @param user the user which is owner of the token * @param participationId the participation's id which the token belongs to * @return an Optional participationVCSAccessToken, */ - public ParticipationVCSAccessToken findByUserIdAndParticipationIdOrElseThrow(long userId, long participationId) { - return participationVcsAccessTokenRepository.findByUserIdAndParticipationIdOrElseThrow(userId, participationId); + public ParticipationVCSAccessToken findByUserAndParticipationIdOrElseThrow(User user, long participationId) { + var participation = programmingExerciseStudentParticipationRepository.findByIdElseThrow(participationId); + loadTeamStudentsForTeamExercise(participation); + if (participation.isOwnedBy(user)) { + return participationVcsAccessTokenRepository.findByUserIdAndParticipationIdOrElseThrow(user.getId(), participationId); + } + else { + throw new AccessForbiddenException("Participation not owned by user"); + } } /** - * Checks if the participationVCSAccessToken for a User,Participation pair exists, and creates a new one if not + * Checks if the participationVCSAccessToken for a User,Participation pair exists, and creates a new one if not; if the user owns the participation * * @param user the user's id which is owner of the token * @param participationId the participation's id which the token belongs to @@ -66,7 +79,26 @@ public ParticipationVCSAccessToken findByUserIdAndParticipationIdOrElseThrow(lon public ParticipationVCSAccessToken createVcsAccessTokenForUserAndParticipationIdOrElseThrow(User user, long participationId) { participationVcsAccessTokenRepository.findByUserIdAndParticipationIdAndThrowIfExists(user.getId(), participationId); var participation = programmingExerciseStudentParticipationRepository.findByIdElseThrow(participationId); - return createParticipationVCSAccessToken(user, participation); + loadTeamStudentsForTeamExercise(participation); + if (participation.isOwnedBy(user)) { + return createParticipationVCSAccessToken(user, participation); + } + else { + throw new AccessForbiddenException("Participation not owned by user"); + } + } + + /** + * Loads the team students of a participation's team, if it has a team + * + * @param participation the participation which team's students are not loaded yet + */ + private void loadTeamStudentsForTeamExercise(StudentParticipation participation) { + if (participation.getTeam().isPresent()) { + Team team = participation.getTeam().get(); + Team teamWithStudents = teamRepository.findWithStudentsByIdElseThrow(team.getId()); + participation.getTeam().get().setStudents(teamWithStudents.getStudents()); + } } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java index c8a4ae521e55..20d98af84bc8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseExportService.java @@ -186,6 +186,7 @@ protected void exportProblemStatementAndEmbeddedFilesAndExerciseDetails(Exercise if (exercise instanceof ProgrammingExercise programmingExercise) { // Used for a save typecast, this should always be true since this class only works with programming exercises. programmingExerciseTaskService.replaceTestIdsWithNames(programmingExercise); + programmingExercise.setAuxiliaryRepositories(auxiliaryRepositoryRepository.findByExerciseId(exercise.getId())); } super.exportProblemStatementAndEmbeddedFilesAndExerciseDetails(exercise, exportErrors, exportDir, pathsToBeZipped); } @@ -261,9 +262,7 @@ public List exportProgrammingExerciseRepositories(ProgrammingExercise exer // Lazy load student participation, sort by id, and set the export options var studentParticipations = studentParticipationRepository.findByExerciseId(exercise.getId()).stream() .map(studentParticipation -> (ProgrammingExerciseStudentParticipation) studentParticipation).sorted(Comparator.comparing(DomainObject::getId)).toList(); - var exportOptions = new RepositoryExportOptionsDTO(); - exportOptions.setAnonymizeRepository(false); - exportOptions.setExportAllParticipants(true); + var exportOptions = new RepositoryExportOptionsDTO(true, false, false, null, false, false, false, false, false); // Export student repositories and add them to list var exportedStudentRepositoryFiles = exportStudentRepositories(exercise, studentParticipations, exportOptions, workingDir, outputDir, exportErrors).stream() @@ -603,7 +602,7 @@ public File exportStudentRepositoriesToZipFile(long programmingExerciseId, @NotN public List exportStudentRepositories(ProgrammingExercise programmingExercise, @NotNull List participations, RepositoryExportOptionsDTO repositoryExportOptions, Path workingDir, Path outputDir, List exportErrors) { var programmingExerciseId = programmingExercise.getId(); - if (repositoryExportOptions.isExportAllParticipants()) { + if (repositoryExportOptions.exportAllParticipants()) { log.info("Request to export all {} student or team repositories of programming exercise {} with title '{}'", participations.size(), programmingExerciseId, programmingExercise.getTitle()); } @@ -617,23 +616,24 @@ public List exportStudentRepositories(ProgrammingExercise programmingExerc List exportedStudentRepositories = Collections.synchronizedList(new ArrayList<>()); log.info("export student repositories for programming exercise {} in parallel", programmingExercise.getId()); - var threadPool = Executors.newFixedThreadPool(10); - var futures = participations.stream().map(participation -> CompletableFuture.runAsync(() -> { - try { - log.debug("invoke createZipForRepositoryWithParticipation for participation {}", participation.getId()); - Path dir = getRepositoryWithParticipation(programmingExercise, participation, repositoryExportOptions, workingDir, outputDir, false); - if (dir != null) { - exportedStudentRepositories.add(dir); + try (var threadPool = Executors.newFixedThreadPool(10)) { + var futures = participations.stream().map(participation -> CompletableFuture.runAsync(() -> { + try { + log.debug("invoke createZipForRepositoryWithParticipation for participation {}", participation.getId()); + Path dir = getRepositoryWithParticipation(programmingExercise, participation, repositoryExportOptions, workingDir, outputDir, false); + if (dir != null) { + exportedStudentRepositories.add(dir); + } } - } - catch (Exception exception) { - var error = "Failed to export the student repository with participation: " + participation.getId() + " for programming exercise '" + programmingExercise.getTitle() - + "' (id: " + programmingExercise.getId() + ") because the repository couldn't be downloaded. "; - exportErrors.add(error); - } - }, threadPool).toCompletableFuture()).toArray(CompletableFuture[]::new); - // wait until all operations finish - CompletableFuture.allOf(futures).thenRun(threadPool::shutdown).join(); + catch (Exception exception) { + var error = "Failed to export the student repository with participation: " + participation.getId() + " for programming exercise '" + + programmingExercise.getTitle() + "' (id: " + programmingExercise.getId() + ") because the repository couldn't be downloaded. "; + exportErrors.add(error); + } + }, threadPool).toCompletableFuture()).toArray(CompletableFuture[]::new); + // wait until all operations finish + CompletableFuture.allOf(futures).thenRun(threadPool::shutdown).join(); + } return exportedStudentRepositories; } @@ -705,7 +705,7 @@ public Path getRepositoryWithParticipation(final ProgrammingExercise programming return null; } - if (repositoryExportOptions.isExcludePracticeSubmissions() && participation.isPracticeMode()) { + if (repositoryExportOptions.excludePracticeSubmissions() && participation.isPracticeMode()) { log.debug("Ignoring practice participation {}", participation); return null; } @@ -722,21 +722,21 @@ public Path getRepositoryWithParticipation(final ProgrammingExercise programming // TODO: this operation is only necessary if the repo was not newly cloned gitService.resetToOriginHead(repository); - if (repositoryExportOptions.isFilterLateSubmissions()) { + if (repositoryExportOptions.filterLateSubmissions()) { filterLateSubmissions(repositoryExportOptions, participation, repository); } - if (repositoryExportOptions.isAddParticipantName()) { + if (repositoryExportOptions.addParticipantName()) { log.debug("Adding student or team name to participation {}", participation); addParticipantIdentifierToProjectName(repository, programmingExercise, participation); } - if (repositoryExportOptions.isCombineStudentCommits()) { + if (repositoryExportOptions.combineStudentCommits()) { log.debug("Combining commits for participation {}", participation); - gitService.combineAllStudentCommits(repository, programmingExercise, repositoryExportOptions.isAnonymizeRepository()); + gitService.combineAllStudentCommits(repository, programmingExercise, repositoryExportOptions.anonymizeRepository()); } - if (repositoryExportOptions.isAnonymizeRepository()) { + if (repositoryExportOptions.anonymizeRepository()) { log.debug("Anonymizing commits for participation {}", participation); gitService.anonymizeStudentCommits(repository, programmingExercise); } @@ -744,7 +744,7 @@ public Path getRepositoryWithParticipation(final ProgrammingExercise programming gitService.removeRemotesFromRepository(repository); } - if (repositoryExportOptions.isNormalizeCodeStyle()) { + if (repositoryExportOptions.normalizeCodeStyle()) { try { log.debug("Normalizing code style for participation {}", participation); fileService.normalizeLineEndingsDirectory(repository.getLocalPath()); @@ -756,7 +756,7 @@ public Path getRepositoryWithParticipation(final ProgrammingExercise programming } log.debug("Create temporary directory for repository {}", repository.getLocalPath().toString()); - return gitService.getRepositoryWithParticipation(repository, outputDir.toString(), repositoryExportOptions.isAnonymizeRepository(), zipOutput); + return gitService.getRepositoryWithParticipation(repository, outputDir.toString(), repositoryExportOptions.anonymizeRepository(), zipOutput); } catch (GitAPIException | GitException ex) { log.error("Failed to create zip for participation id {} with exercise id {} because of the following exception ", participation.getId(), @@ -793,11 +793,11 @@ public void deleteReposDownloadProjectRootDirectory(ProgrammingExercise programm private void filterLateSubmissions(RepositoryExportOptionsDTO repositoryExportOptions, ProgrammingExerciseStudentParticipation participation, Repository repo) { log.debug("Filter late submissions for participation {}", participation.toString()); final Optional latestAllowedDate; - if (repositoryExportOptions.isFilterLateSubmissionsIndividualDueDate()) { + if (repositoryExportOptions.filterLateSubmissionsIndividualDueDate()) { latestAllowedDate = ExerciseDateService.getDueDate(participation); } else { - latestAllowedDate = Optional.of(repositoryExportOptions.getFilterLateSubmissionsDate()); + latestAllowedDate = Optional.of(repositoryExportOptions.filterLateSubmissionsDate()); } if (latestAllowedDate.isPresent()) { diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java index 3ac67af4b28f..7738b6615b2f 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseGradingService.java @@ -986,20 +986,35 @@ private void removeAllTestCaseFeedbackAndSetScoreToZero(Result result, List + * This method compiles various statistics for a programming exercise identified by the provided exercise ID. + * It gathers data on the number of passed and failed tests per test case, as well as the number of issues + * detected in static code analysis per category. The results are encapsulated in a + * {@link ProgrammingExerciseGradingStatisticsDTO} object which includes: + * - The number of results processed + * - A map of test case names to their respective pass/fail statistics + * - A map of static code analysis category names to the number of students per issue count + *

+ * The method performs the following steps: + * 1. Initializes statistics for the number of passed and failed tests per test case. + * 2. Initializes statistics for the number of students per amount of detected issues per category. + * 3. Fetches the latest automatic results for the exercise along with their feedback. + * 4. Processes each result to update test case statistics and detect issues per category. + * 5. Merges individual result statistics into overall statistics. * - * @param exerciseId The current exercise - * @return The statistics object + * @param exerciseId the ID of the exercise + * @return a {@link ProgrammingExerciseGradingStatisticsDTO} object containing the compiled grading statistics */ public ProgrammingExerciseGradingStatisticsDTO generateGradingStatistics(Long exerciseId) { - // number of passed and failed tests per test case + // Initialize statistics for the number of passed and failed tests per test case final var testCases = testCaseRepository.findByExerciseId(exerciseId); final var testCaseStatsMap = new HashMap(); for (ProgrammingExerciseTestCase testCase : testCases) { testCaseStatsMap.put(testCase.getTestName(), new ProgrammingExerciseGradingStatisticsDTO.TestCaseStats(0, 0)); } - // number of students per amount of detected issues per category + // Initialize statistics for the number of students per amount of detected issues per category final Set categories = staticCodeAnalysisCategoryRepository.findByExerciseId(exerciseId); final var categoryIssuesStudentsMap = new HashMap>(); for (StaticCodeAnalysisCategory category : categories) { @@ -1008,63 +1023,123 @@ public ProgrammingExerciseGradingStatisticsDTO generateGradingStatistics(Long ex final var results = resultRepository.findLatestAutomaticResultsWithEagerFeedbacksTestCasesForExercise(exerciseId); for (Result result : results) { - // number of detected issues per category for this result - final var categoryIssuesMap = new HashMap(); - for (var feedback : result.getFeedbacks()) { - addFeedbackToStatistics(categoryIssuesMap, testCaseStatsMap, feedback); - } + // Count the number of detected issues per category for the current result + final var categoryIssuesMap = categorizeStaticCodeAnalysisIssues(result); + // Update the statistics for each test case based on the feedback + updateTestCaseMapBasedOnResultFeedback(result, testCaseStatsMap); + + // Merge the current result's category issues map into the overall map mergeCategoryIssuesMap(categoryIssuesStudentsMap, categoryIssuesMap); } - final var statistics = new ProgrammingExerciseGradingStatisticsDTO(); - statistics.setNumParticipations(results.size()); - statistics.setTestCaseStatsMap(testCaseStatsMap); - statistics.setCategoryIssuesMap(categoryIssuesStudentsMap); - - return statistics; + return new ProgrammingExerciseGradingStatisticsDTO(results.size(), testCaseStatsMap, categoryIssuesStudentsMap); } /** - * Merges the result map of a single student with the overall issues map + * Categorizes static code analysis issues from a given result. + *

+ * This method processes the feedbacks associated with the provided result to identify + * and count the occurrences of static code analysis issues for each category. The result + * is a map where the key is the category name and the value is the count of issues detected + * in that category. * - * @param issuesAllStudents The overall issues map for all students - * @param issuesSingleStudent The issues map for one student + * @param result The {@link Result} object containing feedbacks to be analyzed + * @return A map where the key is the static code analysis category name and the value is the count of occurrences of issues in that category */ - private void mergeCategoryIssuesMap(final Map> issuesAllStudents, final Map issuesSingleStudent) { - for (var entry : issuesSingleStudent.entrySet()) { - final String category = entry.getKey(); - final Integer issueCount = entry.getValue(); - - issuesAllStudents.putIfAbsent(category, new HashMap<>()); + private static Map categorizeStaticCodeAnalysisIssues(Result result) { + return result.getFeedbacks().stream() + // Filter the feedbacks to include only those that are related to static code analysis + .filter(Feedback::isStaticCodeAnalysisFeedback) + // Map each filtered feedback to its static code analysis category name + .map(Feedback::getStaticCodeAnalysisCategory) + // Filter out any empty category names to avoid counting them + .filter(categoryName -> !categoryName.isEmpty()) + // Collect the results into a map where the key is the category name and the value is the count of occurrences + .collect(Collectors.toMap( + // The key in the resulting map is the category name + categoryName -> categoryName, + // The initial value for each key is 1, representing the first occurrence + categoryName -> 1, + // If the key already exists, sum the existing value with the new value (i.e., increment the count) + Integer::sum)); + } - var issuesStudentsMap = issuesAllStudents.get(category); - issuesStudentsMap.putIfAbsent(issueCount, 0); - // add 1 to the number of students for the category & issues - issuesStudentsMap.merge(issueCount, 1, Integer::sum); - } + /** + * Updates the test case statistics map based on the feedback from a given result. + *

+ * This method processes the feedbacks associated with the provided result to update + * the test case statistics map. It counts the number of positive and non-positive feedbacks + * for each test case and updates the corresponding entries in the provided test case statistics map. + * + * @param result The {@link Result} object containing feedbacks to be analyzed + * @param testCaseStatsMap The map of test case names to their respective statistics (passed and failed counts) + */ + private static void updateTestCaseMapBasedOnResultFeedback(Result result, HashMap testCaseStatsMap) { + result.getFeedbacks().stream() + // Filter the feedbacks to include only those that are automatic and have an assigned test case + .filter(feedback -> { + if (!FeedbackType.AUTOMATIC.equals(feedback.getType())) { + return false; + } + if (feedback.getTestCase() == null) { + return false; + } + if (feedback.getTestCase().getTestName() == null) { + // Log the feedback id with null test name to analyse NullPointer issue if it occurs again in the future + log.warn("Feedback with ID {} has a test case with a null test name.", feedback.getId()); + return false; + } + if (feedback.isPositive() == null) { + // Log the feedback with null isPositive value to analyse NullPointer issue if it occurs again in the future + log.warn("Feedback with ID {} has a test case with a null isPositive value.", feedback.getId()); + return false; + } + return true; + }) + // Collect the filtered feedbacks into a map grouped by test case name, and partitioned by whether the feedback is positive + .collect(Collectors.groupingBy( + // Group by the name of the test case associated with the feedback + feedback -> feedback.getTestCase().getTestName(), + // Partition each group into positive and non-positive feedbacks, and count the occurrences + Collectors.partitioningBy(Feedback::isPositive, Collectors.counting()) + // Process each entry in the resulting map + )).forEach((testName, partitionedFeedbacks) -> { + // Get the count of positive feedbacks for the test case, defaulting to 0 if none exist + long numPassed = partitionedFeedbacks.getOrDefault(true, 0L); + // Get the count of non-positive feedbacks for the test case, defaulting to 0 if none exist + long numFailed = partitionedFeedbacks.getOrDefault(false, 0L); + // Ensure there is an entry for the test case in the testCaseStatsMap, initializing with zero passed and failed if absent + testCaseStatsMap.putIfAbsent(testName, new ProgrammingExerciseGradingStatisticsDTO.TestCaseStats(0, 0)); + // Update the entry for the test case in the testCaseStatsMap, incrementing the passed and failed counts + testCaseStatsMap.computeIfPresent(testName, + // Create a new TestCaseStats object with the updated counts and replace the existing entry + (key, stats) -> new ProgrammingExerciseGradingStatisticsDTO.TestCaseStats(stats.numPassed() + (int) numPassed, stats.numFailed() + (int) numFailed)); + }); } /** - * Analyses the feedback and updates the statistics maps + * Merges the result map of a single student with the overall issues map. + *

+ * This method updates the overall issues map for all students by incorporating the issues + * detected for a single student. Each category of issues is updated with the count of issues + * detected for that category and the number of students who had that count of issues. * - * @param categoryIssuesMap The issues map for sca statistics - * @param testCaseStatsMap The map for test case statistics - * @param feedback The given feedback object + * @param issuesAllStudents The overall issues map for all students. The key is the category name, + * and the value is a map where the key is the issue count and the value + * is the number of students with that issue count. + * @param issuesSingleStudent The issues map for one student. The key is the category name, and the value + * is the number of issues detected in that category for this student. */ - private void addFeedbackToStatistics(final Map categoryIssuesMap, final Map testCaseStatsMap, - final Feedback feedback) { - if (feedback.isStaticCodeAnalysisFeedback()) { - String categoryName = feedback.getStaticCodeAnalysisCategory(); - if (categoryName.isEmpty()) { - return; - } - categoryIssuesMap.compute(categoryName, (category, count) -> count == null ? 1 : count + 1); - } - else if (FeedbackType.AUTOMATIC.equals(feedback.getType()) && feedback.getTestCase() != null) { - String testName = feedback.getTestCase().getTestName(); - testCaseStatsMap.putIfAbsent(testName, new ProgrammingExerciseGradingStatisticsDTO.TestCaseStats(0, 0)); - testCaseStatsMap.get(testName).updateWithFeedback(feedback); - } + private static void mergeCategoryIssuesMap(final Map> issuesAllStudents, final Map issuesSingleStudent) { + // Iterate over each entry in the issues map for a single student + issuesSingleStudent.forEach((category, issueCount) -> { + // Ensure the overall issues map has an entry for the current category + issuesAllStudents.putIfAbsent(category, new HashMap<>()); + // Ensure the category map has an entry for the current issue count with an initial value of 0 + issuesAllStudents.get(category).putIfAbsent(issueCount, 0); + // Increment the number of students who had the current issue count for the current category by 1 + issuesAllStudents.get(category).merge(issueCount, 1, Integer::sum); + }); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java index f0a2191d0e44..8f5c1b427390 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportBasicService.java @@ -125,7 +125,7 @@ public ProgrammingExerciseImportBasicService(ExerciseHintService exerciseHintSer * @param newProgrammingExercise The new exercise already containing values which should not get copied, i.e. overwritten * @return The newly created exercise */ - @Transactional // TODO: apply the transaction on a smaller scope + @Transactional // TODO: NOT OK --> apply the transaction on a smaller scope // IMPORTANT: the transactional context only works if you invoke this method from another class public ProgrammingExercise importProgrammingExerciseBasis(final ProgrammingExercise originalProgrammingExercise, final ProgrammingExercise newProgrammingExercise) { prepareBasicExerciseInformation(originalProgrammingExercise, newProgrammingExercise); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java index 3c8b1671cba9..784e29599185 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseImportFromFileService.java @@ -8,6 +8,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Stream; @@ -33,6 +35,7 @@ import de.tum.cit.aet.artemis.core.service.FileService; import de.tum.cit.aet.artemis.core.service.ProfileService; import de.tum.cit.aet.artemis.core.service.ZipFileService; +import de.tum.cit.aet.artemis.programming.domain.AuxiliaryRepository; import de.tum.cit.aet.artemis.programming.domain.ProgrammingExercise; import de.tum.cit.aet.artemis.programming.domain.Repository; import de.tum.cit.aet.artemis.programming.domain.RepositoryType; @@ -170,44 +173,72 @@ private void importRepositoriesFromFile(ProgrammingExercise newExercise, Path ba Repository templateRepo = gitService.getOrCheckoutRepository(new VcsRepositoryUri(newExercise.getTemplateRepositoryUri()), false); Repository solutionRepo = gitService.getOrCheckoutRepository(new VcsRepositoryUri(newExercise.getSolutionRepositoryUri()), false); Repository testRepo = gitService.getOrCheckoutRepository(new VcsRepositoryUri(newExercise.getTestRepositoryUri()), false); + List auxiliaryRepositories = new ArrayList<>(); + for (AuxiliaryRepository auxiliaryRepository : newExercise.getAuxiliaryRepositories()) { + auxiliaryRepositories.add(gitService.getOrCheckoutRepository(auxiliaryRepository.getVcsRepositoryUri(), false)); + } - copyImportedExerciseContentToRepositories(templateRepo, solutionRepo, testRepo, basePath); - replaceImportedExerciseShortName(Map.of(oldExerciseShortName, newExercise.getShortName()), templateRepo, solutionRepo, testRepo); + copyImportedExerciseContentToRepositories(templateRepo, solutionRepo, testRepo, auxiliaryRepositories, basePath); + replaceImportedExerciseShortName(Map.of(oldExerciseShortName, newExercise.getShortName()), List.of(solutionRepo, templateRepo, testRepo)); + replaceImportedExerciseShortName(Map.of(oldExerciseShortName, newExercise.getShortName()), auxiliaryRepositories); gitService.stageAllChanges(templateRepo); gitService.stageAllChanges(solutionRepo); gitService.stageAllChanges(testRepo); + for (Repository auxRepo : auxiliaryRepositories) { + gitService.stageAllChanges(auxRepo); + } gitService.commitAndPush(templateRepo, "Import template from file", true, user); gitService.commitAndPush(solutionRepo, "Import solution from file", true, user); gitService.commitAndPush(testRepo, "Import tests from file", true, user); + for (Repository auxRepo : auxiliaryRepositories) { + gitService.commitAndPush(auxRepo, "Import auxiliary repo from file", true, user); + } + } - private void replaceImportedExerciseShortName(Map replacements, Repository... repositories) { + private void replaceImportedExerciseShortName(Map replacements, List repositories) { for (Repository repository : repositories) { fileService.replaceVariablesInFileRecursive(repository.getLocalPath(), replacements, SHORT_NAME_REPLACEMENT_EXCLUSIONS); } } - private void copyImportedExerciseContentToRepositories(Repository templateRepo, Repository solutionRepo, Repository testRepo, Path basePath) throws IOException { + private void copyImportedExerciseContentToRepositories(Repository templateRepo, Repository solutionRepo, Repository testRepo, List auxiliaryRepositories, + Path basePath) throws IOException { repositoryService.deleteAllContentInRepository(templateRepo); repositoryService.deleteAllContentInRepository(solutionRepo); repositoryService.deleteAllContentInRepository(testRepo); - copyExerciseContentToRepository(templateRepo, RepositoryType.TEMPLATE, basePath); - copyExerciseContentToRepository(solutionRepo, RepositoryType.SOLUTION, basePath); - copyExerciseContentToRepository(testRepo, RepositoryType.TESTS, basePath); + for (Repository auxRepo : auxiliaryRepositories) { + repositoryService.deleteAllContentInRepository(auxRepo); + } + + copyExerciseContentToRepository(templateRepo, RepositoryType.TEMPLATE.getName(), basePath); + copyExerciseContentToRepository(solutionRepo, RepositoryType.SOLUTION.getName(), basePath); + copyExerciseContentToRepository(testRepo, RepositoryType.TESTS.getName(), basePath); + for (Repository auxRepo : auxiliaryRepositories) { + String[] parts = auxRepo.getLocalPath().toString().split("-"); + var auxRepoName = String.join("-", Arrays.copyOfRange(parts, 1, parts.length)); + copyExerciseContentToRepository(auxRepo, auxRepoName, basePath); + } } /** * Copies everything from the extracted zip file to the repository, except the .git folder * - * @param repository the repository to which the content should be copied - * @param repositoryType the type of the repository - * @param basePath the path to the extracted zip file + * @param repository the repository to which the content should be copied + * @param repoName the name of the repository + * @param basePath the path to the extracted zip file **/ - private void copyExerciseContentToRepository(Repository repository, RepositoryType repositoryType, Path basePath) throws IOException { - FileUtils.copyDirectory(retrieveRepositoryDirectoryPath(basePath, repositoryType.getName()).toFile(), repository.getLocalPath().toFile(), - new NotFileFilter(new NameFileFilter(".git"))); + private void copyExerciseContentToRepository(Repository repository, String repoName, Path basePath) throws IOException { + // @formatter:off + FileUtils.copyDirectory( + retrieveRepositoryDirectoryPath(basePath, repoName).toFile(), + repository.getLocalPath().toFile(), + new NotFileFilter(new NameFileFilter(".git")) + ); + // @formatter:on + try (var files = Files.walk(repository.getLocalPath())) { files.filter(file -> "gradlew".equals(file.getFileName().toString())).forEach(file -> file.toFile().setExecutable(true)); } @@ -242,17 +273,17 @@ private void checkRepositoryForTypeExists(Path path, RepositoryType repoType) th } } - private Path retrieveRepositoryDirectoryPath(Path dirPath, String repoType) { + private Path retrieveRepositoryDirectoryPath(Path dirPath, String repoName) { List result; try (Stream walk = Files.walk(dirPath)) { - result = walk.filter(Files::isDirectory).filter(file -> file.getFileName().toString().endsWith("-" + repoType)).toList(); + result = walk.filter(Files::isDirectory).filter(file -> file.getFileName().toString().endsWith("-" + repoName)).toList(); } catch (IOException e) { throw new BadRequestAlertException("Could not read the directory", "programmingExercise", "couldnotreaddirectory"); } if (result.size() != 1) { throw new IllegalArgumentException( - "There are either no or more than one sub-directories containing " + repoType + " in their name. Please make sure that there is exactly one."); + "There are either no or more than one sub-directories containing " + repoName + " in their name. Please make sure that there is exactly one."); } return result.getFirst(); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java index 7fb35b6b1d66..16eebcaca693 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseScheduleService.java @@ -961,45 +961,46 @@ private CompletableFuture> invokeO // TODO: we should think about executing those operations again in batches to avoid issues on the vcs server // Create a threadpool to execute the operation with a fixed amount of threads - ExecutorService threadPool = Executors.newFixedThreadPool(10); - var participations = programmingExercise.getStudentParticipations(); - List> futures = new ArrayList<>(); - for (StudentParticipation studentParticipation : participations) { - Supplier action = () -> { - // We need to set the authorization object for every thread - SecurityUtils.setAuthorizationObject(); - var programmingExerciseStudentParticipation = (ProgrammingExerciseStudentParticipation) studentParticipation; - - if (condition.test(programmingExerciseStudentParticipation)) { - operation.accept(programmingExercise, programmingExerciseStudentParticipation); - } + try (ExecutorService threadPool = Executors.newFixedThreadPool(10)) { + var participations = programmingExercise.getStudentParticipations(); + List> futures = new ArrayList<>(); + for (StudentParticipation studentParticipation : participations) { + Supplier action = () -> { + // We need to set the authorization object for every thread + SecurityUtils.setAuthorizationObject(); + var programmingExerciseStudentParticipation = (ProgrammingExerciseStudentParticipation) studentParticipation; + + if (condition.test(programmingExerciseStudentParticipation)) { + operation.accept(programmingExercise, programmingExerciseStudentParticipation); + } + + return programmingExerciseStudentParticipation; + }; - return programmingExerciseStudentParticipation; - }; + CompletableFuture future = CompletableFuture.supplyAsync(action, threadPool); + futures.add(future); + } - CompletableFuture future = CompletableFuture.supplyAsync(action, threadPool); - futures.add(future); - } + for (var future : futures) { + future.whenComplete((participation, exception) -> { + if (exception != null) { + log.error(String.format("'%s' failed for programming exercise with id %d for student repository with participation id %d", operationName, + programmingExercise.getId(), participation.getId()), exception); + failedOperations.add(participation); + } + }); + } - for (var future : futures) { - future.whenComplete((participation, exception) -> { - if (exception != null) { - log.error(String.format("'%s' failed for programming exercise with id %d for student repository with participation id %d", operationName, - programmingExercise.getId(), participation.getId()), exception); - failedOperations.add(participation); + return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).thenApply(ignore -> { + threadPool.shutdown(); + log.info("Finished executing (scheduled) task '{}' for programming exercise with id {}.", operationName, programmingExercise.getId()); + if (!failedOperations.isEmpty()) { + var failedIds = failedOperations.stream().map(participation -> participation.getId().toString()).collect(Collectors.joining(",")); + log.warn("The (scheduled) task '{}' for programming exercise {} failed for these {} participations: {}", operation, programmingExercise.getId(), + failedOperations.size(), failedIds); } + return failedOperations; }); } - - return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new)).thenApply(ignore -> { - threadPool.shutdown(); - log.info("Finished executing (scheduled) task '{}' for programming exercise with id {}.", operationName, programmingExercise.getId()); - if (!failedOperations.isEmpty()) { - var failedIds = failedOperations.stream().map(participation -> participation.getId().toString()).collect(Collectors.joining(",")); - log.warn("The (scheduled) task '{}' for programming exercise {} failed for these {} participations: {}", operation, programmingExercise.getId(), - failedOperations.size(), failedIds); - } - return failedOperations; - }); } } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java index f0d9f6f426e5..f3770b417e5b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/ProgrammingExerciseTestCaseService.java @@ -69,17 +69,17 @@ public Set update(Long exerciseId, Set existingTestCases = programmingExercise.getTestCases(); Set updatedTests = new HashSet<>(); for (ProgrammingExerciseTestCaseDTO programmingExerciseTestCaseDTO : testCaseProgrammingExerciseTestCaseDTOS) { - Optional matchingTestCaseOpt = existingTestCases.stream() - .filter(testCase -> testCase.getId().equals(programmingExerciseTestCaseDTO.getId())).findFirst(); + Optional matchingTestCaseOpt = existingTestCases.stream().filter(testCase -> testCase.getId().equals(programmingExerciseTestCaseDTO.id())) + .findFirst(); if (matchingTestCaseOpt.isEmpty()) { continue; } ProgrammingExerciseTestCase matchingTestCase = matchingTestCaseOpt.get(); - matchingTestCase.setWeight(programmingExerciseTestCaseDTO.getWeight()); - matchingTestCase.setVisibility(programmingExerciseTestCaseDTO.getVisibility()); - matchingTestCase.setBonusMultiplier(programmingExerciseTestCaseDTO.getBonusMultiplier()); - matchingTestCase.setBonusPoints(programmingExerciseTestCaseDTO.getBonusPoints()); + matchingTestCase.setWeight(programmingExerciseTestCaseDTO.weight()); + matchingTestCase.setVisibility(programmingExerciseTestCaseDTO.visibility()); + matchingTestCase.setBonusMultiplier(programmingExerciseTestCaseDTO.bonusMultiplier()); + matchingTestCase.setBonusPoints(programmingExerciseTestCaseDTO.bonusPoints()); validateTestCase(matchingTestCase); updatedTests.add(matchingTestCase); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseTaskService.java b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseTaskService.java index 1684cf52c018..0b1a14be8646 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseTaskService.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/service/hestia/ProgrammingExerciseTaskService.java @@ -350,7 +350,7 @@ private String convertTestNameToTestIdReplacement(String testName, Set service.updateRepositoryActionType(participation, repositoryActionType)); } diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java index a55c44871619..1659956ac1f8 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingExerciseExportImportResource.java @@ -424,32 +424,37 @@ public ResponseEntity exportSubmissionsByStudentLogins(@PathVariable l var programmingExercise = programmingExerciseRepository.findByIdWithStudentParticipationsAndLegalSubmissionsElseThrow(exerciseId); User user = userRepository.getUserWithGroupsAndAuthorities(); authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.TEACHING_ASSISTANT, programmingExercise, user); - if (repositoryExportOptions.isExportAllParticipants()) { + if (repositoryExportOptions.exportAllParticipants()) { // only instructors are allowed to download all repos authCheckService.checkHasAtLeastRoleForExerciseElseThrow(Role.INSTRUCTOR, programmingExercise, user); } - if (repositoryExportOptions.getFilterLateSubmissionsDate() == null) { - repositoryExportOptions.setFilterLateSubmissionsIndividualDueDate(true); - repositoryExportOptions.setFilterLateSubmissionsDate(programmingExercise.getDueDate()); + if (repositoryExportOptions.filterLateSubmissionsDate() == null) { + repositoryExportOptions = repositoryExportOptions.copyWith(true, programmingExercise.getDueDate()); } Set participantIdentifierList = new HashSet<>(); - if (!repositoryExportOptions.isExportAllParticipants()) { + if (!repositoryExportOptions.exportAllParticipants()) { participantIdentifiers = participantIdentifiers.replaceAll("\\s+", ""); participantIdentifierList.addAll(List.of(participantIdentifiers.split(","))); } // Select the participations that should be exported + final var exportedStudentParticipations = getExportedStudentParticipations(repositoryExportOptions, programmingExercise, participantIdentifierList); + return provideZipForParticipations(exportedStudentParticipations, programmingExercise, repositoryExportOptions); + } + + private static List getExportedStudentParticipations(RepositoryExportOptionsDTO repositoryExportOptions, + ProgrammingExercise programmingExercise, Set participantIdentifierList) { List exportedStudentParticipations = new ArrayList<>(); for (StudentParticipation studentParticipation : programmingExercise.getStudentParticipations()) { ProgrammingExerciseStudentParticipation programmingStudentParticipation = (ProgrammingExerciseStudentParticipation) studentParticipation; - if (repositoryExportOptions.isExportAllParticipants() || (programmingStudentParticipation.getRepositoryUri() != null && studentParticipation.getParticipant() != null + if (repositoryExportOptions.exportAllParticipants() || (programmingStudentParticipation.getRepositoryUri() != null && studentParticipation.getParticipant() != null && participantIdentifierList.contains(studentParticipation.getParticipantIdentifier()))) { exportedStudentParticipations.add(programmingStudentParticipation); } } - return provideZipForParticipations(exportedStudentParticipations, programmingExercise, repositoryExportOptions); + return exportedStudentParticipations; } /** @@ -471,12 +476,11 @@ public ResponseEntity exportSubmissionsByParticipationIds(@PathVariabl // Only instructors or higher may override the anonymization setting if (!authCheckService.isAtLeastInstructorForExercise(programmingExercise, null)) { - repositoryExportOptions.setAnonymizeRepository(true); + repositoryExportOptions = repositoryExportOptions.copyWithAnonymizeRepository(true); } - if (repositoryExportOptions.getFilterLateSubmissionsDate() == null) { - repositoryExportOptions.setFilterLateSubmissionsIndividualDueDate(true); - repositoryExportOptions.setFilterLateSubmissionsDate(programmingExercise.getDueDate()); + if (repositoryExportOptions.filterLateSubmissionsDate() == null) { + repositoryExportOptions = repositoryExportOptions.copyWith(true, programmingExercise.getDueDate()); } var participationIdSet = new ArrayList<>(Arrays.asList(participationIds.split(","))).stream().map(String::trim).map(Long::parseLong).collect(Collectors.toSet()); diff --git a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java index db197fed2c26..7762e4f07c30 100644 --- a/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/programming/web/ProgrammingSubmissionResource.java @@ -398,8 +398,8 @@ public ResponseEntity getProgrammingSubmissionWithoutAsse if (submission != null) { if (lockSubmission) { - Result lockedResult = programmingSubmissionService.lockSubmission(submission, correctionRound); - submission = (ProgrammingSubmission) lockedResult.getSubmission(); + // NOTE: we explicitly load the feedback for the submission eagerly to avoid org.hibernate.LazyInitializationException + submission = programmingSubmissionService.lockAndGetProgrammingSubmission(submission.getId(), correctionRound); } submission.getParticipation().setExercise(programmingExercise); programmingSubmissionService.hideDetails(submission, user); diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java index 274718a9b382..955212be3450 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/service/QuizExerciseService.java @@ -33,7 +33,6 @@ import de.tum.cit.aet.artemis.assessment.domain.Result; import de.tum.cit.aet.artemis.assessment.repository.ResultRepository; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyExerciseLinkRepository; import de.tum.cit.aet.artemis.core.config.Constants; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.dto.SearchResultPageDTO; @@ -87,12 +86,10 @@ public class QuizExerciseService extends QuizService { private final ExerciseService exerciseService; - private final CompetencyExerciseLinkRepository competencyExerciseLinkRepository; - public QuizExerciseService(QuizExerciseRepository quizExerciseRepository, ResultRepository resultRepository, QuizSubmissionRepository quizSubmissionRepository, InstanceMessageSendService instanceMessageSendService, QuizStatisticService quizStatisticService, QuizBatchService quizBatchService, ExerciseSpecificationService exerciseSpecificationService, FileService fileService, DragAndDropMappingRepository dragAndDropMappingRepository, - ShortAnswerMappingRepository shortAnswerMappingRepository, ExerciseService exerciseService, CompetencyExerciseLinkRepository competencyExerciseLinkRepository) { + ShortAnswerMappingRepository shortAnswerMappingRepository, ExerciseService exerciseService) { super(dragAndDropMappingRepository, shortAnswerMappingRepository); this.quizExerciseRepository = quizExerciseRepository; this.resultRepository = resultRepository; @@ -103,7 +100,6 @@ public QuizExerciseService(QuizExerciseRepository quizExerciseRepository, Result this.exerciseSpecificationService = exerciseSpecificationService; this.fileService = fileService; this.exerciseService = exerciseService; - this.competencyExerciseLinkRepository = competencyExerciseLinkRepository; } /** diff --git a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java index fc2b4d3b3c94..da732bcdb3ff 100644 --- a/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/quiz/web/QuizParticipationResource.java @@ -28,7 +28,6 @@ import de.tum.cit.aet.artemis.quiz.domain.QuizExercise; import de.tum.cit.aet.artemis.quiz.repository.QuizExerciseRepository; import de.tum.cit.aet.artemis.quiz.repository.QuizSubmissionRepository; -import de.tum.cit.aet.artemis.quiz.repository.SubmittedAnswerRepository; import de.tum.cit.aet.artemis.quiz.service.QuizBatchService; /** @@ -49,20 +48,16 @@ public class QuizParticipationResource { private final ResultRepository resultRepository; - private final SubmittedAnswerRepository submittedAnswerRepository; - private final QuizSubmissionRepository quizSubmissionRepository; private final QuizBatchService quizBatchService; public QuizParticipationResource(QuizExerciseRepository quizExerciseRepository, ParticipationService participationService, UserRepository userRepository, - ResultRepository resultRepository, SubmittedAnswerRepository submittedAnswerRepository, QuizSubmissionRepository quizSubmissionRepository, - QuizBatchService quizBatchService) { + ResultRepository resultRepository, QuizSubmissionRepository quizSubmissionRepository, QuizBatchService quizBatchService) { this.quizExerciseRepository = quizExerciseRepository; this.participationService = participationService; this.userRepository = userRepository; this.resultRepository = resultRepository; - this.submittedAnswerRepository = submittedAnswerRepository; this.quizSubmissionRepository = quizSubmissionRepository; this.quizBatchService = quizBatchService; } diff --git a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java index 9929c1b5f9db..604964966874 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/repository/TextSubmissionRepository.java @@ -33,8 +33,8 @@ public interface TextSubmissionRepository extends ArtemisJpaRepository findWithEagerResultsById(long submissionId); + @EntityGraph(type = LOAD, attributePaths = { "results.assessor" }) + Optional findWithEagerResultsAssessorById(long submissionId); /** * @param submissionId the submission id we are interested in @@ -43,7 +43,7 @@ public interface TextSubmissionRepository extends ArtemisJpaRepository findWithEagerResultsAndFeedbackAndTextBlocksById(long submissionId); - @EntityGraph(type = LOAD, attributePaths = { "results", "results.assessor", "blocks", "results.feedbacks" }) + @EntityGraph(type = LOAD, attributePaths = { "results.assessor", "blocks", "results.feedbacks" }) Optional findWithEagerResultAndTextBlocksAndFeedbackByResults_Id(long resultId); @NotNull diff --git a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java index a7f5ff325f1a..2df4ae21c2ab 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/service/TextSubmissionService.java @@ -155,11 +155,15 @@ public Optional getRandomTextSubmissionEligibleForNewAssessment( /** * Lock a given text submission that still needs to be assessed to prevent other tutors from receiving and assessing it. * - * @param textSubmission textSubmission to be locked - * @param correctionRound get submission with results in the correction round + * @param textSubmissionId id of the textSubmission to be locked + * @param correctionRound get submission with results in the correction round + * @return the locked textSubmission */ - public void lockTextSubmissionToBeAssessed(TextSubmission textSubmission, int correctionRound) { + public TextSubmission lockTextSubmissionToBeAssessed(long textSubmissionId, int correctionRound) { + // NOTE: we load the feedback for the submission eagerly to avoid org.hibernate.LazyInitializationException + final var textSubmission = textSubmissionRepository.findByIdWithEagerResultsAndFeedbackAndTextBlocksElseThrow(textSubmissionId); lockSubmission(textSubmission, correctionRound); + return textSubmission; } public TextSubmission findOneWithEagerResultFeedbackAndTextBlocks(Long submissionId) { diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java index 900347ecc54e..0f1df354c04b 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextAssessmentResource.java @@ -348,14 +348,14 @@ public ResponseEntity deleteAssessment(@PathVariable Long participationId, * @param submissionId the id of the submission we want * @param correctionRound correction round for which we want the submission * @param resultId if result already exists, we want to get the submission for this specific result - * @return a Participation of the tutor in the submission + * @return a Participation with relevant data for a tutor or instructor to assess the submission */ @GetMapping("text-submissions/{submissionId}/for-assessment") @EnforceAtLeastTutor public ResponseEntity retrieveParticipationForSubmission(@PathVariable Long submissionId, @RequestParam(value = "correction-round", defaultValue = "0") int correctionRound, @RequestParam(value = "resultId", required = false) Long resultId) { log.debug("REST request to get data for tutors text assessment submission: {}", submissionId); - final var textSubmission = textSubmissionRepository.findByIdWithParticipationExerciseResultAssessorAssessmentNoteElseThrow(submissionId); + var textSubmission = textSubmissionRepository.findByIdWithParticipationExerciseResultAssessorAssessmentNoteElseThrow(submissionId); final Participation participation = textSubmission.getParticipation(); final var exercise = participation.getExercise(); final User user = userRepository.getUserWithGroupsAndAuthorities(); @@ -387,7 +387,9 @@ public ResponseEntity retrieveParticipationForSubmission(@PathVar .build(); } - textSubmissionService.lockTextSubmissionToBeAssessed(textSubmission, correctionRound); + textSubmission = textSubmissionService.lockTextSubmissionToBeAssessed(textSubmission.getId(), correctionRound); + // reconnect with participation + textSubmission.setParticipation(participation); // set it since it has changed result = textSubmission.getResultForCorrectionRound(correctionRound); } diff --git a/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java b/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java index 359077783330..b25506a90aef 100644 --- a/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java +++ b/src/main/java/de/tum/cit/aet/artemis/text/web/TextSubmissionResource.java @@ -166,7 +166,7 @@ private ResponseEntity handleTextSubmission(long exerciseId, Tex @EnforceAtLeastStudent public ResponseEntity getTextSubmissionWithResults(@PathVariable long submissionId) { log.debug("REST request to get text submission: {}", submissionId); - var textSubmission = textSubmissionRepository.findWithEagerResultsById(submissionId).orElseThrow(() -> new EntityNotFoundException("TextSubmission", submissionId)); + var textSubmission = textSubmissionRepository.findWithEagerResultsAssessorById(submissionId).orElseThrow(() -> new EntityNotFoundException("TextSubmission", submissionId)); if (!authCheckService.isAtLeastTeachingAssistantForExercise(textSubmission.getParticipation().getExercise())) { // anonymize and throw exception if not authorized to view submission @@ -219,7 +219,7 @@ public ResponseEntity getTextSubmissionWithoutAssessment(@PathVa } // Check if tutors can start assessing the students submission - this.textSubmissionService.checkIfExerciseDueDateIsReached(exercise); + textSubmissionService.checkIfExerciseDueDateIsReached(exercise); // Check if the limit of simultaneously locked submissions has been reached textSubmissionService.checkSubmissionLockLimit(exercise.getCourseViaExerciseGroupOrCourseMember().getId()); @@ -232,10 +232,10 @@ public ResponseEntity getTextSubmissionWithoutAssessment(@PathVa return ResponseEntity.ok(null); } - final TextSubmission textSubmission = optionalTextSubmission.get(); + TextSubmission textSubmission = optionalTextSubmission.get(); if (lockSubmission) { - textSubmissionService.lockTextSubmissionToBeAssessed(optionalTextSubmission.get(), correctionRound); + textSubmission = textSubmissionService.lockTextSubmissionToBeAssessed(textSubmission.getId(), correctionRound); textAssessmentService.prepareSubmissionForAssessment(textSubmission, textSubmission.getResultForCorrectionRound(correctionRound)); } diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index f2a2506dc1f5..78ae88017f7f 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -71,20 +71,20 @@ artemis: empty: default: "ubuntu:24.04" python: - default: "ls1tum/artemis-python-docker:latest" + default: "ls1tum/artemis-python-docker:v1.0.0" c: # possible overrides: gcc, fact - default: "ls1tum/artemis-c-docker:latest" - fact: "sharingcodeability/fact:latest" + default: "ls1tum/artemis-c-docker:v1.0.0" + fact: "sharingcodeability/fact:v0.0.5" haskell: default: "ghcr.io/uni-passau-artemis/artemis-haskell:v22.37.0" vhdl: - default: "tizianleonhardt/era-artemis-vhdl:latest" + default: "ghcr.io/ls1intum/artemis-vhdl-docker:v1.0.0" assembler: - default: "tizianleonhardt/era-artemis-assembler:latest" + default: "ghcr.io/ls1intum/artemis-assembler-docker:v1.0.0" swift: # possible overrides: xcode - default: "ls1tum/artemis-swift-swiftlint-docker:latest" + default: "ls1tum/artemis-swift-swiftlint-docker:swift5.9.2" ocaml: default: "ls1tum/artemis-ocaml-docker:v1" rust: @@ -98,7 +98,7 @@ artemis: c_sharp: default: "ghcr.io/ls1intum/artemis-csharp-docker:v1.0.0" typescript: - default: "ghcr.io/ls1intum/artemis-javascript-docker:v1.0.0" + default: "ghcr.io/ls1intum/artemis-javascript-docker:v1.0.0" # The following properties are used to configure the Artemis build agent. # The build agent is responsible for executing the buildJob to test student submissions. diff --git a/src/main/resources/config/liquibase/changelog/20240905161624_changelog.xml b/src/main/resources/config/liquibase/changelog/20240905161624_changelog.xml new file mode 100644 index 000000000000..43fb2528a950 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20240905161624_changelog.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/changelog/20241112123600_changelog.xml b/src/main/resources/config/liquibase/changelog/20241112123600_changelog.xml new file mode 100644 index 000000000000..c49a4b3c480a --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20241112123600_changelog.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index eac4d911931a..1e695e25fd46 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -25,6 +25,7 @@ + @@ -33,6 +34,7 @@ + diff --git a/src/main/resources/templates/haskell/test/test/Test.hs b/src/main/resources/templates/haskell/test/test/Test.hs index 024ec6008dfd..3f1ec81468e8 100644 --- a/src/main/resources/templates/haskell/test/test/Test.hs +++ b/src/main/resources/templates/haskell/test/test/Test.hs @@ -5,7 +5,9 @@ import qualified Interface as Sub import qualified Solution as Sol import Test.Tasty -import Test.Tasty.Runners.AntXML +import Test.Tasty.Ingredients (composeReporters) +import Test.Tasty.Ingredients.Basic (consoleTestReporter) +import Test.Tasty.Runners.AntXML import Test.SmallCheck.Series as SCS import Test.Tasty.SmallCheck as SC import Test.Tasty.QuickCheck as QC @@ -69,12 +71,12 @@ main = do testRunner $ localOption timeoutOption tests where resultsPath = "test-reports/results.xml" -#ifdef PROD - -- on the server (production mode), run tests with xml output - testRunner = defaultMainWithIngredients [antXMLRunner] +#ifdef PROD + -- on the server (production mode), run tests with additional xml output + testRunner = defaultMainWithIngredients [composeReporters antXMLRunner consoleTestReporter] #else -- locally, run tests with terminal output testRunner = defaultMain -#endif +#endif -- by default, run for 1 second timeoutOption = mkTimeout (1 * 10^6) diff --git a/src/main/webapp/app/admin/admin.route.ts b/src/main/webapp/app/admin/admin.route.ts index 81c3a096f66f..992b20b48c2b 100644 --- a/src/main/webapp/app/admin/admin.route.ts +++ b/src/main/webapp/app/admin/admin.route.ts @@ -20,6 +20,7 @@ import { BuildAgentSummaryComponent } from 'app/localci/build-agents/build-agent import { StandardizedCompetencyManagementComponent } from 'app/admin/standardized-competencies/standardized-competency-management.component'; import { BuildAgentDetailsComponent } from 'app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component'; import { AdminImportStandardizedCompetenciesComponent } from 'app/admin/standardized-competencies/import/admin-import-standardized-competencies.component'; +import { CleanupServiceComponent } from 'app/admin/cleanup-service/cleanup-service.component'; import { PendingChangesGuard } from 'app/shared/guard/pending-changes.guard'; export const adminState: Routes = [ @@ -150,6 +151,13 @@ export const adminState: Routes = [ (module) => module.IrisGlobalSettingsUpdateRoutingModule, ), }, + { + path: 'cleanup-service', + component: CleanupServiceComponent, + data: { + pageTitle: 'cleanupService.title', + }, + }, ...organizationMgmtRoute, ...userManagementRoute, ...systemNotificationManagementRoute, diff --git a/src/main/webapp/app/admin/cleanup-service/cleanup-operation.model.ts b/src/main/webapp/app/admin/cleanup-service/cleanup-operation.model.ts new file mode 100644 index 000000000000..920efd8ead02 --- /dev/null +++ b/src/main/webapp/app/admin/cleanup-service/cleanup-operation.model.ts @@ -0,0 +1,18 @@ +import { WritableSignal } from '@angular/core'; +import dayjs from 'dayjs/esm'; + +export type OperationName = + | 'deleteOrphans' + | 'deletePlagiarismComparisons' + | 'deleteNonRatedResults' + | 'deleteOldRatedResults' + | 'deleteOldSubmissionVersions' + | 'deleteOldFeedback'; + +export class CleanupOperation { + name: OperationName; + deleteFrom: dayjs.Dayjs; + deleteTo: dayjs.Dayjs; + lastExecuted: dayjs.Dayjs | undefined; + datesValid: WritableSignal; +} diff --git a/src/main/webapp/app/admin/cleanup-service/cleanup-service.component.html b/src/main/webapp/app/admin/cleanup-service/cleanup-service.component.html new file mode 100644 index 000000000000..aa1e021f066e --- /dev/null +++ b/src/main/webapp/app/admin/cleanup-service/cleanup-service.component.html @@ -0,0 +1,80 @@ +

+

+ +

+
+ + + + + + + + + + + + @for (operation of cleanupOperations; track operation) { + + + + + + + + } + +
+ + + @if (operation.name !== 'deleteOrphans') { +
+ +
+ } + 		+ @if (operation.name !== 'deleteOrphans') { +
+ +
+ @if (!operation.datesValid()) { + + } + } + 		+ @if (!operation.lastExecuted) { + {{ 'cleanupService.notRunYet' | artemisTranslate }} + } @else { + {{ operation.lastExecuted | artemisDate }} + } + + +
+
+
diff --git a/src/main/webapp/app/admin/cleanup-service/cleanup-service.component.ts b/src/main/webapp/app/admin/cleanup-service/cleanup-service.component.ts new file mode 100644 index 000000000000..fab6e37e6217 --- /dev/null +++ b/src/main/webapp/app/admin/cleanup-service/cleanup-service.component.ts @@ -0,0 +1,114 @@ +import { Component, OnInit, inject, signal } from '@angular/core'; +import dayjs from 'dayjs/esm'; +import { CleanupOperation } from 'app/admin/cleanup-service/cleanup-operation.model'; +import { convertDateFromServer } from 'app/utils/date.utils'; +import { Subject } from 'rxjs'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import { CleanupServiceExecutionRecordDTO, DataCleanupService } from 'app/admin/cleanup-service/data-cleanup.service'; +import { Observer } from 'rxjs'; +import { FormDateTimePickerModule } from 'app/shared/date-time-picker/date-time-picker.module'; +import { ArtemisSharedModule } from 'app/shared/shared.module'; + +@Component({ + selector: 'jhi-cleanup-service', + templateUrl: './cleanup-service.component.html', + standalone: true, + imports: [FormDateTimePickerModule, ArtemisSharedModule], +}) +export class CleanupServiceComponent implements OnInit { + private dialogErrorSource = new Subject(); + dialogError = this.dialogErrorSource.asObservable(); + + private dataCleanupService: DataCleanupService = inject(DataCleanupService); + + cleanupOperations: CleanupOperation[] = [ + { + name: 'deleteOrphans', + deleteFrom: dayjs().subtract(12, 'months'), + deleteTo: dayjs().subtract(6, 'months'), + lastExecuted: undefined, + datesValid: signal(true), + }, + { + name: 'deletePlagiarismComparisons', + deleteFrom: dayjs().subtract(12, 'months'), + deleteTo: dayjs().subtract(6, 'months'), + lastExecuted: undefined, + datesValid: signal(true), + }, + { + name: 'deleteNonRatedResults', + deleteFrom: dayjs().subtract(12, 'months'), + deleteTo: dayjs().subtract(6, 'months'), + lastExecuted: undefined, + datesValid: signal(true), + }, + { + name: 'deleteOldRatedResults', + deleteFrom: dayjs().subtract(12, 'months'), + deleteTo: dayjs().subtract(6, 'months'), + lastExecuted: undefined, + datesValid: signal(true), + }, + ]; + + ngOnInit(): void { + this.loadLastExecutions(); + } + + loadLastExecutions(): void { + this.dataCleanupService.getLastExecutions().subscribe((executionRecordsBody: HttpResponse) => { + const executionRecords = executionRecordsBody.body!; + if (executionRecords && executionRecords.length > 0) { + this.cleanupOperations.forEach((operation, index) => { + const executionRecord = executionRecords[index]; + if (executionRecord && executionRecord.executionDate) { + operation.lastExecuted = convertDateFromServer(executionRecord.executionDate); + } + }); + } + }); + } + + executeCleanupOperation(operation: CleanupOperation): void { + const subscriptionHandler = this.handleResponse(operation); + + switch (operation.name) { + case 'deleteOrphans': + this.dataCleanupService.deleteOrphans().subscribe(subscriptionHandler); + break; + case 'deletePlagiarismComparisons': + this.dataCleanupService.deletePlagiarismComparisons(operation.deleteFrom, operation.deleteTo).subscribe(subscriptionHandler); + break; + case 'deleteNonRatedResults': + this.dataCleanupService.deleteNonRatedResults(operation.deleteFrom, operation.deleteTo).subscribe(subscriptionHandler); + break; + case 'deleteOldRatedResults': + this.dataCleanupService.deleteOldRatedResults(operation.deleteFrom, operation.deleteTo).subscribe(subscriptionHandler); + break; + } + } + + private handleResponse(operation: CleanupOperation): Observer> { + return { + next: (response: HttpResponse) => { + this.dialogErrorSource.next(''); + const executionDateFromServer = convertDateFromServer(response.body!.executionDate); + operation.lastExecuted = executionDateFromServer; + }, + error: (error: any) => { + if (error instanceof HttpErrorResponse) { + this.dialogErrorSource.next(error.message); + } else { + this.dialogErrorSource.next('An unexpected error occurred.'); + } + }, + complete: () => {}, + }; + } + + validateDates(operation: CleanupOperation): void { + const datesValid = operation.deleteFrom && operation.deleteTo && dayjs(operation.deleteTo).isAfter(dayjs(operation.deleteFrom)); + operation.datesValid.set(datesValid); + } +} diff --git a/src/main/webapp/app/admin/cleanup-service/data-cleanup.service.ts b/src/main/webapp/app/admin/cleanup-service/data-cleanup.service.ts new file mode 100644 index 000000000000..4782b5055674 --- /dev/null +++ b/src/main/webapp/app/admin/cleanup-service/data-cleanup.service.ts @@ -0,0 +1,78 @@ +import { Injectable, inject } from '@angular/core'; +import { HttpClient, HttpResponse } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import dayjs from 'dayjs/esm'; +import { convertDateFromClient } from 'app/utils/date.utils'; + +export interface CleanupServiceExecutionRecordDTO { + executionDate: dayjs.Dayjs; + jobType: string; +} + +@Injectable({ providedIn: 'root' }) +export class DataCleanupService { + private readonly adminResourceUrl = 'api/admin/cleanup'; + private http = inject(HttpClient); + + /** + * Send DELETE request to delete orphaned data. + * @returns An observable of type HttpResponse. + */ + deleteOrphans(): Observable> { + return this.http.delete(`${this.adminResourceUrl}/orphans`, { + observe: 'response', + }); + } + + /** + * Send DELETE request to delete plagiarism comparisons within a specific date range. + * @param deleteFrom the start date from which plagiarism comparisons should be deleted + * @param deleteTo the end date until which plagiarism comparisons should be deleted + */ + deletePlagiarismComparisons(deleteFrom: dayjs.Dayjs, deleteTo: dayjs.Dayjs): Observable> { + const deleteFromString = convertDateFromClient(deleteFrom)!; + const deleteToString = convertDateFromClient(deleteTo)!; + return this.http.delete(`${this.adminResourceUrl}/plagiarism-comparisons`, { + params: { deleteFrom: deleteFromString, deleteTo: deleteToString }, + observe: 'response', + }); + } + + /** + * Send DELETE request to delete non-rated results within a specific date range. + * @param deleteFrom the start date from which non-rated results should be deleted + * @param deleteTo the end date until which non-rated results should be deleted + */ + deleteNonRatedResults(deleteFrom: dayjs.Dayjs, deleteTo: dayjs.Dayjs): Observable> { + const deleteFromString = convertDateFromClient(deleteFrom)!; + const deleteToString = convertDateFromClient(deleteTo)!; + return this.http.delete(`${this.adminResourceUrl}/non-rated-results`, { + params: { deleteFrom: deleteFromString, deleteTo: deleteToString }, + observe: 'response', + }); + } + + /** + * Send DELETE request to delete old rated results within a specific date range. + * @param deleteFrom the start date from which old rated results should be deleted + * @param deleteTo the end date until which old rated results should be deleted + */ + deleteOldRatedResults(deleteFrom: dayjs.Dayjs, deleteTo: dayjs.Dayjs): Observable> { + const deleteFromString = convertDateFromClient(deleteFrom)!; + const deleteToString = convertDateFromClient(deleteTo)!; + return this.http.delete(`${this.adminResourceUrl}/old-rated-results`, { + params: { deleteFrom: deleteFromString, deleteTo: deleteToString }, + observe: 'response', + }); + } + + /** + * Send GET request to get the last executions. + * @returns An observable of type HttpResponse. + */ + getLastExecutions(): Observable> { + return this.http.get(`${this.adminResourceUrl}/last-executions`, { + observe: 'response', + }); + } +} diff --git a/src/main/webapp/app/app-routing.module.ts b/src/main/webapp/app/app-routing.module.ts index ee02e755f3a2..6ab77a7e46d0 100644 --- a/src/main/webapp/app/app-routing.module.ts +++ b/src/main/webapp/app/app-routing.module.ts @@ -129,6 +129,11 @@ const LAYOUT_ROUTES: Routes = [navbarRoute, ...errorRoute]; path: 'courses', loadChildren: () => import('./overview/courses.module').then((m) => m.ArtemisCoursesModule), }, + { + path: 'course-management/:courseId/lectures/:lectureId/attachments/:attachmentId', + pathMatch: 'full', + loadComponent: () => import('./lecture/pdf-preview/pdf-preview.component').then((m) => m.PdfPreviewComponent), + }, // ===== GRADING SYSTEM ===== { path: 'courses/:courseId/grading-system', diff --git a/src/main/webapp/app/app.module.ts b/src/main/webapp/app/app.module.ts index 8f90b73a34cb..1e43beff4fc1 100644 --- a/src/main/webapp/app/app.module.ts +++ b/src/main/webapp/app/app.module.ts @@ -21,7 +21,7 @@ import { OrionOutdatedComponent } from 'app/shared/orion/outdated-plugin-warning import { LoadingNotificationComponent } from 'app/shared/notification/loading-notification/loading-notification.component'; import { NotificationPopupComponent } from 'app/shared/notification/notification-popup/notification-popup.component'; import { UserSettingsModule } from 'app/shared/user-settings/user-settings.module'; -import { ThemeModule } from 'app/core/theme/theme.module'; +import { ThemeSwitchComponent } from 'app/core/theme/theme-switch.component'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { FaIconLibrary } from '@fortawesome/angular-fontawesome'; import { artemisIconPack } from 'src/main/webapp/content/icons/icons'; @@ -42,7 +42,7 @@ import { ScrollingModule } from '@angular/cdk/scrolling'; ArtemisComplaintsModule, ArtemisHeaderExercisePageWithDetailsModule, UserSettingsModule, - ThemeModule, + ThemeSwitchComponent, ArtemisSharedComponentModule, ScrollingModule, ], diff --git a/src/main/webapp/app/core/theme/theme-switch.component.html b/src/main/webapp/app/core/theme/theme-switch.component.html index 24772ad09ea6..55581a7c807b 100644 --- a/src/main/webapp/app/core/theme/theme-switch.component.html +++ b/src/main/webapp/app/core/theme/theme-switch.component.html @@ -2,9 +2,9 @@
☾ ☾
-
{{ 'artemisApp.theme.sync' | artemisTranslate }}
+
- +
@@ -17,10 +17,10 @@ [triggers]="''" #popover="ngbPopover" [autoClose]="false" - [animation]="animate" - [placement]="popoverPlacement" + [animation]="true" + [placement]="popoverPlacement()" > -
+

- @if (irisCompetencyGenerationEnabled) { - + @if (irisCompetencyGenerationEnabled()) { + @@ -24,7 +24,7 @@

- @if (isLoading) { + @if (isLoading()) {
}
diff --git a/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts b/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts index e54e4f3975a1..c0c3c3936f71 100644 --- a/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts +++ b/src/main/webapp/app/course/competencies/competency-management/competency-management.component.ts @@ -1,9 +1,8 @@ -import { Component, OnDestroy, OnInit, inject, signal } from '@angular/core'; +import { Component, OnInit, computed, effect, inject, signal, untracked } from '@angular/core'; import { ActivatedRoute, RouterModule } from '@angular/router'; import { AlertService } from 'app/core/util/alert.service'; -import { Competency, CompetencyWithTailRelationDTO, CourseCompetency, CourseCompetencyType, getIcon } from 'app/entities/competency.model'; -import { onError } from 'app/shared/util/global.utils'; -import { Subject, Subscription } from 'rxjs'; +import { CompetencyWithTailRelationDTO, CourseCompetency, CourseCompetencyType, getIcon } from 'app/entities/competency.model'; +import { firstValueFrom, map } from 'rxjs'; import { faCircleQuestion, faEdit, faFileImport, faPencilAlt, faPlus, faRobot, faTrash } from '@fortawesome/free-solid-svg-icons'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; @@ -11,7 +10,6 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { PROFILE_IRIS } from 'app/app.constants'; import { FeatureToggle, FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service'; -import { Prerequisite } from 'app/entities/prerequisite.model'; import { ImportAllCourseCompetenciesModalComponent, ImportAllCourseCompetenciesResult, @@ -23,6 +21,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { CourseCompetenciesRelationModalComponent } from 'app/course/competencies/components/course-competencies-relation-modal/course-competencies-relation-modal.component'; import { CourseCompetencyExplanationModalComponent } from 'app/course/competencies/components/course-competency-explanation-modal/course-competency-explanation-modal.component'; +import { toSignal } from '@angular/core/rxjs-interop'; @Component({ selector: 'jhi-competency-management', @@ -30,20 +29,7 @@ import { CourseCompetencyExplanationModalComponent } from 'app/course/competenci standalone: true, imports: [CompetencyManagementTableComponent, TranslateDirective, FontAwesomeModule, RouterModule, ArtemisSharedComponentModule], }) -export class CompetencyManagementComponent implements OnInit, OnDestroy { - courseId: number; - isLoading = false; - irisCompetencyGenerationEnabled = false; - private dialogErrorSource = new Subject(); - dialogError = this.dialogErrorSource.asObservable(); - standardizedCompetenciesEnabled = false; - private standardizedCompetencySubscription: Subscription; - - competencies: Competency[] = []; - prerequisites: Prerequisite[] = []; - courseCompetencies: CourseCompetency[] = []; - - // Icons +export class CompetencyManagementComponent implements OnInit { protected readonly faEdit = faEdit; protected readonly faPlus = faPlus; protected readonly faFileImport = faFileImport; @@ -52,12 +38,10 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { protected readonly faRobot = faRobot; protected readonly faCircleQuestion = faCircleQuestion; - // other constants readonly getIcon = getIcon; readonly documentationType: DocumentationType = 'Competencies'; readonly CourseCompetencyType = CourseCompetencyType; - // Injected services private readonly activatedRoute = inject(ActivatedRoute); private readonly courseCompetencyApiService = inject(CourseCompetencyApiService); private readonly alertService = inject(AlertService); @@ -66,58 +50,61 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { private readonly irisSettingsService = inject(IrisSettingsService); private readonly featureToggleService = inject(FeatureToggleService); - ngOnInit(): void { - this.activatedRoute.parent!.params.subscribe(async (params) => { - this.courseId = Number(params['courseId']); - await this.loadData(); - this.loadIrisEnabled(); + readonly courseId = toSignal(this.activatedRoute.parent!.params.pipe(map((params) => Number(params.courseId))), { requireSync: true }); + readonly isLoading = signal(false); + + readonly courseCompetencies = signal([]); + competencies = computed(() => this.courseCompetencies().filter((cc) => cc.type === CourseCompetencyType.COMPETENCY)); + prerequisites = computed(() => this.courseCompetencies().filter((cc) => cc.type === CourseCompetencyType.PREREQUISITE)); + + private readonly irisEnabled = toSignal(this.profileService.getProfileInfo().pipe(map((profileInfo) => profileInfo?.activeProfiles?.includes(PROFILE_IRIS))), { + initialValue: false, + }); + + irisCompetencyGenerationEnabled = signal(false); + standardizedCompetenciesEnabled = toSignal(this.featureToggleService.getFeatureToggleActive(FeatureToggle.StandardizedCompetencies), { requireSync: true }); + + constructor() { + effect(() => { + const courseId = this.courseId(); + untracked(async () => await this.loadCourseCompetencies(courseId)); + }); + effect(() => { + const irisEnabled = this.irisEnabled(); + untracked(async () => { + if (irisEnabled) { + await this.loadIrisEnabled(); + } + }); }); + } + + ngOnInit(): void { const lastVisit = sessionStorage.getItem('lastTimeVisitedCourseCompetencyExplanation'); if (!lastVisit) { this.openCourseCompetencyExplanation(); } sessionStorage.setItem('lastTimeVisitedCourseCompetencyExplanation', Date.now().toString()); - this.standardizedCompetencySubscription = this.featureToggleService.getFeatureToggleActive(FeatureToggle.StandardizedCompetencies).subscribe((isActive) => { - this.standardizedCompetenciesEnabled = isActive; - }); } - ngOnDestroy() { - this.dialogErrorSource.unsubscribe(); - if (this.standardizedCompetencySubscription) { - this.standardizedCompetencySubscription.unsubscribe(); + private async loadIrisEnabled() { + try { + const combinedCourseSettings = await firstValueFrom(this.irisSettingsService.getCombinedCourseSettings(this.courseId())); + this.irisCompetencyGenerationEnabled.set(combinedCourseSettings?.irisCompetencyGenerationSettings?.enabled ?? false); + } catch (error) { + this.alertService.error(error); } } - /** - * Sends a request to determine if Iris and Competency Generation is enabled - * - * @private - */ - private loadIrisEnabled() { - this.profileService.getProfileInfo().subscribe((profileInfo) => { - const irisEnabled = profileInfo.activeProfiles.includes(PROFILE_IRIS); - if (irisEnabled) { - this.irisSettingsService.getCombinedCourseSettings(this.courseId).subscribe((settings) => { - this.irisCompetencyGenerationEnabled = settings?.irisCompetencyGenerationSettings?.enabled ?? false; - }); - } - }); - } - - /** - * Loads all data for the competency management: Prerequisites and competencies (with average course progress) - */ - async loadData() { + private async loadCourseCompetencies(courseId: number) { try { - this.isLoading = true; - this.courseCompetencies = await this.courseCompetencyApiService.getCourseCompetenciesByCourseId(this.courseId); - this.competencies = this.courseCompetencies.filter((competency) => competency.type === CourseCompetencyType.COMPETENCY); - this.prerequisites = this.courseCompetencies.filter((competency) => competency.type === CourseCompetencyType.PREREQUISITE); + this.isLoading.set(true); + const courseCompetencies = await this.courseCompetencyApiService.getCourseCompetenciesByCourseId(courseId); + this.courseCompetencies.set(courseCompetencies); } catch (error) { - onError(this.alertService, error); + this.alertService.error(error); } finally { - this.isLoading = false; + this.isLoading.set(false); } } @@ -127,8 +114,8 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { backdrop: 'static', windowClass: 'course-competencies-relation-graph-modal', }); - modalRef.componentInstance.courseId = signal(this.courseId); - modalRef.componentInstance.courseCompetencies = signal(this.courseCompetencies); + modalRef.componentInstance.courseId = signal(this.courseId()); + modalRef.componentInstance.courseCompetencies = signal(this.courseCompetencies()); } /** @@ -139,14 +126,14 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { size: 'lg', backdrop: 'static', }); - modalRef.componentInstance.courseId = signal(this.courseId); + modalRef.componentInstance.courseId = signal(this.courseId()); const importResults: ImportAllCourseCompetenciesResult | undefined = await modalRef.result; if (!importResults) { return; } const courseTitle = importResults.course.title ?? ''; try { - const importedCompetencies = await this.courseCompetencyApiService.importAllByCourseId(this.courseId, importResults.courseCompetencyImportOptions); + const importedCompetencies = await this.courseCompetencyApiService.importAllByCourseId(this.courseId(), importResults.courseCompetencyImportOptions); if (importedCompetencies.length) { this.alertService.success(`artemisApp.courseCompetency.importAll.success`, { noOfCompetencies: importedCompetencies.length, @@ -157,7 +144,7 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { this.alertService.warning(`artemisApp.courseCompetency.importAll.warning`, { courseTitle: courseTitle }); } } catch (error) { - onError(this.alertService, error); + this.alertService.error(error); } } @@ -167,18 +154,15 @@ export class CompetencyManagementComponent implements OnInit, OnDestroy { * @private */ updateDataAfterImportAll(res: Array) { - const importedCompetencies = res.map((dto) => dto.competency).filter((element): element is Competency => element?.type === CourseCompetencyType.COMPETENCY); - const importedPrerequisites = res.map((dto) => dto.competency).filter((element): element is Prerequisite => element?.type === CourseCompetencyType.PREREQUISITE); - - this.competencies = this.competencies.concat(importedCompetencies); - this.prerequisites = this.prerequisites.concat(importedPrerequisites); - this.courseCompetencies = this.competencies.concat(this.prerequisites); + const importedCourseCompetencies = res.map((dto) => dto.competency!); + const newCourseCompetencies = importedCourseCompetencies.filter( + (competency) => !this.courseCompetencies().some((existingCompetency) => existingCompetency.id === competency.id), + ); + this.courseCompetencies.update((courseCompetencies) => courseCompetencies.concat(newCourseCompetencies)); } onRemoveCompetency(competencyId: number) { - this.competencies = this.competencies.filter((competency) => competency.id !== competencyId); - this.prerequisites = this.prerequisites.filter((prerequisite) => prerequisite.id !== competencyId); - this.courseCompetencies = this.competencies.concat(this.prerequisites); + this.courseCompetencies.update((courseCompetencies) => courseCompetencies.filter((cc) => cc.id !== competencyId)); } openCourseCompetencyExplanation(): void { diff --git a/src/main/webapp/app/course/competencies/competency.service.ts b/src/main/webapp/app/course/competencies/competency.service.ts index 1cba4d5410c4..31fd10c6abb1 100644 --- a/src/main/webapp/app/course/competencies/competency.service.ts +++ b/src/main/webapp/app/course/competencies/competency.service.ts @@ -71,7 +71,7 @@ export class CompetencyService extends CourseCompetencyService { importAll(courseId: number, sourceCourseId: number, importRelations: boolean) { return this.httpClient.post>( - `${this.resourceURL}/courses/${courseId}/competencies/import-all/${sourceCourseId}`, + `${this.resourceURL}/courses/${courseId}/competencies/import-all`, { importExercises: false, importRelations: importRelations, diff --git a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html index afd6368b570d..56a6347b3aed 100644 --- a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html +++ b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html @@ -55,6 +55,7 @@ labelName="{{ 'artemisApp.' + courseCompetency?.type + '.create.softDueDate' | artemisTranslate }}" labelTooltip="{{ 'artemisApp.' + courseCompetency?.type + '.create.softDueDateHint' | artemisTranslate }}" formControlName="softDueDate" + [pickerType]="DateTimePickerType.CALENDAR" /> @if (!isInConnectMode) { diff --git a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts index cd512a1d12f6..e7c2cadf3ad4 100644 --- a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts +++ b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts @@ -15,6 +15,7 @@ import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.mo import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { merge } from 'rxjs'; import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; +import { DateTimePickerType } from 'app/shared/date-time-picker/date-time-picker.component'; @Component({ selector: 'jhi-common-course-competency-form', @@ -54,6 +55,7 @@ export class CommonCourseCompetencyFormComponent implements OnInit, OnChanges { onTitleOrDescriptionChange = new EventEmitter(); protected readonly competencyValidators = CourseCompetencyValidators; + protected readonly DateTimePickerType = DateTimePickerType; suggestedTaxonomies: string[] = []; diff --git a/src/main/webapp/app/course/learning-paths/components/competency-graph-modal/competency-graph-modal.component.ts b/src/main/webapp/app/course/learning-paths/components/competency-graph-modal/competency-graph-modal.component.ts index ac7a27af9f09..28594a2f49d9 100644 --- a/src/main/webapp/app/course/learning-paths/components/competency-graph-modal/competency-graph-modal.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/competency-graph-modal/competency-graph-modal.component.ts @@ -1,25 +1,26 @@ -import { Component, effect, inject, input, signal } from '@angular/core'; -import { FontAwesomeModule, IconDefinition } from '@fortawesome/angular-fontawesome'; +import { ChangeDetectionStrategy, Component, effect, inject, input, signal, untracked } from '@angular/core'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faXmark } from '@fortawesome/free-solid-svg-icons'; import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { CompetencyGraphComponent } from 'app/course/learning-paths/components/competency-graph/competency-graph.component'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; import { LearningPathApiService } from 'app/course/learning-paths/services/learning-path-api.service'; import { AlertService } from 'app/core/util/alert.service'; import { CompetencyGraphDTO } from 'app/entities/competency/learning-path.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-competency-graph-modal', standalone: true, - imports: [FontAwesomeModule, CompetencyGraphComponent, ArtemisSharedModule], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [FontAwesomeModule, CompetencyGraphComponent, TranslateDirective], templateUrl: './competency-graph-modal.component.html', styleUrl: './competency-graph-modal.component.scss', }) export class CompetencyGraphModalComponent { - protected readonly closeIcon: IconDefinition = faXmark; + protected readonly closeIcon = faXmark; - private readonly learningPathApiService: LearningPathApiService = inject(LearningPathApiService); - private readonly alertService: AlertService = inject(AlertService); + private readonly learningPathApiService = inject(LearningPathApiService); + private readonly alertService = inject(AlertService); readonly learningPathId = input.required(); @@ -28,7 +29,13 @@ export class CompetencyGraphModalComponent { private readonly activeModal: NgbActiveModal = inject(NgbActiveModal); constructor() { - effect(() => this.loadCompetencyGraph(this.learningPathId()), { allowSignalWrites: true }); + effect( + () => { + const learningPathId = this.learningPathId(); + untracked(() => this.loadCompetencyGraph(learningPathId)); + }, + { allowSignalWrites: true }, + ); } private async loadCompetencyGraph(learningPathId: number): Promise { diff --git a/src/main/webapp/app/course/learning-paths/components/competency-graph/competency-graph.component.ts b/src/main/webapp/app/course/learning-paths/components/competency-graph/competency-graph.component.ts index 88cd93ac83e2..0e0bbe4c14a1 100644 --- a/src/main/webapp/app/course/learning-paths/components/competency-graph/competency-graph.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/competency-graph/competency-graph.component.ts @@ -1,20 +1,18 @@ -import { Component, computed, effect, input, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, input, signal } from '@angular/core'; import { NgxGraphModule, NgxGraphZoomOptions } from '@swimlane/ngx-graph'; import { Subject } from 'rxjs'; -import { CompetencyGraphDTO, NodeType } from 'app/entities/competency/learning-path.model'; +import { CompetencyGraphDTO } from 'app/entities/competency/learning-path.model'; import { CompetencyNodeComponent, SizeUpdate } from 'app/course/learning-paths/components/competency-node/competency-node.component'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; @Component({ selector: 'jhi-competency-graph', standalone: true, - imports: [CompetencyNodeComponent, NgxGraphModule, ArtemisSharedModule], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [CompetencyNodeComponent, NgxGraphModule], templateUrl: './competency-graph.component.html', styleUrl: './competency-graph.component.scss', }) export class CompetencyGraphComponent { - protected readonly NodeType = NodeType; - readonly competencyGraph = input.required(); private readonly internalCompetencyGraph = signal({ diff --git a/src/main/webapp/app/course/learning-paths/components/competency-node/competency-node.component.ts b/src/main/webapp/app/course/learning-paths/components/competency-node/competency-node.component.ts index 5365bb22387b..e4d60b32ef47 100644 --- a/src/main/webapp/app/course/learning-paths/components/competency-node/competency-node.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/competency-node/competency-node.component.ts @@ -1,5 +1,5 @@ import { CommonModule } from '@angular/common'; -import { AfterViewInit, Component, ElementRef, computed, inject, input, output } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, computed, inject, input, output } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { NgbAccordionModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { NodeDimension } from '@swimlane/ngx-graph'; @@ -13,6 +13,7 @@ export interface SizeUpdate { @Component({ selector: 'jhi-learning-path-competency-node', standalone: true, + changeDetection: ChangeDetectionStrategy.OnPush, imports: [NgbDropdownModule, FontAwesomeModule, NgbAccordionModule, CommonModule], templateUrl: './competency-node.component.html', styleUrl: './competency-node.component.scss', diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-exercise/learning-path-exercise.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-exercise/learning-path-exercise.component.ts index 05f904046533..99f230ce1938 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-path-exercise/learning-path-exercise.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-path-exercise/learning-path-exercise.component.ts @@ -1,18 +1,19 @@ -import { Component, InputSignal, ViewContainerRef, effect, inject, input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ViewContainerRef, effect, inject, input } from '@angular/core'; import { CourseExerciseDetailsComponent } from 'app/overview/exercise-details/course-exercise-details.component'; import { CourseExerciseDetailsModule } from 'app/overview/exercise-details/course-exercise-details.module'; @Component({ selector: 'jhi-learning-path-exercise', standalone: true, + changeDetection: ChangeDetectionStrategy.OnPush, imports: [CourseExerciseDetailsModule], templateUrl: './learning-path-exercise.component.html', }) export class LearningPathExerciseComponent { - public readonly courseId: InputSignal = input.required(); - public readonly exerciseId: InputSignal = input.required(); + public readonly courseId = input.required(); + public readonly exerciseId = input.required(); - private readonly viewContainerRef: ViewContainerRef = inject(ViewContainerRef); + private readonly viewContainerRef = inject(ViewContainerRef); constructor() { effect(() => { diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts index 77f4cf3dd262..04822ff754d8 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts @@ -1,4 +1,4 @@ -import { Component, computed, effect, inject, input, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { AlertService } from 'app/core/util/alert.service'; import { LectureUnit, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model'; @@ -6,18 +6,19 @@ import { ArtemisLectureUnitsModule } from 'app/overview/course-lectures/lecture- import { LectureUnitCompletionEvent } from 'app/overview/course-lectures/course-lecture-details.component'; import { LearningPathNavigationService } from 'app/course/learning-paths/services/learning-path-navigation.service'; import { lastValueFrom } from 'rxjs'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; import { VideoUnitComponent } from 'app/overview/course-lectures/video-unit/video-unit.component'; import { TextUnitComponent } from 'app/overview/course-lectures/text-unit/text-unit.component'; import { AttachmentUnitComponent } from 'app/overview/course-lectures/attachment-unit/attachment-unit.component'; import { OnlineUnitComponent } from 'app/overview/course-lectures/online-unit/online-unit.component'; import { isCommunicationEnabled } from 'app/entities/course.model'; import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-learning-path-lecture-unit', standalone: true, - imports: [ArtemisLectureUnitsModule, ArtemisSharedModule, VideoUnitComponent, TextUnitComponent, AttachmentUnitComponent, OnlineUnitComponent, DiscussionSectionComponent], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ArtemisLectureUnitsModule, VideoUnitComponent, TextUnitComponent, AttachmentUnitComponent, OnlineUnitComponent, DiscussionSectionComponent, TranslateDirective], templateUrl: './learning-path-lecture-unit.component.html', }) export class LearningPathLectureUnitComponent { @@ -36,7 +37,13 @@ export class LearningPathLectureUnitComponent { readonly isCommunicationEnabled = computed(() => isCommunicationEnabled(this.lecture()?.course)); constructor() { - effect(() => this.loadLectureUnit(this.lectureUnitId()), { allowSignalWrites: true }); + effect( + () => { + const lectureUnitId = this.lectureUnitId(); + untracked(() => this.loadLectureUnit(lectureUnitId)); + }, + { allowSignalWrites: true }, + ); } async loadLectureUnit(lectureUnitId: number): Promise { diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts index 97609dd46c27..21c0fa4c1c32 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts @@ -1,47 +1,49 @@ -import { Component, InputSignal, OutputEmitterRef, Signal, WritableSignal, computed, effect, inject, input, output, signal, untracked } from '@angular/core'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, input, output, signal, untracked } from '@angular/core'; import { AlertService } from 'app/core/util/alert.service'; import { LearningPathApiService } from 'app/course/learning-paths/services/learning-path-api.service'; import { LearningPathNavigationService } from 'app/course/learning-paths/services/learning-path-navigation.service'; import { LearningPathNavigationObjectDTO } from 'app/entities/competency/learning-path.model'; -import { IconDefinition, faCheckCircle, faLock } from '@fortawesome/free-solid-svg-icons'; +import { faCheckCircle, faLock } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'; +import { CommonModule } from '@angular/common'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-learning-path-nav-overview-learning-objects', standalone: true, - imports: [NgbAccordionModule, FontAwesomeModule, ArtemisSharedModule], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [NgbAccordionModule, FontAwesomeModule, CommonModule, TranslateDirective], templateUrl: './learning-path-nav-overview-learning-objects.component.html', styleUrl: './learning-path-nav-overview-learning-objects.component.scss', }) export class LearningPathNavOverviewLearningObjectsComponent { - protected readonly faCheckCircle: IconDefinition = faCheckCircle; - protected readonly faLock: IconDefinition = faLock; + protected readonly faCheckCircle = faCheckCircle; + protected readonly faLock = faLock; - private readonly alertService: AlertService = inject(AlertService); - private readonly learningPathApiService: LearningPathApiService = inject(LearningPathApiService); + private readonly alertService = inject(AlertService); + private readonly learningPathApiService = inject(LearningPathApiService); private readonly learningPathNavigationService = inject(LearningPathNavigationService); - readonly learningPathId: InputSignal = input.required(); - readonly competencyId: InputSignal = input.required(); + readonly learningPathId = input.required(); + readonly competencyId = input.required(); // competency id of current competency of learning path (not the one of the selected learning object) - readonly currentCompetencyIdOnPath: InputSignal = input.required(); - readonly currentLearningObject: Signal = this.learningPathNavigationService.currentLearningObject; + readonly currentCompetencyIdOnPath = input.required(); + readonly currentLearningObject = this.learningPathNavigationService.currentLearningObject; - readonly isLoading: WritableSignal = signal(false); - readonly learningObjects: WritableSignal = signal(undefined); + readonly isLoading = signal(false); + readonly learningObjects = signal(undefined); - readonly nextLearningObjectOnPath: Signal = computed(() => + readonly nextLearningObjectOnPath = computed(() => this.competencyId() === this.currentCompetencyIdOnPath() ? this.learningObjects()?.find((learningObject) => !learningObject.completed) : undefined, ); - readonly onLearningObjectSelected: OutputEmitterRef = output(); + readonly onLearningObjectSelected = output(); constructor() { effect( () => { - untracked(async () => await this.loadLearningObjects()); + untracked(() => this.loadLearningObjects()); }, { allowSignalWrites: true }, ); diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts index 07722fb3d0e7..6bf5c49cea7a 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts @@ -1,46 +1,53 @@ -import { Component, InputSignal, OutputEmitterRef, Signal, WritableSignal, computed, effect, inject, input, output, signal, viewChild } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, input, output, signal, untracked, viewChild } from '@angular/core'; import { NgbAccordionDirective, NgbAccordionModule, NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { CommonModule } from '@angular/common'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { IconDefinition, faCheckCircle } from '@fortawesome/free-solid-svg-icons'; +import { faCheckCircle } from '@fortawesome/free-solid-svg-icons'; import { AlertService } from 'app/core/util/alert.service'; import { LearningPathCompetencyDTO } from 'app/entities/competency/learning-path.model'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; import { LearningPathApiService } from 'app/course/learning-paths/services/learning-path-api.service'; import { CompetencyGraphModalComponent } from 'app/course/learning-paths/components/competency-graph-modal/competency-graph-modal.component'; import { LearningPathNavOverviewLearningObjectsComponent } from 'app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component'; import { LearningPathNavigationService } from 'app/course/learning-paths/services/learning-path-navigation.service'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-learning-path-nav-overview', standalone: true, - imports: [FontAwesomeModule, CommonModule, NgbDropdownModule, NgbAccordionModule, ArtemisSharedModule, LearningPathNavOverviewLearningObjectsComponent], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [FontAwesomeModule, CommonModule, NgbDropdownModule, NgbAccordionModule, LearningPathNavOverviewLearningObjectsComponent, TranslateDirective], templateUrl: './learning-path-nav-overview.component.html', styleUrl: './learning-path-nav-overview.component.scss', }) export class LearningPathNavOverviewComponent { - protected readonly faCheckCircle: IconDefinition = faCheckCircle; + protected readonly faCheckCircle = faCheckCircle; - private readonly alertService: AlertService = inject(AlertService); - private readonly modalService: NgbModal = inject(NgbModal); - private readonly learningPathApiService: LearningPathApiService = inject(LearningPathApiService); + private readonly alertService = inject(AlertService); + private readonly modalService = inject(NgbModal); + private readonly learningPathApiService = inject(LearningPathApiService); private readonly learningPathNavigationService = inject(LearningPathNavigationService); - readonly learningPathId: InputSignal = input.required(); + readonly learningPathId = input.required(); - readonly competencyAccordion: Signal = viewChild.required(NgbAccordionDirective); + readonly competencyAccordion = viewChild.required(NgbAccordionDirective); - readonly onLearningObjectSelected: OutputEmitterRef = output(); - readonly isLoading: WritableSignal = signal(false); + readonly onLearningObjectSelected = output(); + readonly isLoading = signal(false); readonly competencies = signal([]); // competency id of currently selected learning object - readonly currentCompetencyId: Signal = computed(() => this.learningPathNavigationService.currentLearningObject()?.competencyId); + readonly currentCompetencyId = computed(() => this.learningPathNavigationService.currentLearningObject()?.competencyId); // current competency of learning path (not the one of the selected learning object) - readonly currentCompetencyOnPath: Signal = computed(() => this.competencies()?.find((competency) => competency.masteryProgress < 1)); + readonly currentCompetencyOnPath = computed(() => this.competencies()?.find((competency) => competency.masteryProgress < 1)); constructor() { - effect(async () => await this.loadCompetencies(this.learningPathId()), { allowSignalWrites: true }); + effect( + () => { + const learningPathId = this.learningPathId(); + untracked(() => this.loadCompetencies(learningPathId)); + }, + { allowSignalWrites: true }, + ); } async loadCompetencies(learningPathId: number): Promise { diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts index d243c506179b..dd938e28bd80 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts @@ -1,17 +1,18 @@ -import { Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; import { LearningPathNavigationObjectDTO } from 'app/entities/competency/learning-path.model'; import { CommonModule } from '@angular/common'; import { NgbAccordionModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faCheckCircle, faChevronDown, faChevronLeft, faChevronRight, faFlag, faSpinner } from '@fortawesome/free-solid-svg-icons'; import { LearningPathNavOverviewComponent } from 'app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; import { LearningPathNavigationService } from 'app/course/learning-paths/services/learning-path-navigation.service'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-learning-path-student-nav', standalone: true, - imports: [CommonModule, NgbDropdownModule, NgbAccordionModule, FontAwesomeModule, LearningPathNavOverviewComponent, ArtemisSharedModule], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [CommonModule, NgbDropdownModule, NgbAccordionModule, FontAwesomeModule, LearningPathNavOverviewComponent, TranslateDirective], templateUrl: './learning-path-student-nav.component.html', styleUrl: './learning-path-student-nav.component.scss', }) diff --git a/src/main/webapp/app/course/learning-paths/components/learning-paths-analytics/learning-paths-analytics.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-paths-analytics/learning-paths-analytics.component.ts index 41a8261eb206..6c2678d30c5a 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-paths-analytics/learning-paths-analytics.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-paths-analytics/learning-paths-analytics.component.ts @@ -1,15 +1,17 @@ -import { Component, effect, inject, input, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component, effect, inject, input, signal, untracked } from '@angular/core'; import { LearningPathApiService } from 'app/course/learning-paths/services/learning-path-api.service'; import { CompetencyGraphDTO, CompetencyGraphNodeValueType } from 'app/entities/competency/learning-path.model'; import { AlertService } from 'app/core/util/alert.service'; -import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { CompetencyGraphComponent } from 'app/course/learning-paths/components/competency-graph/competency-graph.component'; import { onError } from 'app/shared/util/global.utils'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { CommonModule } from '@angular/common'; @Component({ selector: 'jhi-learning-paths-analytics', standalone: true, - imports: [ArtemisSharedCommonModule, CompetencyGraphComponent], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [CompetencyGraphComponent, TranslateDirective, CommonModule], templateUrl: './learning-paths-analytics.component.html', styleUrl: './learning-paths-analytics.component.scss', }) @@ -27,7 +29,13 @@ export class LearningPathsAnalyticsComponent { readonly valueSelection = signal(CompetencyGraphNodeValueType.AVERAGE_MASTERY_PROGRESS); constructor() { - effect(() => this.loadInstructionCompetencyGraph(this.courseId()), { allowSignalWrites: true }); + effect( + () => { + const courseId = this.courseId(); + untracked(() => this.loadInstructionCompetencyGraph(courseId)); + }, + { allowSignalWrites: true }, + ); } private async loadInstructionCompetencyGraph(courseId: number): Promise { diff --git a/src/main/webapp/app/course/learning-paths/components/learning-paths-configuration/learning-paths-configuration.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-paths-configuration/learning-paths-configuration.component.ts index 23e5cb8e8612..6f2d305f54cc 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-paths-configuration/learning-paths-configuration.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-paths-configuration/learning-paths-configuration.component.ts @@ -1,17 +1,18 @@ -import { Component, computed, effect, inject, input, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; import { LearningPathApiService } from '../../services/learning-path-api.service'; import { LearningPathsConfigurationDTO } from 'app/entities/competency/learning-path.model'; import { AlertService } from 'app/core/util/alert.service'; import { onError } from 'app/shared/util/global.utils'; -import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; @Component({ selector: 'jhi-learning-paths-configuration', standalone: true, - imports: [FontAwesomeModule, ArtemisSharedCommonModule, ArtemisSharedComponentModule], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [FontAwesomeModule, ArtemisSharedComponentModule, TranslateDirective], templateUrl: './learning-paths-configuration.component.html', styleUrls: ['../../pages/learning-path-instructor-page/learning-path-instructor-page.component.scss'], }) @@ -32,7 +33,13 @@ export class LearningPathsConfigurationComponent { readonly includeAllGradedExercisesEnabled = computed(() => this.learningPathsConfiguration()?.includeAllGradedExercises ?? false); constructor() { - effect(() => this.loadLearningPathsConfiguration(this.courseId()), { allowSignalWrites: true }); + effect( + () => { + const courseId = this.courseId(); + untracked(() => this.loadLearningPathsConfiguration(courseId)); + }, + { allowSignalWrites: true }, + ); } private async loadLearningPathsConfiguration(courseId: number): Promise { diff --git a/src/main/webapp/app/course/learning-paths/components/learning-paths-state/learning-paths-state.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-paths-state/learning-paths-state.component.ts index e5fc57092472..a8460830ca71 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-paths-state/learning-paths-state.component.ts +++ b/src/main/webapp/app/course/learning-paths/components/learning-paths-state/learning-paths-state.component.ts @@ -1,16 +1,19 @@ -import { Component, computed, effect, inject, input, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; import { LearningPathApiService } from 'app/course/learning-paths/services/learning-path-api.service'; import { HealthStatus, LearningPathHealthDTO } from 'app/entities/competency/learning-path-health.model'; import { AlertService } from 'app/core/util/alert.service'; import { onError } from 'app/shared/util/global.utils'; -import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { ActivatedRoute, Router } from '@angular/router'; import { faSpinner } from '@fortawesome/free-solid-svg-icons'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { CommonModule } from '@angular/common'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @Component({ selector: 'jhi-learning-paths-state', standalone: true, - imports: [ArtemisSharedCommonModule], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [TranslateDirective, CommonModule, FontAwesomeModule], templateUrl: './learning-paths-state.component.html', styleUrls: ['./learning-paths-state.component.scss', '../../pages/learning-path-instructor-page/learning-path-instructor-page.component.scss'], }) @@ -42,7 +45,13 @@ export class LearningPathsStateComponent { readonly learningPathHealthState = computed(() => this.learningPathHealth()?.status ?? []); constructor() { - effect(() => this.loadLearningPathHealthState(this.courseId()), { allowSignalWrites: true }); + effect( + () => { + const courseId = this.courseId(); + untracked(() => this.loadLearningPathHealthState(courseId)); + }, + { allowSignalWrites: true }, + ); } protected async loadLearningPathHealthState(courseId: number): Promise { diff --git a/src/main/webapp/app/course/learning-paths/components/learning-paths-table/learning-paths-table.component.html b/src/main/webapp/app/course/learning-paths/components/learning-paths-table/learning-paths-table.component.html index 4f4b23a690e0..a97a5bbcd377 100644 --- a/src/main/webapp/app/course/learning-paths/components/learning-paths-table/learning-paths-table.component.html +++ b/src/main/webapp/app/course/learning-paths/components/learning-paths-table/learning-paths-table.component.html @@ -55,6 +55,7 @@
(false); constructor() { - effect(() => this.loadCourse(this.courseId()), { allowSignalWrites: true }); + effect( + () => { + const courseId = this.courseId(); + untracked(() => this.loadCourse(courseId)); + }, + { allowSignalWrites: true }, + ); } private async loadCourse(courseId: number): Promise { diff --git a/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts b/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts index 7d83742015f0..72c77fbf2d40 100644 --- a/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts +++ b/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts @@ -1,4 +1,4 @@ -import { Component, effect, inject, signal } from '@angular/core'; +import { ChangeDetectionStrategy, Component, effect, inject, signal, untracked } from '@angular/core'; import { LearningObjectType, LearningPathDTO } from 'app/entities/competency/learning-path.model'; import { map } from 'rxjs'; import { toSignal } from '@angular/core/rxjs-interop'; @@ -16,6 +16,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive'; selector: 'jhi-learning-path-student-page', templateUrl: './learning-path-student-page.component.html', styleUrl: './learning-path-student-page.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [LearningPathNavComponent, LearningPathLectureUnitComponent, LearningPathExerciseComponent, TranslateDirective], }) @@ -34,7 +35,13 @@ export class LearningPathStudentPageComponent { readonly isLearningPathNavigationLoading = this.learningPathNavigationService.isLoading; constructor() { - effect(() => this.loadLearningPath(this.courseId()), { allowSignalWrites: true }); + effect( + () => { + const courseId = this.courseId(); + untracked(() => this.loadLearningPath(courseId)); + }, + { allowSignalWrites: true }, + ); } private async loadLearningPath(courseId: number): Promise { diff --git a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html index 11e5ee4c828f..ba2349c564d3 100644 --- a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html +++ b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html @@ -1,7 +1,7 @@ @if (headlines?.length && headlines.length > 1) { } -@for (section of sections; track section) { +@for (section of sections(); track section) {

{{ section.headline | artemisTranslate }}

@for (detail of section.details; track $index) { diff --git a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts index 25a5a6ca72e6..27eeca162243 100644 --- a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts +++ b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts @@ -1,7 +1,7 @@ -import { Component, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewEncapsulation, inject, input } from '@angular/core'; import { isEmpty } from 'lodash-es'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; -import { ButtonSize, TooltipPlacement } from 'app/shared/components/button.component'; +import { ButtonSize } from 'app/shared/components/button.component'; import { IrisSubSettingsType } from 'app/entities/iris/settings/iris-sub-settings.model'; import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service'; import { AlertService } from 'app/core/util/alert.service'; @@ -50,11 +50,13 @@ export class DetailOverviewListComponent implements OnInit, OnDestroy { protected readonly FeatureToggle = FeatureToggle; protected readonly ButtonSize = ButtonSize; protected readonly ProgrammingExerciseParticipationType = ProgrammingExerciseParticipationType; + protected readonly CHAT = IrisSubSettingsType.CHAT; - readonly CHAT = IrisSubSettingsType.CHAT; + private readonly modelingExerciseService = inject(ModelingExerciseService); + private readonly alertService = inject(AlertService); + private readonly profileService = inject(ProfileService); - @Input() - sections: DetailOverviewSection[]; + sections = input.required(); // headline list for navigation bar headlines: { id: string; translationKey: string }[]; @@ -64,14 +66,8 @@ export class DetailOverviewListComponent implements OnInit, OnDestroy { profileSubscription: Subscription; isLocalVC = false; - constructor( - private modelingExerciseService: ModelingExerciseService, - private alertService: AlertService, - private profileService: ProfileService, - ) {} - ngOnInit() { - this.headlines = this.sections.map((section) => { + this.headlines = this.sections().map((section) => { return { id: section.headline.replaceAll('.', '-'), translationKey: section.headline, @@ -98,6 +94,4 @@ export class DetailOverviewListComponent implements OnInit, OnDestroy { ngOnDestroy() { this.profileSubscription?.unsubscribe(); } - - protected readonly TooltipPlacement = TooltipPlacement; } diff --git a/src/main/webapp/app/entities/competency.model.ts b/src/main/webapp/app/entities/competency.model.ts index a48748c22c07..a1e01a1afb71 100644 --- a/src/main/webapp/app/entities/competency.model.ts +++ b/src/main/webapp/app/entities/competency.model.ts @@ -80,6 +80,7 @@ export abstract class CourseCompetency extends BaseCompetency { protected constructor(type: CourseCompetencyType) { super(); this.type = type; + this.masteryThreshold = DEFAULT_MASTERY_THRESHOLD; } } diff --git a/src/main/webapp/app/entities/metis/conversation/one-to-one-chat.model.ts b/src/main/webapp/app/entities/metis/conversation/one-to-one-chat.model.ts index 76f59620f516..d6c8d128596d 100644 --- a/src/main/webapp/app/entities/metis/conversation/one-to-one-chat.model.ts +++ b/src/main/webapp/app/entities/metis/conversation/one-to-one-chat.model.ts @@ -15,3 +15,10 @@ export class OneToOneChatDTO extends ConversationDTO { export function isOneToOneChatDTO(conversation: ConversationDTO): conversation is OneToOneChatDTO { return conversation.type === ConversationType.ONE_TO_ONE; } + +export function getAsOneToOneChatDTO(conversation: ConversationDTO | undefined): OneToOneChatDTO | undefined { + if (!conversation) { + return undefined; + } + return isOneToOneChatDTO(conversation) ? conversation : undefined; +} diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.html b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.html index 7f8623e91b52..cdde46506c49 100644 --- a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.html +++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.html @@ -1,7 +1,7 @@

{{ exercise.title }} [{{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}] + >[{{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.exercisePoints' | artemisTranslate }}] @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { } diff --git a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html index 9d56b746c3c9..9e626d906094 100644 --- a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html +++ b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html @@ -14,9 +14,11 @@

-
- -
+
+
+ +
+
}
} -
+
@switch (exercise.type) { @case (QUIZ) { - + @if (exercise.studentParticipations[0].submissions) { + + } } @case (FILEUPLOAD) { - + @if (exercise.studentParticipations[0].submissions) { + + } } @case (TEXT) { - + @if (exercise.studentParticipations[0].submissions) { + + } } @case (MODELING) { - + @if (exercise.studentParticipations[0].submissions) { + + } } @case (PROGRAMMING) { +
@for (informationBoxData of examInformationBoxData; track informationBoxData) { -
- - - @if (informationBoxData.contentComponent === 'formatedDate') { - - {{ informationBoxData.content | artemisDate: 'long-date' }} - - - {{ informationBoxData.content | artemisDate: 'time' }} - - } @else if (informationBoxData.contentComponent === 'workingTime') { - - } - - -
+ + + @if (informationBoxData.content.type === 'dateTime') { + {{ informationBoxData.content.value | artemisDate }} + } + @if (informationBoxData.content.type === 'workingTime') { + + } + + }
- +
diff --git a/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts b/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts index 33237b989106..3f02da6bab2b 100644 --- a/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts +++ b/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; -import { InformationBox, InformationBoxComponent } from 'app/shared/information-box/information-box.component'; +import { InformationBox, InformationBoxComponent, InformationBoxContent } from 'app/shared/information-box/information-box.component'; import { Exam } from 'app/entities/exam/exam.model'; import { StudentExam } from 'app/entities/student-exam.model'; import { ArtemisExamSharedModule } from 'app/exam/shared/exam-shared.module'; @@ -45,45 +45,78 @@ export class ExamStartInformationComponent implements OnInit { this.prepareInformationBoxData(); } - buildInformationBox(boxTitle: string, boxContent: string | number, boxContentComponent?: string): InformationBox { + buildInformationBox(boxTitle: string, boxContent: InformationBoxContent, isContentComponent = false): InformationBox { const examInformationBoxData: InformationBox = { title: boxTitle ?? '', - content: boxContent ?? '', - contentComponent: boxContentComponent, + content: boxContent, + isContentComponent: isContentComponent, }; return examInformationBoxData; } prepareInformationBoxData(): void { if (this.moduleNumber) { - const informationBoxModuleNumber = this.buildInformationBox('artemisApp.exam.moduleNumber', this.moduleNumber!); + const boxContentModuleNumber: InformationBoxContent = { + type: 'string', + value: this.moduleNumber, + }; + const informationBoxModuleNumber = this.buildInformationBox('artemisApp.exam.moduleNumber', boxContentModuleNumber); this.examInformationBoxData.push(informationBoxModuleNumber); } if (this.courseName) { - const informationBoxCourseName = this.buildInformationBox('artemisApp.exam.course', this.courseName!); + const boxContentCourseName: InformationBoxContent = { + type: 'string', + value: this.courseName, + }; + const informationBoxCourseName = this.buildInformationBox('artemisApp.exam.course', boxContentCourseName); this.examInformationBoxData.push(informationBoxCourseName); } if (this.examiner) { - const informationBoxExaminer = this.buildInformationBox('artemisApp.examManagement.examiner', this.examiner!); + const boxContentExaminer: InformationBoxContent = { + type: 'string', + value: this.examiner, + }; + const informationBoxExaminer = this.buildInformationBox('artemisApp.examManagement.examiner', boxContentExaminer); this.examInformationBoxData.push(informationBoxExaminer); } if (this.examinedStudent) { - const informationBoxExaminedStudent = this.buildInformationBox('artemisApp.exam.examinedStudent', this.examinedStudent!); + const boxContentExaminedStudent: InformationBoxContent = { + type: 'string', + value: this.examinedStudent, + }; + const informationBoxExaminedStudent = this.buildInformationBox('artemisApp.exam.examinedStudent', boxContentExaminedStudent); this.examInformationBoxData.push(informationBoxExaminedStudent); } if (this.startDate) { - const informationBoxStartDate = this.buildInformationBox('artemisApp.exam.date', this.startDate.toString(), 'formatedDate'); + const boxContentStartDate: InformationBoxContent = { + type: 'dateTime', + value: this.startDate, + }; + const informationBoxStartDate = this.buildInformationBox('artemisApp.exam.date', boxContentStartDate, true); this.examInformationBoxData.push(informationBoxStartDate); } - const informationBoxTotalWorkingTime = this.buildInformationBox('artemisApp.exam.workingTime', this.exam.workingTime!, 'workingTime'); + const boxContentExamWorkingTime: InformationBoxContent = { + type: 'workingTime', + value: this.studentExam, + }; + + const informationBoxTotalWorkingTime = this.buildInformationBox('artemisApp.exam.workingTime', boxContentExamWorkingTime, true); this.examInformationBoxData.push(informationBoxTotalWorkingTime); + const boxContentTotalPoints: InformationBoxContent = { + type: 'string', + value: this.totalPoints?.toString() ?? '', + }; - const informationBoxTotalPoints = this.buildInformationBox('artemisApp.exam.points', this.totalPoints!.toString()); + const informationBoxTotalPoints = this.buildInformationBox('artemisApp.exam.points', boxContentTotalPoints); this.examInformationBoxData.push(informationBoxTotalPoints); if (this.numberOfExercisesInExam) { - const informationBoxNumberOfExercises = this.buildInformationBox('artemisApp.exam.exercises', this.numberOfExercisesInExam!.toString()); + const boxContent: InformationBoxContent = { + type: 'string', + value: this.numberOfExercisesInExam?.toString(), + }; + const informationBoxNumberOfExercises = this.buildInformationBox('artemisApp.exam.exercises', boxContent); this.examInformationBoxData.push(informationBoxNumberOfExercises); } } diff --git a/src/main/webapp/app/exam/participate/exercises/exam-submission-components.module.ts b/src/main/webapp/app/exam/participate/exercises/exam-submission-components.module.ts index 0611ec06032b..72fb6667e806 100644 --- a/src/main/webapp/app/exam/participate/exercises/exam-submission-components.module.ts +++ b/src/main/webapp/app/exam/participate/exercises/exam-submission-components.module.ts @@ -18,6 +18,7 @@ import { ArtemisCodeEditorModule } from 'app/exercises/programming/shared/code-e import { ArtemisFullscreenModule } from 'app/shared/fullscreen/fullscreen.module'; import { ArtemisModelingEditorModule } from 'app/exercises/modeling/shared/modeling-editor.module'; import { ArtemisProgrammingSubmissionPolicyStatusModule } from 'app/exercises/programming/participate/programming-submission-policy-status.module'; +import { ExerciseSaveButtonComponent } from './exercise-save-button/exercise-save-button.component'; @NgModule({ declarations: [ @@ -42,6 +43,7 @@ import { ArtemisProgrammingSubmissionPolicyStatusModule } from 'app/exercises/pr ArtemisModelingEditorModule, ArtemisProgrammingSubmissionPolicyStatusModule, ExamExerciseUpdateHighlighterModule, + ExerciseSaveButtonComponent, ], exports: [FileUploadExamSubmissionComponent, QuizExamSubmissionComponent, ProgrammingExamSubmissionComponent, TextExamSubmissionComponent, ModelingExamSubmissionComponent], }) diff --git a/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.html b/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.html new file mode 100644 index 000000000000..8ec143ed83ee --- /dev/null +++ b/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.html @@ -0,0 +1,8 @@ + diff --git a/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.scss b/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.scss new file mode 100644 index 000000000000..0b4d4eb0b98c --- /dev/null +++ b/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.scss @@ -0,0 +1,3 @@ +.saved { + --fa-secondary-opacity: 1; +} diff --git a/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.ts b/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.ts new file mode 100644 index 000000000000..01e627a6941f --- /dev/null +++ b/src/main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component.ts @@ -0,0 +1,25 @@ +import { Component, input, output } from '@angular/core'; +import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { faFloppyDisk } from '@fortawesome/free-solid-svg-icons'; +import { facSaveSuccess } from '../../../../../content/icons/icons'; +import { Submission } from 'app/entities/submission.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; + +@Component({ + selector: 'jhi-exercise-save-button', + templateUrl: './exercise-save-button.component.html', + styleUrls: ['./exercise-save-button.component.scss'], + standalone: true, + imports: [FaIconComponent, TranslateDirective], +}) +export class ExerciseSaveButtonComponent { + protected readonly faFloppyDisk = faFloppyDisk; + protected readonly facSaveSuccess = facSaveSuccess; + + submission = input(); + save = output(); + + onSave() { + this.save.emit(); + } +} diff --git a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html index be860bc79852..e85e710164e9 100644 --- a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html @@ -3,14 +3,14 @@

{{ exercise.exerciseGroup?.title }} - -  ({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) { - , {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }} - }) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { - - } + + + @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { + + }

diff --git a/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.html index aa3306277c53..d1e89ff3f1ea 100644 --- a/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.html @@ -1,17 +1,20 @@ @if (exercise) { -

- - {{ exercise.exerciseGroup?.title }} - - -  ({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) { +
+

+ + {{ exercise.exerciseGroup?.title }} + , {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }} - }) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { - - } -

+ [jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'" + [translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }" + > + + @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { + + } +

+ +
@@ -38,7 +41,7 @@

-   +   diff --git a/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts index 60957411fcf8..d16f4d56ff6d 100644 --- a/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/modeling/modeling-exam-submission.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, ViewChild, input, output } from '@angular/core'; import { UMLModel } from '@ls1intum/apollon'; import dayjs from 'dayjs/esm'; import { ModelingSubmission } from 'app/entities/modeling-submission.model'; @@ -34,12 +34,17 @@ export class ModelingExamSubmissionComponent extends ExamSubmissionComponent imp exercise: ModelingExercise; umlModel: UMLModel; // input model for Apollon+ + // explicitly needed to track if submission.isSynced is changed, otherwise component + // does not update the state due to onPush strategy + isSubmissionSynced = input(); + saveCurrentExercise = output(); + explanationText: string; // current explanation text readonly IncludedInOverallScore = IncludedInOverallScore; // Icons - farListAlt = faListAlt; + protected readonly faListAlt = faListAlt; constructor(changeDetectorReference: ChangeDetectorRef) { super(changeDetectorReference); @@ -154,4 +159,11 @@ export class ModelingExamSubmissionComponent extends ExamSubmissionComponent imp this.changeDetectorReference.detectChanges(); } } + + /** + * Trigger save action in exam participation component + */ + notifyTriggerSave() { + this.saveCurrentExercise.emit(); + } } diff --git a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html index 2bb8078c07ce..35129261f2ec 100644 --- a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.html @@ -2,14 +2,14 @@

{{ exercise.exerciseGroup?.title }} - -  ({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) { - , {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }} - }) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { - - } + + + @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { + + }

diff --git a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html index ace69b781b7e..3bbe2afbdfe3 100644 --- a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.html @@ -1,14 +1,15 @@ -

- - {{ quizConfiguration.exerciseGroup?.title }} - - ({{ quizConfiguration.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}) +
+

+ + {{ quizConfiguration.exerciseGroup?.title }} + + @if (quizConfiguration.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { } - -

+

+ +
diff --git a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts index f967003238ba..26aa88a762d5 100644 --- a/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/quiz/quiz-exam-submission.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, Input, OnInit, QueryList, ViewChildren } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnInit, QueryList, ViewChildren, output } from '@angular/core'; import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { AbstractQuizSubmission } from 'app/entities/quiz/abstract-quiz-exam-submission.model'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; @@ -53,6 +53,8 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme @Input() examTimeline = false; @Input() quizConfiguration: QuizConfiguration; + saveCurrentExercise = output(); + selectedAnswerOptions = new Map(); dragAndDropMappings = new Map(); shortAnswerSubmittedTexts = new Map(); @@ -285,4 +287,11 @@ export class QuizExamSubmissionComponent extends ExamSubmissionComponent impleme this.submissionVersion = submissionVersion; this.updateViewFromSubmissionVersion(); } + + /** + * Trigger save action in exam participation component + */ + notifyTriggerSave() { + this.saveCurrentExercise.emit(); + } } diff --git a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html index cc0a6fba438f..4087130be3ea 100644 --- a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html +++ b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html @@ -1,17 +1,20 @@ @if (exercise) { -

- - {{ exercise.exerciseGroup?.title }} - - -  ({{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) { +
+

+ + {{ exercise.exerciseGroup?.title }} + , {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }} - }) @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { - - } -

+ [jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'" + [translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }" + > + + @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { + + } +

+ +
@@ -40,7 +43,7 @@

-   +   diff --git a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts index 3a493af08507..cb2dc3c0fd51 100644 --- a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts +++ b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnInit, output } from '@angular/core'; import { TextEditorService } from 'app/exercises/text/participate/text-editor.service'; import { Subject } from 'rxjs'; import { TextSubmission } from 'app/entities/text/text-submission.model'; @@ -6,7 +6,7 @@ import { StringCountService } from 'app/exercises/text/participate/string-count. import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model'; import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component'; import { Submission } from 'app/entities/submission.model'; -import { faListAlt } from '@fortawesome/free-regular-svg-icons'; +import { faListAlt } from '@fortawesome/free-solid-svg-icons'; import { MAX_SUBMISSION_TEXT_LENGTH } from 'app/shared/constants/input.constants'; import { SubmissionVersion } from 'app/entities/submission-version.model'; import { htmlForMarkdown } from 'app/shared/util/markdown.conversion.util'; @@ -26,6 +26,8 @@ export class TextExamSubmissionComponent extends ExamSubmissionComponent impleme @Input() exercise: Exercise; + saveCurrentExercise = output(); + readonly IncludedInOverallScore = IncludedInOverallScore; readonly maxCharacterCount = MAX_SUBMISSION_TEXT_LENGTH; @@ -35,7 +37,7 @@ export class TextExamSubmissionComponent extends ExamSubmissionComponent impleme private textEditorInput = new Subject(); // Icons - farListAlt = faListAlt; + protected readonly faListAlt = faListAlt; constructor( private textService: TextEditorService, @@ -121,4 +123,11 @@ export class TextExamSubmissionComponent extends ExamSubmissionComponent impleme this.submissionVersion = submissionVersion; this.updateViewFromSubmissionVersion(); } + + /** + * Trigger save action in exam participation component + */ + notifyTriggerSave() { + this.saveCurrentExercise.emit(); + } } diff --git a/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.html b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.html index 74dfce8f5638..4c9d11e7aab6 100644 --- a/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.html +++ b/src/main/webapp/app/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.html @@ -11,7 +11,7 @@
@if (resultsPublished && exerciseInfo?.achievedPoints !== undefined) {
- [{{ exerciseInfo?.achievedPoints }} / {{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}] + [{{ exerciseInfo?.achievedPoints }} / {{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.exercisePoints' | artemisTranslate }}]
@if (exerciseInfo?.resultIconClass) { @@ -22,7 +22,7 @@
} @else { - [{{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}] + [{{ exercise.maxPoints }} {{ 'artemisApp.examParticipation.exercisePoints' | artemisTranslate }}] }
diff --git a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise.component.ts b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise.component.ts index 01fe874b2afd..0874dea0faf6 100644 --- a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise.component.ts +++ b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise.component.ts @@ -1,28 +1,30 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, inject } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; -import { ActivatedRoute, Router } from '@angular/router'; -import { TranslateService } from '@ngx-translate/core'; import { filter } from 'rxjs/operators'; import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { FileUploadExerciseService } from './file-upload-exercise.service'; import { ExerciseComponent } from 'app/exercises/shared/exercise/exercise.component'; import { onError } from 'app/shared/util/global.utils'; import { AccountService } from 'app/core/auth/account.service'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; import { SortService } from 'app/shared/service/sort.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AlertService } from 'app/core/util/alert.service'; -import { EventManager } from 'app/core/util/event-manager.service'; import { faBook, faPlus, faSort, faTable, faTrash, faUsers, faWrench } from '@fortawesome/free-solid-svg-icons'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'jhi-file-upload-exercise', templateUrl: './file-upload-exercise.component.html', }) export class FileUploadExerciseComponent extends ExerciseComponent { + protected exerciseService = inject(ExerciseService); + protected fileUploadExerciseService = inject(FileUploadExerciseService); + private courseExerciseService = inject(CourseExerciseService); + private alertService = inject(AlertService); + private accountService = inject(AccountService); + private sortService = inject(SortService); + @Input() fileUploadExercises: FileUploadExercise[] = []; filteredFileUploadExercises: FileUploadExercise[] = []; @@ -40,23 +42,6 @@ export class FileUploadExerciseComponent extends ExerciseComponent { return this.fileUploadExercises; } - constructor( - public exerciseService: ExerciseService, - public fileUploadExerciseService: FileUploadExerciseService, - private courseExerciseService: CourseExerciseService, - private alertService: AlertService, - private accountService: AccountService, - private modalService: NgbModal, - private router: Router, - private sortService: SortService, - courseService: CourseManagementService, - translateService: TranslateService, - eventManager: EventManager, - route: ActivatedRoute, - ) { - super(courseService, translateService, route, eventManager); - } - protected loadExercises(): void { this.courseExerciseService .findAllFileUploadExercisesForCourse(this.courseId) diff --git a/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html b/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html index 8f0ff9e7f5dd..0c47167bc90a 100644 --- a/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html +++ b/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html @@ -129,9 +129,9 @@
- @if (highlightedElements && highlightedElements.size > 0) { + @if (highlightedElements() && highlightedElements().size > 0) {
-
+
@@ -160,7 +160,7 @@
} diff --git a/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.ts b/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.ts index 72328f495613..27d7cd03894d 100644 --- a/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.ts +++ b/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild, computed, effect, inject, signal, untracked } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { AlertService } from 'app/core/util/alert.service'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; @@ -40,6 +40,8 @@ export class ExampleModelingSubmissionComponent implements OnInit, FeedbackMarke @ViewChild(ModelingAssessmentComponent, { static: false }) assessmentEditor: ModelingAssessmentComponent; + private readonly themeService = inject(ThemeService); + isNewSubmission: boolean; assessmentMode = false; exerciseId: number; @@ -93,15 +95,14 @@ export class ExampleModelingSubmissionComponent implements OnInit, FeedbackMarke return [...this.referencedFeedback, ...this.unreferencedFeedback]; } - highlightedElements = new Map(); + highlightedElements = signal>(new Map()); referencedExampleFeedback: Feedback[] = []; - highlightColor = 'lightblue'; + highlightColor = computed(() => (this.themeService.userPreference() === Theme.DARK ? 'darkblue' : 'lightblue')); // Icons faSave = faSave; faCircle = faCircle; faInfoCircle = faInfoCircle; - faExclamation = faExclamation; faCodeBranch = faCodeBranch; faChalkboardTeacher = faChalkboardTeacher; @@ -114,9 +115,19 @@ export class ExampleModelingSubmissionComponent implements OnInit, FeedbackMarke private route: ActivatedRoute, private router: Router, private navigationUtilService: ArtemisNavigationUtilService, - private changeDetector: ChangeDetectorRef, - private themeService: ThemeService, - ) {} + ) { + effect(() => { + // Update highlighted elements as soon as current theme changes + const highlightColor = this.highlightColor(); + untracked(() => { + const updatedHighlights = new Map(); + this.highlightedElements().forEach((_, key) => { + updatedHighlights.set(key, highlightColor); + }); + this.highlightedElements.set(updatedHighlights); + }); + }); + } ngOnInit(): void { this.exerciseId = Number(this.route.snapshot.paramMap.get('exerciseId')); @@ -138,20 +149,6 @@ export class ExampleModelingSubmissionComponent implements OnInit, FeedbackMarke this.assessmentMode = true; } this.loadAll(); - - this.themeService.getPreferenceObservable().subscribe((themeOrUndefined) => { - if (themeOrUndefined === Theme.DARK) { - this.highlightColor = 'darkblue'; - } else { - this.highlightColor = 'lightblue'; - } - - const updatedHighlights = new Map(); - this.highlightedElements.forEach((_, key) => { - updatedHighlights.set(key, this.highlightColor); - }); - this.highlightedElements = updatedHighlights; - }); } private loadAll(): void { @@ -478,11 +475,11 @@ export class ExampleModelingSubmissionComponent implements OnInit, FeedbackMarke const missedReferencedExampleFeedbacks = this.referencedExampleFeedback.filter( (feedback) => !this.referencedFeedback.some((referencedFeedback) => referencedFeedback.reference === feedback.reference), ); - this.highlightedElements = new Map(); + const highlightedElements = new Map(); for (const feedback of missedReferencedExampleFeedbacks) { - this.highlightedElements.set(feedback.referenceId!, this.highlightColor); + highlightedElements.set(feedback.referenceId!, this.highlightColor()); } - this.changeDetector.detectChanges(); + this.highlightedElements.set(highlightedElements); } readAndUnderstood() { diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.component.ts b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.component.ts index 74dff3c4b9fc..e1ea83ce136e 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.component.ts +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise.component.ts @@ -1,18 +1,13 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, inject } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { ModelingExerciseService } from './modeling-exercise.service'; import { AccountService } from 'app/core/auth/account.service'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ActivatedRoute, Router } from '@angular/router'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ExerciseComponent } from 'app/exercises/shared/exercise/exercise.component'; -import { TranslateService } from '@ngx-translate/core'; import { onError } from 'app/shared/util/global.utils'; import { SortService } from 'app/shared/service/sort.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AlertService } from 'app/core/util/alert.service'; -import { EventManager } from 'app/core/util/event-manager.service'; import { faBook, faPlus, faSort, faTable, faTimes, faTrash, faUsers, faWrench } from '@fortawesome/free-solid-svg-icons'; import { faListAlt } from '@fortawesome/free-regular-svg-icons'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; @@ -22,7 +17,14 @@ import { CourseExerciseService } from 'app/exercises/shared/course-exercises/cou templateUrl: './modeling-exercise.component.html', }) export class ModelingExerciseComponent extends ExerciseComponent { - @Input() modelingExercises: ModelingExercise[]; + protected exerciseService = inject(ExerciseService); + protected modelingExerciseService = inject(ModelingExerciseService); + private courseExerciseService = inject(CourseExerciseService); + private alertService = inject(AlertService); + private accountService = inject(AccountService); + private sortService = inject(SortService); + + @Input() modelingExercises: ModelingExercise[] = []; filteredModelingExercises: ModelingExercise[]; // Icons faPlus = faPlus; @@ -39,24 +41,6 @@ export class ModelingExerciseComponent extends ExerciseComponent { return this.modelingExercises; } - constructor( - public exerciseService: ExerciseService, - public modelingExerciseService: ModelingExerciseService, - private courseExerciseService: CourseExerciseService, - private alertService: AlertService, - private accountService: AccountService, - private sortService: SortService, - private modalService: NgbModal, - private router: Router, - courseService: CourseManagementService, - translateService: TranslateService, - eventManager: EventManager, - route: ActivatedRoute, - ) { - super(courseService, translateService, route, eventManager); - this.modelingExercises = []; - } - protected loadExercises(): void { this.courseExerciseService.findAllModelingExercisesForCourse(this.courseId).subscribe({ next: (res: HttpResponse) => { diff --git a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html index d29c46e6c02f..1c7637eb8455 100644 --- a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html +++ b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.html @@ -108,7 +108,11 @@

@if (readOnly) { -
+
} @if (withExplanation) { diff --git a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss index b15f7440d9e6..788be9f011a2 100644 --- a/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss +++ b/src/main/webapp/app/exercises/modeling/shared/modeling-editor.component.scss @@ -49,7 +49,24 @@ $draggable-width: 15px; .readonly-diagram { height: 100%; - overflow: hidden; + overflow-x: auto; + overflow-y: auto; +} + +.scroll-container { + scrollbar-width: thin; /* Firefox */ + &::-webkit-scrollbar { + width: 6px; /* WebKit */ + } + + &::-webkit-scrollbar-thumb { + background-color: rgba(0, 0, 0, 0.2); + border-radius: 3px; + } +} + +.full-screen-margin { + margin-top: 30px; } @keyframes spin { diff --git a/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html b/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html index 4d6adec82308..2945fec0662b 100644 --- a/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html +++ b/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html @@ -85,15 +85,15 @@ {{ exercise?.title }} -  [ - {{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }} - @if (exercise.bonusPoints) { - , {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }} - } - @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { - - } - ] + + + @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { + + } + diff --git a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html index 30ee80b5e22f..f63e02962753 100644 --- a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html +++ b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html @@ -20,13 +20,15 @@
{{ exercise?.title }} - -  [{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) { - , {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }} - }] - @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { - - } + + + @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { + + } +
+ + + + +
+

+ +
+
+ + + + + + + + + + + + + + + @for (item of participation().content; track item) { + + + + + + } + +
{{ item.firstName }} {{ item.lastName }}{{ item.login }} + +
+
+ @if (participation().totalElements >= pageSize()) { + + } +
+ +
+
+
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts new file mode 100644 index 000000000000..947f3f3d44cd --- /dev/null +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component.ts @@ -0,0 +1,59 @@ +import { Component, computed, effect, inject, input, signal, untracked } from '@angular/core'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { AlertService } from 'app/core/util/alert.service'; +import { PageableResult, PageableSearch, SortingOrder } from 'app/shared/table/pageable-table'; + +@Component({ + selector: 'jhi-affected-students-modal', + templateUrl: './feedback-affected-students-modal.component.html', + imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule], + providers: [FeedbackAnalysisService], + standalone: true, +}) +export class AffectedStudentsModalComponent { + exerciseId = input.required(); + feedbackDetail = input.required(); + readonly participation = signal>({ content: [], totalPages: 0, totalElements: 0 }); + readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.affectedStudentsModal'; + + page = signal(1); + pageSize = signal(10); + readonly collectionsSize = computed(() => this.participation().totalPages * this.pageSize()); + + activeModal = inject(NgbActiveModal); + feedbackService = inject(FeedbackAnalysisService); + alertService = inject(AlertService); + + constructor() { + effect(() => { + untracked(async () => { + await this.loadAffected(); + }); + }); + } + + private async loadAffected() { + const feedbackDetail = this.feedbackDetail(); + const pageable: PageableSearch = { + page: this.page(), + pageSize: this.pageSize(), + sortedColumn: 'participationId', + sortingOrder: SortingOrder.ASCENDING, + }; + + try { + const response = await this.feedbackService.getParticipationForFeedbackIds(this.exerciseId(), feedbackDetail.concatenatedFeedbackIds, pageable); + this.participation.set(response); + } catch (error) { + this.alertService.error(this.TRANSLATION_BASE + '.error'); + } + } + + setPage(newPage: number): void { + this.page.set(newPage); + this.loadAffected(); + } +} diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.html index 0571f1039ca6..50d4a8ec80f5 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.html @@ -1,10 +1,10 @@
-
+
- +
@for (task of taskArray(); track task) {
@@ -24,7 +24,7 @@
- +
@for (testCase of testCaseNames(); track testCase) {
@@ -43,28 +43,37 @@
- - +
+ +
+ @for (errorCategory of errorCategories(); track errorCategory) { +
+
+ + +
+
+ } +
+
+ +
- - - + + +
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.ts index 09e6784658b9..cf7632c82337 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component.ts @@ -1,4 +1,4 @@ -import { Component, computed, inject, output, signal } from '@angular/core'; +import { Component, inject, output, signal } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { RangeSliderComponent } from 'app/shared/range-slider/range-slider.component'; import { FeedbackAnalysisService } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; @@ -9,6 +9,7 @@ export interface FilterData { tasks: string[]; testCases: string[]; occurrence: number[]; + errorCategories: string[]; } @Component({ @@ -24,26 +25,30 @@ export class FeedbackFilterModalComponent { filterApplied = output(); + readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.filterModal'; readonly FILTER_TASKS_KEY = 'feedbackAnalysis.tasks'; readonly FILTER_TEST_CASES_KEY = 'feedbackAnalysis.testCases'; readonly FILTER_OCCURRENCE_KEY = 'feedbackAnalysis.occurrence'; + readonly FILTER_ERROR_CATEGORIES_KEY = 'feedbackAnalysis.errorCategories'; - readonly totalAmountOfTasks = signal(0); readonly testCaseNames = signal([]); readonly minCount = signal(0); readonly maxCount = signal(0); - readonly taskArray = computed(() => Array.from({ length: this.totalAmountOfTasks() }, (_, i) => i + 1)); + readonly taskArray = signal([]); + readonly errorCategories = signal([]); filters: FilterData = { tasks: [], testCases: [], occurrence: [this.minCount(), this.maxCount() || 1], + errorCategories: [], }; applyFilter(): void { this.localStorage.store(this.FILTER_TASKS_KEY, this.filters.tasks); this.localStorage.store(this.FILTER_TEST_CASES_KEY, this.filters.testCases); this.localStorage.store(this.FILTER_OCCURRENCE_KEY, this.filters.occurrence); + this.localStorage.store(this.FILTER_ERROR_CATEGORIES_KEY, this.filters.errorCategories); this.filterApplied.emit(this.filters); this.activeModal.close(); } @@ -52,10 +57,12 @@ export class FeedbackFilterModalComponent { this.localStorage.clear(this.FILTER_TASKS_KEY); this.localStorage.clear(this.FILTER_TEST_CASES_KEY); this.localStorage.clear(this.FILTER_OCCURRENCE_KEY); + this.localStorage.clear(this.FILTER_ERROR_CATEGORIES_KEY); this.filters = { tasks: [], testCases: [], occurrence: [this.minCount(), this.maxCount()], + errorCategories: [], }; this.filterApplied.emit(this.filters); this.activeModal.close(); diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html index abf8a2bf5b47..c1b14669e1bb 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.html @@ -1,38 +1,26 @@
-

+

- - + - - - - + +
-
+

{{ feedbackDetail().detailText }}

diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.ts index 7178244be5d2..af60c0af8569 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component.ts @@ -12,4 +12,5 @@ import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; export class FeedbackModalComponent { feedbackDetail = input.required(); activeModal = inject(NgbActiveModal); + readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis'; } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html index 295cb206a373..20206a2c4ae3 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html @@ -1,23 +1,31 @@ - - - - @if (sortedColumn() === column) { - - } + + +
+ + @if (column !== 'errorCategory') { + + } +
+ +
+
-

+

- - - - - + + + + + - @for (item of content().resultsOnPage; track item) { + @if (!content().resultsOnPage) { - {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) - - {{ item.detailText.length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText | slice: 0 : 100) + '...' : item.detailText }} - - {{ item.taskNumber }} - {{ item.testCaseName }} - {{ item.errorCategory }} - - + + + } @else { + @for (item of content().resultsOnPage; track item) { + + {{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%) + + {{ item.detailText.length > MAX_FEEDBACK_DETAIL_TEXT_LENGTH ? (item.detailText | slice: 0 : 100) + '...' : item.detailText }} + + {{ item.taskName }} + {{ item.testCaseName }} + {{ item.errorCategory }} + + + + + + } }
- - +
- +
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts index 24855955f5b7..9026d7cbb1ec 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts @@ -2,20 +2,22 @@ import { Component, computed, effect, inject, input, signal, untracked } from '@ import { FeedbackAnalysisService, FeedbackDetail } from './feedback-analysis.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { AlertService } from 'app/core/util/alert.service'; -import { faFilter, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter } from '@fortawesome/free-solid-svg-icons'; +import { faFilter, faSort, faSortDown, faSortUp, faUpRightAndDownLeftFromCenter, faUsers } from '@fortawesome/free-solid-svg-icons'; import { SearchResult, SortingOrder } from 'app/shared/table/pageable-table'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { FeedbackModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-modal.component'; import { FeedbackFilterModalComponent, FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; import { LocalStorageService } from 'ngx-webstorage'; import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; +import { SortIconComponent } from 'app/shared/sort/sort-icon.component'; +import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; @Component({ selector: 'jhi-feedback-analysis', templateUrl: './feedback-analysis.component.html', styleUrls: ['./feedback-analysis.component.scss'], standalone: true, - imports: [ArtemisSharedCommonModule], + imports: [ArtemisSharedCommonModule, SortIconComponent], providers: [FeedbackAnalysisService], }) export class FeedbackAnalysisComponent { @@ -28,7 +30,7 @@ export class FeedbackAnalysisComponent { private localStorage = inject(LocalStorageService); readonly page = signal(1); - readonly pageSize = signal(20); + readonly pageSize = signal(25); readonly searchTerm = signal(''); readonly sortingOrder = signal(SortingOrder.DESCENDING); readonly sortedColumn = signal('count'); @@ -37,23 +39,26 @@ export class FeedbackAnalysisComponent { readonly totalItems = signal(0); readonly collectionsSize = computed(() => this.content().numberOfPages * this.pageSize()); + readonly TRANSLATION_BASE = 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis'; readonly faSort = faSort; readonly faSortUp = faSortUp; readonly faSortDown = faSortDown; readonly faFilter = faFilter; readonly faUpRightAndDownLeftFromCenter = faUpRightAndDownLeftFromCenter; + readonly faUsers = faUsers; readonly SortingOrder = SortingOrder; - readonly MAX_FEEDBACK_DETAIL_TEXT_LENGTH = 150; - readonly sortIcon = computed(() => (this.sortingOrder() === SortingOrder.ASCENDING ? this.faSortUp : this.faSortDown)); + readonly MAX_FEEDBACK_DETAIL_TEXT_LENGTH = 200; readonly FILTER_TASKS_KEY = 'feedbackAnalysis.tasks'; readonly FILTER_TEST_CASES_KEY = 'feedbackAnalysis.testCases'; readonly FILTER_OCCURRENCE_KEY = 'feedbackAnalysis.occurrence'; + readonly FILTER_ERROR_CATEGORIES_KEY = 'feedbackAnalysis.errorCategories'; readonly selectedFiltersCount = signal(0); - readonly totalAmountOfTasks = signal(0); + readonly taskNames = signal([]); readonly testCaseNames = signal([]); readonly minCount = signal(0); readonly maxCount = signal(0); + readonly errorCategories = signal([]); private readonly debounceLoadData = BaseApiHttpService.debounce(this.loadData.bind(this), 300); @@ -69,6 +74,7 @@ export class FeedbackAnalysisComponent { const savedTasks = this.localStorage.retrieve(this.FILTER_TASKS_KEY) || []; const savedTestCases = this.localStorage.retrieve(this.FILTER_TEST_CASES_KEY) || []; const savedOccurrence = this.localStorage.retrieve(this.FILTER_OCCURRENCE_KEY) || []; + const savedErrorCategories = this.localStorage.retrieve(this.FILTER_ERROR_CATEGORIES_KEY) || []; const state = { page: this.page(), @@ -76,6 +82,7 @@ export class FeedbackAnalysisComponent { searchTerm: this.searchTerm() || '', sortingOrder: this.sortingOrder(), sortedColumn: this.sortedColumn(), + filterErrorCategories: this.errorCategories(), }; try { @@ -85,14 +92,16 @@ export class FeedbackAnalysisComponent { tasks: this.selectedFiltersCount() !== 0 ? savedTasks : [], testCases: this.selectedFiltersCount() !== 0 ? savedTestCases : [], occurrence: this.selectedFiltersCount() !== 0 ? savedOccurrence : [], + errorCategories: this.selectedFiltersCount() !== 0 ? savedErrorCategories : [], }, }); this.content.set(response.feedbackDetails); this.totalItems.set(response.totalItems); - this.totalAmountOfTasks.set(response.totalAmountOfTasks); + this.taskNames.set(response.taskNames); this.testCaseNames.set(response.testCaseNames); + this.errorCategories.set(response.errorCategories); } catch (error) { - this.alertService.error('artemisApp.programmingExercise.configureGrading.feedbackAnalysis.error'); + this.alertService.error(this.TRANSLATION_BASE + '.error'); } } @@ -112,10 +121,6 @@ export class FeedbackAnalysisComponent { modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); } - isSortableColumn(column: string): boolean { - return ['count', 'detailText', 'testCaseName'].includes(column); - } - setSortedColumn(column: string): void { if (this.sortedColumn() === column) { this.sortingOrder.set(this.sortingOrder() === SortingOrder.ASCENDING ? SortingOrder.DESCENDING : SortingOrder.ASCENDING); @@ -126,23 +131,33 @@ export class FeedbackAnalysisComponent { this.loadData(); } + getSortDirection(column: string): SortingOrder.ASCENDING | SortingOrder.DESCENDING | 'none' { + if (this.sortedColumn() === column) { + return this.sortingOrder() === SortingOrder.ASCENDING ? SortingOrder.ASCENDING : SortingOrder.DESCENDING; + } + return 'none'; + } + async openFilterModal(): Promise { const savedTasks = this.localStorage.retrieve(this.FILTER_TASKS_KEY); const savedTestCases = this.localStorage.retrieve(this.FILTER_TEST_CASES_KEY); const savedOccurrence = this.localStorage.retrieve(this.FILTER_OCCURRENCE_KEY); + const savedErrorCategories = this.localStorage.retrieve(this.FILTER_ERROR_CATEGORIES_KEY); this.minCount.set(0); this.maxCount.set(await this.feedbackAnalysisService.getMaxCount(this.exerciseId())); const modalRef = this.modalService.open(FeedbackFilterModalComponent, { centered: true, size: 'lg' }); modalRef.componentInstance.exerciseId = this.exerciseId; - modalRef.componentInstance.totalAmountOfTasks = this.totalAmountOfTasks; + modalRef.componentInstance.taskArray = this.taskNames; modalRef.componentInstance.testCaseNames = this.testCaseNames; modalRef.componentInstance.maxCount = this.maxCount; + modalRef.componentInstance.errorCategories = this.errorCategories; modalRef.componentInstance.filters = { tasks: this.selectedFiltersCount() !== 0 ? savedTasks : [], testCases: this.selectedFiltersCount() !== 0 ? savedTestCases : [], occurrence: this.selectedFiltersCount() !== 0 ? savedOccurrence : [this.minCount(), this.maxCount()], + errorCategories: this.selectedFiltersCount() !== 0 ? savedErrorCategories : [], }; modalRef.componentInstance.filterApplied.subscribe((filters: any) => { this.applyFilters(filters); @@ -162,9 +177,18 @@ export class FeedbackAnalysisComponent { if (filters.testCases && filters.testCases.length > 0) { count += filters.testCases.length; } + if (filters.errorCategories?.length) { + count += filters.errorCategories.length; + } if (filters.occurrence && (filters.occurrence[0] !== 0 || filters.occurrence[1] !== this.maxCount())) { count++; } return count; } + + async openAffectedStudentsModal(feedbackDetail: FeedbackDetail): Promise { + const modalRef = this.modalService.open(AffectedStudentsModalComponent, { centered: true, size: 'lg' }); + modalRef.componentInstance.exerciseId = this.exerciseId; + modalRef.componentInstance.feedbackDetail = signal(feedbackDetail); + } } diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts index bb235de5a24c..214c9a4e4f4c 100644 --- a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts +++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts @@ -1,23 +1,33 @@ import { Injectable } from '@angular/core'; -import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; +import { PageableResult, PageableSearch, SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table'; import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service'; -import { HttpParams } from '@angular/common/http'; +import { HttpHeaders, HttpParams } from '@angular/common/http'; import { FilterData } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; export interface FeedbackAnalysisResponse { feedbackDetails: SearchResult; totalItems: number; - totalAmountOfTasks: number; + taskNames: string[]; testCaseNames: string[]; + errorCategories: string[]; } export interface FeedbackDetail { + concatenatedFeedbackIds: number[]; count: number; relativeCount: number; detailText: string; testCaseName: string; - taskNumber: string; + taskName: string; errorCategory: string; } +export interface FeedbackAffectedStudentDTO { + courseId: number; + participationId: number; + firstName: string; + lastName: string; + login: string; + repositoryURI: string; +} @Injectable() export class FeedbackAnalysisService extends BaseApiHttpService { search(pageable: SearchTermPageableSearch, options: { exerciseId: number; filters: FilterData }): Promise { @@ -29,7 +39,8 @@ export class FeedbackAnalysisService extends BaseApiHttpService { .set('sortedColumn', pageable.sortedColumn) .set('filterTasks', options.filters.tasks.join(',')) .set('filterTestCases', options.filters.testCases.join(',')) - .set('filterOccurrence', options.filters.occurrence.join(',')); + .set('filterOccurrence', options.filters.occurrence.join(',')) + .set('filterErrorCategories', options.filters.errorCategories.join(',')); return this.get(`exercises/${options.exerciseId}/feedback-details`, { params }); } @@ -37,4 +48,18 @@ export class FeedbackAnalysisService extends BaseApiHttpService { getMaxCount(exerciseId: number): Promise { return this.get(`exercises/${exerciseId}/feedback-details-max-count`); } + + async getParticipationForFeedbackIds(exerciseId: number, feedbackIds: number[], pageable: PageableSearch): Promise> { + const feedbackIdsHeader = feedbackIds.join(','); + + const params = new HttpParams() + .set('page', pageable.page.toString()) + .set('pageSize', pageable.pageSize.toString()) + .set('sortedColumn', pageable.sortedColumn) + .set('sortingOrder', pageable.sortingOrder); + + const headers = new HttpHeaders().set('feedbackIds', feedbackIdsHeader); + + return this.get>(`exercises/${exerciseId}/feedback-details-participation`, { params, headers }); + } } diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts index 1a1a95462530..baed01da2383 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts @@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { SafeHtml } from '@angular/platform-browser'; import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config'; -import { Subject, Subscription } from 'rxjs'; +import { Subject, Subscription, of } from 'rxjs'; import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { AlertService, AlertType } from 'app/core/util/alert.service'; @@ -57,6 +57,9 @@ import { IrisSubSettingsType } from 'app/entities/iris/settings/iris-sub-setting import { Detail } from 'app/detail-overview-list/detail.model'; import { Competency } from 'app/entities/competency.model'; import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.service'; +import { mergeMap, tap } from 'rxjs/operators'; +import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; +import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto'; @Component({ selector: 'jhi-programming-exercise-detail', @@ -65,15 +68,32 @@ import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.s encapsulation: ViewEncapsulation.None, }) export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { - readonly dayjs = dayjs; - readonly ActionType = ActionType; - readonly ProgrammingExerciseParticipationType = ProgrammingExerciseParticipationType; - readonly FeatureToggle = FeatureToggle; - readonly ProgrammingLanguage = ProgrammingLanguage; - readonly PROGRAMMING = ExerciseType.PROGRAMMING; - readonly ButtonSize = ButtonSize; - readonly AssessmentType = AssessmentType; - readonly documentationType: DocumentationType = 'Programming'; + protected readonly dayjs = dayjs; + protected readonly ActionType = ActionType; + protected readonly ProgrammingExerciseParticipationType = ProgrammingExerciseParticipationType; + protected readonly FeatureToggle = FeatureToggle; + protected readonly ProgrammingLanguage = ProgrammingLanguage; + protected readonly PROGRAMMING = ExerciseType.PROGRAMMING; + protected readonly ButtonSize = ButtonSize; + protected readonly AssessmentType = AssessmentType; + protected readonly documentationType: DocumentationType = 'Programming'; + + protected readonly faUndo = faUndo; + protected readonly faTrash = faTrash; + protected readonly faBook = faBook; + protected readonly faWrench = faWrench; + protected readonly faCheckDouble = faCheckDouble; + protected readonly faTable = faTable; + protected readonly faExclamationTriangle = faExclamationTriangle; + protected readonly faFileSignature = faFileSignature; + protected readonly faListAlt = faListAlt; + protected readonly faChartBar = faChartBar; + protected readonly faLightbulb = faLightbulb; + protected readonly faPencilAlt = faPencilAlt; + protected readonly faUsers = faUsers; + protected readonly faEye = faEye; + protected readonly faUserCheck = faUserCheck; + protected readonly faRobot = faRobot; programmingExercise: ProgrammingExercise; programmingExerciseBuildConfig?: ProgrammingExerciseBuildConfig; @@ -106,10 +126,7 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { private activatedRouteSubscription: Subscription; private templateAndSolutionParticipationSubscription: Subscription; - private profileInfoSubscription: Subscription; private irisSettingsSubscription: Subscription; - private submissionPolicySubscription: Subscription; - private buildLogsSubscription: Subscription; private exerciseStatisticsSubscription: Subscription; private dialogErrorSource = new Subject(); @@ -117,24 +134,6 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { exerciseDetailSections: DetailOverviewSection[]; - // Icons - faUndo = faUndo; - faTrash = faTrash; - faBook = faBook; - faWrench = faWrench; - faCheckDouble = faCheckDouble; - faTable = faTable; - faExclamationTriangle = faExclamationTriangle; - faFileSignature = faFileSignature; - faListAlt = faListAlt; - faChartBar = faChartBar; - faLightbulb = faLightbulb; - faPencilAlt = faPencilAlt; - faUsers = faUsers; - faEye = faEye; - faUserCheck = faUserCheck; - faRobot = faRobot; - constructor( private activatedRoute: ActivatedRoute, private accountService: AccountService, @@ -184,13 +183,15 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { this.templateAndSolutionParticipationSubscription = this.programmingExerciseService .findWithTemplateAndSolutionParticipationAndLatestResults(programmingExercise.id!) - .subscribe((updatedProgrammingExercise) => { - this.programmingExercise = updatedProgrammingExercise.body!; - - this.setLatestCoveredLineRatio(); - this.loadingTemplateParticipationResults = false; - this.loadingSolutionParticipationResults = false; - this.profileInfoSubscription = this.profileService.getProfileInfo().subscribe(async (profileInfo) => { + .pipe( + tap((updatedProgrammingExercise) => { + this.programmingExercise = updatedProgrammingExercise.body!; + this.setLatestCoveredLineRatio(); + this.loadingTemplateParticipationResults = false; + this.loadingSolutionParticipationResults = false; + }), + mergeMap(() => this.profileService.getProfileInfo()), + tap((profileInfo) => { if (profileInfo) { if (this.programmingExercise.projectKey && this.programmingExercise.templateParticipation?.buildPlanId) { this.programmingExercise.templateParticipation.buildPlanUrl = createBuildPlanUrl( @@ -215,38 +216,41 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { if (this.irisEnabled) { this.irisSettingsSubscription = this.irisSettingsService.getCombinedCourseSettings(this.courseId).subscribe((settings) => { this.irisChatEnabled = settings?.irisChatSettings?.enabled ?? false; - this.exerciseDetailSections = this.getExerciseDetails(); }); } } + }), + mergeMap(() => this.programmingExerciseSubmissionPolicyService.getSubmissionPolicyOfProgrammingExercise(exerciseId)), + tap((submissionPolicy) => { + this.programmingExercise.submissionPolicy = submissionPolicy; + }), + mergeMap(() => this.programmingExerciseService.getDiffReport(exerciseId)), + tap((gitDiffReport) => { + this.processGitDiffReport(gitDiffReport, false); + }), + mergeMap(() => + this.programmingExercise.isAtLeastEditor ? this.programmingExerciseService.getBuildLogStatistics(exerciseId!) : of([] as BuildLogStatisticsDTO), + ), + tap((buildLogStatistics) => { + if (this.programmingExercise.isAtLeastEditor) { + this.programmingExercise.buildLogStatistics = buildLogStatistics; + } + }), + ) + .subscribe({ + next: () => { + this.setLatestCoveredLineRatio(); + this.checkAndAlertInconsistencies(); + this.plagiarismCheckSupported = this.programmingLanguageFeatureService.getProgrammingLanguageFeature( + programmingExercise.programmingLanguage, + ).plagiarismCheckSupported; + + /** we make sure to await the results of the subscriptions (switchMap) to only call {@link getExerciseDetails} once */ this.exerciseDetailSections = this.getExerciseDetails(); - }); - - this.submissionPolicySubscription = this.programmingExerciseSubmissionPolicyService - .getSubmissionPolicyOfProgrammingExercise(exerciseId!) - .subscribe((submissionPolicy) => { - this.programmingExercise.submissionPolicy = submissionPolicy; - this.exerciseDetailSections = this.getExerciseDetails(); - }); - - this.loadGitDiffReport(); - - // the build logs endpoint requires at least editor privileges - if (this.programmingExercise.isAtLeastEditor) { - this.buildLogsSubscription = this.programmingExerciseService - .getBuildLogStatistics(exerciseId!) - .subscribe((buildLogStatistics) => (this.programmingExercise.buildLogStatistics = buildLogStatistics)); - this.exerciseDetailSections = this.getExerciseDetails(); - } - - this.setLatestCoveredLineRatio(); - - this.checkAndAlertInconsistencies(); - - this.plagiarismCheckSupported = this.programmingLanguageFeatureService.getProgrammingLanguageFeature( - programmingExercise.programmingLanguage, - ).plagiarismCheckSupported; - this.exerciseDetailSections = this.getExerciseDetails(); + }, + error: (error) => { + this.alertService.error(error.message); + }, }); this.exerciseStatisticsSubscription = this.statisticsService.getExerciseStatistics(exerciseId!).subscribe((statistics: ExerciseManagementStatisticsDto) => { @@ -259,13 +263,17 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { this.dialogErrorSource.unsubscribe(); this.activatedRouteSubscription?.unsubscribe(); this.templateAndSolutionParticipationSubscription?.unsubscribe(); - this.profileInfoSubscription?.unsubscribe(); this.irisSettingsSubscription?.unsubscribe(); - this.submissionPolicySubscription?.unsubscribe(); - this.buildLogsSubscription?.unsubscribe(); this.exerciseStatisticsSubscription?.unsubscribe(); } + /** + * BE CAREFUL WHEN CALLING THIS METHOD!
+ * This method can cause child components to re-render, which can lead to re-initializations resulting + * in unnecessary requests putting load on the server. + * + * When adding a new call to this method, make sure that no duplicated and unnecessary requests are made. + */ getExerciseDetails(): DetailOverviewSection[] { const exercise = this.programmingExercise; exercise.buildConfig = this.programmingExerciseBuildConfig; @@ -780,29 +788,37 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy { return link; } - loadGitDiffReport() { - this.programmingExerciseService.getDiffReport(this.programmingExercise.id!).subscribe((gitDiffReport) => { - if ( - gitDiffReport && - (this.programmingExercise.gitDiffReport?.templateRepositoryCommitHash !== gitDiffReport.templateRepositoryCommitHash || - this.programmingExercise.gitDiffReport?.solutionRepositoryCommitHash !== gitDiffReport.solutionRepositoryCommitHash) - ) { - this.programmingExercise.gitDiffReport = gitDiffReport; - gitDiffReport.programmingExercise = this.programmingExercise; - this.addedLineCount = - gitDiffReport.entries - ?.map((entry) => entry.lineCount) - .filter((lineCount) => lineCount) - .map((lineCount) => lineCount!) - .reduce((lineCount1, lineCount2) => lineCount1 + lineCount2, 0) ?? 0; - this.removedLineCount = - gitDiffReport.entries - ?.map((entry) => entry.previousLineCount) - .filter((lineCount) => lineCount) - .map((lineCount) => lineCount!) - .reduce((lineCount1, lineCount2) => lineCount1 + lineCount2, 0) ?? 0; + /** + * + * @param gitDiffReport + * @param updateDetailSections set to false when called from OnInit, as another method will take care to update the + * {@link exerciseDetailSections} to prevent unnecessary renderings and duplicated requests, + * see description of {@link getExerciseDetails} + */ + private processGitDiffReport(gitDiffReport: ProgrammingExerciseGitDiffReport | undefined, updateDetailSections: boolean = true): void { + const isGitDiffReportUpdated = + gitDiffReport && + (this.programmingExercise.gitDiffReport?.templateRepositoryCommitHash !== gitDiffReport.templateRepositoryCommitHash || + this.programmingExercise.gitDiffReport?.solutionRepositoryCommitHash !== gitDiffReport.solutionRepositoryCommitHash); + if (isGitDiffReportUpdated) { + this.programmingExercise.gitDiffReport = gitDiffReport; + gitDiffReport.programmingExercise = this.programmingExercise; + + const calculateLineCount = (entries: { lineCount?: number; previousLineCount?: number }[] = [], key: 'lineCount' | 'previousLineCount') => + entries.map((entry) => entry[key] ?? 0).reduce((sum, count) => sum + count, 0); + + this.addedLineCount = calculateLineCount(gitDiffReport.entries, 'lineCount'); + this.removedLineCount = calculateLineCount(gitDiffReport.entries, 'previousLineCount'); + + if (updateDetailSections) { this.exerciseDetailSections = this.getExerciseDetails(); } + } + } + + loadGitDiffReport() { + this.programmingExerciseService.getDiffReport(this.programmingExercise.id!).subscribe((gitDiffReport) => { + this.processGitDiffReport(gitDiffReport); }); } diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts index e1f659c87483..3a33c7b88f83 100644 --- a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts +++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts @@ -1,23 +1,19 @@ -import { Component, ContentChild, Input, OnDestroy, OnInit, TemplateRef } from '@angular/core'; +import { Component, ContentChild, Input, OnDestroy, OnInit, TemplateRef, inject } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { merge } from 'rxjs'; import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; import { ProgrammingExerciseInstructorRepositoryType, ProgrammingExerciseService } from './services/programming-exercise.service'; -import { ActivatedRoute } from '@angular/router'; import { ExerciseComponent } from 'app/exercises/shared/exercise/exercise.component'; -import { TranslateService } from '@ngx-translate/core'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; import { onError } from 'app/shared/util/global.utils'; import { AccountService } from 'app/core/auth/account.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; import { SortService } from 'app/shared/service/sort.service'; import { ProgrammingExerciseEditSelectedComponent } from 'app/exercises/programming/manage/programming-exercise-edit-selected.component'; import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model'; import { AlertService } from 'app/core/util/alert.service'; -import { EventManager } from 'app/core/util/event-manager.service'; import { createBuildPlanUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { ConsistencyCheckComponent } from 'app/shared/consistency-check/consistency-check.component'; @@ -46,7 +42,16 @@ import { PROFILE_LOCALCI, PROFILE_LOCALVC, PROFILE_THEIA } from 'app/app.constan templateUrl: './programming-exercise.component.html', }) export class ProgrammingExerciseComponent extends ExerciseComponent implements OnInit, OnDestroy { - @Input() programmingExercises: ProgrammingExercise[]; + protected exerciseService = inject(ExerciseService); + private programmingExerciseService = inject(ProgrammingExerciseService); + private courseExerciseService = inject(CourseExerciseService); + private accountService = inject(AccountService); + private alertService = inject(AlertService); + private modalService = inject(NgbModal); + private sortService = inject(SortService); + private profileService = inject(ProfileService); + + @Input() programmingExercises: ProgrammingExercise[] = []; filteredProgrammingExercises: ProgrammingExercise[]; readonly ActionType = ActionType; FeatureToggle = FeatureToggle; @@ -82,24 +87,6 @@ export class ProgrammingExerciseComponent extends ExerciseComponent implements O return this.programmingExercises; } - constructor( - private programmingExerciseService: ProgrammingExerciseService, - private courseExerciseService: CourseExerciseService, - public exerciseService: ExerciseService, - private accountService: AccountService, - private alertService: AlertService, - private modalService: NgbModal, - private sortService: SortService, - private profileService: ProfileService, - courseService: CourseManagementService, - translateService: TranslateService, - eventManager: EventManager, - route: ActivatedRoute, - ) { - super(courseService, translateService, route, eventManager); - this.programmingExercises = []; - } - ngOnInit(): void { super.ngOnInit(); } diff --git a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html index b1e8a2e356d1..5fb244524421 100644 --- a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html +++ b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html @@ -33,10 +33,11 @@ >
{{ exercise?.title }} - -  [{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) { - , {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }} - }] + + @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) { } diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts index 9eac396fa2bc..d53b738b3ff1 100644 --- a/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts +++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts @@ -11,6 +11,7 @@ import { ViewChild, ViewContainerRef, createComponent, + inject, } from '@angular/core'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; import { ThemeService } from 'app/core/theme/theme.service'; @@ -39,6 +40,7 @@ import diff from 'html-diff-ts'; import { ProgrammingExerciseInstructionService } from 'app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service'; import { escapeStringForUseInRegex } from 'app/shared/util/global.utils'; import { ProgrammingExerciseInstructionTaskStatusComponent } from 'app/exercises/programming/shared/instructions-render/task/programming-exercise-instruction-task-status.component'; +import { toObservable } from '@angular/core/rxjs-interop'; @Component({ selector: 'jhi-programming-exercise-instructions', @@ -46,6 +48,8 @@ import { ProgrammingExerciseInstructionTaskStatusComponent } from 'app/exercises styleUrls: ['./programming-exercise-instruction.scss'], }) export class ProgrammingExerciseInstructionComponent implements OnChanges, OnDestroy { + private themeService = inject(ThemeService); + @Input() public exercise: ProgrammingExercise; @Input() public participation: Participation; @Input() generateHtmlEvents: Observable; @@ -84,8 +88,12 @@ export class ProgrammingExerciseInstructionComponent implements OnChanges, OnDes private injectableContentFoundSubscription: Subscription; private tasksSubscription: Subscription; private generateHtmlSubscription: Subscription; - private themeChangeSubscription: Subscription; private testCases?: ProgrammingExerciseTestCase[]; + private themeChangeSubscription = toObservable(this.themeService.currentTheme).subscribe(() => { + if (!this.isInitial) { + this.updateMarkdown(); + } + }); // Icons faSpinner = faSpinner; @@ -98,16 +106,12 @@ export class ProgrammingExerciseInstructionComponent implements OnChanges, OnDes private programmingExercisePlantUmlWrapper: ProgrammingExercisePlantUmlExtensionWrapper, private programmingExerciseParticipationService: ProgrammingExerciseParticipationService, private programmingExerciseGradingService: ProgrammingExerciseGradingService, - themeService: ThemeService, private sanitizer: DomSanitizer, private programmingExerciseInstructionService: ProgrammingExerciseInstructionService, private appRef: ApplicationRef, private injector: EnvironmentInjector, ) { this.programmingExerciseTaskWrapper.viewContainerRef = this.viewContainerRef; - this.themeChangeSubscription = themeService.getCurrentThemeObservable().subscribe(() => { - this.updateMarkdown(); - }); } /** diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-plant-uml.service.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-plant-uml.service.ts index 801bdaa4d19c..470c54d934dd 100644 --- a/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-plant-uml.service.ts +++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-plant-uml.service.ts @@ -1,8 +1,8 @@ -import { Injectable } from '@angular/core'; +import { Injectable, effect, inject } from '@angular/core'; import { HttpClient, HttpParameterCodec, HttpParams } from '@angular/common/http'; import { Cacheable } from 'ts-cacheable'; import { Observable, Subject } from 'rxjs'; -import { map, tap } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { Theme, ThemeService } from 'app/core/theme/theme.service'; const themeChangedSubject = new Subject(); @@ -12,19 +12,20 @@ export class ProgrammingExercisePlantUmlService { private resourceUrl = 'api/plantuml'; private encoder: HttpParameterCodec; + private readonly themeService = inject(ThemeService); + private readonly http = inject(HttpClient); + /** * Cacheable configuration */ - constructor( - private http: HttpClient, - private themeService: ThemeService, - ) { + constructor() { this.encoder = new HttpUrlCustomEncoder(); - this.themeService - .getCurrentThemeObservable() - .pipe(tap(() => themeChangedSubject.next())) - .subscribe(); + effect(() => { + // Apply the theme as soon as the currentTheme changes + this.themeService.currentTheme(); + themeChangedSubject.next(); + }); } /** @@ -43,7 +44,7 @@ export class ProgrammingExercisePlantUmlService { getPlantUmlImage(plantUml: string) { return this.http .get(`${this.resourceUrl}/png`, { - params: new HttpParams({ encoder: this.encoder }).set('plantuml', plantUml).set('useDarkTheme', this.themeService.getCurrentTheme() === Theme.DARK), + params: new HttpParams({ encoder: this.encoder }).set('plantuml', plantUml).set('useDarkTheme', this.themeService.currentTheme() === Theme.DARK), responseType: 'arraybuffer', }) .pipe(map((res) => this.convertPlantUmlResponseToBase64(res))); @@ -64,7 +65,7 @@ export class ProgrammingExercisePlantUmlService { }) getPlantUmlSvg(plantUml: string): Observable { return this.http.get(`${this.resourceUrl}/svg`, { - params: new HttpParams({ encoder: this.encoder }).set('plantuml', plantUml).set('useDarkTheme', this.themeService.getCurrentTheme() === Theme.DARK), + params: new HttpParams({ encoder: this.encoder }).set('plantuml', plantUml).set('useDarkTheme', this.themeService.currentTheme() === Theme.DARK), responseType: 'text', }); } diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html b/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html index eaf81d0a62f8..3ac4387efbfc 100644 --- a/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html +++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html @@ -2,7 +2,7 @@
- @for (step of steps; track step; let i = $index) { + @for (step of steps; let i = $index; track i) {
) => { diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.html new file mode 100644 index 000000000000..30e26e951231 --- /dev/null +++ b/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.html @@ -0,0 +1,39 @@ +@if (exercise) { +
+ @for (informationBoxItem of informationBoxItems; track informationBoxItem) { + + @switch (informationBoxItem.content.type) { + @case ('difficultyLevel') { + + } + @case ('categories') { + + } + @case ('timeAgo') { + {{ informationBoxItem.content.value | artemisTimeAgo }} + } + @case ('dateTime') { + {{ informationBoxItem.content.value | artemisDate }} + } + @case ('submissionStatus') { + + } + } + + } +
+} diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.scss b/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.scss new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.ts b/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.ts new file mode 100644 index 000000000000..547009a136bd --- /dev/null +++ b/src/main/webapp/app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component.ts @@ -0,0 +1,296 @@ +import { Component, Input, OnChanges, OnInit } from '@angular/core'; +import { SortService } from 'app/shared/service/sort.service'; +import dayjs from 'dayjs/esm'; +import { Exercise, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model'; +import { SubmissionPolicy } from 'app/entities/submission-policy.model'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils'; +import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model'; +import { Course } from 'app/entities/course.model'; +import { SubmissionType } from 'app/entities/submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; +import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils'; +import { SubmissionResultStatusModule } from 'app/overview/submission-result-status.module'; +import { ExerciseCategoriesModule } from 'app/shared/exercise-categories/exercise-categories.module'; +import { InformationBox, InformationBoxComponent } from 'app/shared/information-box/information-box.component'; +import { ComplaintService } from 'app/complaints/complaint.service'; +import { isDateLessThanAWeekInTheFuture } from 'app/utils/date.utils'; +import { DifficultyLevelComponent } from 'app/shared/difficulty-level/difficulty-level.component'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; + +@Component({ + selector: 'jhi-exercise-headers-information', + templateUrl: './exercise-headers-information.component.html', + standalone: true, + imports: [SubmissionResultStatusModule, ExerciseCategoriesModule, InformationBoxComponent, DifficultyLevelComponent, ArtemisSharedCommonModule], + styleUrls: ['./exercise-headers-information.component.scss'], + /* Our tsconfig file has `preserveWhitespaces: 'true'` which causes whitespace to affect content projection. + We need to set it to 'false 'for this component, otherwise the components with the selector [contentComponent] + will not be projected into their specific slot of the "InformationBoxComponent" component.*/ + preserveWhitespaces: false, +}) +export class ExerciseHeadersInformationComponent implements OnInit, OnChanges { + readonly IncludedInOverallScore = IncludedInOverallScore; + readonly dayjs = dayjs; + + @Input() exercise: Exercise; + @Input() studentParticipation?: StudentParticipation; + @Input() course?: Course; + @Input() submissionPolicy?: SubmissionPolicy; + + dueDate?: dayjs.Dayjs; + programmingExercise?: ProgrammingExercise; + individualComplaintDueDate?: dayjs.Dayjs; + achievedPoints: number = 0; + numberOfSubmissions: number; + informationBoxItems: InformationBox[] = []; + + constructor(private sortService: SortService) {} + + ngOnInit() { + this.dueDate = getExerciseDueDate(this.exercise, this.studentParticipation); + + if (this.course?.maxComplaintTimeDays) { + this.individualComplaintDueDate = ComplaintService.getIndividualComplaintDueDate( + this.exercise, + this.course.maxComplaintTimeDays, + this.studentParticipation?.results?.last(), + this.studentParticipation, + ); + } + this.createInformationBoxItems(); + } + + ngOnChanges() { + this.course = this.course ?? getCourseFromExercise(this.exercise); + + if (this.submissionPolicy?.active && this.submissionPolicy?.submissionLimit) { + this.updateSubmissionPolicyItem(); + } + if (this.studentParticipation?.results?.length) { + // The updated participation by the websocket is not guaranteed to be sorted, find the newest result (highest id) + this.sortService.sortByProperty(this.studentParticipation.results, 'id', false); + + const latestRatedResult = this.studentParticipation.results.filter((result) => result.rated).first(); + if (latestRatedResult) { + this.achievedPoints = roundValueSpecifiedByCourseSettings((latestRatedResult.score! * this.exercise.maxPoints!) / 100, this.course) ?? 0; + } + } + } + + createInformationBoxItems() { + this.addPointsItems(); + this.addDueDateItems(); + this.addStartDateItem(); + this.addSubmissionStatusItem(); + this.addSubmissionPolicyItem(); + this.addDifficultyItem(); + this.addCategoryItems(); + } + + addPointsItems() { + const { maxPoints, bonusPoints } = this.exercise; + if (maxPoints) { + if (bonusPoints) { + let achievedBonusPoints: number = 0; + // If the student has more points than the max points, the bonus points are calculated + if (this.achievedPoints > maxPoints) { + achievedBonusPoints = roundValueSpecifiedByCourseSettings(this.achievedPoints - maxPoints, this.course); + } + const achievedPoints = this.achievedPoints - achievedBonusPoints; + this.informationBoxItems.push(this.getPointsItem('points', maxPoints, achievedPoints)); + this.informationBoxItems.push(this.getPointsItem('bonus', bonusPoints, achievedBonusPoints)); + } else { + this.informationBoxItems.push(this.getPointsItem('points', maxPoints, this.achievedPoints)); + } + } + } + + addDueDateItems() { + const now = dayjs(); + + const dueDateItem = this.getDueDateItem(); + if (dueDateItem) { + this.informationBoxItems.push(dueDateItem); + } + // If the due date is in the past and the assessment due date is in the future, show the assessment due date + if (this.dueDate?.isBefore(now) && this.exercise.assessmentDueDate?.isAfter(now)) { + const assessmentDueItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.assessmentDue', + content: { + type: 'dateTime', + value: this.exercise.assessmentDueDate, + }, + isContentComponent: true, + tooltip: 'artemisApp.courseOverview.exerciseDetails.assessmentDueTooltip', + }; + this.informationBoxItems.push(assessmentDueItem); + } + // // If the assessment due date is in the past and the complaint due date is in the future, show the complaint due date + if (this.exercise.assessmentDueDate?.isBefore(now) && this.individualComplaintDueDate?.isAfter(now)) { + const complaintDueItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.complaintDue', + content: { + type: 'dateTime', + value: this.individualComplaintDueDate, + }, + isContentComponent: true, + tooltip: 'artemisApp.courseOverview.exerciseDetails.complaintDueTooltip', + }; + this.informationBoxItems.push(complaintDueItem); + } + } + + getDueDateItem(): InformationBox | undefined { + if (this.dueDate) { + const isDueDateInThePast = this.dueDate.isBefore(dayjs()); + // If the due date is less than a day away, the color change to red + const dueDateStatusBadge = this.dueDate.isBetween(dayjs().add(1, 'day'), dayjs()) ? 'danger' : 'body-color'; + // If the due date is less than a week away, text is displayed relatively e.g. 'in 2 days' + const shouldDisplayDueDateRelative = isDateLessThanAWeekInTheFuture(this.dueDate); + + if (isDueDateInThePast) { + return { + title: 'artemisApp.courseOverview.exerciseDetails.submissionDueOver', + content: { + type: 'dateTime', + value: this.dueDate, + }, + isContentComponent: true, + }; + } + + return { + title: 'artemisApp.courseOverview.exerciseDetails.submissionDue', + content: { + type: shouldDisplayDueDateRelative ? 'timeAgo' : 'dateTime', + value: this.dueDate, + }, + isContentComponent: true, + tooltip: shouldDisplayDueDateRelative ? 'artemisApp.courseOverview.exerciseDetails.submissionDueTooltip' : undefined, + contentColor: dueDateStatusBadge, + tooltipParams: { date: this.dueDate?.format('lll') }, + }; + } + } + + addStartDateItem() { + if (this.exercise.startDate && dayjs().isBefore(this.exercise.startDate)) { + // If the start date is less than a week away, text is displayed relatively e.g. 'in 2 days' + const shouldDisplayStartDateRelative = isDateLessThanAWeekInTheFuture(this.exercise.startDate); + const startDateItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.startDate', + content: { + type: shouldDisplayStartDateRelative ? 'timeAgo' : 'dateTime', + value: this.exercise.startDate, + }, + isContentComponent: true, + tooltip: shouldDisplayStartDateRelative ? 'artemisApp.exerciseActions.startExerciseBeforeStartDate' : undefined, + }; + this.informationBoxItems.push(startDateItem); + } + } + + addDifficultyItem() { + if (this.exercise.difficulty) { + const difficultyItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.difficulty', + content: { + type: 'difficultyLevel', + value: this.exercise.difficulty, + }, + isContentComponent: true, + }; + this.informationBoxItems.push(difficultyItem); + } + } + + addSubmissionStatusItem() { + const submissionStatusItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.status', + content: { + type: 'submissionStatus', + value: this.exercise, + }, + isContentComponent: true, + }; + this.informationBoxItems.push(submissionStatusItem); + } + + addCategoryItems() { + const notReleased = this.exercise.releaseDate && dayjs(this.exercise.releaseDate).isAfter(dayjs()); + + if (notReleased || this.exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY || this.exercise.categories?.length) { + const categoryItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.categories', + content: { + type: 'categories', + value: this.exercise, + }, + isContentComponent: true, + }; + this.informationBoxItems.push(categoryItem); + } + } + + addSubmissionPolicyItem() { + if (this.submissionPolicy?.active && this.submissionPolicy?.submissionLimit) { + this.informationBoxItems.push(this.getSubmissionPolicyItem()); + } + } + + getSubmissionPolicyItem(): InformationBox { + return { + title: 'artemisApp.programmingExercise.submissionPolicy.submissionLimitTitle', + content: { + type: 'string', + value: `${this.numberOfSubmissions} / ${this.submissionPolicy?.submissionLimit}`, + }, + contentColor: this.submissionPolicy?.submissionLimit ? this.getSubmissionColor() : 'body-color', + tooltip: 'artemisApp.programmingExercise.submissionPolicy.submissionPolicyType.' + this.submissionPolicy?.type + '.tooltip', + tooltipParams: { points: this.submissionPolicy?.exceedingPenalty?.toString() }, + }; + } + + getSubmissionColor(): string { + // default color should be 'body-color', thats why the default submissionsLeft is 2 + const submissionsLeft = this.submissionPolicy?.submissionLimit ? this.submissionPolicy?.submissionLimit - this.numberOfSubmissions : 2; + let submissionColor = 'body-color'; + if (submissionsLeft === 1) submissionColor = 'warning'; + // 0 submissions left or limit is already reached + else if (submissionsLeft <= 0) submissionColor = 'danger'; + return submissionColor; + } + + getPointsItem(title: string, maxPoints: number, achievedPoints: number): InformationBox { + return { + title: 'artemisApp.courseOverview.exerciseDetails.' + title, + content: { + type: 'string', + value: `${achievedPoints} / ${maxPoints}`, + }, + }; + } + + updateSubmissionPolicyItem() { + this.countSubmissions(); + + // need to push and pop the submission policy item to update the number of submissions + const submissionItemIndex = this.informationBoxItems.findIndex((item) => item.title === 'artemisApp.programmingExercise.submissionPolicy.submissionLimitTitle'); + if (submissionItemIndex !== -1) { + this.informationBoxItems.splice(submissionItemIndex, 1, this.getSubmissionPolicyItem()); + } + } + + countSubmissions() { + const commitHashSet = new Set(); + + this.studentParticipation?.results + ?.map((result) => result.submission) + .filter((submission) => submission?.type === SubmissionType.MANUAL) + .map((submission) => (submission as ProgrammingSubmission).commitHash) + .forEach((commitHash: string) => commitHashSet.add(commitHash)); + + this.numberOfSubmissions = commitHashSet.size; + } +} diff --git a/src/main/webapp/app/exercises/shared/exercise/exercise.component.ts b/src/main/webapp/app/exercises/shared/exercise/exercise.component.ts index fccf7cdb3269..32d96f26b6f7 100644 --- a/src/main/webapp/app/exercises/shared/exercise/exercise.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise/exercise.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, inject } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Observable, Subject, Subscription, merge } from 'rxjs'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; @@ -15,6 +15,11 @@ interface DeletionServiceInterface { @Component({ template: '' }) export abstract class ExerciseComponent implements OnInit, OnDestroy { + protected translateService = inject(TranslateService); + protected eventManager = inject(EventManager); + private courseService = inject(CourseManagementService); + private route = inject(ActivatedRoute); + private eventSubscriber: Subscription; @Input() embedded = false; @Input() course: Course; @@ -23,8 +28,8 @@ export abstract class ExerciseComponent implements OnInit, OnDestroy { @Output() filteredExerciseCount = new EventEmitter(); showHeading: boolean; courseId: number; - predicate: string; - reverse: boolean; + predicate: string = 'id'; + reverse: boolean = true; selectedExercises: Exercise[] = []; allChecked = false; @@ -35,16 +40,6 @@ export abstract class ExerciseComponent implements OnInit, OnDestroy { protected abstract get exercises(): Exercise[]; - protected constructor( - private courseService: CourseManagementService, - protected translateService: TranslateService, - private route: ActivatedRoute, - protected eventManager: EventManager, - ) { - this.predicate = 'id'; - this.reverse = true; - } - /** * Fetches an exercise from the server (and if needed the course as well) */ diff --git a/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts b/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts index 688b7cd6fb44..79083e180ea2 100644 --- a/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts +++ b/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts @@ -50,10 +50,17 @@ export class ExerciseImportFromFileComponent implements OnInit { switch (this.exerciseType) { case ExerciseType.PROGRAMMING: this.exercise = JSON.parse(exerciseDetails as string) as ProgrammingExercise; + const progEx = this.exercise as ProgrammingExercise; // This is needed to make sure that old exported programming exercises can be imported - if (!(this.exercise as ProgrammingExercise).buildConfig) { - (this.exercise as ProgrammingExercise).buildConfig = copyBuildConfigFromExerciseJson(exerciseJson as ProgrammingExerciseBuildConfig); + if (!progEx.buildConfig) { + progEx.buildConfig = copyBuildConfigFromExerciseJson(exerciseJson as ProgrammingExerciseBuildConfig); } + if (progEx.auxiliaryRepositories) { + progEx.auxiliaryRepositories!.forEach((repo, index) => { + progEx.auxiliaryRepositories![index].id = undefined; + }); + } + this.exercise = progEx; break; default: this.alertService.error('artemisApp.exercise.importFromFile.notSupportedExerciseType', { diff --git a/src/main/webapp/app/exercises/shared/result/result.component.html b/src/main/webapp/app/exercises/shared/result/result.component.html index 65c4be9ca9de..01207f3c5052 100644 --- a/src/main/webapp/app/exercises/shared/result/result.component.html +++ b/src/main/webapp/app/exercises/shared/result/result.component.html @@ -60,7 +60,7 @@ } - @if (!isInSidebarCard) { + @if (!isInSidebarCard && showCompletion) { ({{ result!.completionDate | artemisTimeAgo }}) } @@ -97,7 +97,7 @@ } @case (ResultTemplateStatus.MISSING) { -   + @switch (missingResultInfo) { @case (MissingResultInfo.FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE) { diff --git a/src/main/webapp/app/exercises/shared/result/updating-result.component.ts b/src/main/webapp/app/exercises/shared/result/updating-result.component.ts index 640b02f38bff..ac2f1cc9ae4d 100644 --- a/src/main/webapp/app/exercises/shared/result/updating-result.component.ts +++ b/src/main/webapp/app/exercises/shared/result/updating-result.component.ts @@ -34,6 +34,7 @@ export class UpdatingResultComponent implements OnChanges, OnDestroy { @Input() showBadge = false; @Input() showIcon = true; @Input() isInSidebarCard = false; + @Input() showCompletion = true; @Output() showResult = new EventEmitter(); /** * @property personalParticipation Whether the participation belongs to the user (by being a student) or not (by being an instructor) diff --git a/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts b/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts index 22178ca78f3c..b48b4dbca3ff 100644 --- a/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts +++ b/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; import { TextAssessmentEvent, TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; @@ -13,6 +13,11 @@ import { Location } from '@angular/common'; */ @Injectable({ providedIn: 'root' }) export class TextAssessmentAnalytics { + protected assessmentsService = inject(TextAssessmentService); + protected accountService = inject(AccountService); + private location = inject(Location); + private profileService = inject(ProfileService); + private userId: number; private courseId: number; private textExerciseId: number; @@ -23,12 +28,7 @@ export class TextAssessmentAnalytics { private route: ActivatedRoute; public analyticsEnabled = false; - constructor( - protected assessmentsService: TextAssessmentService, - protected accountService: AccountService, - private profileService: ProfileService, - public location: Location, - ) { + constructor() { // retrieve the analytics enabled status from the profile info and set to current property this.profileService.getProfileInfo().subscribe((profileInfo) => { this.analyticsEnabled = profileInfo.textAssessmentAnalyticsEnabled || false; diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts index 200f7b69d95a..2646fccb48ad 100644 --- a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts +++ b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges, inject } from '@angular/core'; import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { StringCountService } from 'app/exercises/text/participate/string-count.service'; @@ -16,6 +16,8 @@ import { GradingCriterion } from 'app/exercises/shared/structured-grading-criter ], }) export class TextAssessmentAreaComponent implements OnChanges { + private stringCountService = inject(StringCountService); + // inputs @Input() submission: TextSubmission; @Input() textBlockRefs: TextBlockRef[]; @@ -32,8 +34,6 @@ export class TextAssessmentAreaComponent implements OnChanges { wordCount = 0; characterCount = 0; - constructor(private stringCountService: StringCountService) {} - /** * Life cycle hook to indicate component change */ diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts b/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts index 8c1f564182d5..a3c60d5352ee 100644 --- a/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts +++ b/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, inject } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { TextSubmission } from 'app/entities/text/text-submission.model'; @@ -17,6 +17,11 @@ import { getCourseFromExercise } from 'app/entities/exercise.model'; template: '', }) export abstract class TextAssessmentBaseComponent implements OnInit { + protected alertService = inject(AlertService); + protected accountService = inject(AccountService); + protected assessmentsService = inject(TextAssessmentService); + protected structuredGradingCriterionService = inject(StructuredGradingCriterionService); + /* * Base Component for TextSubmissionAssessmentComponent and ExampleTextSubmissionComponent since they share a lot of same functions. */ @@ -29,13 +34,6 @@ export abstract class TextAssessmentBaseComponent implements OnInit { readonly getCourseFromExercise = getCourseFromExercise; - protected constructor( - protected alertService: AlertService, - protected accountService: AccountService, - protected assessmentsService: TextAssessmentService, - protected structuredGradingCriterionService: StructuredGradingCriterionService, - ) {} - async ngOnInit() { // Used to check if the assessor is the current user const identity = await this.accountService.identity(); diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts index 492d620afe9c..6304b95f1625 100644 --- a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts +++ b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; @@ -22,12 +22,10 @@ type TextAssessmentDTO = { feedbacks: Feedback[]; textBlocks: TextBlock[]; asses providedIn: 'root', }) export class TextAssessmentService { - private readonly RESOURCE_URL = 'api'; + private http = inject(HttpClient); + private accountService = inject(AccountService); - constructor( - private http: HttpClient, - private accountService: AccountService, - ) {} + private readonly RESOURCE_URL = 'api'; /** * Saves the passed feedback items of the assessment. diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts index ed71e52c21d4..1d710d15ac1f 100644 --- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts +++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts @@ -1,10 +1,8 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit, inject } from '@angular/core'; import { Location } from '@angular/common'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ActivatedRoute, Router } from '@angular/router'; -import { AlertService } from 'app/core/util/alert.service'; import dayjs from 'dayjs/esm'; -import { AccountService } from 'app/core/auth/account.service'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { TextSubmission } from 'app/entities/text/text-submission.model'; import { TextExercise } from 'app/entities/text/text-exercise.model'; @@ -16,7 +14,6 @@ import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { notUndefined, onError } from 'app/shared/util/global.utils'; import { TranslateService } from '@ngx-translate/core'; import { NEW_ASSESSMENT_PATH } from 'app/exercises/text/assess/text-submission-assessment.route'; -import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service'; import { assessmentNavigateBack } from 'app/exercises/shared/navigate-back.util'; import { getLatestSubmissionResult, @@ -45,6 +42,16 @@ import { Subscription } from 'rxjs'; styleUrls: ['./text-submission-assessment.component.scss'], }) export class TextSubmissionAssessmentComponent extends TextAssessmentBaseComponent implements OnInit, OnDestroy { + private activatedRoute = inject(ActivatedRoute); + private router = inject(Router); + private location = inject(Location); + private route = inject(ActivatedRoute); + private complaintService = inject(ComplaintService); + private submissionService = inject(SubmissionService); + private exampleSubmissionService = inject(ExampleSubmissionService); + private athenaService = inject(AthenaService); + private translateService = inject(TranslateService); + /* * The instance of this component is REUSED for multiple assessments if using the "Assess Next" button! * All properties must be initialized with a default value (or null) in the resetComponent() method. @@ -66,7 +73,7 @@ export class TextSubmissionAssessmentComponent extends TextAssessmentBaseCompone assessmentsAreValid: boolean; noNewSubmissions: boolean; hasAssessmentDueDatePassed: boolean; - correctionRound: number; + correctionRound: number = 0; resultId: number; loadingInitialSubmission = true; highlightDifferences = false; @@ -99,24 +106,9 @@ export class TextSubmissionAssessmentComponent extends TextAssessmentBaseCompone // Icons farListAlt = faListAlt; - constructor( - private activatedRoute: ActivatedRoute, - private router: Router, - private location: Location, - private route: ActivatedRoute, - private complaintService: ComplaintService, - private submissionService: SubmissionService, - private exampleSubmissionService: ExampleSubmissionService, - private athenaService: AthenaService, - alertService: AlertService, - accountService: AccountService, - assessmentsService: TextAssessmentService, - structuredGradingCriterionService: StructuredGradingCriterionService, - translateService: TranslateService, - ) { - super(alertService, accountService, assessmentsService, structuredGradingCriterionService); - translateService.get('artemisApp.textAssessment.confirmCancel').subscribe((text) => (this.cancelConfirmationText = text)); - this.correctionRound = 0; + constructor() { + super(); + this.translateService.get('artemisApp.textAssessment.confirmCancel').subscribe((text) => (this.cancelConfirmationText = text)); this.resetComponent(); } diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts index 83e63bcd21b1..aa8fb3f15542 100644 --- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts +++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, Routes } from '@angular/router'; import { TextSubmission } from 'app/entities/text/text-submission.model'; import { of } from 'rxjs'; @@ -12,7 +12,7 @@ import { catchError, map } from 'rxjs/operators'; @Injectable({ providedIn: 'root' }) export class NewStudentParticipationResolver implements Resolve { - constructor(private textSubmissionService: TextSubmissionService) {} + private textSubmissionService = inject(TextSubmissionService); /** * Resolves the needed StudentParticipations for the TextSubmissionAssessmentComponent using the TextAssessmentService. @@ -33,7 +33,7 @@ export class NewStudentParticipationResolver implements Resolve { - constructor(private textAssessmentService: TextAssessmentService) {} + private textAssessmentService = inject(TextAssessmentService); /** * Resolves the needed StudentParticipations for the TextSubmissionAssessmentComponent using the TextAssessmentService. diff --git a/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts b/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts index 2a34e2b47136..402d82924caa 100644 --- a/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts +++ b/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { Component, EventEmitter, Input, Output, ViewChild, inject } from '@angular/core'; import { TextBlockRef } from 'app/entities/text/text-block-ref.model'; import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component'; import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service'; @@ -17,6 +17,10 @@ type OptionalTextBlockRef = TextBlockRef | undefined; styleUrls: ['./textblock-assessment-card.component.scss'], }) export class TextblockAssessmentCardComponent { + protected route = inject(ActivatedRoute); + private structuredGradingCriterionService = inject(StructuredGradingCriterionService); + textAssessmentAnalytics = inject(TextAssessmentAnalytics); + @Input() textBlockRef: TextBlockRef; @Input() selected = false; @Input() readOnly: boolean; @@ -29,12 +33,8 @@ export class TextblockAssessmentCardComponent { @Output() didDelete = new EventEmitter(); @ViewChild(TextblockFeedbackEditorComponent) feedbackEditor: TextblockFeedbackEditorComponent; - constructor( - public structuredGradingCriterionService: StructuredGradingCriterionService, - public textAssessmentAnalytics: TextAssessmentAnalytics, - protected route: ActivatedRoute, - ) { - textAssessmentAnalytics.setComponentRoute(route); + constructor() { + this.textAssessmentAnalytics.setComponentRoute(this.route); } /** diff --git a/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts b/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts index 0cae1c87a35b..d52448b4164c 100644 --- a/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts +++ b/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild, inject } from '@angular/core'; import { TextBlock } from 'app/entities/text/text-block.model'; import { Feedback, FeedbackType } from 'app/entities/feedback.model'; import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.component'; @@ -16,6 +16,11 @@ import { GradingCriterion } from 'app/exercises/shared/structured-grading-criter styleUrls: ['./textblock-feedback-editor.component.scss'], }) export class TextblockFeedbackEditorComponent implements AfterViewInit { + protected route = inject(ActivatedRoute); + protected modalService = inject(NgbModal); + structuredGradingCriterionService = inject(StructuredGradingCriterionService); + textAssessmentAnalytics = inject(TextAssessmentAnalytics); + readonly FeedbackType = FeedbackType; @Input() textBlock: TextBlock = new TextBlock(); @@ -55,13 +60,8 @@ export class TextblockFeedbackEditorComponent implements AfterViewInit { faTrash = faTrash; faAngleRight = faAngleRight; - constructor( - public structuredGradingCriterionService: StructuredGradingCriterionService, - protected modalService: NgbModal, - protected route: ActivatedRoute, - public textAssessmentAnalytics: TextAssessmentAnalytics, - ) { - textAssessmentAnalytics.setComponentRoute(route); + constructor() { + this.textAssessmentAnalytics.setComponentRoute(this.route); } /** diff --git a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts index 1640da7b1978..9592fcd4c481 100644 --- a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts +++ b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts @@ -1,11 +1,9 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, inject } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { AlertService } from 'app/core/util/alert.service'; import { HttpResponse } from '@angular/common/http'; import { EntityResponseType, ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service'; import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service'; import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor/tutor-participation.service'; -import { AccountService } from 'app/core/auth/account.service'; import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; import { tutorAssessmentTour } from 'app/guided-tour/tours/tutor-assessment-tour'; import { ExampleSubmission, ExampleSubmissionMode } from 'app/entities/example-submission.model'; @@ -16,7 +14,6 @@ import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; import { setLatestSubmissionResult } from 'app/entities/submission.model'; import { TextAssessmentBaseComponent } from 'app/exercises/text/assess/text-assessment-base.component'; -import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service'; import { notUndefined } from 'app/shared/util/global.utils'; import { AssessButtonStates, Context, State, SubmissionButtonStates, UIStates } from 'app/exercises/text/manage/example-text-submission/example-text-submission-state.model'; import { filter, mergeMap, switchMap, tap } from 'rxjs/operators'; @@ -35,6 +32,14 @@ type ExampleSubmissionResponseType = EntityResponseType; styleUrls: ['./example-text-submission.component.scss'], }) export class ExampleTextSubmissionComponent extends TextAssessmentBaseComponent implements OnInit, Context, FeedbackMarker { + private route = inject(ActivatedRoute); + private router = inject(Router); + private exampleSubmissionService = inject(ExampleSubmissionService); + private tutorParticipationService = inject(TutorParticipationService); + private guidedTourService = inject(GuidedTourService); + private navigationUtilService = inject(ArtemisNavigationUtilService); + private exerciseService = inject(ExerciseService); + isNewSubmission: boolean; areNewAssessments = true; @@ -62,20 +67,8 @@ export class ExampleTextSubmissionComponent extends TextAssessmentBaseComponent faEdit = faEdit; farListAlt = faListAlt; - constructor( - private exampleSubmissionService: ExampleSubmissionService, - private tutorParticipationService: TutorParticipationService, - private route: ActivatedRoute, - private router: Router, - private guidedTourService: GuidedTourService, - private navigationUtilService: ArtemisNavigationUtilService, - private exerciseService: ExerciseService, - alertService: AlertService, - accountService: AccountService, - assessmentsService: TextAssessmentService, - structuredGradingCriterionService: StructuredGradingCriterionService, - ) { - super(alertService, accountService, assessmentsService, structuredGradingCriterionService); + constructor() { + super(); this.textBlockRefs = []; this.unusedTextBlockRefs = []; this.submission = new TextSubmission(); diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts index e758013e44ee..92c75b1db510 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit, inject } from '@angular/core'; import { SafeHtml } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { HttpResponse } from '@angular/common/http'; @@ -29,6 +29,12 @@ import { templateUrl: './text-exercise-detail.component.html', }) export class TextExerciseDetailComponent implements OnInit, OnDestroy { + private route = inject(ActivatedRoute); + private eventManager = inject(EventManager); + private artemisMarkdownService = inject(ArtemisMarkdownService); + private textExerciseService = inject(TextExerciseService); + private statisticsService = inject(StatisticsService); + readonly documentationType: DocumentationType = 'Text'; readonly AssessmentType = AssessmentType; @@ -48,14 +54,6 @@ export class TextExerciseDetailComponent implements OnInit, OnDestroy { private subscription: Subscription; private eventSubscriber: Subscription; - constructor( - private eventManager: EventManager, - private textExerciseService: TextExerciseService, - private route: ActivatedRoute, - private artemisMarkdown: ArtemisMarkdownService, - private statisticsService: StatisticsService, - ) {} - /** * Loads the text exercise and subscribes to changes of it on component initialization. */ @@ -78,9 +76,9 @@ export class TextExerciseDetailComponent implements OnInit, OnDestroy { this.isExamExercise = !!this.textExercise.exerciseGroup; this.course = this.isExamExercise ? this.textExercise.exerciseGroup?.exam?.course : this.textExercise.course; - this.formattedGradingInstructions = this.artemisMarkdown.safeHtmlForMarkdown(this.textExercise.gradingInstructions); - this.formattedProblemStatement = this.artemisMarkdown.safeHtmlForMarkdown(this.textExercise.problemStatement); - this.formattedExampleSolution = this.artemisMarkdown.safeHtmlForMarkdown(this.textExercise.exampleSolution); + this.formattedGradingInstructions = this.artemisMarkdownService.safeHtmlForMarkdown(this.textExercise.gradingInstructions); + this.formattedProblemStatement = this.artemisMarkdownService.safeHtmlForMarkdown(this.textExercise.problemStatement); + this.formattedExampleSolution = this.artemisMarkdownService.safeHtmlForMarkdown(this.textExercise.exampleSolution); this.detailOverviewSections = this.getExerciseDetailSections(); }); this.statisticsService.getExerciseStatistics(exerciseId).subscribe((statistics: ExerciseManagementStatisticsDto) => { diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts index ed167d578dd0..6f5538b09ed1 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts @@ -1,5 +1,5 @@ import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { TextExercise } from 'app/entities/text/text-exercise.model'; import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-paging.service'; @@ -7,7 +7,8 @@ import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-pagi export class TextExercisePagingService extends ExercisePagingService { private static readonly RESOURCE_URL = 'api/text-exercises'; - constructor(http: HttpClient) { + constructor() { + const http = inject(HttpClient); super(http, TextExercisePagingService.RESOURCE_URL); } } diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts index 00e2973a5cc6..a1aab34bf04f 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, inject } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; import { Subject } from 'rxjs'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; @@ -12,6 +12,9 @@ import { faListAlt } from '@fortawesome/free-regular-svg-icons'; templateUrl: './text-exercise-row-buttons.component.html', }) export class TextExerciseRowButtonsComponent { + private eventManager = inject(EventManager); + private textExerciseService = inject(TextExerciseService); + @Input() courseId: number; @Input() exercise: TextExercise; private dialogErrorSource = new Subject(); @@ -25,11 +28,6 @@ export class TextExerciseRowButtonsComponent { faTable = faTable; farListAlt = faListAlt; - constructor( - private textExerciseService: TextExerciseService, - private eventManager: EventManager, - ) {} - deleteExercise() { this.textExerciseService.delete(this.exercise.id!).subscribe({ next: () => { diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts index e6abb283f200..18a5e8131205 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild, inject } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { HttpErrorResponse } from '@angular/common/http'; import { TextExercise } from 'app/entities/text/text-exercise.model'; @@ -37,6 +37,18 @@ import { FormulaAction } from 'app/shared/monaco-editor/model/actions/formula.ac changeDetection: ChangeDetectionStrategy.OnPush, }) export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterViewInit { + private activatedRoute = inject(ActivatedRoute); + private alertService = inject(AlertService); + private textExerciseService = inject(TextExerciseService); + private modalService = inject(NgbModal); + private popupService = inject(ExerciseUpdateWarningService); + private exerciseService = inject(ExerciseService); + private exerciseGroupService = inject(ExerciseGroupService); + private courseService = inject(CourseManagementService); + private eventManager = inject(EventManager); + private navigationUtilService = inject(ArtemisNavigationUtilService); + private athenaService = inject(AthenaService); + readonly IncludedInOverallScore = IncludedInOverallScore; readonly documentationType: DocumentationType = 'Text'; @@ -78,20 +90,6 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView plagiarismSubscription?: Subscription; teamSubscription?: Subscription; - constructor( - private alertService: AlertService, - private textExerciseService: TextExerciseService, - private modalService: NgbModal, - private popupService: ExerciseUpdateWarningService, - private exerciseService: ExerciseService, - private exerciseGroupService: ExerciseGroupService, - private courseService: CourseManagementService, - private eventManager: EventManager, - private activatedRoute: ActivatedRoute, - private navigationUtilService: ArtemisNavigationUtilService, - private athenaService: AthenaService, - ) {} - get editType(): EditType { if (this.isImport) { return EditType.IMPORT; diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts index ac46f89650d7..1ab47a466b49 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts @@ -1,19 +1,16 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, inject } from '@angular/core'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { ExerciseType } from 'app/entities/exercise.model'; import { TextExercise } from 'app/entities/text/text-exercise.model'; import { TextExerciseService } from './text-exercise.service'; -import { CourseManagementService } from 'app/course/manage/course-management.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { ActivatedRoute, Router } from '@angular/router'; +import { Router } from '@angular/router'; import { ExerciseComponent } from 'app/exercises/shared/exercise/exercise.component'; -import { TranslateService } from '@ngx-translate/core'; import { onError } from 'app/shared/util/global.utils'; import { AccountService } from 'app/core/auth/account.service'; import { SortService } from 'app/shared/service/sort.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AlertService } from 'app/core/util/alert.service'; -import { EventManager } from 'app/core/util/event-manager.service'; import { faPlus, faSort, faTrash } from '@fortawesome/free-solid-svg-icons'; import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component'; @@ -23,8 +20,17 @@ import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exer templateUrl: './text-exercise.component.html', }) export class TextExerciseComponent extends ExerciseComponent { - @Input() textExercises: TextExercise[]; - filteredTextExercises: TextExercise[]; + protected exerciseService = inject(ExerciseService); + protected textExerciseService = inject(TextExerciseService); + private router = inject(Router); + private courseExerciseService = inject(CourseExerciseService); + private modalService = inject(NgbModal); + private alertService = inject(AlertService); + private sortService = inject(SortService); + private accountService = inject(AccountService); + + @Input() textExercises: TextExercise[] = []; + filteredTextExercises: TextExercise[] = []; // Icons faSort = faSort; @@ -35,25 +41,6 @@ export class TextExerciseComponent extends ExerciseComponent { return this.textExercises; } - constructor( - public exerciseService: ExerciseService, - public textExerciseService: TextExerciseService, - private courseExerciseService: CourseExerciseService, - private modalService: NgbModal, - private router: Router, - courseService: CourseManagementService, - translateService: TranslateService, - private alertService: AlertService, - private sortService: SortService, - eventManager: EventManager, - route: ActivatedRoute, - private accountService: AccountService, - ) { - super(courseService, translateService, route, eventManager); - this.textExercises = []; - this.filteredTextExercises = []; - } - protected loadExercises(): void { this.courseExerciseService.findAllTextExercisesForCourse(this.courseId).subscribe({ next: (res: HttpResponse) => { diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts index 30d4763745fc..d5431d66cc5f 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts @@ -3,7 +3,7 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access-service' import { TextExerciseDetailComponent } from './text-exercise-detail.component'; import { TextExerciseUpdateComponent } from './text-exercise-update.component'; import { TextExercise } from 'app/entities/text/text-exercise.model'; -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { of } from 'rxjs'; @@ -19,11 +19,9 @@ import { ExampleSubmissionsComponent } from 'app/exercises/shared/example-submis @Injectable({ providedIn: 'root' }) export class TextExerciseResolver implements Resolve { - constructor( - private textExerciseService: TextExerciseService, - private courseService: CourseManagementService, - private exerciseGroupService: ExerciseGroupService, - ) {} + private textExerciseService = inject(TextExerciseService); + private courseService = inject(CourseManagementService); + private exerciseGroupService = inject(ExerciseGroupService); /** * Resolves the route and initializes text exercise diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts index 994f1ac75eeb..5c6b9275b3a1 100644 --- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts +++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { HttpClient, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -16,12 +16,10 @@ export type EntityArrayResponseType = HttpResponse; @Injectable({ providedIn: 'root' }) export class TextExerciseService implements ExerciseServicable { - private resourceUrl = 'api/text-exercises'; + private http = inject(HttpClient); + private exerciseService = inject(ExerciseService); - constructor( - private http: HttpClient, - private exerciseService: ExerciseService, - ) {} + private resourceUrl = 'api/text-exercises'; /** * Store a new text exercise on the server. diff --git a/src/main/webapp/app/exercises/text/manage/tutor-effort/tutor-effort-statistics.component.ts b/src/main/webapp/app/exercises/text/manage/tutor-effort/tutor-effort-statistics.component.ts index e6c54d0ce175..45d7cb002e0b 100644 --- a/src/main/webapp/app/exercises/text/manage/tutor-effort/tutor-effort-statistics.component.ts +++ b/src/main/webapp/app/exercises/text/manage/tutor-effort/tutor-effort-statistics.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, inject } from '@angular/core'; import { TutorEffort } from 'app/entities/tutor-effort.model'; import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service'; import { ActivatedRoute, Router } from '@angular/router'; @@ -21,6 +21,12 @@ interface TutorEffortRange { styleUrls: ['./tutor-effort-statistics.component.scss'], }) export class TutorEffortStatisticsComponent extends PlagiarismAndTutorEffortDirective implements OnInit { + private route = inject(ActivatedRoute); + private router = inject(Router); + private textExerciseService = inject(TextExerciseService); + private textAssessmentService = inject(TextAssessmentService); + private translateService = inject(TranslateService); + tutorEfforts: TutorEffort[] = []; numberOfSubmissions: number; totalTimeSpent: number; @@ -43,13 +49,7 @@ export class TutorEffortStatisticsComponent extends PlagiarismAndTutorEffortDire // Icons faSync = faSync; - constructor( - private textExerciseService: TextExerciseService, - private textAssessmentService: TextAssessmentService, - private route: ActivatedRoute, - private translateService: TranslateService, - private router: Router, - ) { + constructor() { super(); this.translateService.onLangChange.subscribe(() => { this.translateLabels(); diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts index 94659dfc211d..81deae339df6 100644 --- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts +++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts @@ -1,5 +1,4 @@ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +import { Component, Input, OnDestroy, OnInit, inject } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { HttpErrorResponse } from '@angular/common/http'; import { AlertService } from 'app/core/util/alert.service'; @@ -34,7 +33,7 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_IRIS } from 'app/app.constants'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; -import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service'; + @Component({ selector: 'jhi-text-editor', templateUrl: './text-editor.component.html', @@ -42,6 +41,16 @@ import { CourseExerciseService } from 'app/exercises/shared/course-exercises/cou styleUrls: ['./text-editor.component.scss'], }) export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeactivate { + private route = inject(ActivatedRoute); + private textSubmissionService = inject(TextSubmissionService); + private textService = inject(TextEditorService); + private alertService = inject(AlertService); + private participationWebsocketService = inject(ParticipationWebsocketService); + private stringCountService = inject(StringCountService); + private accountService = inject(AccountService); + private profileService = inject(ProfileService); + private irisSettingsService = inject(IrisSettingsService); + readonly ButtonType = ButtonType; readonly MAX_CHARACTER_COUNT = MAX_SUBMISSION_TEXT_LENGTH; protected readonly Result = Result; @@ -64,7 +73,7 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact resultWithComplaint?: Result; submission: TextSubmission; course?: Course; - isSaving: boolean; + isSaving: boolean = false; private textEditorInput = new Subject(); textEditorInputObservable = this.textEditorInput.asObservable(); private submissionChange = new Subject(); @@ -96,22 +105,6 @@ export class TextEditorComponent implements OnInit, OnDestroy, ComponentCanDeact showHistory: boolean = false; submissionId: number | undefined; - constructor( - private route: ActivatedRoute, - private textSubmissionService: TextSubmissionService, - private textService: TextEditorService, - private alertService: AlertService, - private translateService: TranslateService, - private participationWebsocketService: ParticipationWebsocketService, - private stringCountService: StringCountService, - private accountService: AccountService, - private courseExerciseService: CourseExerciseService, - private profileService: ProfileService, - private irisSettingsService: IrisSettingsService, - ) { - this.isSaving = false; - } - ngOnInit() { if (this.inputValuesArePresent()) { this.setupComponentWithInputValues(); diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.service.ts b/src/main/webapp/app/exercises/text/participate/text-editor.service.ts index cf7d67767a0a..5c87204ace41 100644 --- a/src/main/webapp/app/exercises/text/participate/text-editor.service.ts +++ b/src/main/webapp/app/exercises/text/participate/text-editor.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable, tap } from 'rxjs'; import { francAll } from 'franc-min'; @@ -8,7 +8,7 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service' @Injectable({ providedIn: 'root' }) export class TextEditorService { - constructor(private http: HttpClient) {} + private http = inject(HttpClient); get(participationId: number): Observable { return this.http diff --git a/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts b/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts index c63aaece1335..00fdd151b73b 100644 --- a/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts +++ b/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, inject } from '@angular/core'; import { Feedback, buildFeedbackTextForReview, checkSubsequentFeedbackInAssessment } from 'app/entities/feedback.model'; import { TextSubmission } from 'app/entities/text/text-submission.model'; import { Result } from 'app/entities/result.model'; @@ -15,6 +15,9 @@ import { Course } from 'app/entities/course.model'; styleUrls: ['./text-result.component.scss'], }) export class TextResultComponent { + private translateService = inject(TranslateService); + private localeConversionService = inject(LocaleConversionService); + public submissionText: string; public textResults: TextResultBlock[]; @@ -40,11 +43,6 @@ export class TextResultComponent { @Input() course?: Course; - constructor( - private translateService: TranslateService, - private localeConversionService: LocaleConversionService, - ) {} - private convertTextToResultBlocks(feedbacks: Feedback[] = []): void { checkSubsequentFeedbackInAssessment(feedbacks); diff --git a/src/main/webapp/app/exercises/text/participate/text-submission.service.ts b/src/main/webapp/app/exercises/text/participate/text-submission.service.ts index 2c90d0c7188c..7d406b3fe8d3 100644 --- a/src/main/webapp/app/exercises/text/participate/text-submission.service.ts +++ b/src/main/webapp/app/exercises/text/participate/text-submission.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -12,10 +12,8 @@ export type EntityResponseType = HttpResponse; @Injectable({ providedIn: 'root' }) export class TextSubmissionService { - constructor( - private http: HttpClient, - private submissionService: SubmissionService, - ) {} + private http = inject(HttpClient); + private submissionService = inject(SubmissionService); create(textSubmission: TextSubmission, exerciseId: number): Observable { const copy = this.submissionService.convert(textSubmission); diff --git a/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts b/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts index 1a846ba58988..b7c83334e01e 100644 --- a/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts +++ b/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output, inject } from '@angular/core'; import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model'; import { FeedbackType } from 'app/entities/feedback.model'; import { TextBlockType } from 'app/entities/text/text-block.model'; @@ -21,6 +21,9 @@ const SPACE = ' '; styleUrls: ['./manual-text-selection.component.scss'], }) export class ManualTextSelectionComponent { + protected route = inject(ActivatedRoute); + textAssessmentAnalytics = inject(TextAssessmentAnalytics); + @Input() public textBlockRefGroup: TextBlockRefGroup; @Input() submission: TextSubmission; @Output() public didSelectWord = new EventEmitter(); @@ -33,11 +36,8 @@ export class ManualTextSelectionComponent { public selectedWords = new Array(); public ready = false; - constructor( - public textAssessmentAnalytics: TextAssessmentAnalytics, - protected route: ActivatedRoute, - ) { - textAssessmentAnalytics.setComponentRoute(route); + constructor() { + this.textAssessmentAnalytics.setComponentRoute(this.route); } calculateIndex(index: number): void { diff --git a/src/main/webapp/app/exercises/text/shared/text-select.directive.ts b/src/main/webapp/app/exercises/text/shared/text-select.directive.ts index 3ff564df7462..8ead1a2d74ee 100644 --- a/src/main/webapp/app/exercises/text/shared/text-select.directive.ts +++ b/src/main/webapp/app/exercises/text/shared/text-select.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, EventEmitter, NgZone, OnDestroy, OnInit, Output } from '@angular/core'; +import { Directive, ElementRef, EventEmitter, NgZone, OnDestroy, OnInit, Output, inject } from '@angular/core'; /** * Disclaimer: @@ -32,15 +32,13 @@ enum EventType { selector: '[jhiTextSelect]', }) export class TextSelectDirective implements OnInit, OnDestroy { + private elementRef = inject(ElementRef); + private zone = inject(NgZone); + @Output() public jhiTextSelect = new EventEmitter(); private hasSelection = false; - constructor( - private elementRef: ElementRef, - private zone: NgZone, - ) {} - /** * Init text select directive by adding event listenes mouseDown and selectionChange event listeners to element. */ diff --git a/src/main/webapp/app/lecture/attachment.service.ts b/src/main/webapp/app/lecture/attachment.service.ts index 0ba18b39a248..cd8a93d7b94f 100644 --- a/src/main/webapp/app/lecture/attachment.service.ts +++ b/src/main/webapp/app/lecture/attachment.service.ts @@ -6,6 +6,7 @@ import { createRequestOption } from 'app/shared/util/request.util'; import { Attachment } from 'app/entities/attachment.model'; import { convertDateFromClient, convertDateFromServer } from 'app/utils/date.utils'; import { objectToJsonBlob } from 'app/utils/blob-util'; +import { cloneDeep } from 'lodash-es'; type EntityResponseType = HttpResponse; type EntityArrayResponseType = HttpResponse; @@ -34,8 +35,11 @@ export class AttachmentService { copy.lecture.posts = undefined; } + /** Ngsw-worker is bypassed temporarily to fix Chromium file upload issue + * See: https://issues.chromium.org/issues/374550348 + **/ return this.http - .post(this.resourceUrl, this.createFormData(copy, file), { observe: 'response' }) + .post(this.resourceUrl, this.createFormData(copy, file), { headers: { 'ngsw-bypass': 'true' }, observe: 'response' }) .pipe(map((res: EntityResponseType) => this.convertAttachmentResponseDatesFromServer(res))); } @@ -50,8 +54,11 @@ export class AttachmentService { const options = createRequestOption(req); const copy = this.convertAttachmentDatesFromClient(attachment); + /** Ngsw-worker is bypassed temporarily to fix Chromium file upload issue + * See: https://issues.chromium.org/issues/374550348 + **/ return this.http - .put(this.resourceUrl + '/' + attachmentId, this.createFormData(copy, file), { params: options, observe: 'response' }) + .put(this.resourceUrl + '/' + attachmentId, this.createFormData(copy, file), { headers: { 'ngsw-bypass': 'true' }, params: options, observe: 'response' }) .pipe(map((res: EntityResponseType) => this.convertAttachmentResponseDatesFromServer(res))); } @@ -96,11 +103,11 @@ export class AttachmentService { } convertAttachmentDatesFromClient(attachment: Attachment): Attachment { - const copy: Attachment = Object.assign({}, attachment, { + // Deep clone is applied to preserve all nested properties of the attachment + return Object.assign({}, cloneDeep(attachment), { releaseDate: convertDateFromClient(attachment.releaseDate), uploadDate: convertDateFromClient(attachment.uploadDate), }); - return copy; } convertAttachmentDatesFromServer(attachment?: Attachment) { diff --git a/src/main/webapp/app/lecture/lecture-attachments.component.html b/src/main/webapp/app/lecture/lecture-attachments.component.html index c20d21a173c5..6192f270d64e 100644 --- a/src/main/webapp/app/lecture/lecture-attachments.component.html +++ b/src/main/webapp/app/lecture/lecture-attachments.component.html @@ -1,29 +1,29 @@
- @if (lecture) { + @if (lecture()) {
- @if (showHeader) { + @if (showHeader()) {
-

: {{ lecture.title }} - {{ lecture.course?.shortName }}

+

: {{ lecture().title }} - {{ lecture().course?.shortName }}

- {{ lecture.startDate | artemisDate }} + {{ lecture().startDate | artemisDate }}
- {{ lecture.endDate | artemisDate }} + {{ lecture().endDate | artemisDate }}
-
+
@@ -83,7 +83,7 @@

- @if (lecture.isAtLeastInstructor) { + @if (lecture().isAtLeastInstructor) {
@if (!attachmentToBeCreated.id) {

- } - @if (attachmentToBeCreated.id) { + } @else {

}
@@ -198,11 +198,11 @@

- -
@@ -212,7 +212,7 @@

@if (!attachmentToBeCreated) {
-
diff --git a/src/main/webapp/app/lecture/lecture-attachments.component.ts b/src/main/webapp/app/lecture/lecture-attachments.component.ts index 6d89f669946a..262bbfe593a5 100644 --- a/src/main/webapp/app/lecture/lecture-attachments.component.ts +++ b/src/main/webapp/app/lecture/lecture-attachments.component.ts @@ -1,9 +1,9 @@ -import { Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Component, ElementRef, OnDestroy, ViewChild, effect, inject, input, signal } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { Lecture } from 'app/entities/lecture.model'; import dayjs from 'dayjs/esm'; -import { Subject } from 'rxjs'; +import { Subject, Subscription } from 'rxjs'; import { FileService } from 'app/shared/http/file.service'; import { Attachment, AttachmentType } from 'app/entities/attachment.model'; import { AttachmentService } from 'app/lecture/attachment.service'; @@ -16,7 +16,7 @@ import { LectureService } from 'app/lecture/lecture.service'; templateUrl: './lecture-attachments.component.html', styleUrls: ['./lecture-attachments.component.scss'], }) -export class LectureAttachmentsComponent implements OnInit, OnDestroy { +export class LectureAttachmentsComponent implements OnDestroy { protected readonly faSpinner = faSpinner; protected readonly faTimes = faTimes; protected readonly faTrash = faTrash; @@ -28,11 +28,16 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy { protected readonly allowedFileExtensions = ALLOWED_FILE_EXTENSIONS_HUMAN_READABLE; protected readonly acceptedFileExtensionsFileBrowser = ACCEPTED_FILE_EXTENSIONS_FILE_BROWSER; + private readonly activatedRoute = inject(ActivatedRoute); + private readonly attachmentService = inject(AttachmentService); + private readonly lectureService = inject(LectureService); + private readonly fileService = inject(FileService); + @ViewChild('fileInput', { static: false }) fileInput: ElementRef; - @Input() lectureId: number | undefined; - @Input() showHeader = true; + lectureId = input(); + showHeader = input(true); - lecture: Lecture; + lecture = signal(new Lecture()); attachments: Attachment[] = []; attachmentToBeCreated?: Attachment; attachmentBackup?: Attachment; @@ -46,30 +51,31 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy { private dialogErrorSource = new Subject(); dialogError$ = this.dialogErrorSource.asObservable(); - constructor( - protected activatedRoute: ActivatedRoute, - private attachmentService: AttachmentService, - private lectureService: LectureService, - private fileService: FileService, - ) {} - - ngOnInit() { - this.notificationText = undefined; - this.activatedRoute.parent!.data.subscribe(({ lecture }) => { - if (this.lectureId) { - this.lectureService.findWithDetails(this.lectureId).subscribe((lectureResponse: HttpResponse) => { - this.lecture = lectureResponse.body!; - this.loadAttachments(); + private routeDataSubscription?: Subscription; + + constructor() { + effect( + () => { + this.notificationText = undefined; + this.routeDataSubscription?.unsubscribe(); // in case the subscription was already defined + this.routeDataSubscription = this.activatedRoute.parent!.data.subscribe(({ lecture }) => { + if (this.lectureId()) { + this.lectureService.findWithDetails(this.lectureId()!).subscribe((lectureResponse: HttpResponse) => { + this.lecture.set(lectureResponse.body!); + this.loadAttachments(); + }); + } else { + this.lecture.set(lecture); + this.loadAttachments(); + } }); - } else { - this.lecture = lecture; - this.loadAttachments(); - } - }); + }, + { allowSignalWrites: true }, + ); } loadAttachments(): void { - this.attachmentService.findAllByLectureId(this.lecture.id!).subscribe((attachmentsResponse: HttpResponse) => { + this.attachmentService.findAllByLectureId(this.lecture().id!).subscribe((attachmentsResponse: HttpResponse) => { this.attachments = attachmentsResponse.body!; this.attachments.forEach((attachment) => { this.viewButtonAvailable[attachment.id!] = this.isViewButtonAvailable(attachment.link!); @@ -79,6 +85,7 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.dialogErrorSource.unsubscribe(); + this.routeDataSubscription?.unsubscribe(); } isViewButtonAvailable(attachmentLink: string): boolean { @@ -91,7 +98,7 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy { addAttachment(): void { const newAttachment = new Attachment(); - newAttachment.lecture = this.lecture; + newAttachment.lecture = this.lecture(); newAttachment.attachmentType = AttachmentType.FILE; newAttachment.version = 0; newAttachment.uploadDate = dayjs(); @@ -133,8 +140,8 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy { this.attachmentService.create(this.attachmentToBeCreated!, this.attachmentFile!).subscribe({ next: (attachmentRes: HttpResponse) => { this.attachments.push(attachmentRes.body!); - this.lectureService.findWithDetails(this.lecture.id!).subscribe((lectureResponse: HttpResponse) => { - this.lecture = lectureResponse.body!; + this.lectureService.findWithDetails(this.lecture().id!).subscribe((lectureResponse: HttpResponse) => { + this.lecture.set(lectureResponse.body!); }); this.attachmentFile = undefined; this.attachmentToBeCreated = undefined; @@ -196,7 +203,7 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy { downloadAttachment(downloadUrl: string): void { if (!this.isDownloadingAttachmentLink) { this.isDownloadingAttachmentLink = downloadUrl; - this.fileService.downloadFile(downloadUrl); + this.fileService.downloadFile(this.fileService.replaceLectureAttachmentPrefixAndUnderscores(downloadUrl)); this.isDownloadingAttachmentLink = undefined; } } diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.ts index 6ed702b59547..1bc42524d04b 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnChanges, ViewChild, computed, inject, input, output, signal } from '@angular/core'; +import { Component, ElementRef, OnChanges, ViewChild, computed, inject, input, output, signal, viewChild } from '@angular/core'; import dayjs from 'dayjs/esm'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { faQuestionCircle, faTimes } from '@fortawesome/free-solid-svg-icons'; @@ -6,6 +6,7 @@ import { ACCEPTED_FILE_EXTENSIONS_FILE_BROWSER, ALLOWED_FILE_EXTENSIONS_HUMAN_RE import { CompetencyLectureUnitLink } from 'app/entities/competency.model'; import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants'; import { toSignal } from '@angular/core/rxjs-interop'; +import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; export interface AttachmentUnitFormData { formProperties: FormProperties; @@ -47,6 +48,8 @@ export class AttachmentUnitFormComponent implements OnChanges { hasCancelButton = input(false); onCancel = output(); + datePickerComponent = viewChild(FormDateTimePickerComponent); + // have to handle the file input as a special case at is not part of the reactive form @ViewChild('fileInput', { static: false }) fileInput: ElementRef; @@ -68,7 +71,7 @@ export class AttachmentUnitFormComponent implements OnChanges { private readonly statusChanges = toSignal(this.form.statusChanges ?? 'INVALID'); isFormValid = computed(() => { - return (this.statusChanges() === 'VALID' || this.fileName()) && !this.isFileTooBig(); + return (this.statusChanges() === 'VALID' || this.fileName()) && !this.isFileTooBig() && this.datePickerComponent()?.isValid(); }); ngOnChanges(): void { diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts index 533d454f9a06..4a5e3ed80a71 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts @@ -26,18 +26,27 @@ export class AttachmentUnitService { } create(formData: FormData, lectureId: number): Observable { + /** Ngsw-worker is bypassed temporarily to fix Chromium file upload issue + * See: https://issues.chromium.org/issues/374550348 + **/ return this.httpClient - .post(`${this.resourceURL}/lectures/${lectureId}/attachment-units?keepFilename=true`, formData, { observe: 'response' }) + .post(`${this.resourceURL}/lectures/${lectureId}/attachment-units?keepFilename=true`, formData, { + headers: { 'ngsw-bypass': 'true' }, + observe: 'response', + }) .pipe(map((res: EntityResponseType) => this.lectureUnitService.convertLectureUnitResponseDatesFromServer(res))); } update(lectureId: number, attachmentUnitId: number, formData: FormData, notificationText?: string): Observable { + /** Ngsw-worker is bypassed temporarily to fix Chromium file upload issue + * See: https://issues.chromium.org/issues/374550348 + **/ return this.httpClient .put( `${this.resourceURL}/lectures/${lectureId}/attachment-units/${attachmentUnitId}?keepFilename=true` + (notificationText ? `¬ificationText=${notificationText}` : ''), formData, - { observe: 'response' }, + { headers: { 'ngsw-bypass': 'true' }, observe: 'response' }, ) .pipe(map((res: EntityResponseType) => this.lectureUnitService.convertLectureUnitResponseDatesFromServer(res))); } diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html index de1442861a96..677b82c94a9b 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html @@ -68,23 +68,27 @@
- @if (lecture.course?.id && showCompetencies) { - - } - @if (viewButtonAvailable[lectureUnit.id!]) { - - - - } +
+ @if (lecture.course?.id && showCompetencies) { + + } + @if (viewButtonAvailable[lectureUnit.id!]) { + + + + } +
+
@if (this.emitEditEvents) { @if (editButtonAvailable(lectureUnit)) { diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.ts index 67adf4f2c8dc..241feda894e8 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.ts @@ -1,5 +1,5 @@ import dayjs from 'dayjs/esm'; -import { Component, OnChanges, computed, inject, input, output } from '@angular/core'; +import { Component, OnChanges, computed, inject, input, output, viewChild } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { faArrowLeft, faTimes } from '@fortawesome/free-solid-svg-icons'; import { map } from 'rxjs'; @@ -8,6 +8,7 @@ import { OnlineResourceDTO } from 'app/lecture/lecture-unit/lecture-unit-managem import { OnlineUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/onlineUnit.service'; import { CompetencyLectureUnitLink } from 'app/entities/competency.model'; import { toSignal } from '@angular/core/rxjs-interop'; +import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; export interface OnlineUnitFormData { name?: string; @@ -45,6 +46,8 @@ export class OnlineUnitFormComponent implements OnChanges { hasCancelButton = input(false); onCancel = output(); + datePickerComponent = viewChild(FormDateTimePickerComponent); + urlValidator = urlValidator; private readonly formBuilder = inject(FormBuilder); @@ -59,7 +62,7 @@ export class OnlineUnitFormComponent implements OnChanges { }); private readonly statusChanges = toSignal(this.form.statusChanges ?? 'INVALID'); - isFormValid = computed(() => this.statusChanges() === 'VALID'); + isFormValid = computed(() => this.statusChanges() === 'VALID' && this.datePickerComponent()?.isValid()); get nameControl() { return this.form.get('name'); diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.ts index b6d7b31447b2..3ed05d37b8c1 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.ts @@ -1,4 +1,4 @@ -import { Component, OnChanges, OnDestroy, OnInit, computed, inject, input, output } from '@angular/core'; +import { Component, OnChanges, OnDestroy, OnInit, computed, inject, input, output, viewChild } from '@angular/core'; import dayjs from 'dayjs/esm'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; @@ -8,6 +8,7 @@ import { TranslateService } from '@ngx-translate/core'; import { faTimes } from '@fortawesome/free-solid-svg-icons'; import { CompetencyLectureUnitLink } from 'app/entities/competency.model'; import { toSignal } from '@angular/core/rxjs-interop'; +import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; export interface TextUnitFormData { name?: string; @@ -32,6 +33,8 @@ export class TextUnitFormComponent implements OnInit, OnChanges, OnDestroy { hasCancelButton = input(false); onCancel = output(); + datePickerComponent = viewChild(FormDateTimePickerComponent); + // not included in reactive form content: string | undefined; contentLoadedFromCache = false; @@ -46,7 +49,7 @@ export class TextUnitFormComponent implements OnInit, OnChanges, OnDestroy { }); private readonly statusChanges = toSignal(this.form.statusChanges ?? 'INVALID'); - isFormValid = computed(() => this.statusChanges() === 'VALID'); + isFormValid = computed(() => this.statusChanges() === 'VALID' && this.datePickerComponent()?.isValid()); private markdownChanges = new Subject(); private markdownChangesSubscription: Subscription; diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.ts index 543526c9491b..0ffea72952dc 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.ts @@ -1,10 +1,11 @@ import dayjs from 'dayjs/esm'; -import { Component, computed, effect, inject, input, output, untracked } from '@angular/core'; +import { Component, computed, effect, inject, input, output, untracked, viewChild } from '@angular/core'; import { AbstractControl, FormBuilder, FormGroup, ValidationErrors, Validators } from '@angular/forms'; import urlParser from 'js-video-url-parser'; import { faArrowLeft, faTimes } from '@fortawesome/free-solid-svg-icons'; import { CompetencyLectureUnitLink } from 'app/entities/competency.model'; import { toSignal } from '@angular/core/rxjs-interop'; +import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; export interface VideoUnitFormData { name?: string; @@ -72,6 +73,8 @@ export class VideoUnitFormComponent { hasCancelButton = input(); onCancel = output(); + datePickerComponent = viewChild(FormDateTimePickerComponent); + videoSourceUrlValidator = videoSourceUrlValidator; videoSourceTransformUrlValidator = videoSourceTransformUrlValidator; @@ -84,7 +87,7 @@ export class VideoUnitFormComponent { competencyLinks: [undefined as CompetencyLectureUnitLink[] | undefined], }); private readonly statusChanges = toSignal(this.form.statusChanges ?? 'INVALID'); - isFormValid = computed(() => this.statusChanges() === 'VALID'); + isFormValid = computed(() => this.statusChanges() === 'VALID' && this.datePickerComponent()?.isValid()); constructor() { effect(() => { diff --git a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.html b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.html index bf47a60b82d2..8883da0aa551 100644 --- a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.html +++ b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.html @@ -1,30 +1,80 @@
-
-

- - @if (attachment) { - {{ attachment.id }}: {{ attachment.name }} - } @else if (attachmentUnit) { - {{ attachmentUnit.id }}: {{ attachmentUnit.name }} +
+
+

+ + @if (attachment()) { + {{ attachment()!.id! }}: {{ attachment()!.name! }} + } @else if (attachmentUnit()) { + {{ attachmentUnit()!.id! }}: {{ attachmentUnit()!.name! }} + } +

+ @if (isPdfLoading()) { + } -

-
-
- @if (isEnlargedView) { -
- - - @if (currentPage !== 1) { - - } - @if (currentPage !== totalPages) { - - } -
{{ currentPage }}
-
+
+
+ + + +
+
+
+ @if (isEnlargedView()) { +
+ + + @if (currentPage() !== 1) { + } + @if (currentPage() !== totalPages()) { + + } +
{{ currentPage() }}
+ } +
+
+ +
+
diff --git a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.scss b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.scss index 1ce2019305cb..967dc25f53f8 100644 --- a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.scss +++ b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.scss @@ -1,21 +1,19 @@ .pdf-container { position: relative; display: grid; - grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); - gap: 30px; - max-height: 60vh; + grid-template-columns: repeat(auto-fill, minmax(270px, 1fr)); + gap: 10px; height: 60vh; overflow-y: auto; border: 1px solid var(--border-color); padding: 10px; - margin: 10px; - width: 95%; + margin: 10px 0; + width: 100%; box-shadow: 0 2px 5px var(--pdf-preview-pdf-container-shadow); - align-items: start; z-index: 0; @media (max-width: 800px) { - grid-template-columns: repeat(2, 1fr); + grid-template-columns: repeat(auto-fit, minmax(270px, 1fr)); } @media (max-width: 500px) { @@ -33,7 +31,7 @@ justify-content: center; align-items: center; background-color: var(--pdf-preview-enlarged-container-overlay); - z-index: 2; + z-index: 5; .btn-close { position: absolute; @@ -87,3 +85,7 @@ right: 10px; } } + +.spinner-border { + margin-left: 10px; +} diff --git a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.ts b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.ts index f2075dc57fbb..e0b1b95ea690 100644 --- a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.ts +++ b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.ts @@ -1,5 +1,5 @@ -import { Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { Component, ElementRef, HostListener, OnDestroy, OnInit, inject, signal, viewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; import { AttachmentService } from 'app/lecture/attachment.service'; import * as PDFJS from 'pdfjs-dist'; import 'pdfjs-dist/build/pdf.worker'; @@ -8,10 +8,16 @@ import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model'; import { AttachmentUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service'; import { onError } from 'app/shared/util/global.utils'; import { AlertService } from 'app/core/util/alert.service'; -import { Subscription } from 'rxjs'; +import { Subject, Subscription } from 'rxjs'; import { Course } from 'app/entities/course.model'; import { HttpErrorResponse } from '@angular/common/http'; import { ArtemisSharedModule } from 'app/shared/shared.module'; +import { faFileImport, faSave, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons'; +import { PDFDocument } from 'pdf-lib'; +import dayjs from 'dayjs/esm'; +import { objectToJsonBlob } from 'app/utils/blob-util'; +import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants'; +import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; type NavigationDirection = 'next' | 'prev'; @@ -23,60 +29,93 @@ type NavigationDirection = 'next' | 'prev'; imports: [ArtemisSharedModule], }) export class PdfPreviewComponent implements OnInit, OnDestroy { - @ViewChild('pdfContainer', { static: true }) pdfContainer: ElementRef; - @ViewChild('enlargedCanvas') enlargedCanvas: ElementRef; + pdfContainer = viewChild.required>('pdfContainer'); + enlargedCanvas = viewChild.required>('enlargedCanvas'); + fileInput = viewChild.required>('fileInput'); - readonly DEFAULT_SLIDE_WIDTH = 250; - course?: Course; - attachment?: Attachment; - attachmentUnit?: AttachmentUnit; - isEnlargedView = false; - currentPage = 1; - totalPages = 0; attachmentSub: Subscription; attachmentUnitSub: Subscription; - constructor( - public route: ActivatedRoute, - private attachmentService: AttachmentService, - private attachmentUnitService: AttachmentUnitService, - private alertService: AlertService, - ) {} + readonly DEFAULT_SLIDE_WIDTH = 250; + readonly DEFAULT_SLIDE_HEIGHT = 800; + course = signal(undefined); + attachment = signal(undefined); + attachmentUnit = signal(undefined); + isEnlargedView = signal(false); + isFileChanged = signal(false); + currentPage = signal(1); + totalPages = signal(0); + selectedPages = signal>(new Set()); + isPdfLoading = signal(false); + attachmentToBeEdited = signal(undefined); + currentPdfBlob = signal(null); + + // Injected services + private readonly route = inject(ActivatedRoute); + private readonly attachmentService = inject(AttachmentService); + private readonly attachmentUnitService = inject(AttachmentUnitService); + private readonly lectureUnitService = inject(LectureUnitService); + private readonly alertService = inject(AlertService); + private readonly router = inject(Router); + + dialogErrorSource = new Subject(); + dialogError$ = this.dialogErrorSource.asObservable(); + + // Icons + protected readonly faFileImport = faFileImport; + protected readonly faSave = faSave; + protected readonly faTimes = faTimes; + protected readonly faTrash = faTrash; ngOnInit() { this.route.data.subscribe((data) => { - this.course = data.course; + this.course.set(data.course); + if ('attachment' in data) { - this.attachment = data.attachment; - this.attachmentSub = this.attachmentService.getAttachmentFile(this.course!.id!, this.attachment!.id!).subscribe({ - next: (blob: Blob) => this.loadPdf(URL.createObjectURL(blob)), + this.attachment.set(data.attachment); + this.attachmentSub = this.attachmentService.getAttachmentFile(this.course()!.id!, this.attachment()!.id!).subscribe({ + next: (blob: Blob) => this.handleBlob(blob), error: (error: HttpErrorResponse) => onError(this.alertService, error), }); } else if ('attachmentUnit' in data) { - this.attachmentUnit = data.attachmentUnit; - this.attachmentUnitSub = this.attachmentUnitService.getAttachmentFile(this.course!.id!, this.attachmentUnit!.id!).subscribe({ - next: (blob: Blob) => this.loadPdf(URL.createObjectURL(blob)), + this.attachmentUnit.set(data.attachmentUnit); + this.attachmentUnitSub = this.attachmentUnitService.getAttachmentFile(this.course()!.id!, this.attachmentUnit()!.id!).subscribe({ + next: (blob: Blob) => this.handleBlob(blob), error: (error: HttpErrorResponse) => onError(this.alertService, error), }); } }); } + handleBlob(blob: Blob): void { + this.currentPdfBlob.set(blob); + const objectUrl = URL.createObjectURL(blob); + this.loadOrAppendPdf(objectUrl).then(() => URL.revokeObjectURL(objectUrl)); + } + ngOnDestroy() { this.attachmentSub?.unsubscribe(); this.attachmentUnitSub?.unsubscribe(); } /** - * Handles keyboard events for navigation within the PDF viewer. - * @param event The keyboard event captured. + * Checks if all pages are selected. + * @returns True if the number of selected pages equals the total number of pages, otherwise false. + */ + allPagesSelected() { + return this.selectedPages().size === this.totalPages(); + } + + /** + * Handles navigation within the PDF viewer using keyboard arrow keys. + * @param event - The keyboard event captured for navigation. */ @HostListener('document:keydown', ['$event']) handleKeyboardEvents(event: KeyboardEvent) { - if (this.isEnlargedView) { - if (event.key === 'ArrowRight' && this.currentPage < this.totalPages) { + if (this.isEnlargedView()) { + if (event.key === 'ArrowRight' && this.currentPage() < this.totalPages()) { this.navigatePages('next'); - } else if (event.key === 'ArrowLeft' && this.currentPage > 1) { + } else if (event.key === 'ArrowLeft' && this.currentPage() > 1) { this.navigatePages('prev'); } } @@ -91,41 +130,67 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { } /** - * Loads a PDF from a provided URL and initializes viewer setup. - * @param fileUrl The URL of the file to load. + * Loads or appends a PDF from a provided URL. + * @param fileUrl The URL of the file to load or append. + * @param append Whether the document should be appended to the existing one. + * @returns A promise that resolves when the PDF is loaded. */ - async loadPdf(fileUrl: string) { + async loadOrAppendPdf(fileUrl: string, append = false): Promise { + this.pdfContainer() + .nativeElement.querySelectorAll('.pdf-canvas-container') + .forEach((canvas) => canvas.remove()); + this.totalPages.set(0); + this.isPdfLoading.set(true); try { const loadingTask = PDFJS.getDocument(fileUrl); const pdf = await loadingTask.promise; - this.totalPages = pdf.numPages; + this.totalPages.set(pdf.numPages); - for (let i = 1; i <= pdf.numPages; i++) { + for (let i = 1; i <= this.totalPages(); i++) { const page = await pdf.getPage(i); const viewport = page.getViewport({ scale: 2 }); - const canvas = this.createCanvas(viewport); + const canvas = this.createCanvas(viewport, i); const context = canvas.getContext('2d'); - if (context) { - await page.render({ canvasContext: context, viewport }).promise; - } + await page.render({ canvasContext: context!, viewport }).promise; - const container = this.createContainer(canvas, i); - this.pdfContainer.nativeElement.appendChild(container); + const canvasContainer = this.createCanvasContainer(canvas, i); + this.pdfContainer().nativeElement.appendChild(canvasContainer); } - URL.revokeObjectURL(fileUrl); + if (append) { + this.scrollToBottom(); + } } catch (error) { onError(this.alertService, error); + } finally { + this.isPdfLoading.set(false); + if (append) { + this.fileInput().nativeElement.value = ''; + } } } + /** + * Scrolls the PDF container to the bottom after appending new pages. + */ + scrollToBottom(): void { + const scrollOptions: ScrollToOptions = { + top: this.pdfContainer().nativeElement.scrollHeight, + left: 0, + behavior: 'smooth' as ScrollBehavior, + }; + this.pdfContainer().nativeElement.scrollTo(scrollOptions); + } + /** * Creates a canvas for each page of the PDF to allow for individual page rendering. * @param viewport The viewport settings used for rendering the page. + * @param pageIndex The index of the page within the PDF document. * @returns A new HTMLCanvasElement configured for the PDF page. */ - private createCanvas(viewport: PDFJS.PageViewport): HTMLCanvasElement { + createCanvas(viewport: PDFJS.PageViewport, pageIndex: number): HTMLCanvasElement { const canvas = document.createElement('canvas'); + canvas.id = `${pageIndex}`; /* Canvas styling is predefined because Canvas tags do not support CSS classes * as they are not HTML elements but rather a bitmap drawing surface. * See: https://stackoverflow.com/a/29675448 @@ -145,17 +210,20 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { * @param pageIndex The index of the page within the PDF document. * @returns A configured div element that includes the canvas and interactive overlays. */ - createContainer(canvas: HTMLCanvasElement, pageIndex: number): HTMLDivElement { + createCanvasContainer(canvas: HTMLCanvasElement, pageIndex: number): HTMLDivElement { const container = document.createElement('div'); /* Dynamically created elements are not detected by DOM, that is why we need to set the styles manually. * See: https://stackoverflow.com/a/70911189 */ - container.classList.add('pdf-page-container'); + container.id = `pdf-page-${pageIndex}`; + container.classList.add('pdf-canvas-container'); container.style.cssText = `position: relative; display: inline-block; width: ${canvas.style.width}; height: ${canvas.style.height}; margin: 20px; box-shadow: 0 2px 6px var(--pdf-preview-canvas-shadow);`; const overlay = this.createOverlay(pageIndex); + const checkbox = this.createCheckbox(pageIndex); container.appendChild(canvas); container.appendChild(overlay); + container.appendChild(checkbox); container.addEventListener('mouseenter', () => { overlay.style.opacity = '1'; @@ -163,7 +231,7 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { container.addEventListener('mouseleave', () => { overlay.style.opacity = '0'; }); - overlay.addEventListener('click', () => this.displayEnlargedCanvas(canvas, pageIndex)); + overlay.addEventListener('click', () => this.displayEnlargedCanvas(canvas)); return container; } @@ -183,42 +251,81 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { return overlay; } + private createCheckbox(pageIndex: number): HTMLDivElement { + const checkbox = document.createElement('input'); + checkbox.type = 'checkbox'; + checkbox.id = String(pageIndex); + checkbox.style.cssText = `position: absolute; top: -5px; right: -5px; z-index: 4;`; + checkbox.checked = this.selectedPages().has(pageIndex); + checkbox.addEventListener('change', () => { + if (checkbox.checked) { + this.selectedPages().add(Number(checkbox.id)); + } else { + this.selectedPages().delete(Number(checkbox.id)); + } + }); + return checkbox; + } + /** * Dynamically updates the canvas size within an enlarged view based on the viewport. */ adjustCanvasSize = () => { - if (this.isEnlargedView) { - const canvasElements = this.pdfContainer.nativeElement.querySelectorAll('.pdf-page-container canvas'); - if (this.currentPage - 1 < canvasElements.length) { - const canvas = canvasElements[this.currentPage - 1] as HTMLCanvasElement; + if (this.isEnlargedView()) { + const canvasElements = this.pdfContainer().nativeElement.querySelectorAll('.pdf-canvas-container canvas'); + if (this.currentPage() - 1 < canvasElements.length) { + const canvas = canvasElements[this.currentPage() - 1] as HTMLCanvasElement; this.updateEnlargedCanvas(canvas); } } }; /** - * Displays a canvas in an enlarged view for detailed examination. - * @param originalCanvas The original canvas element displaying the page. - * @param pageIndex The index of the page being displayed. + * Adjusts the size of the PDF container based on whether the enlarged view is active or not. + * If the enlarged view is active, the container's size is reduced to focus on the enlarged content. + * If the enlarged view is closed, the container returns to its original size. + * + * @param isVertical A boolean flag indicating whether to enlarge or reset the container size. */ - displayEnlargedCanvas(originalCanvas: HTMLCanvasElement, pageIndex: number) { - this.isEnlargedView = true; - this.currentPage = pageIndex; - this.updateEnlargedCanvas(originalCanvas); + adjustPdfContainerSize(isVertical: boolean): void { + const pdfContainer = this.pdfContainer().nativeElement; + if (isVertical) { + pdfContainer.style.height = `${this.DEFAULT_SLIDE_HEIGHT}px`; + } else { + pdfContainer.style.height = '60vh'; + } + } + + /** + * Displays the selected PDF page in an enlarged view for detailed examination. + * @param originalCanvas - The original canvas element of the PDF page to be enlarged. + * */ + displayEnlargedCanvas(originalCanvas: HTMLCanvasElement) { + const isVertical = originalCanvas.height > originalCanvas.width; + this.adjustPdfContainerSize(isVertical); + this.isEnlargedView.set(true); + this.currentPage.set(Number(originalCanvas.id)); this.toggleBodyScroll(true); + setTimeout(() => { + this.updateEnlargedCanvas(originalCanvas); + }, 50); } + /** * Updates the enlarged canvas dimensions to optimize PDF page display within the current viewport. * This method dynamically adjusts the size, position, and scale of the canvas to maintain the aspect ratio, * ensuring the content is centered and displayed appropriately within the available space. * It is called within an animation frame to synchronize updates with the browser's render cycle for smooth visuals. * - * @param {HTMLCanvasElement} originalCanvas - The source canvas element used to extract image data for resizing and redrawing. + * @param originalCanvas - The source canvas element used to extract image data for resizing and redrawing. */ updateEnlargedCanvas(originalCanvas: HTMLCanvasElement) { requestAnimationFrame(() => { if (!this.isEnlargedView) return; + const isVertical = originalCanvas.height > originalCanvas.width; + this.adjustPdfContainerSize(isVertical); + const scaleFactor = this.calculateScaleFactor(originalCanvas); this.resizeCanvas(originalCanvas, scaleFactor); this.redrawCanvas(originalCanvas); @@ -230,14 +337,26 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { * Calculates the scaling factor to adjust the canvas size based on the dimensions of the container. * This method ensures that the canvas is scaled to fit within the container without altering the aspect ratio. * - * @param {HTMLCanvasElement} originalCanvas - The original canvas element representing the PDF page. - * @returns {number} The scaling factor used to resize the original canvas to fit within the container dimensions. + * @param originalCanvas - The original canvas element representing the PDF page. + * @returns The scaling factor used to resize the original canvas to fit within the container dimensions. */ calculateScaleFactor(originalCanvas: HTMLCanvasElement): number { - const containerWidth = this.pdfContainer.nativeElement.clientWidth; - const containerHeight = this.pdfContainer.nativeElement.clientHeight; - const scaleX = containerWidth / originalCanvas.width; - const scaleY = containerHeight / originalCanvas.height; + const containerWidth = this.pdfContainer().nativeElement.clientWidth; + const containerHeight = this.pdfContainer().nativeElement.clientHeight; + + let scaleX, scaleY; + + if (originalCanvas.height > originalCanvas.width) { + // Vertical slide + const fixedHeight = this.DEFAULT_SLIDE_HEIGHT; + scaleY = fixedHeight / originalCanvas.height; + scaleX = containerWidth / originalCanvas.width; + } else { + // Horizontal slide + scaleX = containerWidth / originalCanvas.width; + scaleY = containerHeight / originalCanvas.height; + } + return Math.min(scaleX, scaleY); } @@ -246,11 +365,11 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { * This method updates the dimensions of the enlarged canvas element to ensure that the entire PDF page * is visible and properly scaled within the viewer. * - * @param {HTMLCanvasElement} originalCanvas - The canvas element from which the image is scaled. - * @param {number} scaleFactor - The factor by which the canvas is resized. + * @param originalCanvas - The canvas element from which the image is scaled. + * @param scaleFactor - The factor by which the canvas is resized. */ resizeCanvas(originalCanvas: HTMLCanvasElement, scaleFactor: number): void { - const enlargedCanvas = this.enlargedCanvas.nativeElement; + const enlargedCanvas = this.enlargedCanvas().nativeElement; enlargedCanvas.width = originalCanvas.width * scaleFactor; enlargedCanvas.height = originalCanvas.height * scaleFactor; } @@ -259,15 +378,13 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { * Redraws the original canvas content onto the enlarged canvas at the updated scale. * This method ensures that the image is rendered clearly and correctly positioned on the enlarged canvas. * - * @param {HTMLCanvasElement} originalCanvas - The original canvas containing the image to be redrawn. + * @param originalCanvas - The original canvas containing the image to be redrawn. */ redrawCanvas(originalCanvas: HTMLCanvasElement): void { - const enlargedCanvas = this.enlargedCanvas.nativeElement; + const enlargedCanvas = this.enlargedCanvas().nativeElement; const context = enlargedCanvas.getContext('2d'); - if (context) { - context.clearRect(0, 0, enlargedCanvas.width, enlargedCanvas.height); - context.drawImage(originalCanvas, 0, 0, enlargedCanvas.width, enlargedCanvas.height); - } + context!.clearRect(0, 0, enlargedCanvas.width, enlargedCanvas.height); + context!.drawImage(originalCanvas, 0, 0, enlargedCanvas.width, enlargedCanvas.height); } /** @@ -276,21 +393,22 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { * and visually appealing layout. */ positionCanvas(): void { - const enlargedCanvas = this.enlargedCanvas.nativeElement; - const containerWidth = this.pdfContainer.nativeElement.clientWidth; - const containerHeight = this.pdfContainer.nativeElement.clientHeight; + const enlargedCanvas = this.enlargedCanvas().nativeElement; + const containerWidth = this.pdfContainer().nativeElement.clientWidth; + const containerHeight = this.pdfContainer().nativeElement.clientHeight; enlargedCanvas.style.position = 'absolute'; enlargedCanvas.style.left = `${(containerWidth - enlargedCanvas.width) / 2}px`; enlargedCanvas.style.top = `${(containerHeight - enlargedCanvas.height) / 2}px`; - enlargedCanvas.parentElement!.style.top = `${this.pdfContainer.nativeElement.scrollTop}px`; + enlargedCanvas.parentElement!.style.top = `${this.pdfContainer().nativeElement.scrollTop}px`; } /** * Closes the enlarged view of the PDF and re-enables scrolling in the PDF container. */ closeEnlargedView(event: MouseEvent) { - this.isEnlargedView = false; + this.isEnlargedView.set(false); + this.adjustPdfContainerSize(false); this.toggleBodyScroll(false); event.stopPropagation(); } @@ -300,7 +418,7 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { * @param disable A boolean flag indicating whether scrolling should be disabled (`true`) or enabled (`false`). */ toggleBodyScroll(disable: boolean): void { - this.pdfContainer.nativeElement.style.overflow = disable ? 'hidden' : 'auto'; + this.pdfContainer().nativeElement.style.overflow = disable ? 'hidden' : 'auto'; } /** @@ -309,7 +427,7 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { */ closeIfOutside(event: MouseEvent): void { const target = event.target as HTMLElement; - const enlargedCanvas = this.enlargedCanvas.nativeElement; + const enlargedCanvas = this.enlargedCanvas().nativeElement; if (target.classList.contains('enlarged-container') && target !== enlargedCanvas) { this.closeEnlargedView(event); @@ -331,11 +449,172 @@ export class PdfPreviewComponent implements OnInit, OnDestroy { * @param direction The navigation direction (next or previous). */ navigatePages(direction: NavigationDirection) { - const nextPageIndex = direction === 'next' ? this.currentPage + 1 : this.currentPage - 1; - if (nextPageIndex > 0 && nextPageIndex <= this.totalPages) { - this.currentPage = nextPageIndex; - const canvas = this.pdfContainer.nativeElement.querySelectorAll('.pdf-page-container canvas')[this.currentPage - 1] as HTMLCanvasElement; + const nextPageIndex = direction === 'next' ? this.currentPage() + 1 : this.currentPage() - 1; + if (nextPageIndex > 0 && nextPageIndex <= this.totalPages()) { + this.currentPage.set(nextPageIndex); + const canvas = this.pdfContainer().nativeElement.querySelectorAll('.pdf-canvas-container canvas')[this.currentPage() - 1] as HTMLCanvasElement; this.updateEnlargedCanvas(canvas); } } + + /** + * Deletes the attachment file if it exists, or deletes the attachment unit if it exists. + * @returns A Promise that resolves when the deletion process is completed. + */ + async deleteAttachmentFile() { + if (this.attachment()) { + this.attachmentService.delete(this.attachment()!.id!).subscribe({ + next: () => { + this.router.navigate(['course-management', this.course()!.id, 'lectures', this.attachment()!.lecture!.id, 'attachments']); + this.dialogErrorSource.next(''); + }, + error: (error) => { + this.alertService.error('artemisApp.attachment.pdfPreview.attachmentUpdateError', { error: error.message }); + }, + }); + } else if (this.attachmentUnit()) { + this.lectureUnitService.delete(this.attachmentUnit()!.id!, this.attachmentUnit()!.lecture!.id!).subscribe({ + next: () => { + this.router.navigate(['course-management', this.course()!.id, 'lectures', this.attachmentUnit()!.lecture!.id, 'unit-management']); + this.dialogErrorSource.next(''); + }, + error: (error) => { + this.alertService.error('artemisApp.attachment.pdfPreview.attachmentUpdateError', { error: error.message }); + }, + }); + } + } + + /** + * Deletes selected slides from the PDF viewer. + */ + async deleteSelectedSlides() { + this.isPdfLoading.set(true); + try { + const existingPdfBytes = await this.currentPdfBlob()!.arrayBuffer(); + const pdfDoc = await PDFDocument.load(existingPdfBytes); + + const pagesToDelete = Array.from(this.selectedPages()) + .map((page) => page - 1) + .sort((a, b) => b - a); + pagesToDelete.forEach((pageIndex) => { + pdfDoc.removePage(pageIndex); + }); + + this.isFileChanged.set(true); + const pdfBytes = await pdfDoc.save(); + this.currentPdfBlob.set(new Blob([pdfBytes], { type: 'application/pdf' })); + this.selectedPages().clear(); + + const objectUrl = URL.createObjectURL(this.currentPdfBlob()!); + await this.loadOrAppendPdf(objectUrl, false).then(() => { + this.dialogErrorSource.next(''); + }); + URL.revokeObjectURL(objectUrl); + } catch (error) { + this.alertService.error('artemisApp.attachment.pdfPreview.pageDeleteError', { error: error.message }); + } finally { + this.isPdfLoading.set(false); + } + } + + /** + * Triggers the file input to select files. + */ + triggerFileInput(): void { + this.fileInput().nativeElement.click(); + } + + /** + * Adds a selected PDF file at the end of the current PDF document. + * @param event - The event containing the file input. + */ + async mergePDF(event: Event): Promise { + const file = (event.target as HTMLInputElement).files?.[0]; + + this.isPdfLoading.set(true); + try { + const newPdfBytes = await file!.arrayBuffer(); + const existingPdfBytes = await this.currentPdfBlob()!.arrayBuffer(); + const existingPdfDoc = await PDFDocument.load(existingPdfBytes); + const newPdfDoc = await PDFDocument.load(newPdfBytes); + + const copiedPages = await existingPdfDoc.copyPages(newPdfDoc, newPdfDoc.getPageIndices()); + copiedPages.forEach((page) => existingPdfDoc.addPage(page)); + + this.isFileChanged.set(true); + const mergedPdfBytes = await existingPdfDoc.save(); + this.currentPdfBlob.set(new Blob([mergedPdfBytes], { type: 'application/pdf' })); + + this.selectedPages().clear(); + + const objectUrl = URL.createObjectURL(this.currentPdfBlob()!); + await this.loadOrAppendPdf(objectUrl, true).then(() => URL.revokeObjectURL(objectUrl)); + } catch (error) { + this.alertService.error('artemisApp.attachment.pdfPreview.mergeFailedError', { error: error.message }); + } finally { + this.isPdfLoading.set(false); + } + } + + /** + * Updates the IDs of remaining pages after some have been removed. + */ + updatePageIDs() { + const remainingPages = this.pdfContainer().nativeElement.querySelectorAll('.pdf-canvas-container'); + remainingPages.forEach((container, index) => { + const pageIndex = index + 1; + container.id = `pdf-page-${pageIndex}`; + const canvas = container.querySelector('canvas'); + const overlay = container.querySelector('div'); + const checkbox = container.querySelector('input[type="checkbox"]'); + canvas!.id = String(pageIndex); + overlay!.innerHTML = `${pageIndex}`; + checkbox!.id = String(pageIndex); + }); + } + + updateAttachmentWithFile(): void { + const pdfFile = new File([this.currentPdfBlob()!], 'updatedAttachment.pdf', { type: 'application/pdf' }); + + if (pdfFile.size > MAX_FILE_SIZE) { + this.alertService.error('artemisApp.attachment.pdfPreview.fileSizeError'); + return; + } + + if (this.attachment()) { + this.attachmentToBeEdited.set(this.attachment()); + this.attachmentToBeEdited()!.version!++; + this.attachmentToBeEdited()!.uploadDate = dayjs(); + + this.attachmentService.update(this.attachmentToBeEdited()!.id!, this.attachmentToBeEdited()!, pdfFile).subscribe({ + next: () => { + this.alertService.success('artemisApp.attachment.pdfPreview.attachmentUpdateSuccess'); + this.router.navigate(['course-management', this.course()?.id, 'lectures', this.attachment()!.lecture!.id, 'attachments']); + }, + error: (error) => { + this.alertService.error('artemisApp.attachment.pdfPreview.attachmentUpdateError', { error: error.message }); + }, + }); + } else if (this.attachmentUnit()) { + this.attachmentToBeEdited.set(this.attachmentUnit()!.attachment!); + this.attachmentToBeEdited()!.version!++; + this.attachmentToBeEdited()!.uploadDate = dayjs(); + + const formData = new FormData(); + formData.append('file', pdfFile); + formData.append('attachment', objectToJsonBlob(this.attachmentToBeEdited()!)); + formData.append('attachmentUnit', objectToJsonBlob(this.attachmentUnit()!)); + + this.attachmentUnitService.update(this.attachmentUnit()!.lecture!.id!, this.attachmentUnit()!.id!, formData).subscribe({ + next: () => { + this.alertService.success('artemisApp.attachment.pdfPreview.attachmentUpdateSuccess'); + this.router.navigate(['course-management', this.course()?.id, 'lectures', this.attachmentUnit()!.lecture!.id, 'unit-management']); + }, + error: (error) => { + this.alertService.error('artemisApp.attachment.pdfPreview.attachmentUpdateError', { error: error.message }); + }, + }); + } + } } diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-period.component.ts b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-period.component.ts index 8953b9e67deb..7d9b48571621 100644 --- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-period.component.ts +++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-period.component.ts @@ -9,6 +9,4 @@ export class LectureUpdateWizardPeriodComponent { @Input() currentStep: number; @Input() lecture: Lecture; @Input() validateDatesFunction: () => void; - - constructor() {} } diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts index 2c456af3f0e7..e354df72e629 100644 --- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts +++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts @@ -11,6 +11,4 @@ export class LectureUpdateWizardTitleComponent { @Input() lecture: Lecture; domainActionsDescription = [new FormulaAction()]; - - constructor() {} } diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.html b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.html index 9d838c196f05..3736d642d80e 100644 --- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.html +++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.html @@ -1,5 +1,5 @@
-

+

- } - @if (isAnyUnitFormOpen()) { + } @else {
@if (!isEditingLectureUnit) {

- } - @if (isEditingLectureUnit) { + } @else {

} - @if (isTextUnitFormOpen) { + @if (isTextUnitFormOpen()) { } - @if (isVideoUnitFormOpen) { + @if (isVideoUnitFormOpen()) { } - @if (isOnlineUnitFormOpen) { + @if (isOnlineUnitFormOpen()) { } - @if (isAttachmentUnitFormOpen) { + @if (isAttachmentUnitFormOpen()) { } - @if (isExerciseUnitFormOpen) { + @if (isExerciseUnitFormOpen()) { (false); + isExerciseUnitFormOpen = signal(false); + isVideoUnitFormOpen = signal(false); + isOnlineUnitFormOpen = signal(false); + isAttachmentUnitFormOpen = signal(false); currentlyProcessedTextUnit: TextUnit; currentlyProcessedVideoUnit: VideoUnit; @@ -71,33 +71,33 @@ export class LectureUpdateWizardUnitsComponent implements OnInit { switch (type) { case LectureUnitType.TEXT: - this.isTextUnitFormOpen = true; + this.isTextUnitFormOpen.set(true); break; case LectureUnitType.EXERCISE: - this.isExerciseUnitFormOpen = true; + this.isExerciseUnitFormOpen.set(true); break; case LectureUnitType.VIDEO: - this.isVideoUnitFormOpen = true; + this.isVideoUnitFormOpen.set(true); break; case LectureUnitType.ONLINE: - this.isOnlineUnitFormOpen = true; + this.isOnlineUnitFormOpen.set(true); break; case LectureUnitType.ATTACHMENT: - this.isAttachmentUnitFormOpen = true; + this.isAttachmentUnitFormOpen.set(true); break; } } - isAnyUnitFormOpen(): boolean { - return this.isTextUnitFormOpen || this.isVideoUnitFormOpen || this.isOnlineUnitFormOpen || this.isAttachmentUnitFormOpen || this.isExerciseUnitFormOpen; - } + isAnyUnitFormOpen = computed(() => { + return this.isTextUnitFormOpen() || this.isVideoUnitFormOpen() || this.isOnlineUnitFormOpen() || this.isAttachmentUnitFormOpen() || this.isExerciseUnitFormOpen(); + }); onCloseLectureUnitForms() { - this.isTextUnitFormOpen = false; - this.isVideoUnitFormOpen = false; - this.isOnlineUnitFormOpen = false; - this.isAttachmentUnitFormOpen = false; - this.isExerciseUnitFormOpen = false; + this.isTextUnitFormOpen.set(false); + this.isVideoUnitFormOpen.set(false); + this.isOnlineUnitFormOpen.set(false); + this.isAttachmentUnitFormOpen.set(false); + this.isExerciseUnitFormOpen.set(false); } createEditTextUnit(formData: TextUnitFormData) { @@ -258,11 +258,11 @@ export class LectureUpdateWizardUnitsComponent implements OnInit { this.currentlyProcessedOnlineUnit = lectureUnit as OnlineUnit; this.currentlyProcessedAttachmentUnit = lectureUnit as AttachmentUnit; - this.isTextUnitFormOpen = lectureUnit.type === LectureUnitType.TEXT; - this.isVideoUnitFormOpen = lectureUnit.type === LectureUnitType.VIDEO; - this.isExerciseUnitFormOpen = lectureUnit.type === LectureUnitType.EXERCISE; - this.isOnlineUnitFormOpen = lectureUnit.type === LectureUnitType.ONLINE; - this.isAttachmentUnitFormOpen = lectureUnit.type === LectureUnitType.ATTACHMENT; + this.isTextUnitFormOpen.set(lectureUnit.type === LectureUnitType.TEXT); + this.isVideoUnitFormOpen.set(lectureUnit.type === LectureUnitType.VIDEO); + this.isExerciseUnitFormOpen.set(lectureUnit.type === LectureUnitType.EXERCISE); + this.isOnlineUnitFormOpen.set(lectureUnit.type === LectureUnitType.ONLINE); + this.isAttachmentUnitFormOpen.set(lectureUnit.type === LectureUnitType.ATTACHMENT); switch (lectureUnit.type) { case LectureUnitType.TEXT: diff --git a/src/main/webapp/app/localvc/repository-view/repository-view.component.html b/src/main/webapp/app/localvc/repository-view/repository-view.component.html index 6a41335a4f51..24c332323ed4 100644 --- a/src/main/webapp/app/localvc/repository-view/repository-view.component.html +++ b/src/main/webapp/app/localvc/repository-view/repository-view.component.html @@ -47,6 +47,8 @@

[smallButtons]="false" [routerLinkForRepositoryView]="'.'" [repositoryUri]="repositoryUri" + [participations]="[participation]" + [useParticipationVcsAccessToken]="true" [exercise]="exercise" /> } diff --git a/src/main/webapp/app/lti/lti13-exercise-launch.component.ts b/src/main/webapp/app/lti/lti13-exercise-launch.component.ts index 2c939e994279..28605d6620e6 100644 --- a/src/main/webapp/app/lti/lti13-exercise-launch.component.ts +++ b/src/main/webapp/app/lti/lti13-exercise-launch.component.ts @@ -147,7 +147,7 @@ export class Lti13ExerciseLaunchComponent implements OnInit { replaceWindowLocationWrapper(url: string): void { this.ltiService.setShownViaLti(true); - this.themeService.applyThemeExplicitly(Theme.LIGHT); + this.themeService.applyThemePreference(Theme.LIGHT); const path = new URL(url).pathname; this.router.navigate([path], { replaceUrl: true }); diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.scss b/src/main/webapp/app/overview/course-conversations/course-conversations.component.scss index 4feac4ecf258..e2919dcc3388 100644 --- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.scss +++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.scss @@ -20,8 +20,8 @@ } .scrollable-content { - --message-input-height-dev: 193px; - --message-input-height-prod: 177px; + --message-input-height-dev: 164px; + --message-input-height-prod: 148px; overflow-y: auto; overflow-x: hidden; max-height: calc(100vh - var(--header-height) - var(--message-input-height-prod)); diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts b/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts index 2f6e01364f58..0646118f577f 100644 --- a/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts +++ b/src/main/webapp/app/overview/course-conversations/course-conversations.module.ts @@ -26,7 +26,6 @@ import { GenericConfirmationDialogComponent } from './dialogs/generic-confirmati import { ConversationSettingsComponent } from './dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component'; import { OneToOneChatCreateDialogComponent } from './dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component'; import { GroupChatCreateDialogComponent } from './dialogs/group-chat-create-dialog/group-chat-create-dialog.component'; -import { GroupChatIconComponent } from './other/group-chat-icon/group-chat-icon.component'; import { ArtemisMarkdownModule } from 'app/shared/markdown.module'; import { CourseConversationsCodeOfConductComponent } from 'app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component'; import { CourseWideSearchComponent } from 'app/overview/course-conversations/course-wide-search/course-wide-search.component'; @@ -79,7 +78,6 @@ const routes: Routes = [ ConversationSettingsComponent, OneToOneChatCreateDialogComponent, GroupChatCreateDialogComponent, - GroupChatIconComponent, CourseWideSearchComponent, ], }) diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html index bd18770a088c..193b823d77b3 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html @@ -6,8 +6,8 @@

@if (getAsChannel(activeConversation); as channel) { } - @if (getAsGroupChat(activeConversation); as groupChat) { - + @if (getAsGroupChat(activeConversation)) { + } {{ conversationService.getConversationName(activeConversation, true) }} diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.ts b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.ts index 840262873e86..bd75071f1610 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.ts +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.ts @@ -7,6 +7,7 @@ import { ConversationService } from 'app/shared/metis/conversations/conversation import { isOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; import { getAsGroupChatDTO } from 'app/entities/metis/conversation/group-chat.model'; import { AbstractDialogComponent } from 'app/overview/course-conversations/dialogs/abstract-dialog.component'; +import { faPeopleGroup } from '@fortawesome/free-solid-svg-icons'; export enum ConversationDetailTabs { MEMBERS = 'members', @@ -24,6 +25,7 @@ export class ConversationDetailDialogComponent extends AbstractDialogComponent { @Input() selectedTab: ConversationDetailTabs = ConversationDetailTabs.MEMBERS; isInitialized = false; + readonly faPeopleGroup = faPeopleGroup; initialize() { super.initialize(['course', 'activeConversation', 'selectedTab']); diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html index 1db98b09814d..ddd8dbf400b7 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html @@ -13,8 +13,23 @@

} - @if (getAsGroupChat(activeConversation); as groupChat) { - + @if (getAsGroupChat(activeConversation)) { + + } + @if (getAsOneToOneChat(activeConversation) && otherUser) { + + } {{ conversationService.getConversationName(activeConversation, true) }}

diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts index ead5e1856a23..a8c9ff8ffe26 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, OnDestroy, OnInit, Output, inject } from '@angular/core'; -import { faChevronLeft, faSearch, faUserGroup, faUserPlus } from '@fortawesome/free-solid-svg-icons'; +import { faChevronLeft, faPeopleGroup, faSearch, faUserGroup, faUserPlus } from '@fortawesome/free-solid-svg-icons'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Course } from 'app/entities/course.model'; @@ -18,6 +18,8 @@ import { defaultFirstLayerDialogOptions, getChannelSubTypeReferenceTranslationKe import { catchError } from 'rxjs/operators'; import { MetisService } from 'app/shared/metis/metis.service'; import { CourseSidebarService } from 'app/overview/course-sidebar.service'; +import { getAsOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; +import { ConversationUserDTO } from 'app/entities/metis/conversation/conversation-user-dto.model'; @Component({ selector: 'jhi-conversation-header', @@ -39,11 +41,13 @@ export class ConversationHeaderComponent implements OnInit, OnDestroy { activeConversationAsChannel?: ChannelDTO; channelSubTypeReferenceTranslationKey?: string; channelSubTypeReferenceRouterLink?: string; + otherUser?: ConversationUserDTO; faUserPlus = faUserPlus; faUserGroup = faUserGroup; faSearch = faSearch; faChevronLeft = faChevronLeft; + readonly faPeopleGroup = faPeopleGroup; private courseSidebarService: CourseSidebarService = inject(CourseSidebarService); @@ -56,6 +60,7 @@ export class ConversationHeaderComponent implements OnInit, OnDestroy { ) {} getAsGroupChat = getAsGroupChatDTO; + getAsOneToOneChat = getAsOneToOneChatDTO; canAddUsers = canAddUsersToConversation; @@ -64,6 +69,13 @@ export class ConversationHeaderComponent implements OnInit, OnDestroy { this.subscribeToActiveConversation(); } + getOtherUser() { + const conversation = getAsOneToOneChatDTO(this.activeConversation); + if (conversation) { + this.otherUser = conversation.members?.find((user) => !user.isRequestingUser); + } + } + ngOnDestroy() { this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); @@ -79,6 +91,7 @@ export class ConversationHeaderComponent implements OnInit, OnDestroy { this.activeConversationAsChannel = getAsChannelDTO(conversation); this.channelSubTypeReferenceTranslationKey = getChannelSubTypeReferenceTranslationKey(this.activeConversationAsChannel?.subType); this.channelSubTypeReferenceRouterLink = this.metisService.getLinkForChannelSubType(this.activeConversationAsChannel); + this.getOtherUser(); }); } diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html index fff9b45bde03..f7f35b3b2a3e 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html @@ -75,13 +75,13 @@ 'hide-input': isHiddenInputWithCallToAction, }" infinite-scroll - class="conversation-messages-message-list" + class="conversation-messages-message-list position-relative" [scrollWindow]="false" (scrolledUp)="fetchNextPage()" > - @for (group of groupedPosts; track postsTrackByFn($index, group)) { + @for (group of groupedPosts; track postsGroupTrackByFn($index, group)) {
@for (post of group.posts; track postsTrackByFn($index, post)) {
@@ -107,15 +107,10 @@ @if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
- +
} @else { - + }
} @@ -125,15 +120,10 @@ @if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
- +
} @else { - + }
} diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss index d6900d231537..83aa144d2d9e 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss @@ -3,8 +3,8 @@ @import 'bootstrap/scss/mixins'; .conversation-messages { - --message-input-height-prod: 171px; - --message-input-height-dev: 187px; + --message-input-height-prod: 142px; + --message-input-height-dev: 158px; --search-height: 52px; --channel-header-height: 52px; diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts index 5169cc8f4610..7fdbe98508c2 100644 --- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts +++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.ts @@ -9,6 +9,7 @@ import { OnInit, Output, QueryList, + Renderer2, ViewChild, ViewChildren, ViewEncapsulation, @@ -32,6 +33,7 @@ import { LayoutService } from 'app/shared/breakpoints/layout.service'; import { CustomBreakpointNames } from 'app/shared/breakpoints/breakpoints.service'; import dayjs from 'dayjs/esm'; import { User } from 'app/core/user/user.model'; +import { PostingThreadComponent } from 'app/shared/metis/posting-thread/posting-thread.component'; interface PostGroup { author: User | undefined; @@ -46,16 +48,23 @@ interface PostGroup { }) export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnDestroy { private ngUnsubscribe = new Subject(); + readonly sessionStorageKey = 'conversationId.scrollPosition.'; + readonly PageType = PageType; readonly ButtonType = ButtonType; + private scrollDebounceTime = 100; // ms + scrollSubject = new Subject(); + canStartSaving = false; + createdNewMessage = false; + @Output() openThread = new EventEmitter(); @ViewChild('searchInput') searchInput: ElementRef; @ViewChildren('postingThread') - messages: QueryList; + messages: QueryList; @ViewChild('container') content: ElementRef; @Input() @@ -77,6 +86,7 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD searchText = ''; _activeConversation?: ConversationDTO; + elementsAtScrollPosition: PostingThreadComponent[]; newPost?: Post; posts: Post[] = []; groupedPosts: PostGroup[] = []; @@ -93,6 +103,7 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD isHiddenInputFull = false; private layoutService: LayoutService = inject(LayoutService); + private renderer = inject(Renderer2); constructor( public metisService: MetisService, // instance from course-conversations.component @@ -104,6 +115,7 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD this.subscribeToSearch(); this.subscribeToMetis(); this.subscribeToActiveConversation(); + this.setupScrollDebounce(); this.isMobile = this.layoutService.isBreakpointActive(CustomBreakpointNames.extraSmall); this.layoutService @@ -147,11 +159,28 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD ngAfterViewInit() { this.messages.changes.pipe(takeUntil(this.ngUnsubscribe)).subscribe(this.handleScrollOnNewMessage); + this.messages.changes.pipe(takeUntil(this.ngUnsubscribe)).subscribe(() => { + if (!this.createdNewMessage && this.posts.length > 0) { + this.scrollToStoredId(); + } else { + this.createdNewMessage = false; + } + }); + this.content.nativeElement.addEventListener('scroll', () => { + this.findElementsAtScrollPosition(); + }); } ngOnDestroy(): void { this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); + this.scrollSubject.complete(); + this.content?.nativeElement.removeEventListener('scroll', this.saveScrollPosition); + } + + private scrollToStoredId() { + const savedScrollId = sessionStorage.getItem(this.sessionStorageKey + this._activeConversation?.id) ?? ''; + requestAnimationFrame(() => this.goToLastSelectedElement(parseInt(savedScrollId, 10))); } private onActiveConversationChange() { @@ -168,6 +197,7 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD this.searchInput.nativeElement.value = ''; this.searchText = ''; } + this.canStartSaving = false; this.onSearch(); this.createEmptyPost(); } @@ -260,11 +290,15 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD fetchNextPage() { const morePostsAvailable = this.posts.length < this.totalNumberOfPosts; + let addBuffer = 0; if (morePostsAvailable) { this.page += 1; this.commandMetisToFetchPosts(); + addBuffer = 50; + } else if (!this.canStartSaving) { + this.canStartSaving = true; } - this.content.nativeElement.scrollTop = this.content.nativeElement.scrollTop + 50; + this.content.nativeElement.scrollTop = this.content.nativeElement.scrollTop + addBuffer; } public commandMetisToFetchPosts(forceUpdate = false) { @@ -305,7 +339,9 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD return this.metisService.createEmptyPostForContext(conversation); } - postsTrackByFn = (index: number, post: Post): number => post.id!; + postsGroupTrackByFn = (index: number, post: PostGroup): string => 'grp_' + post.posts.map((p) => p.id?.toString()).join('_'); + + postsTrackByFn = (index: number, post: Post): string => 'post_' + post.id!; setPostForThread(post: Post) { this.openThread.emit(post); @@ -318,9 +354,9 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD scrollToBottomOfMessages() { // Use setTimeout to ensure the scroll happens after the new message is rendered - setTimeout(() => { + requestAnimationFrame(() => { this.content.nativeElement.scrollTop = this.content.nativeElement.scrollHeight; - }, 0); + }); } onSearchQueryInput($event: Event) { @@ -334,4 +370,58 @@ export class ConversationMessagesComponent implements OnInit, AfterViewInit, OnD this.searchInput.nativeElement.dispatchEvent(new Event('input')); } } + + private setupScrollDebounce(): void { + this.scrollSubject.pipe(debounceTime(this.scrollDebounceTime), takeUntil(this.ngUnsubscribe)).subscribe((postId) => { + if (this._activeConversation?.id) { + sessionStorage.setItem(this.sessionStorageKey + this._activeConversation.id, postId.toString()); + } + }); + } + + saveScrollPosition = (postId: number) => { + this.scrollSubject.next(postId); + }; + + handleNewMessageCreated() { + this.createdNewMessage = true; + this.createEmptyPost(); + this.scrollToBottomOfMessages(); + } + + async goToLastSelectedElement(lastScrollPosition: number) { + if (!lastScrollPosition) { + this.scrollToBottomOfMessages(); + this.canStartSaving = true; + return; + } + const messageArray = this.messages.toArray(); + const element = messageArray.find((message) => message.post.id === lastScrollPosition); // Suchen nach dem Post + + if (!element) { + this.fetchNextPage(); + } else { + // We scroll to the element with a slight buffer to ensure its fully visible (-10) + this.content.nativeElement.scrollTop = Math.max(0, element.elementRef.nativeElement.offsetTop - 10); + this.canStartSaving = true; + } + } + + findElementsAtScrollPosition() { + const messageArray = this.messages.toArray(); + const containerRect = this.content.nativeElement.getBoundingClientRect(); + const visibleMessages = []; + for (const message of messageArray) { + if (!message.elementRef?.nativeElement || !message.post?.id) continue; + const rect = message.elementRef.nativeElement.getBoundingClientRect(); + if (rect.top >= containerRect.top && rect.bottom <= containerRect.bottom) { + visibleMessages.push(message); + break; // Only need the first visible message + } + } + this.elementsAtScrollPosition = visibleMessages; + if (this.elementsAtScrollPosition && this.canStartSaving) { + this.saveScrollPosition(this.elementsAtScrollPosition[0].post.id!); + } + } } diff --git a/src/main/webapp/app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.html b/src/main/webapp/app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.html deleted file mode 100644 index b685df2fd200..000000000000 --- a/src/main/webapp/app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/webapp/app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.ts b/src/main/webapp/app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.ts deleted file mode 100644 index fbcd38cfb5b2..000000000000 --- a/src/main/webapp/app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; -import { faPeopleGroup } from '@fortawesome/free-solid-svg-icons'; - -@Component({ - selector: 'jhi-group-chat-icon', - templateUrl: './group-chat-icon.component.html', -}) -export class GroupChatIconComponent { - // icons - faPeopleGroup = faPeopleGroup; -} diff --git a/src/main/webapp/app/overview/course-lectures/attachment-unit/attachment-unit.component.ts b/src/main/webapp/app/overview/course-lectures/attachment-unit/attachment-unit.component.ts index bc5b4ed321dc..5634aeda7a5e 100644 --- a/src/main/webapp/app/overview/course-lectures/attachment-unit/attachment-unit.component.ts +++ b/src/main/webapp/app/overview/course-lectures/attachment-unit/attachment-unit.component.ts @@ -37,17 +37,21 @@ export class AttachmentUnitComponent extends LectureUnitDirective -
- +
+
+ + - -
-
- -
-
- @if (course) { - @if (courses?.length) { -
- -
- } @else { +
+
+ +
+
+ @if (course) { + @if (courses?.length) { +
- } +
+ } @else { + } + } -
- @for (course of courses; track course) { - - } -
+
+ @for (course of courses; track course) { + + }
- @if (!isNavbarCollapsed) { -
{{ course?.title }}
- }
- -
-
-
    - @for (sidebarItem of sidebarItems; track sidebarItem) { -
  • - @if (sidebarItem.hasInOrionProperty && sidebarItem.showInOrionWindow !== undefined) { - + @if (!isNavbarCollapsed) { +
    {{ course?.title }}
    + } +
+ +
+
+
    + @for (sidebarItem of sidebarItems; track sidebarItem) { +
  • + @if (sidebarItem.hasInOrionProperty && sidebarItem.showInOrionWindow !== undefined) { + + } @else { + + } +
    • + } +
  • +
    + + +
    +
    • +
    + @for (hiddenItem of hiddenItems; track hiddenItem) { +
  • + @if (hiddenItem.hasInOrionProperty && hiddenItem.showInOrionWindow !== undefined) { + } @else { - + }
    • } -
  • -
    - - -
    -
    • -
    - @for (hiddenItem of hiddenItems; track hiddenItem) { + @if (courseActionItems?.length && anyItemHidden) { + @for (courseActionItem of courseActionItems; track courseActionItem) {
  • - @if (hiddenItem.hasInOrionProperty && hiddenItem.showInOrionWindow !== undefined) { - - } @else { - - } + + +
    • } - @if (courseActionItems?.length && anyItemHidden) { - @for (courseActionItem of courseActionItems; track courseActionItem) { -
  • - - - -
    • - } - } -
    -
-
-
- -
- @if (courseActionItems?.length && !anyItemHidden) { -
-
  • - @for (courseActionItem of courseActionItems; track courseActionItem) { - - - - } -
    • -
    - } - -
    -
    - - + }
    -
    +
    - - - @if (course) { + +
    + @if (courseActionItems?.length && !anyItemHidden) { +
    +
  • + @for (courseActionItem of courseActionItems; track courseActionItem) { + + + + } +
    • +
    + } +
    -
    - @if (hasSidebar) { - - } -
    {{ 'artemisApp.courseOverview.menu.' + pageTitle | artemisTranslate }}
    +
    + +
    -
    - @if (isNotManagementView && course.isAtLeastTutor) { -
    - +
    +
    +
    + + + @if (course) { +
    +
    + @if (hasSidebar) { + - } -
    + + } +
    -
    - @if (!hasSidebar) { - +
    + @if (isNotManagementView && course.isAtLeastTutor) { +
    + +
    + } + @if (showRefreshButton) { + } - -
    - -
    - } - - -
    -
    -} @else { - -
    - @if (!hasSidebar) { - - } - -
    - -
    +
    +
    + @if (!hasSidebar) { + + } + + @if (!isShownViaLti) { + + } +
    + } + +
    -} +
    +
    + @if (!hasSidebar) { + + } + + @if (isShownViaLti) { + + } +
    + + +
    + +
    +     + @if (courseImage) {
    @@ -252,7 +259,7 @@ [id]="sidebarItem.testId ?? ''" [ngClass]="{ 'guided-tour': sidebarItem.guidedTour, - newMessage: !communicationRouteLoaded && hasUnreadMessages && sidebarItem.title === 'Communication', + newMessage: hasUnreadMessages && sidebarItem.title === 'Communication', collapsed: isNavbarCollapsed, }" jhiOrionFilter diff --git a/src/main/webapp/app/overview/course-overview.component.scss b/src/main/webapp/app/overview/course-overview.component.scss index a7b6b5180084..81e906106a0d 100644 --- a/src/main/webapp/app/overview/course-overview.component.scss +++ b/src/main/webapp/app/overview/course-overview.component.scss @@ -37,15 +37,15 @@ $transition-color-length: 0.2s; } .mat-drawer-container { - height: calc(100vh - var(--sidebar-footer-height-prod)); + height: calc(100vh - var(--sidebar-footer-height-prod) - var(--spacing-modules)); &.sidenav-height-dev { - height: calc(100vh - var(--sidebar-footer-height-dev)); + height: calc(100vh - var(--sidebar-footer-height-dev) - var(--spacing-modules)); } @media (max-width: 768px) { - height: calc(100vh - var(--sidebar-footer-height-prod)) !important; - height: calc(100dvh - var(--sidebar-footer-height-prod)) !important; + height: calc(100vh - var(--sidebar-footer-height-prod) - var(--spacing-modules)) !important; + height: calc(100dvh - var(--sidebar-footer-height-prod) - var(--spacing-modules)) !important; } &.exam-wrapper { @@ -56,14 +56,14 @@ $transition-color-length: 0.2s; box-sizing: content-box; width: $menu-width-open; transition: width 0.2s ease-in-out !important; - height: calc(100vh - var(--sidebar-footer-height-prod)); + height: calc(100vh - var(--sidebar-footer-height-prod) - var(--spacing-modules)); &.sidenav-height-dev { - height: calc(100vh - var(--sidebar-footer-height-dev)); + height: calc(100vh - var(--sidebar-footer-height-dev) - var(--spacing-modules)); } @media (max-width: 768px) { - height: calc(100vh - var(--sidebar-footer-height-prod)) !important; + height: calc(100vh - var(--sidebar-footer-height-prod) - var(--spacing-modules)) !important; } } diff --git a/src/main/webapp/app/overview/course-overview.component.ts b/src/main/webapp/app/overview/course-overview.component.ts index fd9485c0efe3..18ab280c3e28 100644 --- a/src/main/webapp/app/overview/course-overview.component.ts +++ b/src/main/webapp/app/overview/course-overview.component.ts @@ -19,6 +19,7 @@ import { IconDefinition, faChalkboardUser, faChartBar, + faChartColumn, faChevronLeft, faChevronRight, faCircleNotch, @@ -30,7 +31,6 @@ import { faFlag, faGraduationCap, faListAlt, - faListCheck, faNetworkWired, faPersonChalkboard, faQuestion, @@ -179,6 +179,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit facSidebar = facSidebar; faEllipsis = faEllipsis; faQuestion = faQuestion; + faChartColumn = faChartColumn; FeatureToggle = FeatureToggle; CachingStrategy = CachingStrategy; @@ -496,7 +497,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit } const exercisesItem: SidebarItem = { routerLink: 'exercises', - icon: faListCheck, + icon: faListAlt, title: 'Exercises', translation: 'artemisApp.courseOverview.menu.exercises', hidden: false, @@ -504,7 +505,7 @@ export class CourseOverviewComponent implements OnInit, OnDestroy, AfterViewInit const statisticsItem: SidebarItem = { routerLink: 'statistics', - icon: faListAlt, + icon: faChartColumn, title: 'Statistics', translation: 'artemisApp.courseOverview.menu.statistics', hasInOrionProperty: true, diff --git a/src/main/webapp/app/overview/course-overview.scss b/src/main/webapp/app/overview/course-overview.scss index 366470e3c500..718a755e7b56 100644 --- a/src/main/webapp/app/overview/course-overview.scss +++ b/src/main/webapp/app/overview/course-overview.scss @@ -1,16 +1,6 @@ /* ========================================================================== Course Info Bar ========================================================================== */ -.tab-bar-exercise-details { - flex-wrap: wrap; - - // move instructor actions onto their own line for small/medium devices - .instructor-actions { - width: 100%; - justify-content: flex-end; - } -} - .course-body-container { position: relative; } diff --git a/src/main/webapp/app/overview/discussion-section/discussion-section.component.scss b/src/main/webapp/app/overview/discussion-section/discussion-section.component.scss index 8e950f5556dd..15214ef60aee 100644 --- a/src/main/webapp/app/overview/discussion-section/discussion-section.component.scss +++ b/src/main/webapp/app/overview/discussion-section/discussion-section.component.scss @@ -35,7 +35,7 @@ $discussion-section-card-min-width: 360px; align-items: center; background-color: var(--artemis-dark); cursor: pointer; - border-radius: 1em 1em 0 0; + border-radius: 0.25em 0.25em 0 0; .card-title { display: flex; diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html index 29582939ece9..2bb6478e9300 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html @@ -1,115 +1,62 @@ @if (exercise) { -
    - - {{ exercise.title }} - -
    - - @if (plagiarismCaseInfo && plagiarismCaseInfo.verdict !== PlagiarismVerdict.NO_PLAGIARISM) { - - @if (!plagiarismCaseInfo?.createdByContinuousPlagiarismControl) { - - } - @if (plagiarismCaseInfo?.createdByContinuousPlagiarismControl) { - - } - - } -
    -
    - -
    +
    +
    +
    +
    {{ exercise.title }}
    +
    +
    @if (exercise.isAtLeastTutor) { -
    - {{ - 'artemisApp.courseOverview.exerciseDetails.instructorActions.title' + (exercise.isAtLeastInstructor ? '' : 'Tutor') | artemisTranslate - }} -
    - - - - - - - - - - @if (exercise.type !== QUIZ) { - - - - - } - @if (exercise.type === QUIZ) { - - - - - } - @if (exercise.type === QUIZ) { - - - - - } - @if (exercise.isAtLeastEditor) { - @if (exercise.type === QUIZ) { - - - - - } - @if (exercise.type === MODELING) { - - - - - } - @if (exercise.type === PROGRAMMING) { - - - - - } - @if (!QUIZ_ENDED_STATUS.includes(quizExerciseStatus)) { - - - - - } - @if (QUIZ_ENDED_STATUS.includes(quizExerciseStatus) && exercise.isAtLeastInstructor) { - - - - - } +
    + +
    + @for (instructorActionItem of instructorActionItems; track instructorActionItem) { + }
    } + + @if (plagiarismCaseInfo && plagiarismCaseInfo.verdict !== PlagiarismVerdict.NO_PLAGIARISM) { + + @if (!plagiarismCaseInfo?.createdByContinuousPlagiarismControl) { + + } + @if (plagiarismCaseInfo?.createdByContinuousPlagiarismControl) { + + } + + }
    + +
    +
    + +
    + +
    - @if ((this.sortedHistoryResults?.length && this.sortedHistoryResults.length > 1) || this.practiceStudentParticipation?.results?.length) {
    diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.scss b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.scss index aa14a1bf85a8..e69de29bb2d1 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.scss +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.scss @@ -1,8 +0,0 @@ -.tab-bar-exercise-details { - display: flex; - min-height: 60px; - margin: 0 -1rem 0.5rem -1rem; - padding: 0.5rem 1rem; - border-bottom: 1px solid var(--overview-border-color); - gap: 1rem; -} diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts index a8c94911d1cc..330e469035a6 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts @@ -11,7 +11,7 @@ import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; import { programmingExerciseFail, programmingExerciseSuccess } from 'app/guided-tour/tours/course-exercise-detail-tour'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { Participation } from 'app/entities/participation/participation.model'; -import { Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model'; import { StudentParticipation } from 'app/entities/participation/student-participation.model'; import { ExampleSolutionInfo, ExerciseDetailsType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; @@ -29,7 +29,7 @@ import { ComplaintService } from 'app/complaints/complaint.service'; import { Complaint } from 'app/entities/complaint.model'; import { SubmissionPolicy } from 'app/entities/submission-policy.model'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; -import { faAngleDown, faAngleUp, faBook, faEye, faFileSignature, faListAlt, faSignal, faTable, faWrench } from '@fortawesome/free-solid-svg-icons'; +import { IconDefinition, faAngleDown, faAngleUp, faBook, faEye, faFileSignature, faListAlt, faSignal, faTable, faWrench } from '@fortawesome/free-solid-svg-icons'; import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service'; import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict'; @@ -44,7 +44,13 @@ import { ScienceService } from 'app/shared/science/science.service'; import { ScienceEventType } from 'app/shared/science/science.model'; import { PROFILE_IRIS } from 'app/app.constants'; import { ChatServiceMode } from 'app/iris/iris-chat.service'; +import { IconProp } from '@fortawesome/fontawesome-svg-core'; +interface InstructorActionItem { + routerLink: string; + icon?: IconDefinition; + translation: string; +} @Component({ selector: 'jhi-course-exercise-details', templateUrl: './course-exercise-details.component.html', @@ -56,6 +62,7 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp readonly PlagiarismVerdict = PlagiarismVerdict; readonly QuizStatus = QuizStatus; readonly QUIZ_ENDED_STATUS: (QuizStatus | undefined)[] = [QuizStatus.CLOSED, QuizStatus.OPEN_FOR_PRACTICE]; + readonly QUIZ_EDITABLE_STATUS: (QuizStatus | undefined)[] = [QuizStatus.VISIBLE, QuizStatus.INVISIBLE]; readonly QUIZ = ExerciseType.QUIZ; readonly PROGRAMMING = ExerciseType.PROGRAMMING; readonly MODELING = ExerciseType.MODELING; @@ -100,6 +107,8 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp isProduction = true; isTestServer = false; isGeneratingFeedback: boolean = false; + instructorActionItems: InstructorActionItem[] = []; + exerciseIcon: IconProp; exampleSolutionInfo?: ExampleSolutionInfo; @@ -165,21 +174,6 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp }); } - ngOnDestroy() { - if (this.participationUpdateListener) { - this.participationUpdateListener.unsubscribe(); - if (this.studentParticipations) { - this.studentParticipations.forEach((participation) => { - this.participationWebsocketService.unsubscribeForLatestResultOfParticipation(participation.id!, this.exercise!); - }); - } - } - this.teamAssignmentUpdateListener?.unsubscribe(); - this.submissionSubscription?.unsubscribe(); - this.paramsSubscription?.unsubscribe(); - this.profileSubscription?.unsubscribe(); - } - loadExercise() { this.irisSettings = undefined; this.studentParticipations = this.participationWebsocketService.getParticipationsForExercise(this.exerciseId); @@ -224,6 +218,10 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp this.subscribeToTeamAssignmentUpdates(); this.baseResource = `/course-management/${this.courseId}/${this.exercise.type}-exercises/${this.exercise.id}/`; + if (this.exercise?.type) { + this.exerciseIcon = getIcon(this.exercise?.type); + } + this.createInstructorActions(); } /** @@ -443,5 +441,125 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp this.exampleSolutionCollapsed = !this.exampleSolutionCollapsed; } - setIsGeneratingFeedback() {} + // INSTRUCTOR ACTIONS + createInstructorActions() { + if (this.exercise?.isAtLeastTutor) { + this.instructorActionItems = this.createTutorActions(); + } + if (this.exercise?.isAtLeastEditor) { + this.instructorActionItems.push(...this.createEditorActions()); + } + if (this.exercise?.isAtLeastInstructor && this.QUIZ_ENDED_STATUS.includes(this.quizExerciseStatus)) { + this.instructorActionItems.push(this.getReEvaluateItem()); + } + } + + createTutorActions(): InstructorActionItem[] { + const tutorActionItems = [...this.getDefaultItems()]; + if (this.exercise?.type === ExerciseType.QUIZ) { + tutorActionItems.push(...this.getQuizItems()); + } else { + tutorActionItems.push(this.getParticipationItem()); + } + return tutorActionItems; + } + + getDefaultItems(): InstructorActionItem[] { + return [ + { + routerLink: `${this.baseResource}`, + icon: faEye, + translation: 'entity.action.view', + }, + { + routerLink: `${this.baseResource}scores`, + icon: faTable, + translation: 'entity.action.scores', + }, + ]; + } + + getQuizItems(): InstructorActionItem[] { + return [ + { + routerLink: `${this.baseResource}preview`, + icon: faEye, + translation: 'artemisApp.quizExercise.preview', + }, + { + routerLink: `${this.baseResource}solution`, + icon: faEye, + translation: 'artemisApp.quizExercise.solution', + }, + ]; + } + + getParticipationItem(): InstructorActionItem { + return { + routerLink: `${this.baseResource}participations`, + icon: faListAlt, + translation: 'artemisApp.exercise.participations', + }; + } + + createEditorActions(): InstructorActionItem[] { + const editorItems: InstructorActionItem[] = []; + if (this.exercise?.type === ExerciseType.QUIZ) { + editorItems.push(this.getStatisticItem('quiz-point-statistic')); + if (this.QUIZ_EDITABLE_STATUS.includes(this.quizExerciseStatus)) { + editorItems.push(this.getQuizEditItem()); + } + } else if (this.exercise?.type === ExerciseType.MODELING) { + editorItems.push(this.getStatisticItem('exercise-statistics')); + } else if (this.exercise?.type === ExerciseType.PROGRAMMING) { + editorItems.push(this.getGradingItem()); + } + return editorItems; + } + + getStatisticItem(routerLink: string): InstructorActionItem { + return { + routerLink: `${this.baseResource}${routerLink}`, + icon: faSignal, + translation: 'artemisApp.courseOverview.exerciseDetails.instructorActions.statistics', + }; + } + + getGradingItem(): InstructorActionItem { + return { + routerLink: `${this.baseResource}grading/test-cases`, + icon: faFileSignature, + translation: 'artemisApp.programmingExercise.configureGrading.shortTitle', + }; + } + + getQuizEditItem(): InstructorActionItem { + return { + routerLink: `${this.baseResource}edit`, + icon: faWrench, + translation: 'entity.action.edit', + }; + } + + getReEvaluateItem(): InstructorActionItem { + return { + routerLink: `${this.baseResource}re-evaluate`, + icon: faWrench, + translation: 'entity.action.re-evaluate', + }; + } + + ngOnDestroy() { + this.participationUpdateListener?.unsubscribe(); + this.studentParticipations?.forEach((participation) => { + if (participation.id && this.exercise) { + this.participationWebsocketService.unsubscribeForLatestResultOfParticipation(participation.id, this.exercise); + } + }); + + this.teamAssignmentUpdateListener?.unsubscribe(); + this.submissionSubscription?.unsubscribe(); + this.paramsSubscription?.unsubscribe(); + this.profileSubscription?.unsubscribe(); + } } diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts index 63f0858ea8b8..6c5664b7bff2 100644 --- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts +++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts @@ -31,6 +31,7 @@ import { ArtemisFeedbackModule } from 'app/exercises/shared/feedback/feedback.mo import { ArtemisExerciseInfoModule } from 'app/exercises/shared/exercise-info/exercise-info.module'; import { IrisModule } from 'app/iris/iris.module'; import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component'; +import { ExerciseHeadersInformationComponent } from 'app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component'; const routes: Routes = [ { @@ -45,6 +46,8 @@ const routes: Routes = [ }, ]; +const standaloneComponents = [ExerciseHeadersInformationComponent]; + @NgModule({ imports: [ ArtemisExerciseButtonsModule, @@ -71,6 +74,7 @@ const routes: Routes = [ ArtemisExerciseInfoModule, IrisModule, DiscussionSectionComponent, + [...standaloneComponents], ], declarations: [CourseExerciseDetailsComponent, OrionCourseExerciseDetailsComponent, LtiInitializerComponent, LtiInitializerModalComponent, ProblemStatementComponent], exports: [CourseExerciseDetailsComponent, OrionCourseExerciseDetailsComponent, ProblemStatementComponent], diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html index d23e8a057abf..6b7f975bec37 100644 --- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html +++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html @@ -117,6 +117,7 @@ [participations]="exercise.studentParticipations!" [courseAndExerciseNavigationUrlSegment]="['/courses', courseId, 'exercises', 'programming-exercises', exercise.id, 'code-editor']" [exercise]="exercise" + [hideLabelMobile]="true" /> } @if (programmingExercise?.allowOfflineIde) { @@ -126,6 +127,7 @@ [participations]="exercise.studentParticipations!" [exercise]="exercise" [routerLinkForRepositoryView]="repositoryLink + '/repository/' + exercise.studentParticipations![0].id" + [hideLabelMobile]="true" [useParticipationVcsAccessToken]="true" /> } diff --git a/src/main/webapp/app/overview/submission-result-status.component.html b/src/main/webapp/app/overview/submission-result-status.component.html index 2cc0eaac36b4..062fe40125fa 100644 --- a/src/main/webapp/app/overview/submission-result-status.component.html +++ b/src/main/webapp/app/overview/submission-result-status.component.html @@ -11,6 +11,7 @@ [showBadge]="showBadge" [showIcon]="showIcon" [isInSidebarCard]="isInSidebarCard" + [showCompletion]="showCompletion" [short]="short" [personalParticipation]="true" /> @@ -19,24 +20,20 @@
    @if (exercise.teamMode && exercise.studentAssignedTeamIdComputed && !exercise.studentAssignedTeamId) { - } - @if (uninitialized) { + } @else if (uninitialized) { - } - @if (exerciseMissedDueDate) { + } @else if (exerciseMissedDueDate) { - } - @if (notSubmitted) { + } @else if (notSubmitted) { - } - @if (!notSubmitted && studentParticipation?.initializationState === InitializationState.FINISHED) { + } @else if (!notSubmitted && studentParticipation?.initializationState === InitializationState.FINISHED) { - } - @if (studentParticipation?.initializationState === InitializationState.INITIALIZED && exercise.type === ExerciseType.QUIZ) { + } @else if (studentParticipation?.initializationState === InitializationState.INITIALIZED && exercise.type === ExerciseType.QUIZ) { - } - @if (quizNotStarted) { + } @else if (quizNotStarted) { + } @else { + - }
    } diff --git a/src/main/webapp/app/overview/submission-result-status.component.ts b/src/main/webapp/app/overview/submission-result-status.component.ts index 5fe0027a5adb..2677fcf51883 100644 --- a/src/main/webapp/app/overview/submission-result-status.component.ts +++ b/src/main/webapp/app/overview/submission-result-status.component.ts @@ -31,6 +31,7 @@ export class SubmissionResultStatusComponent implements OnChanges { @Input() showUngradedResults = false; @Input() showIcon = true; @Input() isInSidebarCard = false; + @Input() showCompletion = true; @Input() short = true; @Input() triggerLastGraded = true; diff --git a/src/main/webapp/app/shared/components/code-button/code-button.component.html b/src/main/webapp/app/shared/components/code-button/code-button.component.html index 122d8df4e398..80972a802a38 100644 --- a/src/main/webapp/app/shared/components/code-button/code-button.component.html +++ b/src/main/webapp/app/shared/components/code-button/code-button.component.html @@ -7,7 +7,7 @@ [buttonLabel]="'artemisApp.exerciseActions.code' | artemisTranslate" [buttonLoading]="loading" [smallButton]="smallButtons" - [hideLabelMobile]="false" + [hideLabelMobile]="hideLabelMobile" [ngbPopover]="popContent" [autoClose]="'outside'" placement="right auto" @@ -17,10 +17,10 @@ @if (useSsh && !copyEnabled) {
    } - @if (useToken && !copyEnabled && tokenMissing) { + @if (useToken && tokenMissing) {
    } - @if (useToken && !copyEnabled && tokenExpired) { + @if (useToken && tokenExpired) {
    } @if (participations && participations.length > 1) { diff --git a/src/main/webapp/app/shared/components/code-button/code-button.component.ts b/src/main/webapp/app/shared/components/code-button/code-button.component.ts index c823449f95da..c2db34fea6b4 100644 --- a/src/main/webapp/app/shared/components/code-button/code-button.component.ts +++ b/src/main/webapp/app/shared/components/code-button/code-button.component.ts @@ -33,6 +33,7 @@ export class CodeButtonComponent implements OnInit, OnChanges { @Input() routerLinkForRepositoryView?: string | (string | number)[]; @Input() participations?: ProgrammingExerciseStudentParticipation[]; @Input() exercise?: ProgrammingExercise; + @Input() hideLabelMobile = false; useSsh = false; useToken = false; @@ -81,7 +82,12 @@ export class CodeButtonComponent implements OnInit, OnChanges { ) {} async ngOnInit() { - this.user = (await this.accountService.identity())!; + const user = await this.accountService.identity(); + if (!user) { + return; + } + this.user = user; + this.refreshTokenState(); this.copyEnabled = true; @@ -104,6 +110,7 @@ export class CodeButtonComponent implements OnInit, OnChanges { }, }); + // Get ssh information from the user this.profileService.getProfileInfo().subscribe((profileInfo) => { this.sshSettingsUrl = profileInfo.sshKeysURL; @@ -127,6 +134,14 @@ export class CodeButtonComponent implements OnInit, OnChanges { this.sshSettingsUrl = profileInfo.sshKeysURL; } this.sshKeyMissingTip = this.formatTip('artemisApp.exerciseActions.sshKeyTip', this.sshSettingsUrl); + + if (this.useSsh) { + this.useSshUrl(); + } + if (this.useToken) { + this.useHttpsUrlWithToken(); + } + this.loadParticipationVcsAccessTokens(); }); this.ideSettingsService.loadIdePreferences().then((programmingLanguageToIde) => { @@ -162,7 +177,7 @@ export class CodeButtonComponent implements OnInit, OnChanges { public useHttpsUrlWithToken() { this.useSsh = false; this.useToken = true; - this.copyEnabled = !!(this.accessTokensEnabled && this.useToken && ((!!this.user.vcsAccessToken && !this.isTokenExpired()) || this.useParticipationVcsAccessToken)); + this.copyEnabled = !!(this.accessTokensEnabled && ((!!this.user.vcsAccessToken && !this.isTokenExpired()) || this.useParticipationVcsAccessToken)); this.refreshTokenState(); this.storeToLocalStorage(); } @@ -236,6 +251,9 @@ export class CodeButtonComponent implements OnInit, OnChanges { if (error.status == 404) { this.createNewVcsAccessToken(participation); } + if (error.status == 403) { + this.useParticipationVcsAccessToken = false; + } }, }); } @@ -253,7 +271,11 @@ export class CodeButtonComponent implements OnInit, OnChanges { } } }, - error: () => {}, + error: (error: HttpErrorResponse) => { + if (error.status == 403) { + this.useParticipationVcsAccessToken = false; + } + }, }); } diff --git a/src/main/webapp/app/shared/components/exercise-action-button.component.html b/src/main/webapp/app/shared/components/exercise-action-button.component.html index bc2b41ec1981..13516b497161 100644 --- a/src/main/webapp/app/shared/components/exercise-action-button.component.html +++ b/src/main/webapp/app/shared/components/exercise-action-button.component.html @@ -1,6 +1,6 @@
    @if (buttonIcon) { - + }   {{ buttonLabel }} diff --git a/src/main/webapp/app/shared/components/not-released-tag.component.ts b/src/main/webapp/app/shared/components/not-released-tag.component.ts index a1f4dbefbc90..9fdb0a54a3a7 100644 --- a/src/main/webapp/app/shared/components/not-released-tag.component.ts +++ b/src/main/webapp/app/shared/components/not-released-tag.component.ts @@ -9,6 +9,6 @@ import { Exercise } from 'app/entities/exercise.model'; }) export class NotReleasedTagComponent { @Input() public exercise: Exercise; - @Input() public noMargin?: boolean; + @Input() public noMargin: boolean = true; readonly dayjs = dayjs; } diff --git a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html index ce94f86bca0c..47eafc60ec58 100644 --- a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html +++ b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html @@ -9,7 +9,7 @@ [buttonLabel]="'artemisApp.exerciseActions.openCodeEditor' | artemisTranslate" [buttonLoading]="loading" [smallButton]="smallButtons" - [hideLabelMobile]="false" + [hideLabelMobile]="hideLabelMobile" [routerLink]="[courseAndExerciseNavigationUrl, participations[0].id]" > } @@ -22,7 +22,7 @@ [buttonLabel]="'artemisApp.exerciseActions.openCodeEditor' | artemisTranslate" [buttonLoading]="loading" [smallButton]="smallButtons" - [hideLabelMobile]="false" + [hideLabelMobile]="hideLabelMobile" [ngbPopover]="popContent" [autoClose]="'outside'" placement="right auto" @@ -44,7 +44,7 @@ [buttonLabel]="'artemisApp.exerciseActions.' + (isPracticeMode ? 'openPracticeCodeEditor' : 'openGradedCodeEditor') | artemisTranslate" [buttonLoading]="loading" [smallButton]="smallButtons" - [hideLabelMobile]="false" + [hideLabelMobile]="hideLabelMobile" [routerLink]="[courseAndExerciseNavigationUrl, activeParticipation.id]" > diff --git a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.ts b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.ts index 24438355258d..10b32d55360e 100644 --- a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.ts +++ b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.ts @@ -22,6 +22,8 @@ export class OpenCodeEditorButtonComponent implements OnChanges { courseAndExerciseNavigationUrlSegment: any[]; @Input() exercise: Exercise; + @Input() + hideLabelMobile = false; courseAndExerciseNavigationUrl: string; activeParticipation: ProgrammingExerciseStudentParticipation; diff --git a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html index e2bc97df120d..d3e4254e97d6 100644 --- a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html +++ b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html @@ -13,13 +13,30 @@ [placeholder]="'artemisApp.userSelector.placeholderText' | artemisTranslate" [ngbTypeahead]="search" [inputFormatter]="usersFormatter" - [resultFormatter]="usersFormatter" + [resultTemplate]="resultTemplate" [editable]="false" [focusFirst]="false" (input)="onInputChange($event)" placement="bottom-start" #instance="ngbTypeahead" /> + +
    + + {{ getUserLabel(user) }} +
    +     @if (isSearching) {
    diff --git a/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts b/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts index ca44726f11bb..8c47180607d0 100644 --- a/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts +++ b/src/main/webapp/app/shared/course-users-selector/course-users-selector.module.ts @@ -4,9 +4,10 @@ import { ArtemisSharedModule } from 'app/shared/shared.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { NgModule } from '@angular/core'; import { CourseUsersSelectorComponent } from 'app/shared/course-users-selector/course-users-selector.component'; +import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component'; @NgModule({ - imports: [CommonModule, FormsModule, ReactiveFormsModule, ArtemisSharedModule, ArtemisSharedComponentModule], + imports: [CommonModule, FormsModule, ReactiveFormsModule, ArtemisSharedModule, ArtemisSharedComponentModule, ProfilePictureComponent], exports: [CourseUsersSelectorComponent], declarations: [CourseUsersSelectorComponent], }) diff --git a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component.ts b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component.ts index ee9ba578b47b..1da8f8762db0 100644 --- a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component.ts +++ b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component.ts @@ -1,13 +1,14 @@ -import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core'; import { round } from 'app/shared/util/utils'; import { Theme, ThemeService } from 'app/core/theme/theme.service'; import { Subscription } from 'rxjs'; +import { toObservable } from '@angular/core/rxjs-interop'; @Component({ selector: 'jhi-progress-bar', templateUrl: './progress-bar.component.html', }) -export class ProgressBarComponent implements OnInit, OnChanges, OnDestroy { +export class ProgressBarComponent implements OnChanges, OnDestroy { @Input() public tooltip: string; @Input() public percentage: number; @Input() public numerator: number; @@ -20,10 +21,8 @@ export class ProgressBarComponent implements OnInit, OnChanges, OnDestroy { constructor( private themeService: ThemeService, private ref: ChangeDetectorRef, - ) {} - - ngOnInit() { - this.themeSubscription = this.themeService.getCurrentThemeObservable().subscribe(() => { + ) { + this.themeSubscription = toObservable(this.themeService.currentTheme).subscribe(() => { this.chooseProgressBarTextColor(); // Manually run change detection as it doesn't do it automatically for some reason @@ -60,7 +59,7 @@ export class ProgressBarComponent implements OnInit, OnChanges, OnDestroy { * Function to change the text color to indicate a finished status */ chooseProgressBarTextColor() { - switch (this.themeService.getCurrentTheme()) { + switch (this.themeService.currentTheme()) { case Theme.DARK: this.foregroundColorClass = 'text-white'; break; diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html index e26c6b8f8633..f6958870f086 100644 --- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html +++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html @@ -1,4 +1,4 @@ -@if (labelName()) { +@if (labelName() && !hideLabelName()) { @@ -26,19 +26,35 @@ [min]="minDate()" [max]="maxDate()" (ngModelChange)="updateField($event)" - [owlDateTime]="dt" + [owlDateTime]="pickerType() === DateTimePickerType.CALENDAR ? dtCalendar : pickerType() === DateTimePickerType.TIMER ? dtTimer : dtDefault" name="datePicker" /> - + @switch (pickerType()) { + @case (DateTimePickerType.TIMER) { + + } + @case (DateTimePickerType.CALENDAR) { + + } + @default { + + } + } + + + +
    - + + +
    @if (dateInput.invalid || (requiredField() && !dateInput.value)) {
    diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts index 5d1c3bcaf164..78d1f46b9a11 100644 --- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts +++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts @@ -3,6 +3,12 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR, NgModel } from '@angular/forms import { faCalendarAlt, faCircleXmark, faClock, faGlobe, faQuestionCircle, faTriangleExclamation } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; +export enum DateTimePickerType { + CALENDAR, + TIMER, + DEFAULT, +} + @Component({ selector: 'jhi-date-time-picker', templateUrl: `./date-time-picker.component.html`, @@ -24,7 +30,9 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { protected readonly faTriangleExclamation = faTriangleExclamation; @ViewChild('dateInput', { static: false }) dateInput: NgModel; + labelName = input(); + hideLabelName = input(false); labelTooltip = input(); value = model(); disabled = input(false); @@ -35,6 +43,7 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { min = input(); // Dates before this date are not selectable. max = input(); // Dates after this date are not selectable. shouldDisplayTimeZoneWarning = input(true); // Displays a warning that the current time zone might differ from the participants'. + pickerType = input(DateTimePickerType.DEFAULT); // Select type of picker valueChange = output(); protected isInputValid = signal(false); @@ -134,4 +143,6 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { this.dateInput.reset(undefined); this.updateSignals(); } + + protected readonly DateTimePickerType = DateTimePickerType; } diff --git a/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.html b/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.html new file mode 100644 index 000000000000..9f61483533b1 --- /dev/null +++ b/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.html @@ -0,0 +1,5 @@ +
    +
    +
    +
    +
    diff --git a/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.scss b/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.scss new file mode 100644 index 000000000000..e621c444014f --- /dev/null +++ b/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.scss @@ -0,0 +1,4 @@ +.skill-bar { + width: 1.2rem; + height: 0.6rem; +} diff --git a/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.ts b/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.ts new file mode 100644 index 000000000000..69af618315e3 --- /dev/null +++ b/src/main/webapp/app/shared/difficulty-level/difficulty-level.component.ts @@ -0,0 +1,48 @@ +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; +import { DifficultyLevel } from 'app/entities/exercise.model'; +import { Subscription } from 'rxjs'; +import { ArtemisSharedModule } from '../shared.module'; +import { ArtemisSharedComponentModule } from '../components/shared-component.module'; + +export interface ColoredDifficultyLevel { + label: string; + color: string[]; +} +@Component({ + selector: 'jhi-difficulty-level', + templateUrl: './difficulty-level.component.html', + styleUrls: ['./difficulty-level.component.scss'], + standalone: true, + imports: [ArtemisSharedModule, ArtemisSharedComponentModule], +}) +export class DifficultyLevelComponent implements OnInit, OnDestroy { + private translateSubscription: Subscription; + @Input() difficultyLevel: string; + coloredDifficultyLevel: ColoredDifficultyLevel = { label: '', color: [] }; + + constructor(private translateService: TranslateService) {} + + ngOnInit(): void { + this.translateSubscription = this.translateService.onLangChange.subscribe(() => { + this.mapDifficultyLevelToColors(this.difficultyLevel); + }); + this.coloredDifficultyLevel = this.mapDifficultyLevelToColors(this.difficultyLevel); + } + + mapDifficultyLevelToColors(difficultyLevel: string): ColoredDifficultyLevel { + switch (difficultyLevel) { + case DifficultyLevel.EASY: + return { label: this.translateService.instant('artemisApp.exercise.easy'), color: [...Array(1).fill('success'), ...Array(2).fill('body')] }; + case DifficultyLevel.MEDIUM: + return { label: this.translateService.instant('artemisApp.exercise.medium'), color: [...Array(2).fill('warning'), ...Array(1).fill('body')] }; + case DifficultyLevel.HARD: + return { label: this.translateService.instant('artemisApp.exercise.hard'), color: [...Array(3).fill('danger')] }; + } + return { label: this.translateService.instant('artemisApp.exercise.noLevel'), color: [...Array(3).fill('body')] }; + } + + ngOnDestroy(): void { + this.translateSubscription?.unsubscribe(); + } +} diff --git a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html index f811a3f4c4e7..3c99371ad386 100644 --- a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html +++ b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html @@ -1,27 +1,31 @@ @if (exercise.releaseDate && dayjs(exercise.releaseDate).isAfter(dayjs()) && showTags.notReleased) { -

    + -

    + } @if (asQuizExercise(exercise).isActiveQuiz && showTags.quizLive) { -

    + -

    -} -@for (category of exercise.categories; track category) { - -} -@if (exercise.difficulty && showTags.difficulty) { -

    - -

    + } @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY && showTags.includedInScore) { -

    + -

    + +} +@for (category of exercise.categories; track category) { + @if (category.category) { + + {{ category.category | truncate: 30 }} + + } +} +@if (exercise.difficulty && showTags.difficulty) { + + + } diff --git a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.ts b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.ts index 43ca30b06c3e..065c59b801fc 100644 --- a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.ts +++ b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.ts @@ -21,6 +21,7 @@ export class ExerciseCategoriesComponent { readonly dayjs = dayjs; @Input() exercise: Exercise; + @Input() isSmall: boolean = false; @Input() showTags: ShowTagsConfig = { diff --git a/src/main/webapp/app/shared/http/file.service.ts b/src/main/webapp/app/shared/http/file.service.ts index c14136a6688d..05960940f7aa 100644 --- a/src/main/webapp/app/shared/http/file.service.ts +++ b/src/main/webapp/app/shared/http/file.service.ts @@ -116,4 +116,20 @@ export class FileService { } while (mapOfFiles && mapOfFiles.has(name)); return name; } + + /** + * Removes the prefix from the file name, and replaces underscore with spaces + * @param link + */ + replaceAttachmentPrefixAndUnderscores(link: string): string { + return link.replace(/AttachmentUnit_\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}_/, '').replace(/_/g, ' '); + } + + /** + * Removes the prefix from the file name, and replaces underscore with spaces + * @param link + */ + replaceLectureAttachmentPrefixAndUnderscores(link: string): string { + return link.replace(/LectureAttachment_\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}_/, '').replace(/_/g, ' '); + } } diff --git a/src/main/webapp/app/shared/information-box/information-box.component.html b/src/main/webapp/app/shared/information-box/information-box.component.html index 93a62b96655d..5495dbfd46d1 100644 --- a/src/main/webapp/app/shared/information-box/information-box.component.html +++ b/src/main/webapp/app/shared/information-box/information-box.component.html @@ -1,15 +1,15 @@ @if (informationBoxData) {
    -
    - @if (informationBoxData.contentComponent) { +
    + @if (informationBoxData.isContentComponent) { } @else { -
    - {{ informationBoxData.content }} +
    + {{ informationBoxData.content.value }}
    }
    diff --git a/src/main/webapp/app/shared/information-box/information-box.component.ts b/src/main/webapp/app/shared/information-box/information-box.component.ts index 3e909eb46ee9..5be6212f7277 100644 --- a/src/main/webapp/app/shared/information-box/information-box.component.ts +++ b/src/main/webapp/app/shared/information-box/information-box.component.ts @@ -1,16 +1,46 @@ import { Component, Input } from '@angular/core'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { DifficultyLevel, Exercise } from 'app/entities/exercise.model'; +import { DateType } from '../pipes/artemis-date.pipe'; +import { StudentExam } from 'app/entities/student-exam.model'; export interface InformationBox { title: string; - content: string | number; - contentComponent?: string; + content: InformationBoxContent; + isContentComponent?: boolean; tooltip?: string; tooltipParams?: Record; contentColor?: string; } +export interface StudentExamContent { + type: 'workingTime'; + value: StudentExam; +} + +export interface DateContent { + type: 'timeAgo' | 'dateTime'; + value: DateType; +} + +export interface DifficultyLevelContent { + type: 'difficultyLevel'; + value: DifficultyLevel; +} + +export interface ExerciseContent { + type: 'submissionStatus' | 'categories'; + value: Exercise; +} + +export interface StringNumberContent { + type: 'string'; + value: string | number; +} + +export type InformationBoxContent = StudentExamContent | DateContent | ExerciseContent | DifficultyLevelContent | StringNumberContent; + @Component({ standalone: true, imports: [ArtemisSharedModule, ArtemisSharedComponentModule], diff --git a/src/main/webapp/app/shared/layouts/navbar/navbar.component.html b/src/main/webapp/app/shared/layouts/navbar/navbar.component.html index 4883c2e7b81c..209186817f17 100644 --- a/src/main/webapp/app/shared/layouts/navbar/navbar.component.html +++ b/src/main/webapp/app/shared/layouts/navbar/navbar.component.html @@ -135,7 +135,7 @@
    diff --git a/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts b/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts index af2c4cc17437..cdf3bbb137ae 100644 --- a/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts +++ b/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts @@ -23,6 +23,7 @@ import { faBell, faBook, faBookOpen, + faBroom, faChevronRight, faCog, faEye, @@ -119,6 +120,7 @@ export class NavbarComponent implements OnInit, OnDestroy { faGears = faGears; faPuzzlePiece = faPuzzlePiece; faChevronRight = faChevronRight; + faBroom = faBroom; private standardizedCompetencySubscription: Subscription; private authStateSubscription: Subscription; @@ -364,6 +366,7 @@ export class NavbarComponent implements OnInit, OnDestroy { standardized_competencies: 'artemisApp.standardizedCompetency.manage.title', prerequisites: 'artemisApp.prerequisite.title', import_standardized: 'artemisApp.standardizedCompetency.courseImport.title', + cleanup_service: 'cleanupService.title', }; studentPathBreadcrumbTranslations: { [key: string]: string } = { diff --git a/src/main/webapp/app/shared/layouts/navbar/navbar.scss b/src/main/webapp/app/shared/layouts/navbar/navbar.scss index ddc951b1aa60..4bfe0d015a35 100644 --- a/src/main/webapp/app/shared/layouts/navbar/navbar.scss +++ b/src/main/webapp/app/shared/layouts/navbar/navbar.scss @@ -201,7 +201,8 @@ a:not(.btn):hover { background-color: var(--navbar-breadcrumb-background); margin-left: 1rem; margin-bottom: 0; - padding: 5px 16px 5px 16px; + padding: 0.25rem 1rem; + font-size: smaller; .breadcrumb-link { font-weight: 300; diff --git a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html index 073e4e907593..6682f5c146c0 100644 --- a/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html +++ b/src/main/webapp/app/shared/metis/answer-post/answer-post.component.html @@ -5,7 +5,6 @@ [isReadOnlyMode]="isReadOnlyMode" [isCommunicationPage]="isCommunicationPage" [lastReadDate]="lastReadDate" - [hasChannelModerationRights]="hasChannelModerationRights" [isDeleted]="isDeleted" /> } diff --git a/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.html b/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.html index 8566cb951bff..08cceca47792 100644 --- a/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.html +++ b/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.html @@ -7,8 +7,8 @@ [color]="'var(--primary)'" [recent]="recent" [i18n]="{ search: 'artemisApp.metis.searchEmoji' | artemisTranslate, categories: { recent: 'artemisApp.metis.courseEmojiSelectionCategory' | artemisTranslate } }" - [darkMode]="dark" - [imageUrlFn]="singleImageFunction" + [darkMode]="dark()" + [imageUrlFn]="singleImageFunction()" [backgroundImageFn]="utils.EMOJI_SHEET_URL" (emojiSelect)="onEmojiSelect($event)" /> diff --git a/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.ts b/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.ts index 7dcaa9cfbfeb..e37e83152d1a 100644 --- a/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.ts +++ b/src/main/webapp/app/shared/metis/emoji/emoji-picker.component.ts @@ -1,6 +1,5 @@ -import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output, computed, inject } from '@angular/core'; import { Theme, ThemeService } from 'app/core/theme/theme.service'; -import { Subscription } from 'rxjs'; import { EmojiUtils } from 'app/shared/metis/emoji/emoji.utils'; import { EmojiData } from '@ctrl/ngx-emoji-mart/ngx-emoji'; @@ -8,28 +7,17 @@ import { EmojiData } from '@ctrl/ngx-emoji-mart/ngx-emoji'; selector: 'jhi-emoji-picker', templateUrl: './emoji-picker.component.html', }) -export class EmojiPickerComponent implements OnDestroy { +export class EmojiPickerComponent { + private themeService = inject(ThemeService); + @Input() emojisToShowFilter: (emoji: string | EmojiData) => boolean; @Input() categoriesIcons: { [key: string]: string }; @Input() recent: string[]; @Output() emojiSelect: EventEmitter = new EventEmitter(); utils = EmojiUtils; - singleImageFunction: (emoji: EmojiData | null) => string; - - dark = false; - themeSubscription: Subscription; - - constructor(private themeService: ThemeService) { - this.themeSubscription = themeService.getCurrentThemeObservable().subscribe((theme) => { - this.dark = theme === Theme.DARK; - this.singleImageFunction = this.dark ? EmojiUtils.singleDarkModeEmojiUrlFn : () => ''; - }); - } - - ngOnDestroy(): void { - this.themeSubscription.unsubscribe(); - } + dark = computed(() => this.themeService.currentTheme() === Theme.DARK); + singleImageFunction = computed(() => (this.dark() ? EmojiUtils.singleDarkModeEmojiUrlFn : () => '')); onEmojiSelect(event: any) { this.emojiSelect.emit(event); diff --git a/src/main/webapp/app/shared/metis/emoji/emoji.component.html b/src/main/webapp/app/shared/metis/emoji/emoji.component.html index 537b14712a91..ac71d2e4826a 100644 --- a/src/main/webapp/app/shared/metis/emoji/emoji.component.html +++ b/src/main/webapp/app/shared/metis/emoji/emoji.component.html @@ -1,7 +1,6 @@ -@if (!dark) { +@if (!dark()) { -} -@if (dark) { +} @else { } diff --git a/src/main/webapp/app/shared/metis/emoji/emoji.component.ts b/src/main/webapp/app/shared/metis/emoji/emoji.component.ts index 75d21024aad9..00e651bf19b7 100644 --- a/src/main/webapp/app/shared/metis/emoji/emoji.component.ts +++ b/src/main/webapp/app/shared/metis/emoji/emoji.component.ts @@ -1,6 +1,5 @@ -import { Component, Input, OnDestroy } from '@angular/core'; +import { Component, Input, computed, inject } from '@angular/core'; import { Theme, ThemeService } from 'app/core/theme/theme.service'; -import { Subscription } from 'rxjs'; import { EmojiUtils } from 'app/shared/metis/emoji/emoji.utils'; @Component({ @@ -8,21 +7,11 @@ import { EmojiUtils } from 'app/shared/metis/emoji/emoji.utils'; templateUrl: './emoji.component.html', styleUrls: ['./emoji.component.scss'], }) -export class EmojiComponent implements OnDestroy { - utils = EmojiUtils; +export class EmojiComponent { + private themeService = inject(ThemeService); + utils = EmojiUtils; @Input() emoji: string; - dark = false; - themeSubscription: Subscription; - - constructor(private themeService: ThemeService) { - this.themeSubscription = themeService.getCurrentThemeObservable().subscribe((theme) => { - this.dark = theme === Theme.DARK; - }); - } - - ngOnDestroy(): void { - this.themeSubscription.unsubscribe(); - } + dark = computed(() => this.themeService.currentTheme() === Theme.DARK); } diff --git a/src/main/webapp/app/shared/metis/metis.component.scss b/src/main/webapp/app/shared/metis/metis.component.scss index f17e5cb1389c..0db317b31ea8 100644 --- a/src/main/webapp/app/shared/metis/metis.component.scss +++ b/src/main/webapp/app/shared/metis/metis.component.scss @@ -78,7 +78,7 @@ $delete-delay-duration: 6s; } .card { - border-radius: 1em; + border-radius: 0.25em; } @include media-breakpoint-down(sm) { diff --git a/src/main/webapp/app/shared/metis/post.service.ts b/src/main/webapp/app/shared/metis/post.service.ts index a44201956253..ed859078e07c 100644 --- a/src/main/webapp/app/shared/metis/post.service.ts +++ b/src/main/webapp/app/shared/metis/post.service.ts @@ -82,16 +82,6 @@ export class PostService extends PostingService { .pipe(map(this.convertPostResponseArrayDatesFromServer)); } - /** - * gets all tags for course - * @param {number} courseId - * @return {Observable} - */ - // TODO: unused, delete - getAllPostTagsByCourseId(courseId: number): Observable> { - return this.http.get(`${this.resourceUrl}${courseId}/messages/tags`, { observe: 'response' }); - } - /** * updates a post * @param {number} courseId @@ -128,20 +118,6 @@ export class PostService extends PostingService { return this.http.delete(`${this.resourceUrl}${courseId}${PostService.getResourceEndpoint(undefined, post)}/${post.id}`, { observe: 'response' }); } - /** - * determines similar posts in a course - * @param {Post} tempPost - * @param {number} courseId - * @return {Observable>} - */ - // TODO: unused, remove - computeSimilarityScoresWithCoursePosts(tempPost: Post, courseId: number): Observable { - const copy = this.convertPostingDateFromClient(tempPost); - return this.http - .post(`${this.resourceUrl}${courseId}/posts/similarity-check`, copy, { observe: 'response' }) - .pipe(map(this.convertPostResponseArrayDatesFromServer)); - } - /** * takes an array of posts and converts the date from the server * @param {HttpResponse} res diff --git a/src/main/webapp/app/shared/metis/post/post.component.html b/src/main/webapp/app/shared/metis/post/post.component.html index 1fcad5a5987f..42352bdfa0d6 100644 --- a/src/main/webapp/app/shared/metis/post/post.component.html +++ b/src/main/webapp/app/shared/metis/post/post.component.html @@ -6,7 +6,6 @@ [posting]="posting" [isDeleted]="isDeleted" [isCommunicationPage]="isCommunicationPage" - [hasChannelModerationRights]="hasChannelModerationRights" (isModalOpen)="displayInlineInput = true" [lastReadDate]="lastReadDate" /> @@ -68,6 +67,7 @@ >
    @if (!previewMode) { + - + @if (!previewMode) { } - diff --git a/src/main/webapp/app/shared/metis/post/post.component.scss b/src/main/webapp/app/shared/metis/post/post.component.scss index 1a6cf4b3ace2..10cb7ef83132 100644 --- a/src/main/webapp/app/shared/metis/post/post.component.scss +++ b/src/main/webapp/app/shared/metis/post/post.component.scss @@ -20,6 +20,7 @@ top: -1.8rem; right: 1%; display: flex; + max-height: 2.2rem; gap: 10px; visibility: hidden; transition: diff --git a/src/main/webapp/app/shared/metis/post/post.component.ts b/src/main/webapp/app/shared/metis/post/post.component.ts index d70c13abae68..bd502fbea1ac 100644 --- a/src/main/webapp/app/shared/metis/post/post.component.ts +++ b/src/main/webapp/app/shared/metis/post/post.component.ts @@ -90,7 +90,7 @@ export class PostComponent extends PostingDirective implements OnInit, OnC isConsecutive = input(false); dropdownPosition = { x: 0, y: 0 }; - @ViewChild(PostReactionsBarComponent) private reactionsBarComponent!: PostReactionsBarComponent; + @ViewChild(PostReactionsBarComponent) protected reactionsBarComponent!: PostReactionsBarComponent; constructor( public metisService: MetisService, @@ -218,6 +218,13 @@ export class PostComponent extends PostingDirective implements OnInit, OnC this.postFooterComponent.openCreateAnswerPostModal(); } + /** + * Close create answer modal + */ + closeCreateAnswerPostModal() { + this.postFooterComponent.closeCreateAnswerPostModal(); + } + /** * sorts answerPosts by two criteria * 1. criterion: resolvesPost -> true comes first diff --git a/src/main/webapp/app/shared/metis/posting-footer/post-footer/post-footer.component.ts b/src/main/webapp/app/shared/metis/posting-footer/post-footer/post-footer.component.ts index 7f6d3b0531a5..5808a9b342ba 100644 --- a/src/main/webapp/app/shared/metis/posting-footer/post-footer/post-footer.component.ts +++ b/src/main/webapp/app/shared/metis/posting-footer/post-footer/post-footer.component.ts @@ -173,6 +173,13 @@ export class PostFooterComponent extends PostingFooterDirective implements this.createAnswerPostModalComponent.open(); } + /** + * Close create answer modal + */ + closeCreateAnswerPostModal() { + this.createAnswerPostModalComponent.close(); + } + protected postsTrackByFn(index: number, post: Post): number { return post.id!; } diff --git a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts index 9871b3bbee8f..bb1ff3cbbbd2 100644 --- a/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts +++ b/src/main/webapp/app/shared/metis/posting-header/answer-post-header/answer-post-header.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angu import { AnswerPost } from 'app/entities/metis/answer-post.model'; import { PostingHeaderDirective } from 'app/shared/metis/posting-header/posting-header.directive'; import { MetisService } from 'app/shared/metis/metis.service'; -import { faCheck, faCog, faPencilAlt } from '@fortawesome/free-solid-svg-icons'; +import { faCheck, faPencilAlt } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; import { AccountService } from 'app/core/auth/account.service'; @@ -18,13 +18,9 @@ export class AnswerPostHeaderComponent extends PostingHeaderDirective(); - isAuthorOfOriginalPost: boolean; - isAnswerOfAnnouncement: boolean; - // Icons - faCheck = faCheck; - faPencilAlt = faPencilAlt; - faCog = faCog; + readonly faCheck = faCheck; + readonly faPencilAlt = faPencilAlt; constructor( protected metisService: MetisService, diff --git a/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts b/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts index 3463b66456fc..fe4bc129addd 100644 --- a/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts +++ b/src/main/webapp/app/shared/metis/posting-header/post-header/post-header.component.ts @@ -3,7 +3,7 @@ import { Post } from 'app/entities/metis/post.model'; import { PostingHeaderDirective } from 'app/shared/metis/posting-header/posting-header.directive'; import { MetisService } from 'app/shared/metis/metis.service'; import { PostCreateEditModalComponent } from 'app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component'; -import { faCheckSquare, faCog, faPencilAlt } from '@fortawesome/free-solid-svg-icons'; +import { faCheckSquare, faPencilAlt } from '@fortawesome/free-solid-svg-icons'; import dayjs from 'dayjs/esm'; import { CachingStrategy } from 'app/shared/image/secured-image.component'; import { AccountService } from 'app/core/auth/account.service'; @@ -22,9 +22,8 @@ export class PostHeaderComponent extends PostingHeaderDirective implements isAtLeastInstructorInCourse: boolean; // Icons - faPencilAlt = faPencilAlt; - faCheckSquare = faCheckSquare; - faCog = faCog; + readonly faPencilAlt = faPencilAlt; + readonly faCheckSquare = faCheckSquare; constructor( protected metisService: MetisService, diff --git a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts index e6deddb407b8..f07ef5e1ed04 100644 --- a/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts +++ b/src/main/webapp/app/shared/metis/posting-header/posting-header.directive.ts @@ -95,6 +95,10 @@ export abstract class PostingHeaderDirective implements OnIni this.userAuthority = 'tutor'; this.userRoleBadge = roleBadgeTranslationPath + this.userAuthority; this.userAuthorityTooltip = toolTipTranslationPath + this.userAuthority; + } else { + this.userAuthority = 'student'; + this.userRoleBadge = 'artemisApp.metis.userRoles.deleted'; + this.userAuthorityTooltip = 'artemisApp.metis.userAuthorityTooltips.deleted'; } } } diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html index 86a4a499a599..e0ed87168dc9 100644 --- a/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html +++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.html @@ -89,13 +89,4 @@ } }
    - - @if (isLastAnswer && !isThreadSidebar) { -
    - -
    - }
    diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html index 5ba32fbe573e..500954b38df8 100644 --- a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html +++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.html @@ -1,10 +1,18 @@ -
    +
    + @if (hoverBar && sortedAnswerPosts.length === 0) { +
    + +
    + } @if (!isCommunicationPage) { @if (sortedAnswerPosts.length) { @if (showAnswers) {
    - @@ -12,8 +20,8 @@ } @else {
    -
    } - } @else { - -
    - -
    } } @else { @if (!isThreadSidebar) { - - @if (hoverBar && sortedAnswerPosts.length === 0) { -
    - -
    - } @if (!showAnswers && sortedAnswerPosts.length) {
    @@ -142,7 +133,7 @@ }
    - @if (getShowNewMessageIcon()) { + @if (isEmojiCount && getShowNewMessageIcon()) {
    }
    diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts index 1d039326b20b..2ff96f282a6b 100644 --- a/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts +++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component.ts @@ -41,6 +41,7 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective(); @Output() openPostingCreateEditModal = new EventEmitter(); + @Output() closePostingCreateEditModal = new EventEmitter(); @Output() openThread = new EventEmitter(); @Input() previewMode: boolean; isAtLeastInstructorInCourse: boolean; @@ -63,6 +64,16 @@ export class PostReactionsBarComponent extends PostingsReactionsBarDirective reaction.count >= 1); } + openAnswerView() { + this.showAnswersChange.emit(true); + this.openPostingCreateEditModal.emit(); + } + + closeAnswerView() { + this.showAnswersChange.emit(false); + this.closePostingCreateEditModal.emit(); + } + /** * on initialization: call resetTooltipsAndPriority */ diff --git a/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.component.scss b/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.component.scss index 0a289a54ceaa..bc7fbfc61165 100644 --- a/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.component.scss +++ b/src/main/webapp/app/shared/metis/posting-reactions-bar/posting-reactions-bar.component.scss @@ -13,6 +13,7 @@ border-radius: 1rem; align-items: center; height: 1.2rem; + display: inline-flex; &.open-selector { box-shadow: inset 0 0 0 1px var(--metis-gray); diff --git a/src/main/webapp/app/shared/metis/posting-thread/posting-thread.component.ts b/src/main/webapp/app/shared/metis/posting-thread/posting-thread.component.ts index 776d29facdd1..8cb7db55b963 100644 --- a/src/main/webapp/app/shared/metis/posting-thread/posting-thread.component.ts +++ b/src/main/webapp/app/shared/metis/posting-thread/posting-thread.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, Output, inject } from '@angular/core'; import { Post } from 'app/entities/metis/post.model'; import dayjs from 'dayjs/esm'; @@ -18,4 +18,6 @@ export class PostingThreadComponent { @Input() hasChannelModerationRights = false; @Output() openThread = new EventEmitter(); @Input() isConsecutive: boolean | undefined = false; + + elementRef = inject(ElementRef); } diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.service.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.service.ts index 5bbb04e440fc..52a2b40a3693 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.service.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.service.ts @@ -2,7 +2,6 @@ import { Injectable, effect, inject } from '@angular/core'; import * as monaco from 'monaco-editor'; import { CUSTOM_MARKDOWN_CONFIG, CUSTOM_MARKDOWN_LANGUAGE, CUSTOM_MARKDOWN_LANGUAGE_ID } from 'app/shared/monaco-editor/model/languages/monaco-custom-markdown.language'; import { Theme, ThemeService } from 'app/core/theme/theme.service'; -import { toSignal } from '@angular/core/rxjs-interop'; import { MONACO_LIGHT_THEME_DEFINITION } from 'app/shared/monaco-editor/model/themes/monaco-light.theme'; import { MonacoEditorTheme } from 'app/shared/monaco-editor/model/themes/monaco-editor-theme.model'; import { MONACO_DARK_THEME_DEFINITION } from 'app/shared/monaco-editor/model/themes/monaco-dark.theme'; @@ -15,7 +14,7 @@ import { MONACO_DARK_THEME_DEFINITION } from 'app/shared/monaco-editor/model/the @Injectable({ providedIn: 'root' }) export class MonacoEditorService { private readonly themeService: ThemeService = inject(ThemeService); - private readonly currentTheme = toSignal(this.themeService.getCurrentThemeObservable(), { requireSync: true }); + private readonly currentTheme = this.themeService.currentTheme; private lightTheme: MonacoEditorTheme; private darkTheme: MonacoEditorTheme; diff --git a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html index a3ec25c5b6d6..92d7b034e785 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html +++ b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.html @@ -14,6 +14,9 @@ ({{ (groupedData[groupKey].entityData | searchFilter: ['title', 'type'] : searchValue)?.length }})
    + @if (totalUnreadMessagesPerGroup[groupKey] > 0 && collapseState[groupKey]) { + {{ totalUnreadMessagesPerGroup[groupKey] }} + }
    diff --git a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.scss b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.scss index 78788a1fb334..61f8e82f8193 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.scss +++ b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.scss @@ -5,3 +5,22 @@ hr { border-top-color: var(--overview-light-border-color); } + +.unread-count { + background-color: var(--bs-primary); + color: var(--bs-white); + border-radius: 50%; + font-size: 0.6rem; + width: 1.1rem; + height: 1.1rem; + display: flex; + justify-content: center; + align-items: center; + overflow: hidden; + white-space: nowrap; +} + +.icon-container { + display: flex; + align-items: center; +} diff --git a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts index 030cdbb879ec..26f65e5258fa 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts +++ b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts @@ -27,6 +27,7 @@ export class SidebarAccordionComponent implements OnChanges, OnInit { readonly faChevronRight = faChevronRight; readonly faFile = faFile; + totalUnreadMessagesPerGroup: { [key: string]: number } = {}; ngOnInit() { this.expandGroupWithSelectedItem(); @@ -39,6 +40,7 @@ export class SidebarAccordionComponent implements OnChanges, OnInit { } else { this.setStoredCollapseState(); } + this.calculateUnreadMessagesOfGroup(); } setStoredCollapseState() { @@ -67,6 +69,19 @@ export class SidebarAccordionComponent implements OnChanges, OnInit { } } + calculateUnreadMessagesOfGroup(): void { + if (!this.groupedData) { + this.totalUnreadMessagesPerGroup = {}; + return; + } + + Object.keys(this.groupedData).forEach((groupKey) => { + this.totalUnreadMessagesPerGroup[groupKey] = this.groupedData[groupKey].entityData + .filter((item: SidebarCardElement) => item.conversation?.unreadMessagesCount) + .reduce((sum, item) => sum + (item.conversation?.unreadMessagesCount || 0), 0); + }); + } + toggleGroupCategoryCollapse(groupCategoryKey: string) { this.collapseState[groupCategoryKey] = !this.collapseState[groupCategoryKey]; localStorage.setItem('sidebar.accordion.collapseState.' + this.storageId + '.byCourse.' + this.courseId, JSON.stringify(this.collapseState)); diff --git a/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.html b/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.html index 15f1ecdd6e90..5a166b9cc0f6 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.html +++ b/src/main/webapp/app/shared/sidebar/sidebar-card-item/sidebar-card-item.component.html @@ -54,7 +54,20 @@ [class.muted]="sidebarItem.conversation?.isMuted" [ngClass]="unreadCount() > 0 ? 'fw-bold' : 'fw-normal'" > - @if (sidebarItem.icon) { + @if (otherUser) { + + + } @else if (sidebarItem.icon) { } {{ sidebarItem.title }} - @if (sidebarType === 'exercise' && sidebarItem.studentParticipation && sidebarItem.exercise) { + @if (sidebarType === 'exercise' && sidebarItem.exercise) { (0); + otherUser: any; + + readonly faPeopleGroup = faPeopleGroup; formattedUnreadCount: string = ''; ngOnInit(): void { this.formattedUnreadCount = this.getFormattedUnreadCount(); + this.extractMessageUser(); } ngOnChanges(changes: SimpleChanges): void { @@ -30,4 +36,16 @@ export class SidebarCardItemComponent implements OnInit, OnChanges { } return this.unreadCount().toString() || ''; } + + extractMessageUser(): void { + if (this.sidebarItem.type === 'oneToOneChat' && (this.sidebarItem.conversation as OneToOneChatDTO)?.members) { + this.otherUser = (this.sidebarItem.conversation as OneToOneChatDTO).members!.find((user) => !user.isRequestingUser); + } else { + this.otherUser = null; + } + + if (this.sidebarItem.type === 'groupChat') { + this.sidebarItem.icon = this.faPeopleGroup; + } + } } diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.html b/src/main/webapp/app/shared/sidebar/sidebar.component.html index becdd0a69eda..e0a664240503 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar.component.html +++ b/src/main/webapp/app/shared/sidebar/sidebar.component.html @@ -1,12 +1,12 @@
    -
    +
    @if (searchFieldEnabled) {
    @if (showFilter) { -
    +
    @if (isFilterActive) { @@ -31,7 +31,7 @@ } diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.ts b/src/main/webapp/app/shared/sidebar/sidebar.component.ts index bb44a30c1ee8..99903955e980 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar.component.ts +++ b/src/main/webapp/app/shared/sidebar/sidebar.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, effect, input, output } from '@angular/core'; -import { faFilter, faFilterCircleXmark, faHashtag, faPlusCircle, faSearch, faUser, faUsers } from '@fortawesome/free-solid-svg-icons'; +import { faFilter, faFilterCircleXmark, faHashtag, faPeopleGroup, faPlusCircle, faSearch, faUser } from '@fortawesome/free-solid-svg-icons'; import { ActivatedRoute, Params } from '@angular/router'; import { Subscription, distinctUntilChanged } from 'rxjs'; import { ProfileService } from '../layouts/profiles/profile.service'; @@ -57,7 +57,7 @@ export class SidebarComponent implements OnDestroy, OnChanges, OnInit { readonly faFilter = faFilter; readonly faFilterCurrentlyApplied = faFilterCircleXmark; readonly faUser = faUser; - readonly faUsers = faUsers; + readonly faPeopleGroup = faPeopleGroup; readonly faPlusCircle = faPlusCircle; readonly faSearch = faSearch; readonly faHashtag = faHashtag; diff --git a/src/main/webapp/app/shared/sidebar/sidebar.module.ts b/src/main/webapp/app/shared/sidebar/sidebar.module.ts index 5a6ca727a8b5..3e5222a0a6e2 100644 --- a/src/main/webapp/app/shared/sidebar/sidebar.module.ts +++ b/src/main/webapp/app/shared/sidebar/sidebar.module.ts @@ -16,6 +16,7 @@ import { SidebarCardDirective } from 'app/shared/sidebar/sidebar-card.directive' import { ConversationOptionsComponent } from 'app/shared/sidebar/conversation-options/conversation-options.component'; import { ArtemisExamSharedModule } from 'app/exam/shared/exam-shared.module'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; +import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component'; @NgModule({ imports: [ @@ -29,6 +30,7 @@ import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.co SidebarCardDirective, ArtemisExamSharedModule, SearchFilterComponent, + ProfilePictureComponent, ], declarations: [ SidebarAccordionComponent, diff --git a/src/main/webapp/app/shared/sort/sort-icon.component.html b/src/main/webapp/app/shared/sort/sort-icon.component.html new file mode 100644 index 000000000000..cf949e260e0f --- /dev/null +++ b/src/main/webapp/app/shared/sort/sort-icon.component.html @@ -0,0 +1,4 @@ +
    + + +
    diff --git a/src/main/webapp/app/shared/sort/sort-icon.component.scss b/src/main/webapp/app/shared/sort/sort-icon.component.scss new file mode 100644 index 000000000000..cbb91b3787ae --- /dev/null +++ b/src/main/webapp/app/shared/sort/sort-icon.component.scss @@ -0,0 +1,7 @@ +.sort-icon { + margin-left: 0.5rem; +} + +.icon { + margin-bottom: -1.25rem; +} diff --git a/src/main/webapp/app/shared/sort/sort-icon.component.ts b/src/main/webapp/app/shared/sort/sort-icon.component.ts new file mode 100644 index 000000000000..678c8ec94cac --- /dev/null +++ b/src/main/webapp/app/shared/sort/sort-icon.component.ts @@ -0,0 +1,22 @@ +import { Component, computed, input } from '@angular/core'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { CommonModule } from '@angular/common'; +import { faSortDown, faSortUp } from '@fortawesome/free-solid-svg-icons'; +import { SortingOrder } from 'app/shared/table/pageable-table'; + +@Component({ + selector: 'jhi-sort-icon', + templateUrl: './sort-icon.component.html', + styleUrls: ['./sort-icon.component.scss'], + standalone: true, + imports: [FontAwesomeModule, CommonModule], +}) +export class SortIconComponent { + direction = input.required(); + + faSortUp = faSortUp; + faSortDown = faSortDown; + + isAscending = computed(() => this.direction() === SortingOrder.ASCENDING); + isDescending = computed(() => this.direction() === SortingOrder.DESCENDING); +} diff --git a/src/main/webapp/app/shared/table/pageable-table.ts b/src/main/webapp/app/shared/table/pageable-table.ts index 82c9d4f0ef5e..131648d7737b 100644 --- a/src/main/webapp/app/shared/table/pageable-table.ts +++ b/src/main/webapp/app/shared/table/pageable-table.ts @@ -1,3 +1,9 @@ +export interface PageableResult { + content: T[]; + totalElements: number; + totalPages: number; +} + export interface SearchResult { resultsOnPage: T[]; numberOfPages: number; diff --git a/src/main/webapp/app/utils/date.utils.ts b/src/main/webapp/app/utils/date.utils.ts index 37ec993c27aa..d05d241f29f1 100644 --- a/src/main/webapp/app/utils/date.utils.ts +++ b/src/main/webapp/app/utils/date.utils.ts @@ -74,3 +74,7 @@ export function dayOfWeekZeroSundayToZeroMonday(dayOfWeekZeroSunday: number): nu } return (dayOfWeekZeroSunday + 6) % 7; } + +export function isDateLessThanAWeekInTheFuture(date: dayjs.Dayjs): boolean { + return date.isBetween(dayjs().add(1, 'week'), dayjs()); +} diff --git a/src/main/webapp/content/images/feature-overview/instructors/create_conduct_assess.png b/src/main/webapp/content/images/feature-overview/instructors/create_conduct_assess.png index 60f6b90af648..d1521384a17e 100644 Binary files a/src/main/webapp/content/images/feature-overview/instructors/create_conduct_assess.png and b/src/main/webapp/content/images/feature-overview/instructors/create_conduct_assess.png differ diff --git a/src/main/webapp/content/images/feature-overview/instructors/fully_configurable.png b/src/main/webapp/content/images/feature-overview/instructors/fully_configurable.png index 7637b4de916a..39c7bf88fea1 100644 Binary files a/src/main/webapp/content/images/feature-overview/instructors/fully_configurable.png and b/src/main/webapp/content/images/feature-overview/instructors/fully_configurable.png differ diff --git a/src/main/webapp/content/images/feature-overview/instructors/plagiarism.png b/src/main/webapp/content/images/feature-overview/instructors/plagiarism.png index 760edf184f2c..ab403beac09e 100644 Binary files a/src/main/webapp/content/images/feature-overview/instructors/plagiarism.png and b/src/main/webapp/content/images/feature-overview/instructors/plagiarism.png differ diff --git a/src/main/webapp/content/images/feature-overview/students/online_exams.png b/src/main/webapp/content/images/feature-overview/students/online_exams.png index 910eac9ebe96..f533c22b3a0a 100644 Binary files a/src/main/webapp/content/images/feature-overview/students/online_exams.png and b/src/main/webapp/content/images/feature-overview/students/online_exams.png differ diff --git a/src/main/webapp/content/images/feature-overview/students/quiz_exercises.png b/src/main/webapp/content/images/feature-overview/students/quiz_exercises.png index 161fe6bec160..084ba7ec5ff8 100644 Binary files a/src/main/webapp/content/images/feature-overview/students/quiz_exercises.png and b/src/main/webapp/content/images/feature-overview/students/quiz_exercises.png differ diff --git a/src/main/webapp/content/images/feature-overview/students/user_interface.png b/src/main/webapp/content/images/feature-overview/students/user_interface.png index fe54735c3959..53189a84e07d 100644 Binary files a/src/main/webapp/content/images/feature-overview/students/user_interface.png and b/src/main/webapp/content/images/feature-overview/students/user_interface.png differ diff --git a/src/main/webapp/content/images/feature-overview/students/workingOffline.png b/src/main/webapp/content/images/feature-overview/students/workingOffline.png index 09828e36138c..cd9e91e74036 100644 Binary files a/src/main/webapp/content/images/feature-overview/students/workingOffline.png and b/src/main/webapp/content/images/feature-overview/students/workingOffline.png differ diff --git a/src/main/webapp/content/scss/global.scss b/src/main/webapp/content/scss/global.scss index caf96c151a82..5f39e6e101c4 100644 --- a/src/main/webapp/content/scss/global.scss +++ b/src/main/webapp/content/scss/global.scss @@ -1114,7 +1114,7 @@ $transition-in-between-delay: 0.05s; .sidebar-wrap { overflow: hidden; max-width: $sidebar-width; - margin-right: $spacer; + margin-right: 0.5rem; transition: max-width $transition-sidebar-width-length 0s ease-in-out, diff --git a/src/main/webapp/content/scss/themes/_dark-variables.scss b/src/main/webapp/content/scss/themes/_dark-variables.scss index 8ed8a5523727..836772022df2 100644 --- a/src/main/webapp/content/scss/themes/_dark-variables.scss +++ b/src/main/webapp/content/scss/themes/_dark-variables.scss @@ -131,9 +131,10 @@ $footer-height-dev: 3rem; $footer-height-prod: 2rem; // Sidebar -$sidebar-width: 275px; -$sidebar-footer-height-dev: 134px; -$sidebar-footer-height-prod: 118px; +$sidebar-width: 255px; +$sidebar-footer-height-dev: 104px; +$sidebar-footer-height-prod: 88px; +$spacing-modules: 1rem; //Module and Navigationbar $module-bg: $neutral-dark; diff --git a/src/main/webapp/content/scss/themes/_default-variables.scss b/src/main/webapp/content/scss/themes/_default-variables.scss index 337a58ed3316..35047ea29f83 100644 --- a/src/main/webapp/content/scss/themes/_default-variables.scss +++ b/src/main/webapp/content/scss/themes/_default-variables.scss @@ -53,9 +53,10 @@ $footer-height-dev: 3rem; $footer-height-prod: 2rem; // Sidebar -$sidebar-footer-height-dev: 134px; -$sidebar-footer-height-prod: 118px; -$sidebar-width: 275px; +$sidebar-footer-height-dev: 104px; +$sidebar-footer-height-prod: 88px; +$sidebar-width: 255px; +$spacing-modules: 1rem; //Module and Navigationbar $module-bg: $white; diff --git a/src/main/webapp/content/scss/themes/theme-default.scss b/src/main/webapp/content/scss/themes/theme-default.scss index 182f24e32e94..dba63eaa7c91 100644 --- a/src/main/webapp/content/scss/themes/theme-default.scss +++ b/src/main/webapp/content/scss/themes/theme-default.scss @@ -49,5 +49,5 @@ html { } .btn-outline-primary:not(.list-group-item):hover { - color: black; + color: $white; } diff --git a/src/main/webapp/i18n/de/cleanupService.json b/src/main/webapp/i18n/de/cleanupService.json new file mode 100644 index 000000000000..aa509515921c --- /dev/null +++ b/src/main/webapp/i18n/de/cleanupService.json @@ -0,0 +1,27 @@ +{ + "cleanupService": { + "title": "Aufräumdienst", + "table": { + "operation": "Operationsname", + "deleteFrom": "Löschen von", + "deleteTo": "Löschen bis", + "lastExecuted": "Zuletzt ausgeführt" + }, + "operation": { + "deleteOrphans": "Orphans löschen", + "deletePlagiarismComparisons": "Plagiatsvergleiche löschen", + "deleteNonRatedResults": "Nicht bewertete Ergebnisse löschen", + "deleteOldRatedResults": "Alte bewertete Ergebnisse löschen", + "deleteOldSubmissionVersions": "Alte Teilnahmeversionen löschen", + "deleteOldFeedback": "Altes Feedback löschen" + }, + "execute": { + "question": "Bist du sicher, dass du die Operation {{ title }} ausführen möchtest? Diese Aktion kann NICHT rückgängig gemacht werden!", + "typeOperationNameToConfirm": "Bitte gib den Namen der Operation ein, um zu bestätigen." + }, + "notRunYet": "Diese Operation wurde noch nicht ausgeführt", + "error": { + "datesInvalid": "'Löschen bis' muss nach 'Löschen von' liegen" + } + } +} diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index c8644192874a..34cea3d9900d 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -314,8 +314,8 @@ "preparingParticipation": "Aufgabe wird vorbereitet. Dies kann ein paar Sekunden dauern.", "generateParticipationFailed": "Das Vorbereiten der Aufgabe ist fehlgeschlagen.", "generateParticipationRetry": "Erneut versuchen", - "points": "Punkte", - "bonus": "Bonuspunkte", + "points": "({{ points }} Punkte)", + "bonus": "({{ points }} Punkte, {{ bonusPoints }} Bonuspunkte)", "synced": "Aufgabe gespeichert", "notSynced": "Aufgabe nicht gespeichert", "notStarted": "Aufgabe nicht gestartet", @@ -338,7 +338,9 @@ "noActionRequired": "Artemis erfordert keine weitere Aktion, das Fenster kann geschlossen werden.", "followExamProtocol": "Halte dich an die Klausuranweisungen deiner Lehrenden.", "button": "Zusammenfassung der Klausur anzeigen{{ countdown }}" - } + }, + "saveExercise": "Aufgabe speichern", + "exerciseSaved": "Aufgabe gespeichert" }, "exerciseGroup": { "created": "Neue Aufgabengruppe erstellt", diff --git a/src/main/webapp/i18n/de/global.json b/src/main/webapp/i18n/de/global.json index 25efebb0907a..30ee7cae00df 100644 --- a/src/main/webapp/i18n/de/global.json +++ b/src/main/webapp/i18n/de/global.json @@ -116,7 +116,8 @@ "iris": "Iris Einstellungen", "jhipster-needle-menu-add-admin-element": "JHipster will add additional menu entries here (do not translate!)", "lti": "LTI Konfiguration", - "standardizedCompetencies": "Standardisierte Kompetenzen" + "standardizedCompetencies": "Standardisierte Kompetenzen", + "cleanupService": "Aufräumdienst" }, "language": "Sprache", "settings": "Einstellungen", @@ -222,7 +223,7 @@ "open": "Öffnen", "save": "Speichern", "saving": "Speichern...", - "view": "Details", + "view": "Ansehen", "reset": "Zurücksetzen", "preview": "Vorschau", "visual": "Visuell", diff --git a/src/main/webapp/i18n/de/lecture.json b/src/main/webapp/i18n/de/lecture.json index 5c1dd797824e..cfe674a84872 100644 --- a/src/main/webapp/i18n/de/lecture.json +++ b/src/main/webapp/i18n/de/lecture.json @@ -100,7 +100,16 @@ "pdfPreview": { "title": "Anhang", "attachmentIDError": "Ungültiger Anhang oder ungültige Anhangs-ID.", - "attachmentUnitIDError": "Ungültige Dateieinheit oder ungültige Dateieinheits-ID." + "attachmentUnitIDError": "Ungültige Dateieinheit oder ungültige Dateieinheits-ID.", + "removePageButton": "Seiten entfernen", + "appendPDFButton": "PDF anhängen", + "attachmentUpdateSuccess": "Anhang erfolgreich aktualisiert.", + "attachmentUpdateError": "Fehler beim Aktualisieren des Anhangs: {{error}}", + "mergeFailedError": "Fehler beim Zusammenführen der Dateien: {{error}}", + "pageDeleteError": "Fehler beim Löschen der Seiten: {{error}}", + "fileSizeError": "Die Datei ist zu groß. Die maximale Dateigröße beträgt 20MB.", + "deletePagesQuestion": "Möchtest du die ausgewählten Seiten wirklich löschen?", + "deleteAllPagesQuestion": "Möchtest du wirklich alle Seiten löschen? Dies führt zur Löschung des Anhangs." } } } diff --git a/src/main/webapp/i18n/de/metis.json b/src/main/webapp/i18n/de/metis.json index d7fa19710c0d..f88d74bce4f9 100644 --- a/src/main/webapp/i18n/de/metis.json +++ b/src/main/webapp/i18n/de/metis.json @@ -142,12 +142,14 @@ "userRoles": { "instructor": "Instruktor", "tutor": "Tutor", - "student": "Student" + "student": "Student", + "deleted": "Gelöscht" }, "userAuthorityTooltips": { "instructor": "Lehrkraft: Verantwortlich für die Kursdurchführung.", "tutor": "Tutor:in: Verantwortlich für die Unterstützung der Studierenden bei ihren Fragen zum Kurs und zu den Übungen.", - "student": "Studierende:r: Nimmt an Kursen und Übungen teil und stellt Fragen." + "student": "Studierende:r: Nimmt an Kursen und Übungen teil und stellt Fragen.", + "deleted": "Gelöscht: Nutzer:in wurde gelöscht." } } } diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index ceae33b2a043..41533417cf1e 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -351,10 +351,12 @@ "task": "Aufgabe", "testcase": "Testfall", "errorCategory": "Fehlerkategorie", - "totalItems": "Insgesamt {{count}} Elemente", + "totalItems": "Insgesamt {{count}} Element(e)", "error": "Beim Laden des Feedbacks ist ein Fehler aufgetreten.", "search": "Suche ...", "filter": "Filter", + "noData": "Es konnten keine Feedback Einträge für die Programmieraufgabe gefunden werden.", + "noDataFilter": "Für den spezifizierten Filter oder Suchbegriff konnten keine Feedback Einträge gefunden werden.", "feedbackModal": { "header": "Fehlerdetails", "feedbackTitle": "Feedback zu Testfällen", @@ -364,10 +366,19 @@ "modalTitle": "Filteroptionen", "task": "Tasks", "testcase": "Testfälle", + "errorCategory": "Fehlerkategorien", "occurrence": "Häufigkeit", "clear": "Filter zurücksetzen", "cancel": "Abbrechen", "apply": "Filter anwenden" + }, + "affectedStudentsModal": { + "header": "Betroffene Studierende", + "name": "Name", + "login": "Login", + "repository": "Repository", + "totalItems": "Insgesamt {{count}} Element(e)", + "error": "Beim Laden der betroffenen Studierenden ist ein Fehler aufgetreten." } }, "help": { @@ -601,10 +612,10 @@ }, "submission_penalty": { "title": "Punktabzug je Überschreitung", - "tooltip": "Das System zieht für jede Abgabe, die das Abgabelimit überschreitet, Punkte vom Gesamtergebnis ab. Versuche, innerhalb der erlaubten Abgaben zu bleiben, um Abzüge zu vermeiden!" + "tooltip": "Das System zieht für jede Abgabe, die das Abgabelimit überschreitet, Punkte vom Gesamtergebnis ab. Der Punktabzug für diese Aufgabe ist -{{points}} Punkte." } }, - "submissionLimitTitle": "Abgabelimit", + "submissionLimitTitle": "Abgaben", "submissionLimitDescription": "Die Anzahl von erlaubten Abgaben, bis das System die ausgewählte Abgaberichtlinie durchsetzt.", "editInGradingInformation": "Das Abgabelimit kann nur in der Bewertungssicht der Programmieraufgabe bearbeitet und (de)aktiviert werden.", "goToGradingToEditInformation": "Gehe zur Bewertungsseite, um die Abgaberichtlinie zu bearbeiten.", diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json index 3c15b1c3987c..6c72a925727c 100644 --- a/src/main/webapp/i18n/de/student-dashboard.json +++ b/src/main/webapp/i18n/de/student-dashboard.json @@ -269,53 +269,55 @@ "selectLecture": "Bitte wähle eine Vorlesung aus." }, "exerciseDetails": { - "dueDate": "Einreichungsfrist:", - "runTestsAfterDueDate": "Testdurchlauf nach Einreichungsfrist:", - "complaintDueDate": "Beschwerdefrist:", - "categories": "Kategorien:", - "type": "Typ:", - "difficulty": "Schwierigkeit:", - "exerciseStatus": "Aufgabenstatus:", - "points": "Punkte:", - "bonus": "Bonus:", + "dueDate": "Einreichungsfrist", + "runTestsAfterDueDate": "Testdurchlauf nach Einreichungsfrist", + "complaintDueDate": "Beschwerdefrist", + "categories": "Kategorien", + "type": "Typ", + "difficulty": "Schwierigkeit", + "exerciseStatus": "Aufgabenstatus", + "points": "Punkte", + "bonus": "Bonus", "of": " von ", - "problemStatement": "Problemstellung:", + "problemStatement": "Problemstellung", "noResults": "Du hast noch keine Ergebnisse", "instructorActions": { - "title": "Aktionen für Lehrende:", + "title": "Aktionen für Lehrende", "titleTutor": "Aktionen für Tutor:innen", "scores": "Ergebnisse", "statistics": "Statistiken" }, "notParticipated": "Nicht teilgenommen", - "yourGradedResult": "Dein gewertetes Ergebnis:", - "recentResults": "Aktuelle Ergebnisse:", + "yourGradedResult": "Dein gewertetes Ergebnis", + "recentResults": "Aktuelle Ergebnisse", "noGradedResult": "Du hast noch kein gewertetes Ergebnis.", - "allResults": "Alle Ergebnisse:", + "allResults": "Alle Ergebnisse", "hideResults": "Ergebnisse verbergen", "showResults": "Alle Ergebnisse anzeigen", "graded": "Bewertet", "notGraded": "Nicht bewertet", "rated": "Bewertet", "practice": "Übung", - "assessmentType": "Bewertung:", - "releaseDate": "Veröffentlichungsdatum:", + "assessmentType": "Bewertung", + "releaseDate": "Veröffentlichungsdatum", "releaseDateTooltip": "Studierende können diese Aufgabe ab {{date}} sehen.", "startDate": "Startdatum:", "startDateTooltip": "Studierende können diese Aufgabe ab {{date}} bearbeiten.", "submissionDue": "Abgabe bis:", "submissionDueTooltip": "Die Abgabe ist bis {{date}} möglich.", - "exampleSolutionPublicationDate": "Veröffentlichungsdatum der Beispiellösung:", + "submissionDueOver": "Abgabe vorbei:", + "exampleSolutionPublicationDate": "Veröffentlichungsdatum der Beispiellösung", "exampleSolutionPublicationDateTooltip": "Die Beispiellösung wird am {{date}} veröffentlicht.", - "assessmentDue": "Bewertung bis:", + "assessmentDue": "Bewertung bis", "assessmentDueTooltip": "Die Frist für die Bewertung ist am {{date}}.", - "complaintDue": "Beschwerde bis:", + "complaintDue": "Beschwerde bis", "complaintDueTooltip": "Du kannst eine Beschwerde bis {{date}} einreichen.", - "complaintPossible": "Beschwerde möglich:", + "complaintPossible": "Beschwerde möglich", "complaintPossibleTooltip": "Nach Erhalt einer Bewertung wirst du {{days}} Tage zum Einreichen einer Beschwerde haben.", - "presented": "Präsentiert:", - "presentation": "Präsentation:", - "selectExercise": "Bitte wähle eine Aufgabe aus." + "presented": "Präsentiert", + "presentation": "Präsentation", + "selectExercise": "Bitte wähle eine Aufgabe aus.", + "status": "Status" } } } diff --git a/src/main/webapp/i18n/en/buildAgents.json b/src/main/webapp/i18n/en/buildAgents.json index 1610e1bd0847..974086655128 100644 --- a/src/main/webapp/i18n/en/buildAgents.json +++ b/src/main/webapp/i18n/en/buildAgents.json @@ -8,9 +8,9 @@ "memberAddress": "Member Address", "maxNumberOfConcurrentBuildJobs": "Max # of concurrent build jobs", "numberOfCurrentBuildJobs": "# of current build jobs", - "runningBuildJobs": "Running build jobs", + "runningBuildJobs": "Running Build Jobs", "status": "Status", - "recentBuildJobs": "Recent build jobs", + "recentBuildJobs": "Recent Build Jobs", "running": "Running", "idle": "Idle", "paused": "Paused", diff --git a/src/main/webapp/i18n/en/cleanupService.json b/src/main/webapp/i18n/en/cleanupService.json new file mode 100644 index 000000000000..569ca3932aa1 --- /dev/null +++ b/src/main/webapp/i18n/en/cleanupService.json @@ -0,0 +1,27 @@ +{ + "cleanupService": { + "title": "Cleanup Service", + "table": { + "operation": "Operation name", + "deleteFrom": "Delete from", + "deleteTo": "Delete to", + "lastExecuted": "Last executed" + }, + "operation": { + "deleteOrphans": "Delete orphans", + "deletePlagiarismComparisons": "Delete plagiarism comparisons", + "deleteNonRatedResults": "Delete non-rated results", + "deleteOldRatedResults": "Delete old rated results", + "deleteOldSubmissionVersions": "Delete old submission versions", + "deleteOldFeedback": "Delete old feedback versions" + }, + "execute": { + "question": "Are you sure you want to execute the operation {{ title }}? This action can NOT be undone!", + "typeOperationNameToConfirm": "Please type in the name of the operation to confirm." + }, + "notRunYet": "This operation has not been run yet", + "error": { + "datesInvalid": "'Delete to' must be after 'Delete from'" + } + } +} diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index 691db17fe332..374506d757af 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -314,8 +314,8 @@ "preparingParticipation": "Preparing exercise. This may take a few seconds.", "generateParticipationFailed": "The preparation of the exercise failed.", "generateParticipationRetry": "Retry", - "points": "Points", - "bonus": "Bonus Points", + "points": "({{ points }} Points)", + "bonus": "({{ points }} Points, {{ bonusPoints }} Bonus Points)", "synced": "Exercise saved", "notSynced": "Exercise not saved", "notStarted": "Exercise not started", @@ -338,7 +338,9 @@ "noActionRequired": "Artemis does not require any further action and this window can be closed.", "followExamProtocol": "Be sure to follow your instructor's exam protocol.", "button": "Show exam summary{{countdown}}" - } + }, + "saveExercise": "Save exercise", + "exerciseSaved": "Exercise saved" }, "exerciseGroup": { "created": "New exercise group created", diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json index d9c73f2fd300..72739d2d972d 100644 --- a/src/main/webapp/i18n/en/global.json +++ b/src/main/webapp/i18n/en/global.json @@ -116,7 +116,8 @@ "iris": "Iris Settings", "jhipster-needle-menu-add-admin-element": "JHipster will add additional menu entries here (do not translate!)", "lti": "LTI Configuration", - "standardizedCompetencies": "Standardized Competencies" + "standardizedCompetencies": "Standardized Competencies", + "cleanupService": "Cleanup Service" }, "language": "Language", "settings": "Settings", diff --git a/src/main/webapp/i18n/en/lecture.json b/src/main/webapp/i18n/en/lecture.json index b03b840b400f..79525529f4c5 100644 --- a/src/main/webapp/i18n/en/lecture.json +++ b/src/main/webapp/i18n/en/lecture.json @@ -100,7 +100,16 @@ "pdfPreview": { "title": "Attachment", "attachmentIDError": "Invalid Attachment or Attachment ID.", - "attachmentUnitIDError": "Invalid Attachment Unit or Attachment Unit ID." + "attachmentUnitIDError": "Invalid Attachment Unit or Attachment Unit ID.", + "removePageButton": "Remove Pages", + "appendPDFButton": "Append PDF", + "attachmentUpdateSuccess": "Attachment updated successfully.", + "attachmentUpdateError": "Failed to update attachment: {{error}}", + "mergeFailedError": "Failed to merge files: {{error}}", + "pageDeleteError": "Failed to delete pages: {{error}}", + "fileSizeError": "The file size exceeds the limit of 20MB.", + "deletePagesQuestion": "Are you sure you want to delete the selected pages?", + "deleteAllPagesQuestion": "Are you sure you want to delete all pages? This will result in the deletion of the attachment." } } } diff --git a/src/main/webapp/i18n/en/metis.json b/src/main/webapp/i18n/en/metis.json index bfb25d30252b..034f9f3b624a 100644 --- a/src/main/webapp/i18n/en/metis.json +++ b/src/main/webapp/i18n/en/metis.json @@ -142,12 +142,14 @@ "userRoles": { "instructor": "Instructor", "tutor": "Tutor", - "student": "Student" + "student": "Student", + "deleted": "Deleted" }, "userAuthorityTooltips": { "instructor": "Instructor: Responsible for course conduction.", "tutor": "Tutor: Responsible for helping users with their questions about the course and exercises.", - "student": "Student: Takes courses, participates in exercises, and asks questions." + "student": "Student: Takes courses, participates in exercises, and asks questions.", + "deleted": "Deleted: This user was deleted." } } } diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index df85bd7c0911..d3a53f20f180 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -351,10 +351,12 @@ "task": "Task", "testcase": "Test Case", "errorCategory": "Error Category", - "totalItems": "In total {{count}} items", + "totalItems": "In total {{count}} item(s)", "error": "An error occurred while loading the feedback.", "search": "Search ...", "filter": "Filters", + "noData": "No Feedback Entries could be found for the Programming Exercise.", + "noDataFilter": "No Feedback Entries could be found for the specified filter or search Term.", "feedbackModal": { "header": "Error Details", "feedbackTitle": "Test Case Feedback", @@ -364,10 +366,19 @@ "modalTitle": "Filter Options", "task": "Tasks", "testcase": "Test Cases", + "errorCategory": "Error Categories", "occurrence": "Occurrence", "clear": "Clear Filter", "cancel": "Cancel", "apply": "Apply Filter" + }, + "affectedStudentsModal": { + "header": "Affected Students", + "name": "Name", + "login": "Login", + "repository": "Repository", + "totalItems": "In total {{count}} item(s)", + "error": "There was an error while loading the affected Students for this feedback." } }, "help": { @@ -601,10 +612,10 @@ }, "submission_penalty": { "title": "Submission Penalty", - "tooltip": "The system deducts points from your score for each submission that exceeds the submission limit. Try to stay within the submission limit to avoid penalties!" + "tooltip": "The system deducts points from your score for each submission that exceeds the submission limit. The penalty for this exercise is -{{points}} points." } }, - "submissionLimitTitle": "Submission limit", + "submissionLimitTitle": "Submissions", "submissionLimitDescription": "The number of submissions a participant can make before the system enforces the selected policy.", "editInGradingInformation": "The submission policy can only be edited and toggled on the grading page of the programming exercise!", "goToGradingToEditInformation": "Go to the grading page to edit submission policy.", diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json index 1e51fba7c618..8506e7e5ed8b 100644 --- a/src/main/webapp/i18n/en/student-dashboard.json +++ b/src/main/webapp/i18n/en/student-dashboard.json @@ -269,53 +269,55 @@ "selectLecture": " Please select a Lecture." }, "exerciseDetails": { - "dueDate": "Due date:", + "dueDate": "Due date", "runTestsAfterDueDate": "Tests run after due date:", "complaintDueDate": "Complaint due date:", - "categories": "Categories:", + "categories": "Categories", "type": "Type:", - "difficulty": "Difficulty:", - "exerciseStatus": "Exercise status:", - "points": "Points:", - "bonus": "Bonus:", + "difficulty": "Difficulty", + "exerciseStatus": "Exercise status", + "points": "Points", + "bonus": "Bonus", "of": " of ", "problemStatement": "Problem statement:", "noResults": "You have no results yet", "instructorActions": { - "title": "Instructor actions:", - "titleTutor": "Tutor actions:", + "title": "Instructor actions", + "titleTutor": "Tutor actions", "scores": "Scores", "statistics": "Statistics" }, "notParticipated": "Not participated", - "yourGradedResult": "Your graded result:", - "recentResults": "Recent results:", + "yourGradedResult": "Your graded result", + "recentResults": "Recent results", "noGradedResult": "You have no graded result.", - "allResults": "All results:", + "allResults": "All results", "hideResults": "Hide results", "showResults": "Show all results", "graded": "Graded", "notGraded": "Not graded", "rated": "Graded", "practice": "Practice", - "assessmentType": "Assessment:", - "releaseDate": "Release date:", + "assessmentType": "Assessment", + "releaseDate": "Release date", "releaseDateTooltip": "Students can see this exercise from {{date}}.", - "startDate": "Start date:", + "startDate": "Start date", "startDateTooltip": "Students can work on this exercise from {{date}}.", - "submissionDue": "Submission due:", + "submissionDue": "Submission due", "submissionDueTooltip": "The submission is due by {{date}}.", - "exampleSolutionPublicationDate": "Example solution publication date:", + "submissionDueOver": "Submission closed", + "exampleSolutionPublicationDate": "Example solution publication date", "exampleSolutionPublicationDateTooltip": "The example solution is published at {{date}}.", - "assessmentDue": "Assessment due:", + "assessmentDue": "Assessment due", "assessmentDueTooltip": "The assessment is due by {{date}}.", - "complaintDue": "Complaint due:", + "complaintDue": "Complaint due", "complaintDueTooltip": "You can write a complaint until {{date}}.", - "complaintPossible": "Complaint possible:", + "complaintPossible": "Complaint possible", "complaintPossibleTooltip": "After receiving an assessment, you will have {{days}} days to file a complaint.", - "presented": "Presented:", - "presentation": "Presentation:", - "selectExercise": "Please select an Exercise." + "presented": "Presented", + "presentation": "Presentation", + "selectExercise": "Please select an Exercise.", + "status": "Status" } } } diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java index 9c27ccab0d46..b58435f9248d 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/AssessmentTeamComplaintIntegrationTest.java @@ -73,10 +73,6 @@ class AssessmentTeamComplaintIntegrationTest extends AbstractSpringIntegrationIn private ComplaintRequestDTO complaintRequest; - private Complaint moreFeedbackRequest; - - private Course course; - private Team team; private final String resourceUrl = "/api/complaints"; @@ -85,7 +81,7 @@ class AssessmentTeamComplaintIntegrationTest extends AbstractSpringIntegrationIn void initTestCase() throws Exception { userUtilService.addUsers(TEST_PREFIX, 1, 2, 0, 1); // Initialize with 3 max team complaints and 7 days max complaint due date - course = modelingExerciseUtilService.addCourseWithOneModelingExercise(); + Course course = modelingExerciseUtilService.addCourseWithOneModelingExercise(); modelingExercise = (ModelingExercise) course.getExercises().iterator().next(); modelingExercise.setMode(ExerciseMode.TEAM); modelingExercise = exerciseRepository.save(modelingExercise); @@ -93,7 +89,6 @@ void initTestCase() throws Exception { saveModelingSubmissionAndAssessment(); complaint = new Complaint().result(modelingAssessment).complaintText("This is not fair").complaintType(ComplaintType.COMPLAINT); complaintRequest = new ComplaintRequestDTO(complaint.getResult().getId(), complaint.getComplaintText(), complaint.getComplaintType(), Optional.empty()); - moreFeedbackRequest = new Complaint().result(modelingAssessment).complaintText("Please explain").complaintType(ComplaintType.MORE_FEEDBACK); } @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java index 1d04c504db90..6b02b3e4d247 100644 --- a/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/assessment/ResultServiceIntegrationTest.java @@ -22,9 +22,13 @@ import org.junit.jupiter.params.provider.MethodSource; import org.mockito.ArgumentMatchers; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + import de.tum.cit.aet.artemis.assessment.domain.AssessmentType; import de.tum.cit.aet.artemis.assessment.domain.Feedback; import de.tum.cit.aet.artemis.assessment.domain.GradingCriterion; @@ -739,13 +743,11 @@ void testGetAllFeedbackDetailsForExercise() throws Exception { feedback.setTestCase(testCase); StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); - Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); - participationUtilService.addFeedbackToResult(feedback, result); String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=detailText&sortingOrder=ASCENDING" - + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence="; + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories="; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); @@ -755,6 +757,7 @@ void testGetAllFeedbackDetailsForExercise() throws Exception { assertThat(feedbackDetail.relativeCount()).isEqualTo(100.0); assertThat(feedbackDetail.detailText()).isEqualTo("Some feedback"); assertThat(feedbackDetail.testCaseName()).isEqualTo("test1"); + assertThat(response.errorCategories()).containsExactlyInAnyOrder("Student Error", "Ares Error", "AST Error"); assertThat(response.totalItems()).isEqualTo(1); } @@ -789,7 +792,7 @@ void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception participationUtilService.addFeedbackToResult(feedback3, result1); String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details" + "?page=1&pageSize=10&sortedColumn=detailText&sortingOrder=ASCENDING" - + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence="; + + "&searchTerm=&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories="; FeedbackAnalysisResponseDTO response = request.get(url, HttpStatus.OK, FeedbackAnalysisResponseDTO.class); @@ -810,6 +813,7 @@ void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception assertThat(secondFeedbackDetail.relativeCount()).isEqualTo(50.0); assertThat(secondFeedbackDetail.detailText()).isEqualTo("Some different feedback"); assertThat(secondFeedbackDetail.testCaseName()).isEqualTo("test1"); + assertThat(response.errorCategories()).containsExactlyInAnyOrder("Student Error", "Ares Error", "AST Error"); assertThat(response.totalItems()).isEqualTo(2); } @@ -861,4 +865,42 @@ void testGetMaxCountForExerciseWithMultipleFeedback() throws Exception { assertThat(maxCount).isEqualTo(2); } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetParticipationForFeedbackId() throws Exception { + ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1"); + ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1"); + testCase.setId(1L); + + Feedback feedback = new Feedback(); + feedback.setPositive(false); + feedback.setDetailText("Feedback for student"); + feedback.setTestCase(testCase); + feedback = feedbackRepository.saveAndFlush(feedback); + + Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation); + participationUtilService.addFeedbackToResult(feedback, result); + + String url = "/api/exercises/" + programmingExercise.getId() + "/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING"; + HttpHeaders headers = new HttpHeaders(); + headers.add("feedbackIds", String.valueOf(feedback.getId())); + + String jsonResponse = request.get(url, HttpStatus.OK, String.class, headers); + + JsonNode jsonNode = new ObjectMapper().readTree(jsonResponse); + assertThat(jsonNode.has("content")).isTrue(); + assertThat(jsonNode.has("pageable")).isTrue(); + assertThat(jsonNode.has("last")).isTrue(); + assertThat(jsonNode.has("totalElements")).isTrue(); + assertThat(jsonNode.has("totalPages")).isTrue(); + assertThat(jsonNode.has("first")).isTrue(); + assertThat(jsonNode.has("size")).isTrue(); + assertThat(jsonNode.has("number")).isTrue(); + assertThat(jsonNode.has("sort")).isTrue(); + assertThat(jsonNode.has("numberOfElements")).isTrue(); + assertThat(jsonNode.has("empty")).isTrue(); + } + } diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java index f2f393231477..c3cf27caa54b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/AbstractCompetencyPrerequisiteIntegrationTest.java @@ -2,6 +2,7 @@ import static de.tum.cit.aet.artemis.core.util.TestResourceUtils.HalfSecond; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.fail; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -16,6 +17,7 @@ import org.springframework.http.HttpStatus; import de.tum.cit.aet.artemis.atlas.AbstractAtlasIntegrationTest; +import de.tum.cit.aet.artemis.atlas.domain.competency.Competency; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyExerciseLink; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyLectureUnitLink; import de.tum.cit.aet.artemis.atlas.domain.competency.CompetencyRelation; @@ -27,6 +29,7 @@ import de.tum.cit.aet.artemis.atlas.dto.CompetencyImportResponseDTO; import de.tum.cit.aet.artemis.atlas.dto.CompetencyWithTailRelationDTO; import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.DomainObject; import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.IncludedInOverallScore; @@ -505,10 +508,30 @@ void shouldImportAllCompetencies(Function createCourse importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course3.getId()), false, false, false, Optional.empty(), false); competencyDTOList = importAllCall(course.getId(), importOptions, HttpStatus.CREATED); - assertThat(competencyDTOList).hasSize(2); + assertThat(competencyDTOList).hasSize(1); // relations should be empty when not importing them assertThat(competencyDTOList.getFirst().tailRelations()).isNull(); - assertThat(competencyDTOList.get(1).tailRelations()).isNull(); + } + + // Test + void shouldImportAllCompetenciesWithSomeExisting(Function copyCourseCompetency, int expectedCourseCompetencies) throws Exception { + competencyUtilService.createCompetencies(course, 2); + prerequisiteUtilService.createPrerequisites(course, 2); + + CourseCompetency newCompetency = copyCourseCompetency.apply(courseCompetency); + newCompetency.setCourse(course2); + newCompetency = courseCompetencyRepository.save(newCompetency); + + CompetencyImportOptionsDTO importOptions = new CompetencyImportOptionsDTO(Set.of(), Optional.of(course.getId()), false, false, false, Optional.empty(), false); + importAllCall(course2.getId(), importOptions, HttpStatus.CREATED); + + course2 = courseRepository.findByIdWithExercisesAndLecturesAndLectureUnitsAndCompetenciesElseThrow(course2.getId()); + assertThat(course2.getPrerequisites().size() + course2.getCompetencies().size()).isEqualTo(expectedCourseCompetencies); + switch (newCompetency) { + case Competency competency -> assertThat(course2.getCompetencies().stream().map(DomainObject::getId)).contains(competency.getId()); + case Prerequisite prerequisite -> assertThat(course2.getPrerequisites().stream().map(DomainObject::getId)).contains(prerequisite.getId()); + default -> fail("Unexpected CourseCompetency subclass"); + } } // Test @@ -633,10 +656,9 @@ void shouldImportCompetencies(Function createCourseCom importOptions = new CompetencyImportOptionsDTO(competencyIds, Optional.empty(), false, false, false, Optional.empty(), false); competencyDTOList = importBulkCall(course.getId(), importOptions, HttpStatus.CREATED); - assertThat(competencyDTOList).hasSize(2); + assertThat(competencyDTOList).hasSize(1); // relations should be empty when not importing them assertThat(competencyDTOList.getFirst().tailRelations()).isNull(); - assertThat(competencyDTOList.get(1).tailRelations()).isNull(); } // Test diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java index e4e59099d9e5..2f1ccc5c8536 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CompetencyIntegrationTest.java @@ -284,6 +284,12 @@ void shouldImportAllCompetencies() throws Exception { super.shouldImportAllCompetencies(competencyUtilService::createCompetency); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllCompetenciesWithSomeExisting() throws Exception { + shouldImportAllCompetenciesWithSomeExisting(Competency::new, 3); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void shouldImportAllExerciseAndLectureWithCompetency() throws Exception { diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java index 9b33684117fa..b12b09b6e191 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/CourseCompetencyIntegrationTest.java @@ -194,6 +194,12 @@ void shouldImportAllCompetencies() throws Exception { super.shouldImportAllCompetencies(competencyUtilService::createCompetency); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllCompetenciesWithSomeExisting() throws Exception { + shouldImportAllCompetenciesWithSomeExisting(Competency::new, 5); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void shouldImportAllExerciseAndLectureWithCompetency() throws Exception { diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java index 42293964287f..9e84044aa6c9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/competency/PrerequisiteIntegrationTest.java @@ -278,6 +278,12 @@ void shouldImportAllCompetencies() throws Exception { super.shouldImportAllCompetencies(prerequisiteUtilService::createPrerequisite); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void shouldImportAllCompetenciesWithSomeExisting() throws Exception { + shouldImportAllCompetenciesWithSomeExisting(Prerequisite::new, 3); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void shouldImportAllExerciseAndLectureWithCompetency() throws Exception { diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/util/LearningPathUtilService.java b/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/util/LearningPathUtilService.java index fc922e932d68..93a099824cf6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/util/LearningPathUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/learningpath/util/LearningPathUtilService.java @@ -1,14 +1,8 @@ package de.tum.cit.aet.artemis.atlas.learningpath.util; -import java.util.Set; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.tum.cit.aet.artemis.atlas.domain.competency.CourseCompetency; -import de.tum.cit.aet.artemis.atlas.domain.competency.LearningPath; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; -import de.tum.cit.aet.artemis.atlas.repository.CourseCompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.atlas.test_repository.LearningPathTestRepository; import de.tum.cit.aet.artemis.core.domain.Course; @@ -30,12 +24,6 @@ public class LearningPathUtilService { @Autowired private LearningPathTestRepository learningPathRepository; - @Autowired - private CompetencyRepository competencyRepository; - - @Autowired - private CourseCompetencyRepository courseCompetencyRepository; - /** * Enable and generate learning paths for course. * @@ -49,43 +37,6 @@ public Course enableAndGenerateLearningPathsForCourse(Course course) { return courseRepository.save(eagerlyLoadedCourse); } - /** - * Creates learning path for course. - * - * @param course the course for which the learning path should be generated - * @return the persisted learning path - */ - public LearningPath createLearningPathInCourse(Course course) { - final var competencies = courseCompetencyRepository.findAllForCourse(course.getId()); - LearningPath learningPath = createLearningPath(competencies); - learningPath.setCourse(course); - return learningPathRepository.save(learningPath); - } - - /** - * Creates learning path for given user in course. - * - * @param course the course for which the learning path should be generated - * @return the persisted learning path - */ - public LearningPath createLearningPathInCourseForUser(Course course, User user) { - final var learningPath = createLearningPathInCourse(course); - learningPath.setUser(user); - return learningPathRepository.save(learningPath); - } - - /** - * Creates learning path. - * - * @param competencies the competencies that will be linked to the learning path - * @return the persisted learning path - */ - public LearningPath createLearningPath(Set competencies) { - LearningPath learningPath = new LearningPath(); - learningPath.setCompetencies(competencies); - return learningPathRepository.save(learningPath); - } - /** * Deletes all learning paths of given user. * @@ -95,12 +46,4 @@ public void deleteLearningPaths(User user) { learningPathRepository.deleteAll(user.getLearningPaths()); } - /** - * Deletes all learning paths of all given user. - * - * @param users the users for which all learning paths should be deleted - */ - public void deleteLearningPaths(Iterable users) { - users.forEach(this::deleteLearningPaths); - } } diff --git a/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java index d18a5ed65662..31227e22ff7e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/atlas/service/LearningPathServiceTest.java @@ -11,24 +11,17 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import de.tum.cit.aet.artemis.assessment.util.StudentScoreUtilService; -import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyProgressUtilService; import de.tum.cit.aet.artemis.atlas.competency.util.CompetencyUtilService; import de.tum.cit.aet.artemis.atlas.domain.competency.RelationType; import de.tum.cit.aet.artemis.atlas.dto.LearningPathHealthDTO; import de.tum.cit.aet.artemis.atlas.learningpath.util.LearningPathUtilService; -import de.tum.cit.aet.artemis.atlas.repository.CompetencyRepository; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathRecommendationService; import de.tum.cit.aet.artemis.atlas.service.learningpath.LearningPathService; import de.tum.cit.aet.artemis.core.domain.Course; -import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.security.SecurityUtils; import de.tum.cit.aet.artemis.core.user.util.UserUtilService; import de.tum.cit.aet.artemis.core.util.CourseFactory; import de.tum.cit.aet.artemis.core.util.CourseUtilService; -import de.tum.cit.aet.artemis.lecture.repository.LectureUnitRepository; -import de.tum.cit.aet.artemis.lecture.util.LectureUtilService; -import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationIndependentTest; class LearningPathServiceTest extends AbstractSpringIntegrationIndependentTest { @@ -50,28 +43,8 @@ class LearningPathServiceTest extends AbstractSpringIntegrationIndependentTest { @Autowired private CompetencyUtilService competencyUtilService; - @Autowired - private LectureUtilService lectureUtilService; - - @Autowired - private ProgrammingExerciseUtilService programmingExerciseUtilService; - - @Autowired - private CompetencyRepository competencyRepository; - - @Autowired - private CompetencyProgressUtilService competencyProgressUtilService; - - @Autowired - private StudentScoreUtilService studentScoreUtilService; - - @Autowired - private LectureUnitRepository lectureUnitRepository; - private Course course; - private User user; - @BeforeEach void setAuthorizationForRepositoryRequests() { SecurityUtils.setAuthorizationObject(); @@ -129,8 +102,7 @@ class GenerateNgxPathRepresentation { @BeforeEach void setup() { - final var users = userUtilService.addUsers(TEST_PREFIX, 1, 0, 0, 0); - user = users.getFirst(); + userUtilService.addUsers(TEST_PREFIX, 1, 0, 0, 0); course = CourseFactory.generateCourse(null, ZonedDateTime.now().minusDays(8), ZonedDateTime.now().minusDays(8), new HashSet<>(), TEST_PREFIX + "tumuser", TEST_PREFIX + "tutor", TEST_PREFIX + "editor", TEST_PREFIX + "instructor"); course = courseRepository.save(course); diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/MessageIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/MessageIntegrationTest.java index a23b10fd360d..d9b8f3be40e1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/communication/MessageIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/communication/MessageIntegrationTest.java @@ -9,8 +9,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import java.time.ZonedDateTime; import java.util.List; @@ -32,24 +30,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.test.context.TestSecurityContextHolder; import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.ResultActions; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import com.fasterxml.jackson.databind.ObjectMapper; - import de.tum.cit.aet.artemis.communication.domain.AnswerPost; import de.tum.cit.aet.artemis.communication.domain.ConversationParticipant; import de.tum.cit.aet.artemis.communication.domain.DisplayPriority; import de.tum.cit.aet.artemis.communication.domain.Post; import de.tum.cit.aet.artemis.communication.domain.PostSortCriterion; import de.tum.cit.aet.artemis.communication.domain.conversation.Channel; +import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation; import de.tum.cit.aet.artemis.communication.domain.conversation.OneToOneChat; import de.tum.cit.aet.artemis.communication.domain.notification.ConversationNotification; import de.tum.cit.aet.artemis.communication.domain.notification.Notification; @@ -84,9 +75,6 @@ class MessageIntegrationTest extends AbstractSpringIntegrationIndependentTest { @Autowired private ConversationParticipantTestRepository conversationParticipantRepository; - @Autowired - private ObjectMapper objectMapper; - @Autowired private ConversationUtilService conversationUtilService; @@ -316,9 +304,8 @@ void testBroadCastWithNotification() throws Exception { @ValueSource(ints = { HIGHER_PAGE_SIZE, LOWER_PAGE_SIZE, EQUAL_PAGE_SIZE }) @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void testFindMessagesWithPageSizes(int pageSize) { - - var student1 = userTestRepository.findOneWithGroupsAndAuthoritiesByLogin(TEST_PREFIX + "student1").orElseThrow(); - var student2 = userTestRepository.findOneWithGroupsAndAuthoritiesByLogin(TEST_PREFIX + "student2").orElseThrow(); + var student1 = userTestRepository.findOneByLogin(TEST_PREFIX + "student1").orElseThrow(); + var student2 = userTestRepository.findOneByLogin(TEST_PREFIX + "student2").orElseThrow(); List posts = conversationUtilService.createPostsWithAnswersAndReactionsAndConversation(course, student1, student2, NUMBER_OF_POSTS, TEST_PREFIX); long conversationId = posts.getFirst().getConversation().getId(); for (Post post : posts) { @@ -422,7 +409,7 @@ void testGetConversationPost() throws Exception { List returnedPosts = request.getList("/api/courses/" + courseId + "/messages", HttpStatus.OK, Post.class, params); // get amount of posts with that certain - assertThat(returnedPosts).hasSize(existingConversationMessages.stream().filter(post -> post.getConversation().getId() == conversationId).toList().size()); + assertThat(returnedPosts).hasSize(existingConversationMessages.stream().filter(post -> Objects.equals(post.getConversation().getId(), conversationId)).toList().size()); } @Test @@ -602,19 +589,18 @@ void testPinPost_asTutor() throws Exception { @WithMockUser(username = TEST_PREFIX + "tutor1") void testEditConversationPostWithUserMention(String userMention, boolean isUserMentionValid) throws Exception { // conversation post of tutor1 must be only editable by them - Post conversationPostToUpdate = existingConversationMessages.getFirst(); - conversationPostToUpdate.setContent("User changes one of their conversation posts" + userMention); + Post postToUpdate = existingConversationMessages.getFirst(); + postToUpdate.setContent("User changes one of their conversation posts" + userMention); if (!isUserMentionValid) { - request.putWithResponseBody("/api/courses/" + courseId + "/messages/" + conversationPostToUpdate.getId(), conversationPostToUpdate, Post.class, HttpStatus.BAD_REQUEST); + request.putWithResponseBody("/api/courses/" + courseId + "/messages/" + postToUpdate.getId(), postToUpdate, Post.class, HttpStatus.BAD_REQUEST); verify(websocketMessagingService, never()).sendMessageToUser(anyString(), anyString(), any(PostDTO.class)); return; } - Post updatedPost = request.putWithResponseBody("/api/courses/" + courseId + "/messages/" + conversationPostToUpdate.getId(), conversationPostToUpdate, Post.class, - HttpStatus.OK); + Post updatedPost = request.putWithResponseBody("/api/courses/" + courseId + "/messages/" + postToUpdate.getId(), postToUpdate, Post.class, HttpStatus.OK); - assertThat(conversationPostToUpdate).isEqualTo(updatedPost); + assertThat(postToUpdate).isEqualTo(updatedPost); // both conversation participants should be notified about the update verify(websocketMessagingService, timeout(2000).times(2)).sendMessage(anyString(), @@ -665,84 +651,93 @@ void testDeleteConversationPost_forbidden() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void testIncreaseUnreadMessageCountAfterMessageSend() throws Exception { + var student1 = userTestRepository.findOneByLogin(TEST_PREFIX + "student1").orElseThrow(); + var student2 = userTestRepository.findOneByLogin(TEST_PREFIX + "student2").orElseThrow(); + Post postToSave = createPostWithOneToOneChat(TEST_PREFIX); Post createdPost = createPostAndAwaitAsyncCode(postToSave); await().untilAsserted(() -> { SecurityUtils.setAuthorizationObject(); - long unreadMessages = oneToOneChatRepository.findByIdWithConversationParticipantsAndUserGroups(createdPost.getConversation().getId()).orElseThrow() - .getConversationParticipants().stream() - .filter(conversationParticipant -> !Objects.equals(conversationParticipant.getUser().getId(), postToSave.getAuthor().getId())).findAny().orElseThrow() - .getUnreadMessagesCount(); - assertThat(unreadMessages).isEqualTo(1L); + // student1 (author) should have 0 unread messages, student2 (conversation participant) should have 1 unread message + assertThat(getUnreadMessagesCount(createdPost.getConversation(), student1)).isZero(); + assertThat(getUnreadMessagesCount(createdPost.getConversation(), student2)).isEqualTo(1); }); } @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void testDecreaseUnreadMessageCountAfterMessageRead() throws Exception { - Post postToSave1 = createPostWithOneToOneChat(TEST_PREFIX); - - ResultActions resultActions = request - .performMvcRequest(MockMvcRequestBuilders.post("/api/courses/" + courseId + "/messages").contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(postToSave1)).with(user(TEST_PREFIX + "student1").roles("USER")).accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isCreated()); + var student1 = userTestRepository.findOneByLogin(TEST_PREFIX + "student1").orElseThrow(); + var student2 = userTestRepository.findOneByLogin(TEST_PREFIX + "student2").orElseThrow(); - MvcResult result = resultActions.andReturn(); - String contentAsString = result.getResponse().getContentAsString(); - Post createdPost1 = objectMapper.readValue(contentAsString, Post.class); + Post postToSave1 = createPostWithOneToOneChat(TEST_PREFIX); + Post createdPost1 = request.postWithResponseBody("/api/courses/" + courseId + "/messages", postToSave1, Post.class, HttpStatus.CREATED); - request.performMvcRequest(MockMvcRequestBuilders.get("/api/courses/" + courseId + "/messages").param("conversationId", createdPost1.getConversation().getId().toString()) - .param("pagingEnabled", "true").param("size", String.valueOf(MAX_POSTS_PER_PAGE)).with(user(TEST_PREFIX + "student2").roles("USER")) - .accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk()); + userUtilService.changeUser(TEST_PREFIX + "student2"); + // we read the messages by "getting" them from the server as student + var params = new LinkedMultiValueMap(); + params.add("conversationId", createdPost1.getConversation().getId().toString()); + params.add("pagingEnabled", "true"); + params.add("size", String.valueOf(MAX_POSTS_PER_PAGE)); + Set returnedPosts = request.getSet("/api/courses/" + courseId + "/messages", HttpStatus.OK, Post.class, params); + assertThat(returnedPosts).hasSize(1); await().untilAsserted(() -> { SecurityUtils.setAuthorizationObject(); - assertThat(oneToOneChatRepository.findByIdWithConversationParticipantsAndUserGroups(createdPost1.getConversation().getId()).orElseThrow().getConversationParticipants() - .stream().filter(conversationParticipant -> !Objects.equals(conversationParticipant.getUser().getId(), postToSave1.getAuthor().getId())).findAny().orElseThrow() - .getUnreadMessagesCount()).isZero(); + assertThat(getUnreadMessagesCount(createdPost1.getConversation(), student2)).isZero(); + assertThat(getUnreadMessagesCount(createdPost1.getConversation(), student1)).isZero(); }); } @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void testDecreaseUnreadMessageCountWhenDeletingMessage() throws Exception { - Post postToSave1 = createPostWithOneToOneChat(TEST_PREFIX); - Post postToSave2 = createPostWithOneToOneChat(TEST_PREFIX); - - ResultActions resultActions = request - .performMvcRequest(MockMvcRequestBuilders.post("/api/courses/" + courseId + "/messages").contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(postToSave1)).with(user(TEST_PREFIX + "student1").roles("USER")).accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isCreated()); + final var student1 = userTestRepository.findOneByLogin(TEST_PREFIX + "student1").orElseThrow(); + final var student2 = userTestRepository.findOneByLogin(TEST_PREFIX + "student2").orElseThrow(); - MvcResult result = resultActions.andReturn(); - String contentAsString = result.getResponse().getContentAsString(); - Post createdPost1 = objectMapper.readValue(contentAsString, Post.class); + Post postToSave1 = createPostWithOneToOneChat(TEST_PREFIX); // OneToOneChat 1 + Post postToSave2 = createPostWithOneToOneChat(TEST_PREFIX); // OneToOneChat 1 - ResultActions resultActions2 = request - .performMvcRequest(MockMvcRequestBuilders.post("/api/courses/" + courseId + "/messages").contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(postToSave2)).with(user(TEST_PREFIX + "student1").roles("USER")).accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isCreated()); + Post createdPost1 = request.postWithResponseBody("/api/courses/" + courseId + "/messages", postToSave1, Post.class, HttpStatus.CREATED); + final var oneToOneChat1 = createdPost1.getConversation(); + // student 1 adds a message, so the unread count for student 2 should be 1 + await().untilAsserted(() -> { + SecurityUtils.setAuthorizationObject(); + assertThat(getUnreadMessagesCount(oneToOneChat1, student1)).isZero(); + assertThat(getUnreadMessagesCount(oneToOneChat1, student2)).isEqualTo(1); + }); - MvcResult result2 = resultActions2.andReturn(); - String contentAsString2 = result2.getResponse().getContentAsString(); - Post createdPost2 = objectMapper.readValue(contentAsString2, Post.class); + Post createdPost2 = request.postWithResponseBody("/api/courses/" + courseId + "/messages", postToSave2, Post.class, HttpStatus.CREATED); + final var oneToOneChat2 = createdPost2.getConversation(); + // student 1 adds a message, so the unread count for student 2 should be 1 + await().untilAsserted(() -> { + SecurityUtils.setAuthorizationObject(); + assertThat(getUnreadMessagesCount(oneToOneChat1, student1)).isZero(); + assertThat(getUnreadMessagesCount(oneToOneChat1, student2)).isEqualTo(1); + }); - request.performMvcRequest(MockMvcRequestBuilders.delete("/api/courses/" + courseId + "/messages/" + createdPost2.getId()).with(user(TEST_PREFIX + "student1").roles("USER")) - .accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk()); + request.delete("/api/courses/" + courseId + "/messages/" + createdPost2.getId(), HttpStatus.OK); + // After deleting the message in the second chat, the unread count in the first chat should stay the same, the unread count in the second chat will become 0 + await().untilAsserted(() -> { + SecurityUtils.setAuthorizationObject(); + assertThat(getUnreadMessagesCount(oneToOneChat1, student2)).isEqualTo(1); + assertThat(getUnreadMessagesCount(oneToOneChat2, student2)).isZero(); - SecurityContextHolder.setContext(TestSecurityContextHolder.getContext()); - long unreadMessages = oneToOneChatRepository.findByIdWithConversationParticipantsAndUserGroups(createdPost1.getConversation().getId()).orElseThrow() - .getConversationParticipants().stream() - .filter(conversationParticipant -> !Objects.equals(conversationParticipant.getUser().getId(), postToSave1.getAuthor().getId())).findAny().orElseThrow() - .getUnreadMessagesCount(); + // no changes for student1 + assertThat(getUnreadMessagesCount(oneToOneChat1, student1)).isZero(); + assertThat(getUnreadMessagesCount(oneToOneChat1, student1)).isZero(); + }); + } - assertThat(unreadMessages).isEqualTo(1); + private long getUnreadMessagesCount(Conversation conversation, User user) { + return oneToOneChatRepository.findByIdWithConversationParticipantsAndUserGroups(conversation.getId()).orElseThrow().getConversationParticipants().stream() + .filter(conversationParticipant -> Objects.equals(conversationParticipant.getUser().getId(), user.getId())).findFirst().orElseThrow().getUnreadMessagesCount(); } private Post createPostWithOneToOneChat(String userPrefix) { - var student1 = userTestRepository.findOneWithGroupsAndAuthoritiesByLogin(userPrefix + "student1").orElseThrow(); - var student2 = userTestRepository.findOneWithGroupsAndAuthoritiesByLogin(userPrefix + "student2").orElseThrow(); + var student1 = userTestRepository.findOneByLogin(userPrefix + "student1").orElseThrow(); + var student2 = userTestRepository.findOneByLogin(userPrefix + "student2").orElseThrow(); var chat = new OneToOneChat(); chat.setCourse(course); chat.setCreator(student1); @@ -810,29 +805,4 @@ private Post createPostAndAwaitAsyncCode(Post postToSave) throws Exception { private static List courseInformationSharingConfigurationProvider() { return List.of(CourseInformationSharingConfiguration.COMMUNICATION_ONLY, CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING); } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testSimilarityCheck() throws Exception { - Post postToCheck = new Post(); - postToCheck.setTitle("Title Post"); - - List similarPosts = request.postListWithResponseBody("/api/courses/" + courseId + "/messages/similarity-check", postToCheck, Post.class, HttpStatus.OK); - assertThat(similarPosts).hasSize(5); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testGetPostTagsForCourse() throws Exception { - List returnedTags = request.getList("/api/courses/" + courseId + "/messages/tags", HttpStatus.OK, String.class); - // 4 different tags were used for the posts - assertThat(returnedTags).hasSameSizeAs(conversationMessageRepository.findPostTagsForCourse(courseId)); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") - void testGetPostTagsForCourseWithNonExistentCourseId_notFound() throws Exception { - List returnedTags = request.getList("/api/courses/" + 9999L + "/messages/tags", HttpStatus.NOT_FOUND, String.class); - assertThat(returnedTags).isNull(); - } } diff --git a/src/test/java/de/tum/cit/aet/artemis/communication/similarity/TitleJaccardSimilarityCompareStrategyTest.java b/src/test/java/de/tum/cit/aet/artemis/communication/similarity/TitleJaccardSimilarityCompareStrategyTest.java deleted file mode 100644 index 516f3ee01137..000000000000 --- a/src/test/java/de/tum/cit/aet/artemis/communication/similarity/TitleJaccardSimilarityCompareStrategyTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package de.tum.cit.aet.artemis.communication.similarity; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import de.tum.cit.aet.artemis.communication.domain.Post; -import de.tum.cit.aet.artemis.communication.service.similarity.TitleJaccardSimilarityCompareStrategy; - -class TitleJaccardSimilarityCompareStrategyTest { - - private TitleJaccardSimilarityCompareStrategy compareStrategy; - - @BeforeEach - void setUp() { - compareStrategy = new TitleJaccardSimilarityCompareStrategy(); - } - - @Test - void testSimilarTitle_equal() { - Post post1 = new Post(); - post1.setTitle("Some title"); - Post post2 = new Post(); - post2.setTitle("Title some"); - Double expectedResult = 1.0; - - Double actualResult = compareStrategy.performSimilarityCheck(post1, post2); - - assertThat(actualResult).isEqualTo(expectedResult); - } - - @Test - void testSimilarTitle_different() { - Post post1 = new Post(); - post1.setTitle("Totally different"); - Post post2 = new Post(); - post2.setTitle("Something else"); - - Double actualResult = compareStrategy.performSimilarityCheck(post1, post2); - - assertThat(actualResult).isLessThan(0.5); - } - - @Test - void testSimilarTitle_similar() { - Post post1 = new Post(); - post1.setTitle("Totally different"); - Post post2 = new Post(); - post2.setTitle("Somewhat different"); - - Double actualResult = compareStrategy.performSimilarityCheck(post1, post2); - - assertThat(actualResult).isGreaterThan(0.5).isLessThan(1); - } - - @Test - void testSimilarTitle_missing() { - Post post1 = new Post(); - Post post2 = new Post(); - Double expectedResult = 0.0; - - Double actualResult = compareStrategy.performSimilarityCheck(post1, post2); - - assertThat(actualResult).isEqualTo(expectedResult); - } -} diff --git a/src/test/java/de/tum/cit/aet/artemis/core/CleanupIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/core/CleanupIntegrationTest.java new file mode 100644 index 000000000000..9b0fc4767270 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/core/CleanupIntegrationTest.java @@ -0,0 +1,560 @@ +package de.tum.cit.aet.artemis.core; + +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.CONFIRMED; +import static de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismStatus.NONE; +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.ZonedDateTime; +import java.util.Arrays; +import java.util.List; +import java.util.Set; + +import jakarta.validation.constraints.NotNull; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.util.LinkedMultiValueMap; + +import de.tum.cit.aet.artemis.assessment.domain.Feedback; +import de.tum.cit.aet.artemis.assessment.domain.LongFeedbackText; +import de.tum.cit.aet.artemis.assessment.domain.Rating; +import de.tum.cit.aet.artemis.assessment.domain.Result; +import de.tum.cit.aet.artemis.assessment.domain.StudentScore; +import de.tum.cit.aet.artemis.assessment.domain.TeamScore; +import de.tum.cit.aet.artemis.assessment.repository.FeedbackRepository; +import de.tum.cit.aet.artemis.assessment.repository.LongFeedbackTextRepository; +import de.tum.cit.aet.artemis.assessment.repository.ParticipantScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.RatingRepository; +import de.tum.cit.aet.artemis.assessment.repository.StudentScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.TeamScoreRepository; +import de.tum.cit.aet.artemis.assessment.repository.TextBlockRepository; +import de.tum.cit.aet.artemis.assessment.test_repository.ResultTestRepository; +import de.tum.cit.aet.artemis.core.domain.CleanupJobExecution; +import de.tum.cit.aet.artemis.core.domain.CleanupJobType; +import de.tum.cit.aet.artemis.core.domain.Course; +import de.tum.cit.aet.artemis.core.domain.Language; +import de.tum.cit.aet.artemis.core.domain.User; +import de.tum.cit.aet.artemis.core.dto.CleanupServiceExecutionRecordDTO; +import de.tum.cit.aet.artemis.core.repository.cleanup.CleanupJobExecutionRepository; +import de.tum.cit.aet.artemis.core.test_repository.CourseTestRepository; +import de.tum.cit.aet.artemis.exercise.domain.Submission; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; +import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationUtilService; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; +import de.tum.cit.aet.artemis.exercise.repository.TeamRepository; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismComparison; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismMatch; +import de.tum.cit.aet.artemis.plagiarism.domain.PlagiarismSubmission; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextPlagiarismResult; +import de.tum.cit.aet.artemis.plagiarism.domain.text.TextSubmissionElement; +import de.tum.cit.aet.artemis.plagiarism.repository.PlagiarismComparisonRepository; +import de.tum.cit.aet.artemis.programming.domain.ProgrammingSubmission; +import de.tum.cit.aet.artemis.programming.util.ProgrammingExerciseUtilService; +import de.tum.cit.aet.artemis.shared.base.AbstractSpringIntegrationJenkinsGitlabTest; +import de.tum.cit.aet.artemis.text.domain.TextBlock; +import de.tum.cit.aet.artemis.text.domain.TextExercise; +import de.tum.cit.aet.artemis.text.repository.TextExerciseRepository; +import de.tum.cit.aet.artemis.text.util.TextExerciseFactory; +import de.tum.cit.aet.artemis.text.util.TextExerciseUtilService; + +class CleanupIntegrationTest extends AbstractSpringIntegrationJenkinsGitlabTest { + + private static final String TEST_PREFIX = "cleanup"; + + private static final ZonedDateTime DELETE_FROM = ZonedDateTime.now().minusMonths(12); + + private static final ZonedDateTime DELETE_TO = ZonedDateTime.now().minusMonths(6); + + @Autowired + private CourseTestRepository courseRepository; + + @Autowired + private CleanupJobExecutionRepository cleanupJobExecutionRepository; + + @Autowired + private ProgrammingExerciseUtilService programmingExerciseUtilService; + + @Autowired + private FeedbackRepository feedbackRepository; + + @Autowired + private LongFeedbackTextRepository longFeedbackTextRepository; + + @Autowired + private StudentScoreRepository studentScoreRepository; + + @Autowired + private TeamScoreRepository teamScoreRepository; + + @Autowired + private RatingRepository ratingRepository; + + @Autowired + private ResultTestRepository resultRepository; + + @Autowired + private PlagiarismComparisonRepository plagiarismComparisonRepository; + + @Autowired + private TextExerciseUtilService textExerciseUtilService; + + @Autowired + private TextBlockRepository textBlockRepository; + + @Autowired + private TextExerciseRepository textExerciseRepository; + + @Autowired + private ExerciseTestRepository exerciseRepository; + + @Autowired + private ParticipantScoreRepository participantScoreRepository; + + @Autowired + private ParticipationUtilService participationUtilService; + + @Autowired + private TeamRepository teamRepository; + + private Course oldCourse; + + private Course newCourse; + + private User student; + + private User instructor; + + @BeforeEach + void initTestCase() { + ZonedDateTime now = ZonedDateTime.now(); + + oldCourse = programmingExerciseUtilService.addCourseWithOneProgrammingExercise(); + oldCourse.setStartDate(now.minusMonths(12).plusDays(2)); + oldCourse.setEndDate(now.minusMonths(6).minusDays(2)); + TextExercise finishedTextExercise1 = TextExerciseFactory.generateTextExercise(now.minusMonths(12).plusDays(2), now.minusMonths(12).plusDays(2).plusHours(12), + now.minusMonths(12).plusDays(2).plusHours(24), oldCourse); + finishedTextExercise1.setTitle("Finished"); + oldCourse.addExercises(finishedTextExercise1); + oldCourse = courseRepository.save(oldCourse); + exerciseRepository.save(finishedTextExercise1); + + newCourse = programmingExerciseUtilService.addCourseWithOneProgrammingExercise(); + newCourse.setStartDate(now); + newCourse.setEndDate(now.plusMonths(6)); + TextExercise finishedTextExercise2 = TextExerciseFactory.generateTextExercise(now.minusMonths(12).plusDays(2), now.minusMonths(12).plusDays(2).plusHours(12), + now.minusMonths(12).plusDays(2).plusHours(24), newCourse); + finishedTextExercise2.setTitle("Finished"); + newCourse.addExercises(finishedTextExercise2); + newCourse = courseRepository.save(newCourse); + exerciseRepository.save(finishedTextExercise2); + userUtilService.addUsers(TEST_PREFIX, 4, 0, 0, 1); + student = userUtilService.getUserByLogin(TEST_PREFIX + "student4"); + instructor = userUtilService.getUserByLogin(TEST_PREFIX + "instructor1"); + } + + @Test + @WithMockUser(roles = "ADMIN") + void testDeleteOrphans() throws Exception { + var oldExercise = textExerciseRepository.findByCourseIdWithCategories(oldCourse.getId()).getFirst(); + + var orphanFeedback = createFeedbackWithLinkedLongFeedback(); + var orphanTextBlock = createTextBlockForFeedback(orphanFeedback); + + StudentScore orphanStudentScore = new StudentScore(); + orphanStudentScore.setExercise(oldExercise); + orphanStudentScore = studentScoreRepository.save(orphanStudentScore); + + TeamScore orphanTeamScore = new TeamScore(); + orphanTeamScore.setExercise(oldExercise); + orphanTeamScore = teamScoreRepository.save(orphanTeamScore); + + var orphanResult = new Result(); + orphanResult = resultRepository.save(orphanResult); + + orphanFeedback.setResult(orphanResult); + orphanFeedback = feedbackRepository.save(orphanFeedback); + + var submission = participationUtilService.addSubmission(textExerciseRepository.findByCourseIdWithCategories(newCourse.getId()).getFirst(), new ProgrammingSubmission(), + student.getLogin()); + + var nonOrphanFeedback = createFeedbackWithLinkedLongFeedback(); + var nonOrphanTextBlock = createTextBlockForFeedback(nonOrphanFeedback); + + Result nonOrphanResult = new Result(); + nonOrphanResult.setParticipation(submission.getParticipation()); + nonOrphanResult.setSubmission(submission); + nonOrphanFeedback.setResult(nonOrphanResult); + nonOrphanResult = resultRepository.save(nonOrphanResult); + + nonOrphanFeedback.setResult(nonOrphanResult); + nonOrphanFeedback = feedbackRepository.save(nonOrphanFeedback); + + StudentScore nonOrphanStudentScore = new StudentScore(); + nonOrphanStudentScore.setUser(student); + nonOrphanStudentScore.setExercise(oldExercise); + nonOrphanStudentScore = studentScoreRepository.save(nonOrphanStudentScore); + + TeamScore nonOrphanTeamScore = new TeamScore(); + nonOrphanTeamScore.setExercise(oldExercise); + Team team = new Team(); + team.setShortName("team"); + nonOrphanTeamScore.setTeam(team); + teamRepository.save(team); + nonOrphanTeamScore = teamScoreRepository.save(nonOrphanTeamScore); + + Rating nonOrphanRating = new Rating(); + nonOrphanRating.setResult(nonOrphanResult); + nonOrphanRating = ratingRepository.save(nonOrphanRating); + + Rating orphanRating = new Rating(); + orphanRating.setResult(orphanResult); + orphanRating = ratingRepository.save(orphanRating); + + var responseBody = request.delete("/api/admin/cleanup/orphans", new LinkedMultiValueMap<>(), null, CleanupServiceExecutionRecordDTO.class, HttpStatus.OK); + + assertThat(responseBody.jobType()).isEqualTo("deleteOrphans"); + assertThat(responseBody.executionDate()).isNotNull(); + + assertThat(longFeedbackTextRepository.existsById(orphanFeedback.getLongFeedback().orElseThrow().getId())).isFalse(); + assertThat(textBlockRepository.existsById(orphanTextBlock.getId())).isFalse(); + assertThat(feedbackRepository.existsById(orphanFeedback.getId())).isFalse(); + assertThat(studentScoreRepository.existsById(orphanStudentScore.getId())).isFalse(); + assertThat(teamScoreRepository.existsById(orphanTeamScore.getId())).isFalse(); + assertThat(resultRepository.existsById(orphanResult.getId())).isFalse(); + assertThat(ratingRepository.existsById(orphanRating.getId())).isFalse(); + + assertThat(textBlockRepository.existsById(nonOrphanTextBlock.getId())).isTrue(); + assertThat(longFeedbackTextRepository.existsById(nonOrphanFeedback.getLongFeedback().orElseThrow().getId())).isTrue(); + assertThat(feedbackRepository.existsById(nonOrphanFeedback.getId())).isTrue(); + assertThat(studentScoreRepository.existsById(nonOrphanStudentScore.getId())).isTrue(); + assertThat(teamScoreRepository.existsById(nonOrphanTeamScore.getId())).isTrue(); + assertThat(ratingRepository.existsById(nonOrphanRating.getId())).isTrue(); + assertThat(resultRepository.existsById(nonOrphanResult.getId())).isTrue(); + } + + @Test + @WithMockUser(roles = "ADMIN") + void testDeletePlagiarismComparisons() throws Exception { + // old course, should delete undecided plagiarism comparisons + var textExercise1 = textExerciseRepository.findByCourseIdWithCategories(oldCourse.getId()).getFirst(); + var textPlagiarismResult1 = textExerciseUtilService.createTextPlagiarismResultForExercise(textExercise1); + + var submission1 = participationUtilService.addSubmission(textExercise1, ParticipationFactory.generateTextSubmission("", Language.GERMAN, true), TEST_PREFIX + "student1"); + var submission2 = participationUtilService.addSubmission(textExercise1, ParticipationFactory.generateTextSubmission("", Language.GERMAN, true), TEST_PREFIX + "student2"); + var submission3 = participationUtilService.addSubmission(textExercise1, ParticipationFactory.generateTextSubmission("", Language.GERMAN, true), TEST_PREFIX + "student3"); + var plagiarismComparison1 = getTextSubmissionElementPlagiarismComparison(textPlagiarismResult1, submission1, submission2); + plagiarismComparison1 = plagiarismComparisonRepository.save(plagiarismComparison1); + + var plagiarismComparison2 = getSubmissionElementPlagiarismComparison(textPlagiarismResult1, submission2, submission3); + plagiarismComparison2 = plagiarismComparisonRepository.save(plagiarismComparison2); + + // new course, should not delete undecided plagiarism comparisons + var textExercise2 = textExerciseRepository.findByCourseIdWithCategories(newCourse.getId()).getFirst(); + var textPlagiarismResult2 = textExerciseUtilService.createTextPlagiarismResultForExercise(textExercise2); + + var submission4 = participationUtilService.addSubmission(textExercise2, ParticipationFactory.generateTextSubmission("", Language.GERMAN, true), TEST_PREFIX + "student1"); + var submission5 = participationUtilService.addSubmission(textExercise2, ParticipationFactory.generateTextSubmission("", Language.GERMAN, true), TEST_PREFIX + "student2"); + var submission6 = participationUtilService.addSubmission(textExercise2, ParticipationFactory.generateTextSubmission("", Language.GERMAN, true), TEST_PREFIX + "student3"); + var plagiarismComparison3 = getTextSubmissionElementPlagiarismComparison(textPlagiarismResult2, submission4, submission5); + plagiarismComparison3 = plagiarismComparisonRepository.save(plagiarismComparison3); + + var plagiarismComparison4 = getSubmissionElementPlagiarismComparison(textPlagiarismResult2, submission2, submission6); + plagiarismComparison4 = plagiarismComparisonRepository.save(plagiarismComparison4); + + LinkedMultiValueMap params = new LinkedMultiValueMap<>(); + params.add("deleteFrom", DELETE_FROM.toString()); + params.add("deleteTo", DELETE_TO.toString()); + var responseBody = request.delete("/api/admin/cleanup/plagiarism-comparisons", params, null, CleanupServiceExecutionRecordDTO.class, HttpStatus.OK); + + assertThat(responseBody.jobType()).isEqualTo("deletePlagiarismComparisons"); + assertThat(responseBody.executionDate()).isNotNull(); + + assertThat(plagiarismComparisonRepository.existsById(plagiarismComparison2.getId())).isFalse(); + assertThat(plagiarismComparisonRepository.existsById(plagiarismComparison1.getId())).isTrue(); + + assertThat(plagiarismComparisonRepository.existsById(plagiarismComparison4.getId())).isTrue(); + assertThat(plagiarismComparisonRepository.existsById(plagiarismComparison3.getId())).isTrue(); + + } + + @NotNull + private static PlagiarismComparison getSubmissionElementPlagiarismComparison(TextPlagiarismResult textPlagiarismResult1, Submission submission2, + Submission submission3) { + PlagiarismComparison plagiarismComparison2 = new PlagiarismComparison<>(); + plagiarismComparison2.setPlagiarismResult(textPlagiarismResult1); + plagiarismComparison2.setStatus(NONE); + var plagiarismSubmissionA2 = new PlagiarismSubmission(); + plagiarismSubmissionA2.setStudentLogin(TEST_PREFIX + "student2"); + plagiarismSubmissionA2.setSubmissionId(submission2.getId()); + var plagiarismSubmissionB2 = new PlagiarismSubmission(); + plagiarismSubmissionB2.setStudentLogin(TEST_PREFIX + "student3"); + plagiarismSubmissionB2.setSubmissionId(submission3.getId()); + plagiarismComparison2.setSubmissionA(plagiarismSubmissionA2); + plagiarismComparison2.setSubmissionB(plagiarismSubmissionB2); + plagiarismComparison2.setMatches(Set.of(new PlagiarismMatch())); + return plagiarismComparison2; + } + + @NotNull + private static PlagiarismComparison getTextSubmissionElementPlagiarismComparison(TextPlagiarismResult textPlagiarismResult1, Submission submission1, + Submission submission2) { + PlagiarismComparison plagiarismComparison1 = new PlagiarismComparison<>(); + plagiarismComparison1.setPlagiarismResult(textPlagiarismResult1); + plagiarismComparison1.setStatus(CONFIRMED); + var plagiarismSubmissionA1 = new PlagiarismSubmission(); + plagiarismSubmissionA1.setStudentLogin(TEST_PREFIX + "student1"); + plagiarismSubmissionA1.setSubmissionId(submission1.getId()); + var plagiarismSubmissionB1 = new PlagiarismSubmission(); + plagiarismSubmissionB1.setStudentLogin(TEST_PREFIX + "student2"); + plagiarismSubmissionB1.setSubmissionId(submission2.getId()); + plagiarismComparison1.setSubmissionA(plagiarismSubmissionA1); + plagiarismComparison1.setSubmissionB(plagiarismSubmissionB1); + plagiarismComparison1.setMatches(Set.of(new PlagiarismMatch())); + return plagiarismComparison1; + } + + @Test + @WithMockUser(roles = "ADMIN") + void testDeleteNonRatedResults() throws Exception { + // create non rated results for an old course + var oldExercise = textExerciseRepository.findByCourseIdWithCategories(oldCourse.getId()).getFirst(); + var oldStudentParticipation = participationUtilService.createAndSaveParticipationForExercise(oldExercise, student.getLogin()); + var oldSubmission = participationUtilService.addSubmission(oldStudentParticipation, ParticipationFactory.generateProgrammingSubmission(true)); + var oldResult1 = participationUtilService.generateResult(oldSubmission, instructor); + oldResult1.setParticipation(oldStudentParticipation); + oldResult1.setRated(false); + var oldResult2 = participationUtilService.generateResult(oldSubmission, instructor); + oldResult2.setParticipation(oldStudentParticipation); + oldResult2.setRated(false); + + var oldFeedback1 = createFeedbackWithLinkedLongFeedback(); + var oldTextBlock1 = createTextBlockForFeedback(oldFeedback1); + participationUtilService.addFeedbackToResult(oldFeedback1, oldResult1); + + var oldFeedback2 = createFeedbackWithLinkedLongFeedback(); + var oldTextBlock2 = createTextBlockForFeedback(oldFeedback2); + participationUtilService.addFeedbackToResult(oldFeedback2, oldResult2); + + StudentScore oldParticipantScore1 = new StudentScore(); + oldParticipantScore1.setExercise(oldExercise); + oldParticipantScore1.setUser(student); + oldParticipantScore1.setLastRatedResult(oldResult1); + oldParticipantScore1 = studentScoreRepository.save(oldParticipantScore1); + + StudentScore oldParticipantScore2 = new StudentScore(); + oldParticipantScore2.setUser(student); + oldParticipantScore2.setExercise(oldExercise); + oldParticipantScore2.setLastResult(oldResult2); + oldParticipantScore2 = studentScoreRepository.save(oldParticipantScore1); + + // create non rated results for the new course + var newExercise = textExerciseRepository.findByCourseIdWithCategories(newCourse.getId()).getFirst(); + var newStudentParticipation = participationUtilService.createAndSaveParticipationForExercise(newExercise, student.getLogin()); + var newSubmission = participationUtilService.addSubmission(newStudentParticipation, ParticipationFactory.generateProgrammingSubmission(true)); + var newResult1 = participationUtilService.generateResult(newSubmission, instructor); + newResult1.setParticipation(newStudentParticipation); + newResult1.setRated(false); + var newResult2 = participationUtilService.generateResult(newSubmission, instructor); + newResult2.setParticipation(newStudentParticipation); + newResult2.setRated(false); + + var newFeedback1 = createFeedbackWithLinkedLongFeedback(); + var newTextBlock1 = createTextBlockForFeedback(newFeedback1); + participationUtilService.addFeedbackToResult(newFeedback1, newResult1); + + var newFeedback2 = createFeedbackWithLinkedLongFeedback(); + var newTextBlock2 = createTextBlockForFeedback(newFeedback2); + participationUtilService.addFeedbackToResult(newFeedback2, newResult2); + + StudentScore newParticipantScore1 = new StudentScore(); + newParticipantScore1.setUser(student); + newParticipantScore1.setExercise(newExercise); + newParticipantScore1.setLastRatedResult(newResult1); + newParticipantScore1 = studentScoreRepository.save(newParticipantScore1); + + StudentScore newParticipantScore2 = new StudentScore(); + newParticipantScore2.setUser(student); + newParticipantScore2.setExercise(newExercise); + newParticipantScore2.setLastResult(newResult2); + newParticipantScore2 = studentScoreRepository.save(newParticipantScore2); + + LinkedMultiValueMap params = new LinkedMultiValueMap<>(); + params.add("deleteFrom", DELETE_FROM.toString()); + params.add("deleteTo", DELETE_TO.toString()); + var responseBody = request.delete("/api/admin/cleanup/non-rated-results", params, null, CleanupServiceExecutionRecordDTO.class, HttpStatus.OK); + + assertThat(responseBody.jobType()).isEqualTo("deleteNonRatedResults"); + assertThat(responseBody.executionDate()).isNotNull(); + + // assertThat(participantScoreRepository.findById(oldParticipantScore1.getId())).isEmpty(); + // assertThat(participantScoreRepository.findById(oldParticipantScore2.getId())).isEmpty(); + // assertThat(resultRepository.findById(oldResult1.getId())).isEmpty(); + assertThat(feedbackRepository.findByResult(oldResult1)).isEmpty(); + assertThat(textBlockRepository.findById(oldTextBlock1.getId())).isEmpty(); + + assertThat(resultRepository.findById(oldResult2.getId())).isNotEmpty(); + assertThat(feedbackRepository.findByResult(oldResult2)).isNotEmpty(); + assertThat(textBlockRepository.findById(oldTextBlock2.getId())).isNotEmpty(); + + assertThat(participantScoreRepository.findById(newParticipantScore1.getId())).isNotEmpty(); + assertThat(participantScoreRepository.findById(newParticipantScore2.getId())).isNotEmpty(); + assertThat(resultRepository.findById(newResult1.getId())).isPresent(); + assertThat(feedbackRepository.findByResult(newResult1)).isNotEmpty(); + assertThat(textBlockRepository.findById(newTextBlock1.getId())).isNotEmpty(); + + assertThat(resultRepository.findById(newResult2.getId())).isNotEmpty(); + assertThat(feedbackRepository.findByResult(newResult2)).isNotEmpty(); + assertThat(textBlockRepository.findById(newTextBlock2.getId())).isNotEmpty(); + } + + @Test + @WithMockUser(roles = "ADMIN") + void testDeleteOldRatedResults() throws Exception { + // create rated results for an old course + var oldExercise = textExerciseRepository.findByCourseIdWithCategories(oldCourse.getId()).getFirst(); + var oldStudentParticipation = participationUtilService.createAndSaveParticipationForExercise(oldExercise, student.getLogin()); + var oldSubmission = participationUtilService.addSubmission(oldStudentParticipation, ParticipationFactory.generateProgrammingSubmission(true)); + var oldResult1 = participationUtilService.generateResult(oldSubmission, instructor); // should be deleted, with all associated entities + oldResult1.setParticipation(oldStudentParticipation); + var oldResult2 = participationUtilService.generateResult(oldSubmission, instructor); + oldResult2.setParticipation(oldStudentParticipation); + + var oldFeedback1 = createFeedbackWithLinkedLongFeedback(); + var oldTextBlock1 = createTextBlockForFeedback(oldFeedback1); + participationUtilService.addFeedbackToResult(oldFeedback1, oldResult1); + + var oldFeedback2 = createFeedbackWithLinkedLongFeedback(); + var oldTextBlock2 = createTextBlockForFeedback(oldFeedback2); + participationUtilService.addFeedbackToResult(oldFeedback2, oldResult2); + + StudentScore oldParticipantScore1 = new StudentScore(); + oldParticipantScore1.setUser(student); + oldParticipantScore1.setExercise(oldExercise); + oldParticipantScore1.setLastRatedResult(oldResult1); + oldParticipantScore1 = studentScoreRepository.save(oldParticipantScore1); + + StudentScore oldParticipantScore2 = new StudentScore(); + oldParticipantScore2.setExercise(oldExercise); + oldParticipantScore2.setLastResult(oldResult2); + oldParticipantScore2.setUser(student); + oldParticipantScore2 = studentScoreRepository.save(oldParticipantScore2); + + // create rated results for the new course + var newExercise = textExerciseRepository.findByCourseIdWithCategories(newCourse.getId()).getFirst(); + var newStudentParticipation = participationUtilService.createAndSaveParticipationForExercise(newExercise, student.getLogin()); + var newSubmission = participationUtilService.addSubmission(newStudentParticipation, ParticipationFactory.generateProgrammingSubmission(true)); + var newResult1 = participationUtilService.generateResult(newSubmission, instructor); // should not be deleted, with all associated entities + newResult1.setParticipation(newStudentParticipation); + var newResult2 = participationUtilService.generateResult(newSubmission, instructor); + newResult2.setParticipation(newStudentParticipation); + + var newFeedback1 = createFeedbackWithLinkedLongFeedback(); + var newTextBlock1 = createTextBlockForFeedback(newFeedback1); + participationUtilService.addFeedbackToResult(newFeedback1, newResult1); + + var newFeedback2 = createFeedbackWithLinkedLongFeedback(); + var newTextBlock2 = createTextBlockForFeedback(newFeedback2); + participationUtilService.addFeedbackToResult(newFeedback2, newResult2); + + StudentScore newParticipantScore1 = new StudentScore(); + newParticipantScore1.setUser(student); + newParticipantScore1.setExercise(newExercise); + newParticipantScore1.setLastRatedResult(newResult1); + newParticipantScore1 = studentScoreRepository.save(newParticipantScore1); + + StudentScore newParticipantScore2 = new StudentScore(); + newParticipantScore2.setUser(student); + newParticipantScore2.setExercise(newExercise); + newParticipantScore2.setLastResult(newResult2); + newParticipantScore2 = studentScoreRepository.save(newParticipantScore2); + + LinkedMultiValueMap params = new LinkedMultiValueMap<>(); + params.add("deleteFrom", DELETE_FROM.toString()); + params.add("deleteTo", DELETE_TO.toString()); + var responseBody = request.delete("/api/admin/cleanup/old-rated-results", params, null, CleanupServiceExecutionRecordDTO.class, HttpStatus.OK); + + assertThat(responseBody.jobType()).isEqualTo("deleteRatedResults"); + assertThat(responseBody.executionDate()).isNotNull(); + + // assertThat(participantScoreRepository.findById(oldParticipantScore1.getId())).isEmpty(); + assertThat(participantScoreRepository.findById(oldParticipantScore2.getId())).isPresent(); + // assertThat(resultRepository.findById(oldResult1.getId())).isEmpty(); + assertThat(feedbackRepository.findByResult(oldResult1)).isEmpty(); + assertThat(textBlockRepository.findById(oldTextBlock1.getId())).isEmpty(); + + assertThat(resultRepository.findById(oldResult2.getId())).isPresent(); + assertThat(feedbackRepository.findByResult(oldResult2)).isNotEmpty(); + assertThat(textBlockRepository.findById(oldTextBlock2.getId())).isNotEmpty(); + + assertThat(participantScoreRepository.findById(newParticipantScore1.getId())).isPresent(); + assertThat(participantScoreRepository.findById(newParticipantScore2.getId())).isPresent(); + assertThat(resultRepository.findById(newResult1.getId())).isPresent(); + assertThat(feedbackRepository.findByResult(newResult1)).isNotEmpty(); + assertThat(textBlockRepository.findById(newTextBlock1.getId())).isNotEmpty(); + + assertThat(resultRepository.findById(newResult2.getId())).isPresent(); + assertThat(feedbackRepository.findByResult(newResult2)).isNotEmpty(); + assertThat(textBlockRepository.findById(newTextBlock2.getId())).isNotEmpty(); + } + + @Test + @WithMockUser(roles = "ADMIN") + void testGetLastExecutions() throws Exception { + + var now = ZonedDateTime.now(); + + var jobExecution = new CleanupJobExecution(); + jobExecution.setCleanupJobType(CleanupJobType.ORPHANS); + jobExecution.setDeletionTimestamp(now); + cleanupJobExecutionRepository.save(jobExecution); + + var response = request.getList("/api/admin/cleanup/last-executions", HttpStatus.OK, CleanupServiceExecutionRecordDTO.class); + + List enumJobTypes = Arrays.stream(CleanupJobType.values()).map(CleanupJobType::label).toList(); + + assertThat(response).isNotNull(); + assertThat(response).extracting(CleanupServiceExecutionRecordDTO::jobType).containsAll(enumJobTypes); + + var orphansJob = response.stream().filter(elem -> elem.jobType().equals(CleanupJobType.ORPHANS.label())).findFirst(); + + assertThat(orphansJob).isPresent(); + assertThat(now).isNotNull(); + } + + @Test + @WithMockUser(roles = "USER") + void testUnauthorizedAccess() throws Exception { + request.postWithoutResponseBody("/api/admin/cleanup/orphans", HttpStatus.FORBIDDEN, new LinkedMultiValueMap<>()); + request.postWithoutResponseBody("/api/admin/cleanup/plagiarism-comparisons", HttpStatus.FORBIDDEN, new LinkedMultiValueMap<>()); + request.postWithoutResponseBody("/api/admin/cleanup/non-rated-results", HttpStatus.FORBIDDEN, new LinkedMultiValueMap<>()); + request.postWithoutResponseBody("/api/admin/cleanup/old-rated-results", HttpStatus.FORBIDDEN, new LinkedMultiValueMap<>()); + + request.get("/api/admin/cleanup/last-executions", HttpStatus.FORBIDDEN, List.class); + } + + private Feedback createFeedbackWithLinkedLongFeedback() { + Feedback feedback = new Feedback(); + feedback = feedbackRepository.save(feedback); + + LongFeedbackText longFeedback = new LongFeedbackText(); + longFeedback.setFeedback(feedback); + longFeedback.setText("text" + longFeedback.hashCode()); + longFeedbackTextRepository.save(longFeedback); + + feedback.setLongFeedbackText(Set.of(longFeedback)); + + return feedbackRepository.save(feedback); + } + + private TextBlock createTextBlockForFeedback(Feedback feedback) { + TextBlock textBlock = new TextBlock(); + textBlock.setFeedback(feedback); + textBlock.setText("text" + feedback.hashCode()); + textBlock.computeId(); + return textBlockRepository.save(textBlock); + } +} diff --git a/src/test/java/de/tum/cit/aet/artemis/core/authentication/UserAccountLocalVcsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/core/authentication/UserAccountLocalVcsIntegrationTest.java index afb5a65a107d..6428ea303037 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/authentication/UserAccountLocalVcsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/authentication/UserAccountLocalVcsIntegrationTest.java @@ -74,6 +74,12 @@ void getAndCreateParticipationVcsAccessTokenByUser() throws Exception { userTestService.getAndCreateParticipationVcsAccessToken(); } + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void getParticipationVcsAccessTokenByUserForTeamExercise() throws Exception { + userTestService.getAndCreateParticipationVcsAccessTokenForTeamExercise(); + } + @Test @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") void createAndDeleteUserVcsAccessTokenByUser() throws Exception { diff --git a/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java b/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java index aa95dbf6d7a2..d5f9b379f1a6 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/user/util/UserTestService.java @@ -46,7 +46,11 @@ import de.tum.cit.aet.artemis.core.test_repository.UserTestRepository; import de.tum.cit.aet.artemis.core.util.CourseUtilService; import de.tum.cit.aet.artemis.core.util.RequestUtilService; +import de.tum.cit.aet.artemis.exercise.domain.ExerciseMode; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Team; +import de.tum.cit.aet.artemis.exercise.repository.ExerciseTestRepository; +import de.tum.cit.aet.artemis.exercise.team.TeamUtilService; import de.tum.cit.aet.artemis.exercise.test_repository.ParticipationTestRepository; import de.tum.cit.aet.artemis.exercise.test_repository.SubmissionTestRepository; import de.tum.cit.aet.artemis.lti.service.LtiService; @@ -94,6 +98,9 @@ public class UserTestService { @Autowired private UserUtilService userUtilService; + @Autowired + private TeamUtilService teamUtilService; + @Autowired private CourseUtilService courseUtilService; @@ -138,6 +145,9 @@ public class UserTestService { @Autowired private SubmissionTestRepository submissionRepository; + @Autowired + private ExerciseTestRepository exerciseTestRepository; + public void setup(String testPrefix, MockDelegate mockDelegate) throws Exception { this.TEST_PREFIX = testPrefix; this.mockDelegate = mockDelegate; @@ -1017,6 +1027,36 @@ public void getAndCreateParticipationVcsAccessToken() throws Exception { participationRepository.deleteById(submission.getParticipation().getId()); } + // Test + public void getAndCreateParticipationVcsAccessTokenForTeamExercise() throws Exception { + User user = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); + var course = courseUtilService.addEmptyCourse(); + var exercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course); + exercise.setMode(ExerciseMode.TEAM); + exerciseTestRepository.save(exercise); + courseRepository.save(course); + User tutor1 = userTestRepository.findOneByLogin(TEST_PREFIX + "tutor1").orElseThrow(); + Team team = teamUtilService.createTeam(Set.of(user), tutor1, exercise, "team1"); + + var submission = (ProgrammingSubmission) new ProgrammingSubmission().commitHash("abc").type(SubmissionType.MANUAL).submitted(true); + submission = programmingExerciseUtilService.addProgrammingSubmissionToTeamExercise(exercise, submission, team); + + // request existing token + request.get("/api/account/participation-vcs-access-token?participationId=" + submission.getParticipation().getId(), HttpStatus.NOT_FOUND, String.class); + + var token = request.putWithResponseBody("/api/account/participation-vcs-access-token?participationId=" + submission.getParticipation().getId(), null, String.class, + HttpStatus.OK); + assertThat(token).isNotNull(); + + var token2 = request.get("/api/account/participation-vcs-access-token?participationId=" + submission.getParticipation().getId(), HttpStatus.OK, String.class); + assertThat(token2).isEqualTo(token); + + submissionRepository.delete(submission); + participationVCSAccessTokenRepository.deleteAll(); + participationRepository.deleteById(submission.getParticipation().getId()); + teamUtilService.deleteTeam(team); + } + // Test public void createAndDeleteUserVcsAccessToken() throws Exception { User user = userUtilService.getUserByLogin(TEST_PREFIX + "student1"); diff --git a/src/test/java/de/tum/cit/aet/artemis/core/util/RequestUtilService.java b/src/test/java/de/tum/cit/aet/artemis/core/util/RequestUtilService.java index 3d992677b553..8c107e3bbb11 100644 --- a/src/test/java/de/tum/cit/aet/artemis/core/util/RequestUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/core/util/RequestUtilService.java @@ -782,6 +782,31 @@ public void delete(String path, HttpStatus expectedStatus, T body) throws Ex restoreSecurityContext(); } + /** + * Sends a multipart delete request with a mandatory json file and an optional file. + * + * @param path the path to send the request to + * @param responseType the expected response type as class + * @param body the payload + * @param expectedStatus the expected status + * @param params the optional parameters for the request + * @param the type of the main object to send + * @param the type of the response object + * @return the response as object of the given type or null if the status is not 2xx + * @throws Exception if the request fails + */ + public R delete(String path, MultiValueMap params, T body, Class responseType, HttpStatus expectedStatus) throws Exception { + String jsonBody = mapper.writeValueAsString(body); + MvcResult res = performMvcRequest(MockMvcRequestBuilders.delete(new URI(path)).contentType(MediaType.APPLICATION_JSON).content(jsonBody).params(params)) + .andExpect(status().is(expectedStatus.value())).andReturn(); + restoreSecurityContext(); + if (!expectedStatus.is2xxSuccessful()) { + assertThat(res.getResponse().containsHeader("location")).as("no location header on failed request").isFalse(); + return null; + } + return mapper.readValue(res.getResponse().getContentAsString(), responseType); + } + /** * The Security Context gets cleared after a REST call. * To prevent issues with further queries and rest calls in a test we restore the security context from the test security context holder diff --git a/src/test/java/de/tum/cit/aet/artemis/exercise/team/TeamUtilService.java b/src/test/java/de/tum/cit/aet/artemis/exercise/team/TeamUtilService.java index 542647f0dd8d..d24b66221cf8 100644 --- a/src/test/java/de/tum/cit/aet/artemis/exercise/team/TeamUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/exercise/team/TeamUtilService.java @@ -244,4 +244,8 @@ public Team createTeam(Set students, User owner, Exercise exercise, String team.setExercise(exercise); return teamRepo.saveAndFlush(team); } + + public void deleteTeam(Team team) { + teamRepo.delete(team); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java index d127e1d40db4..929d46b4b5bb 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/AttachmentUnitIntegrationTest.java @@ -278,6 +278,7 @@ void updateAttachmentUnit_asInstructor_shouldUpdateAttachmentUnit() throws Excep attachment = attachmentRepository.findById(attachment.getId()).orElseThrow(); assertThat(attachmentUnit2.getAttachment()).isEqualTo(attachment); assertThat(attachment.getAttachmentUnit()).isEqualTo(attachmentUnit2); + assertThat(attachmentUnit1.getCompetencyLinks()).anyMatch(link -> link.getCompetency().getId().equals(competency.getId())); verify(competencyProgressService, timeout(1000).times(1)).updateProgressForUpdatedLearningObjectAsync(eq(attachmentUnit), eq(Optional.of(attachmentUnit))); } @@ -334,6 +335,7 @@ void getAttachmentUnit_correctId_shouldReturnAttachmentUnit() throws Exception { this.attachment.setAttachmentUnit(this.attachmentUnit); this.attachment = attachmentRepository.save(attachment); this.attachmentUnit = this.attachmentUnitRepository.save(this.attachmentUnit); + competencyUtilService.linkLectureUnitToCompetency(competency, attachmentUnit); // 1. check the database call directly this.attachmentUnit = this.attachmentUnitRepository.findByIdElseThrow(this.attachmentUnit.getId()); @@ -342,6 +344,7 @@ void getAttachmentUnit_correctId_shouldReturnAttachmentUnit() throws Exception { // 2. check the REST call this.attachmentUnit = request.get("/api/lectures/" + lecture1.getId() + "/attachment-units/" + this.attachmentUnit.getId(), HttpStatus.OK, AttachmentUnit.class); assertThat(this.attachmentUnit.getAttachment()).isEqualTo(this.attachment); + assertThat(this.attachmentUnit.getCompetencyLinks()).anyMatch(link -> link.getCompetency().getId().equals(competency.getId())); } @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java index 75587b96f77d..dea62c73d76b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureIntegrationTest.java @@ -110,6 +110,7 @@ void initTestCase() throws Exception { channel.setLecture(this.lecture1); channelRepository.save(channel); textExercise = textExerciseRepository.findByCourseIdWithCategories(course1.getId()).stream().findFirst().orElseThrow(); + // Add users that are not in the course userUtilService.createAndSaveUser(TEST_PREFIX + "student42"); userUtilService.createAndSaveUser(TEST_PREFIX + "instructor42"); @@ -126,6 +127,7 @@ void initTestCase() throws Exception { lecture1 = lectureUtilService.addLectureUnitsToLecture(this.lecture1, List.of(exerciseUnit, attachmentUnit, videoUnit, textUnit, onlineUnit)); competency = competencyUtilService.createCompetency(course1); + competencyUtilService.linkExerciseToCompetency(competency, textExercise); } private void addAttachmentToLecture() { @@ -296,6 +298,8 @@ void getLecture_ExerciseAndAttachmentReleased_shouldGetLectureWithAllLectureUnit Lecture receivedLectureWithDetails = request.get("/api/lectures/" + lecture1.getId() + "/details", HttpStatus.OK, Lecture.class); assertThat(receivedLectureWithDetails.getId()).isEqualTo(lecture1.getId()); assertThat(receivedLectureWithDetails.getLectureUnits()).hasSize(5); + assertThat(receivedLectureWithDetails.getLectureUnits().stream().filter(lectureUnit -> lectureUnit instanceof ExerciseUnit).toList().getFirst().getCompetencyLinks()) + .hasSize(1); assertThat(receivedLectureWithDetails.getAttachments()).hasSize(2); testGetLecture(lecture1.getId()); diff --git a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java index 2a79f139fc96..882e19f57822 100644 --- a/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/lecture/LectureUnitServiceTest.java @@ -11,6 +11,7 @@ import de.tum.cit.aet.artemis.core.domain.User; import de.tum.cit.aet.artemis.core.user.util.UserUtilService; +import de.tum.cit.aet.artemis.lecture.domain.AttachmentUnit; import de.tum.cit.aet.artemis.lecture.domain.Lecture; import de.tum.cit.aet.artemis.lecture.domain.LectureUnit; import de.tum.cit.aet.artemis.lecture.domain.LectureUnitCompletion; @@ -87,4 +88,18 @@ void testUncompleteAllUnits() { assertThat(lectureUnitCompletionRepository.findByLectureUnitIdAndUserId(unit1.getId(), student1.getId())).isEmpty(); assertThat(lectureUnitCompletionRepository.findByLectureUnitIdAndUserId(unit2.getId(), student1.getId())).isEmpty(); } + + @Test + void testSaveWithCompetencyLinksWithNullLinks() { + AttachmentUnit lectureUnit = new AttachmentUnit(); + lectureUnit.setCompetencyLinks(null); + + LectureUnit savedLectureUnit = lectureUnitService.saveWithCompetencyLinks(lectureUnit, unit -> { + unit.setId(1L); + return unit; + }); + + assertThat(savedLectureUnit).isNotNull(); + assertThat(savedLectureUnit.getCompetencyLinks()).isEmpty(); + } } diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java index fcbdc0bdef78..56adec3eb361 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/AbstractProgrammingIntegrationLocalCILocalVCTest.java @@ -52,6 +52,9 @@ public abstract class AbstractProgrammingIntegrationLocalCILocalVCTest extends A // External Repositories // Services + @Autowired + protected ProgrammingExerciseIntegrationTestService programmingExerciseIntegrationTestService; + @Autowired protected AeolusRequestMockProvider aeolusRequestMockProvider; diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java index 6b4c43477276..8d065c0e2870 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseGradingServiceTest.java @@ -1229,7 +1229,7 @@ void shouldCalculateCorrectStatistics() throws Exception { final var endpoint = "/programming-exercises/" + programmingExerciseSCAEnabled.getId() + "/grading/statistics"; final var statistics = request.get("/api" + endpoint, HttpStatus.OK, ProgrammingExerciseGradingStatisticsDTO.class); - assertThat(statistics.getNumParticipations()).isEqualTo(5); + assertThat(statistics.numParticipations()).isEqualTo(5); var testCaseStatsMap = new HashMap(); testCaseStatsMap.put("test1", new ProgrammingExerciseGradingStatisticsDTO.TestCaseStats(5, 0)); @@ -1239,12 +1239,12 @@ void shouldCalculateCorrectStatistics() throws Exception { // check some additional methods to increase test coverage var test1 = testCaseStatsMap.get("test1"); var test2 = testCaseStatsMap.get("test2"); - assertThat(test1.getNumFailed()).isZero(); - assertThat(test1.getNumPassed()).isEqualTo(5); + assertThat(test1.numFailed()).isZero(); + assertThat(test1.numPassed()).isEqualTo(5); assertThat(test1.hashCode()).isNotEqualTo(test2.hashCode()); assertThat(test1).isNotEqualTo(test2).isNotNull(); - assertThat(statistics.getTestCaseStatsMap()).containsExactlyInAnyOrderEntriesOf(testCaseStatsMap); + assertThat(statistics.testCaseStatsMap()).containsExactlyInAnyOrderEntriesOf(testCaseStatsMap); var categoryIssuesMap = new HashMap>(); categoryIssuesMap.put("Bad Practice", Map.of(2, 1, 5, 3)); @@ -1252,7 +1252,7 @@ void shouldCalculateCorrectStatistics() throws Exception { categoryIssuesMap.put("Potential Bugs", Map.of(1, 5)); categoryIssuesMap.put("Miscellaneous", Map.of()); - assertThat(statistics.getCategoryIssuesMap()).containsExactlyInAnyOrderEntriesOf(categoryIssuesMap); + assertThat(statistics.categoryIssuesMap()).containsExactlyInAnyOrderEntriesOf(categoryIssuesMap); } @Test diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java index 5812c2923e0e..4646464e8458 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationJenkinsGitlabTest.java @@ -74,6 +74,18 @@ void testExportSubmissionsByParticipationIds_includePracticeSubmissions() throws programmingExerciseIntegrationTestService.testExportSubmissionsByParticipationIds_includePracticeSubmissions(); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectNameError() throws Exception { + programmingExerciseIntegrationTestService.testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectNameError(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectName() throws Exception { + programmingExerciseIntegrationTestService.testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectName(); + } + @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testExportSubmissionsByParticipationIds() throws Exception { @@ -562,6 +574,12 @@ void createProgrammingExercise_projectTypeNotExpected_badRequest() throws Except programmingExerciseIntegrationTestService.createProgrammingExercise_projectTypeNotExpected_badRequest(); } + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void createProgrammingExercise_onlineCodeEditorNotExpected_badRequest() throws Exception { + programmingExerciseIntegrationTestService.createProgrammingExercise_onlineCodeEditorNotExpected_badRequest(); + } + private static Set generateSupportedLanguagesWithoutHaskell() { Set supportedLanguages = ArgumentSources.generateJenkinsSupportedLanguages(); supportedLanguages.remove(ProgrammingLanguage.HASKELL); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java index 23739bdaacd3..6b716d45b5a9 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseIntegrationTestService.java @@ -16,6 +16,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,6 +38,7 @@ import java.util.Optional; import java.util.Set; import java.util.function.BiFunction; +import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.zip.ZipFile; @@ -291,10 +293,6 @@ void setup(String userPrefix, MockDelegate mockDelegate, VersionControlService v GitService.commit(localGit).setMessage("empty").setAllowEmpty(true).setSign(false).setAuthor("test", "test@test.com").call(); localGit.push().call(); - // we use the temp repository as remote origin for all repositories that are created during the - // TODO: distinguish between template, test and solution - doReturn(new GitUtilService.MockFileRepositoryUri(remoteRepoFile)).when(versionControlService).getCloneRepositoryUri(anyString(), anyString()); - this.plagiarismChecksTestReposDir = Files.createTempDirectory("jplag-repos").toFile(); } @@ -388,8 +386,7 @@ List exportSubmissionsWithPracticeSubmissionByParticipationIds(boolean exc // Export with excludePracticeSubmissions var participationIds = programmingExerciseStudentParticipationRepository.findAll().stream().map(participation -> participation.getId().toString()).toList(); final var path = "/api/programming-exercises/" + programmingExercise.getId() + "/export-repos-by-participation-ids/" + String.join(",", participationIds); - var exportOptions = new RepositoryExportOptionsDTO(); - exportOptions.setExcludePracticeSubmissions(excludePracticeSubmissions); + var exportOptions = new RepositoryExportOptionsDTO(false, false, false, null, excludePracticeSubmissions, false, false, false, false); downloadedFile = request.postWithResponseBodyFile(path, exportOptions, HttpStatus.OK); assertThat(downloadedFile).exists(); @@ -402,7 +399,7 @@ void testExportSubmissionsByParticipationIds_excludePracticeSubmissions() throws // Make sure that the practice submission is not included assertThat(entries).anyMatch(entry -> entry.toString().endsWith(Path.of("student1", ".git").toString())) - .noneMatch(entry -> entry.toString().matches(".*practice-[^\\/]*student2.*.git$")); + .noneMatch(entry -> entry.toString().matches(".*practice-[^/]*student2.*.git$")); } void testExportSubmissionsByParticipationIds_includePracticeSubmissions() throws Exception { @@ -410,7 +407,7 @@ void testExportSubmissionsByParticipationIds_includePracticeSubmissions() throws // Make sure that the practice submission is included assertThat(entries).anyMatch(entry -> entry.toString().endsWith(Path.of("student1", ".git").toString())) - .anyMatch(entry -> entry.toString().matches(".*practice-[^\\/]*student2.*.git$")); + .anyMatch(entry -> entry.toString().matches(".*practice-[^/]*student2.*.git$")); } void testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectName() throws Exception { @@ -439,8 +436,7 @@ void testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectNa final var path = "/api/programming-exercises/" + programmingExercise.getId() + "/export-repos-by-participation-ids/" + String.join(",", List.of(participation.get().getId().toString())); // all options false by default, only test if export works at all - var exportOptions = new RepositoryExportOptionsDTO(); - exportOptions.setAddParticipantName(true); + var exportOptions = new RepositoryExportOptionsDTO(false, false, false, null, false, true, false, false, false); downloadedFile = request.postWithResponseBodyFile(path, exportOptions, HttpStatus.OK); assertThat(downloadedFile).exists(); @@ -483,8 +479,7 @@ void testExportSubmissionsByParticipationIds_addParticipantIdentifierToProjectNa final var path = "/api/programming-exercises/" + programmingExercise.getId() + "/export-repos-by-participation-ids/" + String.join(",", List.of(participation.get().getId().toString())); // all options false by default, only test if export works at all - var exportOptions = new RepositoryExportOptionsDTO(); - exportOptions.setAddParticipantName(true); + var exportOptions = new RepositoryExportOptionsDTO(false, false, false, null, false, true, false, false, false); downloadedFile = request.postWithResponseBodyFile(path, exportOptions, HttpStatus.OK); assertThat(downloadedFile).exists(); @@ -538,8 +533,6 @@ void testExportSubmissionAnonymizationCombining() throws Exception { // Rest call final var path = "/api/programming-exercises/" + programmingExercise.getId() + "/export-repos-by-participation-ids/" + participation1.getId(); - var exportOptions = getOptions(); - exportOptions.setAddParticipantName(false); downloadedFile = request.postWithResponseBodyFile(path, getOptions(), HttpStatus.OK); assertThat(downloadedFile).exists(); @@ -602,14 +595,7 @@ private File exportSubmissionsByStudentLogins(HttpStatus expectedStatus) throws } private RepositoryExportOptionsDTO getOptions() { - final var repositoryExportOptions = new RepositoryExportOptionsDTO(); - repositoryExportOptions.setFilterLateSubmissions(true); - repositoryExportOptions.setExcludePracticeSubmissions(false); - repositoryExportOptions.setCombineStudentCommits(true); - repositoryExportOptions.setAnonymizeRepository(true); - repositoryExportOptions.setAddParticipantName(true); - repositoryExportOptions.setNormalizeCodeStyle(true); - return repositoryExportOptions; + return new RepositoryExportOptionsDTO(false, true, false, null, false, true, true, true, true); } void testProgrammingExerciseDelete() throws Exception { @@ -1444,6 +1430,8 @@ void importProgrammingExercise_vcsProjectWithSameTitleAlreadyExists_badRequest() } void importProgrammingExercise_updatesTestCaseIds() throws Exception { + doReturn(new GitUtilService.MockFileRepositoryUri(remoteRepoFile)).when(versionControlService).getCloneRepositoryUri(anyString(), anyString()); + programmingExercise = programmingExerciseRepository.findByIdWithTemplateAndSolutionParticipationAndAuxiliaryRepositoriesElseThrow(programmingExercise.getId()); var tests = programmingExerciseUtilService.addTestCasesToProgrammingExercise(programmingExercise); var test1 = tests.getFirst(); @@ -1475,6 +1463,8 @@ void importProgrammingExercise_updatesTestCaseIds() throws Exception { var savedProgrammingExercise = programmingExerciseRepository.findByIdElseThrow(response.getId()); assertThat(savedProgrammingExercise.getProblemStatement()).isEqualTo(newProblemStatement); + + reset(versionControlService); } void exportSubmissionsByStudentLogins_notInstructorForExercise_forbidden() throws Exception { @@ -1488,8 +1478,7 @@ private String getDefaultAPIEndpointForExportRepos() { } void exportSubmissionsByStudentLogins_exportAllAsTutor_forbidden() throws Exception { - final var options = getOptions(); - options.setExportAllParticipants(true); + final var options = new RepositoryExportOptionsDTO(true, true, false, null, false, true, true, true, true); request.post(getDefaultAPIEndpointForExportRepos(), options, HttpStatus.FORBIDDEN); } @@ -1546,15 +1535,8 @@ void updateTestCases_asInstrutor() throws Exception { mockDelegate.mockTriggerBuild(programmingExercise.getSolutionParticipation()); mockDelegate.mockTriggerBuild(programmingExercise.getTemplateParticipation()); final var testCases = programmingExerciseTestCaseRepository.findByExerciseId(programmingExercise.getId()); - final var updates = testCases.stream().map(testCase -> { - final var testCaseUpdate = new ProgrammingExerciseTestCaseDTO(); - testCaseUpdate.setId(testCase.getId()); - testCaseUpdate.setVisibility(Visibility.AFTER_DUE_DATE); - testCaseUpdate.setWeight(testCase.getId() + 42.0); - testCaseUpdate.setBonusMultiplier(testCase.getId() + 1.0); - testCaseUpdate.setBonusPoints(testCase.getId() + 2.0); - return testCaseUpdate; - }).toList(); + final var updates = testCases.stream().map(testCase -> new ProgrammingExerciseTestCaseDTO(testCase.getId(), testCase.getId() + 42.0, testCase.getId() + 1.0, + testCase.getId() + 2.0, Visibility.AFTER_DUE_DATE)).toList(); final var endpoint = "/programming-exercises/" + programmingExercise.getId() + "/update-test-cases"; final var testCasesResponse = request.patchWithResponseBody("/api" + endpoint, updates, new TypeReference>() { @@ -1578,15 +1560,8 @@ void updateTestCases_asInstrutor_triggerBuildFails() throws Exception { mockDelegate.mockTriggerBuildFailed(programmingExercise.getTemplateParticipation()); final var testCases = programmingExerciseTestCaseRepository.findByExerciseId(programmingExercise.getId()); - final var updates = testCases.stream().map(testCase -> { - final var testCaseUpdate = new ProgrammingExerciseTestCaseDTO(); - testCaseUpdate.setId(testCase.getId()); - testCaseUpdate.setVisibility(Visibility.AFTER_DUE_DATE); - testCaseUpdate.setWeight(testCase.getId() + 42.0); - testCaseUpdate.setBonusMultiplier(testCase.getId() + 1.0); - testCaseUpdate.setBonusPoints(testCase.getId() + 2.0); - return testCaseUpdate; - }).toList(); + final var updates = testCases.stream().map(testCase -> new ProgrammingExerciseTestCaseDTO(testCase.getId(), testCase.getId() + 42.0, testCase.getId() + 1.0, + testCase.getId() + 2.0, Visibility.AFTER_DUE_DATE)).toList(); final var endpoint = "/programming-exercises/" + programmingExercise.getId() + "/update-test-cases"; final var testCasesResponse = request.patchWithResponseBody("/api" + endpoint, updates, new TypeReference>() { @@ -1596,14 +1571,14 @@ void updateTestCases_asInstrutor_triggerBuildFails() throws Exception { } void updateTestCases_nonExistingExercise_notFound() throws Exception { - final var update = new ProgrammingExerciseTestCaseDTO(); + final var update = new ProgrammingExerciseTestCaseDTO(null, null, null, null, null); final var endpoint = "/programming-exercises/" + (programmingExercise.getId() + 1337) + "/update-test-cases"; request.patchWithResponseBody("/api" + endpoint, List.of(update), String.class, HttpStatus.NOT_FOUND); } void updateTestCases_instructorInWrongCourse_forbidden() throws Exception { userUtilService.addInstructor("other-instructors", userPrefix + "other-instructor"); - final var update = new ProgrammingExerciseTestCaseDTO(); + final var update = new ProgrammingExerciseTestCaseDTO(null, null, null, null, null); final var endpoint = "/programming-exercises/" + programmingExercise.getId() + "/update-test-cases"; request.patchWithResponseBody("/api" + endpoint, List.of(update), String.class, HttpStatus.FORBIDDEN); @@ -1611,15 +1586,8 @@ void updateTestCases_instructorInWrongCourse_forbidden() throws Exception { void updateTestCases_testCaseWeightSmallerThanZero_badRequest() throws Exception { final var testCases = programmingExerciseTestCaseRepository.findByExerciseId(programmingExercise.getId()); - final var updates = testCases.stream().map(testCase -> { - final var testCaseUpdate = new ProgrammingExerciseTestCaseDTO(); - testCaseUpdate.setId(testCase.getId()); - testCaseUpdate.setVisibility(Visibility.AFTER_DUE_DATE); - testCaseUpdate.setWeight(-1.); - testCaseUpdate.setBonusMultiplier(testCase.getId() + 1.0); - testCaseUpdate.setBonusPoints(testCase.getId() + 2.0); - return testCaseUpdate; - }).toList(); + final var updates = testCases.stream() + .map(testCase -> new ProgrammingExerciseTestCaseDTO(testCase.getId(), -1., testCase.getId() + 1.0, testCase.getId() + 2.0, Visibility.AFTER_DUE_DATE)).toList(); final var endpoint = "/programming-exercises/" + programmingExercise.getId() + "/update-test-cases"; request.patchWithResponseBody("/api" + endpoint, updates, String.class, HttpStatus.BAD_REQUEST); @@ -1628,7 +1596,9 @@ void updateTestCases_testCaseWeightSmallerThanZero_badRequest() throws Exception void updateTestCases_testCaseMultiplierSmallerThanZero_badRequest() throws Exception { final var testCases = List.copyOf(programmingExerciseTestCaseRepository.findByExerciseId(programmingExercise.getId())); final var updates = transformTestCasesToDto(testCases); - updates.getFirst().setBonusMultiplier(-1.0); + var firstUpdate = updates.getFirst(); + firstUpdate = new ProgrammingExerciseTestCaseDTO(firstUpdate.id(), firstUpdate.weight(), -1.0, firstUpdate.bonusPoints(), firstUpdate.visibility()); + updates.set(0, firstUpdate); final var endpoint = "/programming-exercises/" + programmingExercise.getId() + "/update-test-cases"; request.performMvcRequest( @@ -1653,26 +1623,22 @@ void updateTestCases_testCaseBonusPointsNull() throws Exception { mockDelegate.mockTriggerBuild(programmingExercise.getTemplateParticipation()); final var updates = transformTestCasesToDto(testCases); - updates.getFirst().setBonusPoints(null); + var firstUpdate = updates.getFirst(); + firstUpdate = new ProgrammingExerciseTestCaseDTO(firstUpdate.id(), firstUpdate.weight(), firstUpdate.bonusMultiplier(), null, firstUpdate.visibility()); + updates.set(0, firstUpdate); + final var endpoint = "/programming-exercises/" + programmingExercise.getId() + "/update-test-cases"; final var testCasesResponse = request.patchWithResponseBody("/api" + endpoint, updates, new TypeReference>() { }, HttpStatus.OK); - final var updatedTestCase = testCasesResponse.stream().filter(testCase -> testCase.getId().equals(updates.getFirst().getId())).findFirst().orElseThrow(); + final var updatedTestCase = testCasesResponse.stream().filter(testCase -> testCase.getId().equals(updates.getFirst().id())).findFirst().orElseThrow(); assertThat(updatedTestCase.getBonusPoints()).isZero(); assertThat(testCasesResponse.stream().filter(testCase -> !testCase.getId().equals(updatedTestCase.getId()))).allMatch(testCase -> testCase.getBonusPoints() == 1d); } private static List transformTestCasesToDto(Collection testCases) { - return testCases.stream().map(testCase -> { - final var testCaseUpdate = new ProgrammingExerciseTestCaseDTO(); - testCaseUpdate.setId(testCase.getId()); - testCaseUpdate.setVisibility(testCase.getVisibility()); - testCaseUpdate.setWeight(testCase.getWeight()); - testCaseUpdate.setBonusMultiplier(testCase.getBonusMultiplier()); - testCaseUpdate.setBonusPoints(testCase.getBonusPoints()); - return testCaseUpdate; - }).toList(); + return testCases.stream().map(testCase -> new ProgrammingExerciseTestCaseDTO(testCase.getId(), testCase.getWeight(), testCase.getBonusMultiplier(), + testCase.getBonusPoints(), testCase.getVisibility())).collect(Collectors.toCollection(ArrayList::new)); } void resetTestCaseWeights_asInstructor() throws Exception { @@ -1955,11 +1921,11 @@ void testGetPlagiarismResultWithoutExercise() throws Exception { void testValidateValidAuxiliaryRepository() throws Exception { AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults(); - testAuxRepo(auxRepoBuilder, HttpStatus.CREATED); + testAuxRepo(auxRepoBuilder, HttpStatus.OK); } void testValidateAuxiliaryRepositoryIdSetOnRequest() throws Exception { - testAuxRepo(AuxiliaryRepositoryBuilder.defaults().withId(0L), HttpStatus.BAD_REQUEST); + testAuxRepo(AuxiliaryRepositoryBuilder.defaults().withId(0L), HttpStatus.INTERNAL_SERVER_ERROR); } @@ -1988,12 +1954,12 @@ void testValidateAuxiliaryRepositoryWithInvalidCheckoutDirectory() throws Except void testValidateAuxiliaryRepositoryWithoutCheckoutDirectory() throws Exception { AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults().withoutCheckoutDirectory(); - testAuxRepo(auxRepoBuilder, HttpStatus.CREATED); + testAuxRepo(auxRepoBuilder, HttpStatus.OK); } void testValidateAuxiliaryRepositoryWithBlankCheckoutDirectory() throws Exception { AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults().withCheckoutDirectory(" "); - testAuxRepo(auxRepoBuilder, HttpStatus.CREATED); + testAuxRepo(auxRepoBuilder, HttpStatus.OK); } void testValidateAuxiliaryRepositoryWithTooLongCheckoutDirectory() throws Exception { @@ -2016,7 +1982,7 @@ void testValidateAuxiliaryRepositoryWithTooLongDescription() throws Exception { void testValidateAuxiliaryRepositoryWithoutDescription() throws Exception { AuxiliaryRepositoryBuilder auxRepoBuilder = AuxiliaryRepositoryBuilder.defaults().withoutDescription(); - testAuxRepo(auxRepoBuilder, HttpStatus.CREATED); + testAuxRepo(auxRepoBuilder, HttpStatus.OK); } void testGetAuxiliaryRepositoriesMissingExercise() throws Exception { @@ -2077,9 +2043,7 @@ void testResetOnlyDeleteBuildPlansSuccess() throws Exception { // Two participations exist with build plans before reset var participations = programmingExerciseStudentParticipationRepository.findByExerciseId(programmingExercise.getId()); assertThat(participations).hasSize(2); - participations.forEach(participation -> { - assertThat(participation.getBuildPlanId()).isNotNull(); - }); + participations.forEach(participation -> assertThat(participation.getBuildPlanId()).isNotNull()); var resetOptions = new ProgrammingExerciseResetOptionsDTO(true, false, false, false); request.put(defaultResetEndpoint(programmingExercise.getId()), resetOptions, HttpStatus.OK); @@ -2087,9 +2051,7 @@ void testResetOnlyDeleteBuildPlansSuccess() throws Exception { // Two participations exist with build plans removed after reset participations = programmingExerciseStudentParticipationRepository.findByExerciseId(programmingExercise.getId()); assertThat(participations).hasSize(2); - participations.forEach(participation -> { - assertThat(participation.getBuildPlanId()).isNull(); - }); + participations.forEach(participation -> assertThat(participation.getBuildPlanId()).isNull()); } void testResetDeleteBuildPlansAndDeleteStudentRepositoriesSuccess() throws Exception { @@ -2197,7 +2159,7 @@ public void addAuxiliaryRepositoryToExercise(ProgrammingExercise exercise) { } private String defaultAuxiliaryRepositoryEndpoint() { - return "/api/programming-exercises/setup"; + return "/api/programming-exercises"; } private String defaultResetEndpoint() { @@ -2230,17 +2192,7 @@ private void testAuxRepo(AuxiliaryRepositoryBuilder body, HttpStatus expectedSta private void testAuxRepo(List body, HttpStatus expectedStatus) throws Exception { programmingExercise.setAuxiliaryRepositories(body); - programmingExercise.setId(null); - programmingExercise.setSolutionParticipation(null); - programmingExercise.setTemplateParticipation(null); - programmingExercise.setChannelName("pe-test"); - programmingExercise.setShortName("ExerciseTitle"); - programmingExercise.setTitle("Title"); - if (expectedStatus == HttpStatus.CREATED) { - mockDelegate.mockConnectorRequestsForSetup(programmingExercise, false, false, false); - mockDelegate.mockGetProjectKeyFromAnyUrl(programmingExercise.getProjectKey()); - } - request.postWithResponseBody(defaultAuxiliaryRepositoryEndpoint(), programmingExercise, ProgrammingExercise.class, expectedStatus); + request.putWithResponseBody(defaultAuxiliaryRepositoryEndpoint(), programmingExercise, ProgrammingExercise.class, expectedStatus); } private static class AuxiliaryRepositoryBuilder { @@ -2314,8 +2266,8 @@ AuxiliaryRepository get() { } } - void testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden() throws Exception { - userUtilService.addInstructor("other-instructors", userPrefix + "instructoralt"); + void testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden(String testPrefix) throws Exception { + userUtilService.addInstructor("other-instructors", testPrefix + "instructoralt"); programmingExerciseUtilService.addCourseWithOneProgrammingExercise(); ProgrammingExercise programmingExercise = programmingExerciseTestRepository.findAllWithEagerTemplateAndSolutionParticipations().getFirst(); request.put("/api/programming-exercises/" + programmingExercise.getId() + "/re-evaluate", programmingExercise, HttpStatus.FORBIDDEN); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCIntegrationTest.java new file mode 100644 index 000000000000..0194806e6028 --- /dev/null +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseLocalVCIntegrationTest.java @@ -0,0 +1,203 @@ +package de.tum.cit.aet.artemis.programming; + +import java.io.IOException; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.security.test.context.support.WithMockUser; + +class ProgrammingExerciseLocalVCIntegrationTest extends AbstractProgrammingIntegrationLocalCILocalVCTest { + + private static final String TEST_PREFIX = "programmingexerciselocalvc"; + + @BeforeEach + void initTestCase() throws Exception { + programmingExerciseIntegrationTestService.setup(TEST_PREFIX, this, versionControlService, continuousIntegrationService); + } + + @AfterEach + void tearDown() throws IOException { + programmingExerciseIntegrationTestService.tearDown(); + } + + protected String getTestPrefix() { + return TEST_PREFIX; + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateValidAuxiliaryRepository() throws Exception { + programmingExerciseIntegrationTestService.testValidateValidAuxiliaryRepository(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryIdSetOnRequest() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryIdSetOnRequest(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithoutName() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithoutName(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithTooLongName() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithTooLongName(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithDuplicatedName() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithDuplicatedName(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithRestrictedName() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithRestrictedName(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithInvalidCheckoutDirectory() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithInvalidCheckoutDirectory(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithoutCheckoutDirectory() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithoutCheckoutDirectory(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithBlankCheckoutDirectory() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithBlankCheckoutDirectory(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithTooLongCheckoutDirectory() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithTooLongCheckoutDirectory(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithDuplicatedCheckoutDirectory() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithDuplicatedCheckoutDirectory(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithNullCheckoutDirectory() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithNullCheckoutDirectory(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithTooLongDescription() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithTooLongDescription(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testValidateAuxiliaryRepositoryWithoutDescription() throws Exception { + programmingExerciseIntegrationTestService.testValidateAuxiliaryRepositoryWithoutDescription(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetAuxiliaryRepositoriesMissingExercise() throws Exception { + programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesMissingExercise(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetAuxiliaryRepositoriesOk() throws Exception { + programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesOk(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testGetAuxiliaryRepositoriesEmptyOk() throws Exception { + programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesEmptyOk(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testGetAuxiliaryRepositoriesForbidden() throws Exception { + programmingExerciseIntegrationTestService.testGetAuxiliaryRepositoriesForbidden(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER") + void testExportAuxiliaryRepositoryForbidden() throws Exception { + programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryForbidden(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testExportAuxiliaryRepositoryBadRequest() throws Exception { + programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryBadRequest(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testExportAuxiliaryRepositoryExerciseNotFound() throws Exception { + programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryExerciseNotFound(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testExportAuxiliaryRepositoryRepositoryNotFound() throws Exception { + programmingExerciseIntegrationTestService.testExportAuxiliaryRepositoryRepositoryNotFound(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructoralt1", roles = "INSTRUCTOR") + void testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden() throws Exception { + programmingExerciseIntegrationTestService.testReEvaluateAndUpdateProgrammingExercise_instructorNotInCourse_forbidden(TEST_PREFIX); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testReEvaluateAndUpdateProgrammingExercise_notFound() throws Exception { + programmingExerciseIntegrationTestService.testReEvaluateAndUpdateProgrammingExercise_notFound(); + } + + @Test + @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + void testReEvaluateAndUpdateProgrammingExercise_isNotSameGivenExerciseIdInRequestBody_conflict() throws Exception { + programmingExerciseIntegrationTestService.testReEvaluateAndUpdateProgrammingExercise_isNotSameGivenExerciseIdInRequestBody_conflict(); + } + // + // @Test + // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + // void test_redirectGetSolutionRepositoryFilesWithoutContent() throws Exception { + // programmingExerciseIntegrationTestService.test_redirectGetSolutionRepositoryFilesWithoutContent(); + // } + // + // @Test + // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + // void test_redirectGetTemplateRepositoryFilesWithContent() throws Exception { + // programmingExerciseIntegrationTestService.test_redirectGetTemplateRepositoryFilesWithContent(); + // } + // + // @Test + // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + // void testRedirectGetParticipationRepositoryFilesWithContentAtCommit() throws Exception { + // programmingExerciseIntegrationTestService.testRedirectGetParticipationRepositoryFilesWithContentAtCommit(); + // } + // + // @Test + // @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") + // void testRedirectGetParticipationRepositoryFilesWithContentAtCommitForbidden() throws Exception { + // programmingExerciseIntegrationTestService.testRedirectGetParticipationRepositoryFilesWithContentAtCommitForbidden(); + // } + + // TODO add all other tests +} diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTemplateIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTemplateIntegrationTest.java index 909814b1e829..ff5faef25c3b 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTemplateIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTemplateIntegrationTest.java @@ -2,7 +2,7 @@ import static de.tum.cit.aet.artemis.core.util.TestConstants.COMMIT_HASH_OBJECT_ID; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Fail.fail; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; @@ -83,13 +83,11 @@ class ProgrammingExerciseTemplateIntegrationTest extends AbstractProgrammingInte @BeforeAll static void detectMavenHome() { /* - * Maven invoker only looks for those two values and ignores maven, even if it is available over PATH. Because Maven reports the path when "-version" is used, we use that - * to auto-detect the maven home and store it in the system properties. + * Maven invoker only looks for system properties and ignores maven, even if it is available over PATH. + * Because Maven reports the path when "-version" is used, we use that to auto-detect the maven home and store it in the system properties. */ - String m2Home = System.getenv("M2_HOME"); - String mavenHome = System.getProperty("maven.home"); - if (m2Home != null || mavenHome != null) { + if (isMavenHomeSet()) { return; } @@ -98,57 +96,68 @@ static void detectMavenHome() { var lines = runProcess(new ProcessBuilder(mvnExecutable, "-version")); String prefix = "maven home:"; Optional home = lines.stream().filter(line -> line.toLowerCase().startsWith(prefix)).findFirst(); - if (home.isPresent()) { - System.setProperty("maven.home", home.get().substring(prefix.length()).strip()); - } - else { - fail("maven home not found, unexpected '-version' format"); - } + home.ifPresent(homeLocation -> System.setProperty("maven.home", homeLocation.substring(prefix.length()).strip())); } catch (Exception e) { - fail("maven home not found", e); + log.debug("maven home not found", e); } } + private static boolean isMavenHomeSet() { + String m2Home = System.getenv("M2_HOME"); + String mavenHome = System.getProperty("maven.home"); + + return m2Home != null || mavenHome != null; + } + @BeforeAll static void findAndSetJava17Home() throws Exception { if (Os.isFamily(Os.FAMILY_UNIX) || Os.isFamily(Os.FAMILY_MAC)) { - // Use which to find all java installations on Linux - var javaInstallations = runProcess(new ProcessBuilder("which", "-a", "java")); - for (String path : javaInstallations) { - File binFolder = new File(path).getParentFile(); - if (checkJavaVersion(binFolder, "./java", "-version")) { - return; - } - } + findAndSetJava17UnixSystems(); + } + else if (Os.isFamily(Os.FAMILY_WINDOWS)) { + findAndSetJava17Windows(); + } + } - var alternativeInstallations = runProcess(new ProcessBuilder("/usr/libexec/java_home", "-v", "17")); - for (String path : alternativeInstallations) { - File binFolder = new File(path).getParentFile(); - binFolder = new File(binFolder, "Home/bin"); - if (checkJavaVersion(binFolder, "./java", "-version")) { - return; - } + private static void findAndSetJava17UnixSystems() throws Exception { + // Use which to find all java installations on Linux + var javaInstallations = runProcess(new ProcessBuilder("which", "-a", "java")); + for (String path : javaInstallations) { + File binFolder = new File(path).getParentFile(); + if (checkJavaVersion(binFolder, "./java", "-version")) { + return; } } - else if (Os.isFamily(Os.FAMILY_WINDOWS)) { - // Use PATH to find all java installations on windows - String[] path = System.getenv("PATH").split(";"); - var java17 = Arrays.stream(path).map(Path::of).filter(p -> p.endsWith("bin")).filter(Files::isDirectory).filter(binDir -> Files.exists(binDir.resolve("java.exe"))) - .filter(binDir -> { - try { - return checkJavaVersion(binDir.toFile(), "cmd", "/c", "java.exe", "-version"); - } - catch (Exception e) { - return false; - } - }).findFirst(); - - if (java17.isPresent()) { + + // Mac systems have additional locations where Java could potentially be + if (Os.isFamily(Os.FAMILY_MAC)) { + findAndSetJava17Mac(); + } + } + + private static void findAndSetJava17Mac() throws Exception { + var alternativeInstallations = runProcess(new ProcessBuilder("/usr/libexec/java_home", "-v", "17")); + for (String path : alternativeInstallations) { + File binFolder = new File(path).getParentFile(); + binFolder = new File(binFolder, "Home/bin"); + if (checkJavaVersion(binFolder, "./java", "-version")) { return; } } - fail("Java 17 not found"); + } + + private static void findAndSetJava17Windows() { + // Use PATH to find all java installations on windows + String[] path = System.getenv("PATH").split(";"); + Arrays.stream(path).map(Path::of).filter(p -> p.endsWith("bin")).filter(Files::isDirectory).filter(binDir -> Files.exists(binDir.resolve("java.exe"))).forEach(binDir -> { + try { + checkJavaVersion(binDir.toFile(), "cmd", "/c", "java.exe", "-version"); + } + catch (Exception e) { + // ignore: we still continue to find another Java installation + } + }); } private static boolean checkJavaVersion(File binFolder, String... command) throws Exception { @@ -248,6 +257,7 @@ private Stream languageTypeBuilder() { @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") @MethodSource("languageTypeBuilder") void testTemplateExercise(ProgrammingLanguage language, ProjectType projectType, boolean testwiseCoverageAnalysis) throws Exception { + checkPreconditionsForJavaTemplateExecution(projectType); runTests(language, projectType, exerciseRepo, TestResult.FAILED, testwiseCoverageAnalysis); } @@ -255,9 +265,17 @@ void testTemplateExercise(ProgrammingLanguage language, ProjectType projectType, @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") @MethodSource("languageTypeBuilder") void testTemplateSolution(ProgrammingLanguage language, ProjectType projectType, boolean testwiseCoverageAnalysis) throws Exception { + checkPreconditionsForJavaTemplateExecution(projectType); runTests(language, projectType, solutionRepo, TestResult.SUCCESSFUL, testwiseCoverageAnalysis); } + private void checkPreconditionsForJavaTemplateExecution(final ProjectType projectType) { + if (projectType == null || projectType.isMaven()) { + assumeTrue(isMavenHomeSet(), "Could not find Maven. Skipping execution of template tests."); + } + assumeTrue(java17Home != null, "Could not find Java 17. Skipping execution of template tests."); + } + private void runTests(ProgrammingLanguage language, ProjectType projectType, LocalRepository repository, TestResult testResult, boolean testwiseCoverageAnalysis) throws Exception { exercise.setProgrammingLanguage(language); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java index 504d895a9200..47aa4af868d1 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingExerciseTestCaseServiceTest.java @@ -95,12 +95,7 @@ void shouldUpdateTestWeight() { ProgrammingExerciseTestCase testCase = testCaseRepository.findByExerciseId(programmingExercise.getId()).iterator().next(); Set programmingExerciseTestCaseDTOS = new HashSet<>(); - ProgrammingExerciseTestCaseDTO programmingExerciseTestCaseDTO = new ProgrammingExerciseTestCaseDTO(); - programmingExerciseTestCaseDTO.setId(testCase.getId()); - programmingExerciseTestCaseDTO.setWeight(400.0); - programmingExerciseTestCaseDTO.setBonusMultiplier(1.0); - programmingExerciseTestCaseDTO.setBonusPoints(0.0); - programmingExerciseTestCaseDTO.setVisibility(Visibility.ALWAYS); + ProgrammingExerciseTestCaseDTO programmingExerciseTestCaseDTO = new ProgrammingExerciseTestCaseDTO(testCase.getId(), 400.0, 1.0, 0.0, Visibility.ALWAYS); programmingExerciseTestCaseDTOS.add(programmingExerciseTestCaseDTO); assertThat(programmingExercise.getTestCasesChanged()).isFalse(); @@ -131,16 +126,9 @@ void shouldAllowTestCaseWeightSumZero(AssessmentType assessmentType) { feedbackCreationService.generateTestCasesFromBuildResult(result, programmingExercise); Set testCases = testCaseRepository.findByExerciseId(programmingExercise.getId()); - Set testCaseDTOs = testCases.stream().map(testCase -> { - final ProgrammingExerciseTestCaseDTO testCaseDTO = new ProgrammingExerciseTestCaseDTO(); - testCaseDTO.setId(testCase.getId()); - testCaseDTO.setBonusMultiplier(testCase.getBonusMultiplier()); - testCaseDTO.setBonusPoints(testCase.getBonusPoints()); - testCaseDTO.setVisibility(testCase.getVisibility()); - testCaseDTO.setWeight(0.0); - return testCaseDTO; - }).collect(Collectors.toSet()); - + Set testCaseDTOs = testCases.stream() + .map(testCase -> new ProgrammingExerciseTestCaseDTO(testCase.getId(), 0.0, testCase.getBonusMultiplier(), testCase.getBonusPoints(), testCase.getVisibility())) + .collect(Collectors.toSet()); Set updated = testCaseService.update(programmingExercise.getId(), testCaseDTOs); assertThat(updated).hasSize(3).allMatch(testCase -> testCase.getWeight() == 0.0); } diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java index 102643f76237..89dc295175d7 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/ProgrammingSubmissionAndResultGitlabJenkinsIntegrationTest.java @@ -117,7 +117,7 @@ void shouldExtractBuildLogAnalytics_noSca() throws Exception { assertThat(statistics.buildCount()).isEqualTo(1); assertThat(statistics.agentSetupDuration()).isEqualTo(90); assertThat(statistics.testDuration()).isEqualTo(10); - assertThat(statistics.scaDuration()).isNull(); + assertThat(statistics.scaDuration()).isEqualTo(0.0); assertThat(statistics.totalJobDuration()).isEqualTo(110); assertThat(statistics.dependenciesDownloadedCount()).isEqualTo(1); } @@ -156,11 +156,11 @@ void shouldExtractBuildLogAnalytics_noSca_gradle() throws Exception { var statistics = buildLogStatisticsEntryRepository.findAverageBuildLogStatistics(exercise); assertThat(statistics.buildCount()).isEqualTo(1); - assertThat(statistics.agentSetupDuration()).isNull(); + assertThat(statistics.agentSetupDuration()).isEqualTo(0.0); assertThat(statistics.testDuration()).isEqualTo(20); - assertThat(statistics.scaDuration()).isNull(); + assertThat(statistics.scaDuration()).isEqualTo(0.0); assertThat(statistics.totalJobDuration()).isEqualTo(20); - assertThat(statistics.dependenciesDownloadedCount()).isNull(); + assertThat(statistics.dependenciesDownloadedCount()).isEqualTo(0.0); } @Test @@ -209,11 +209,11 @@ void shouldExtractBuildLogAnalytics_unsupportedProgrammingLanguage() throws Exce var statistics = buildLogStatisticsEntryRepository.findAverageBuildLogStatistics(exercise); // Should not extract any statistics assertThat(statistics.buildCount()).isZero(); - assertThat(statistics.agentSetupDuration()).isNull(); - assertThat(statistics.testDuration()).isNull(); - assertThat(statistics.scaDuration()).isNull(); - assertThat(statistics.totalJobDuration()).isNull(); - assertThat(statistics.dependenciesDownloadedCount()).isNull(); + assertThat(statistics.agentSetupDuration()).isEqualTo(0.0); + assertThat(statistics.testDuration()).isEqualTo(0.0); + assertThat(statistics.scaDuration()).isEqualTo(0.0); + assertThat(statistics.totalJobDuration()).isEqualTo(0.0); + assertThat(statistics.dependenciesDownloadedCount()).isEqualTo(0.0); } private static Stream shouldSaveBuildLogsOnStudentParticipationArguments() { diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCIntegrationTest.java index af998a54a556..4f6840fd63f4 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCIntegrationTest.java @@ -110,7 +110,7 @@ void testFetchPush_repositoryDoesNotExist() throws IOException, GitAPIException, void testFetchPush_usingVcsAccessToken() { var programmingParticipation = localVCLocalCITestService.createParticipation(programmingExercise, student1Login); var student = userUtilService.getUserByLogin(student1Login); - var participationVcsAccessToken = localVCLocalCITestService.getParticipationVcsAccessToken(student.getId(), programmingParticipation.getId()); + var participationVcsAccessToken = localVCLocalCITestService.getParticipationVcsAccessToken(student, programmingParticipation.getId()); var token = participationVcsAccessToken.getVcsAccessToken(); programmingExerciseRepository.save(programmingExercise); diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCITestService.java b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCITestService.java index c6d7556e3766..7ad94838921f 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCITestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/icl/LocalVCLocalCITestService.java @@ -676,13 +676,13 @@ public void verifyRepositoryFoldersExist(ProgrammingExercise programmingExercise /** * Gets the participationVcsAccessToken belonging to a user and a participation * - * @param userId The user's id + * @param user The user * @param programmingParticipationId The participation's id * * @return the participationVcsAccessToken of the user for the given participationId */ - public ParticipationVCSAccessToken getParticipationVcsAccessToken(Long userId, Long programmingParticipationId) { - return participationVcsAccessTokenService.findByUserIdAndParticipationIdOrElseThrow(userId, programmingParticipationId); + public ParticipationVCSAccessToken getParticipationVcsAccessToken(User user, Long programmingParticipationId) { + return participationVcsAccessTokenService.findByUserAndParticipationIdOrElseThrow(user, programmingParticipationId); } /** diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java index b8963f3decae..21b133700a9e 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseTestService.java @@ -2630,12 +2630,12 @@ public void buildLogStatistics_noStatistics() throws Exception { exercise.setBuildConfig(programmingExerciseBuildConfigRepository.save(exercise.getBuildConfig())); exercise = programmingExerciseRepository.save(exercise); var statistics = request.get("/api/programming-exercises/" + exercise.getId() + "/build-log-statistics", HttpStatus.OK, BuildLogStatisticsDTO.class); - assertThat(statistics.buildCount()).isZero(); - assertThat(statistics.agentSetupDuration()).isNull(); - assertThat(statistics.testDuration()).isNull(); - assertThat(statistics.scaDuration()).isNull(); - assertThat(statistics.totalJobDuration()).isNull(); - assertThat(statistics.dependenciesDownloadedCount()).isNull(); + assertThat(statistics.buildCount()).isEqualTo(0); + assertThat(statistics.agentSetupDuration()).isEqualTo(0); + assertThat(statistics.testDuration()).isEqualTo(0); + assertThat(statistics.scaDuration()).isEqualTo(0); + assertThat(statistics.totalJobDuration()).isEqualTo(0); + assertThat(statistics.dependenciesDownloadedCount()).isEqualTo(0); } // TEST diff --git a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java index e27ce95ac8ca..7178f4376a08 100644 --- a/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java +++ b/src/test/java/de/tum/cit/aet/artemis/programming/util/ProgrammingExerciseUtilService.java @@ -42,6 +42,7 @@ import de.tum.cit.aet.artemis.exam.util.ExamUtilService; import de.tum.cit.aet.artemis.exercise.domain.InitializationState; import de.tum.cit.aet.artemis.exercise.domain.SubmissionType; +import de.tum.cit.aet.artemis.exercise.domain.Team; import de.tum.cit.aet.artemis.exercise.domain.participation.Participation; import de.tum.cit.aet.artemis.exercise.domain.participation.StudentParticipation; import de.tum.cit.aet.artemis.exercise.participation.util.ParticipationFactory; @@ -741,6 +742,21 @@ public ProgrammingSubmission addProgrammingSubmission(ProgrammingExercise exerci return submission; } + /** + * Adds programming submission to provided programming exercise. The provided login is used to access or create a participation. + * + * @param exercise The exercise to which the submission should be added. + * @param submission The submission which should be added to the programming exercise. + * @param team The login of the user used to access or create an exercise participation. + * @return The created programming submission. + */ + public ProgrammingSubmission addProgrammingSubmissionToTeamExercise(ProgrammingExercise exercise, ProgrammingSubmission submission, Team team) { + StudentParticipation participation = participationUtilService.addTeamParticipationForProgrammingExercise(exercise, team); + submission.setParticipation(participation); + submission = programmingSubmissionRepo.save(submission); + return submission; + } + /** * Adds a submission with a result to the given programming exercise. The submission will be assigned to the corresponding participation of the given login (if exists or * create a new participation). diff --git a/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupsConfigurationIntegrationTest.java b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupsConfigurationIntegrationTest.java index 0dda38b7f7c6..64c5b0cba89a 100644 --- a/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupsConfigurationIntegrationTest.java +++ b/src/test/java/de/tum/cit/aet/artemis/tutorialgroup/TutorialGroupsConfigurationIntegrationTest.java @@ -115,13 +115,8 @@ void getOneOfCourse_asStudent_shouldReturnTutorialGroupsConfiguration() throws E @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void create_asInstructor_shouldCreateTutorialGroupsConfiguration() throws Exception { - // when - var temp = getTutorialGroupsConfigurationPath(courseId); - var temp2 = buildExampleConfiguration(courseId); - var configurationFromRequest = request.postWithResponseBody(getTutorialGroupsConfigurationPath(courseId), buildExampleConfiguration(courseId), TutorialGroupsConfiguration.class, HttpStatus.CREATED); - // then assertThat(configurationFromRequest).isNotNull(); this.assertConfigurationStructure(configurationFromRequest, FIRST_AUGUST_MONDAY, FIRST_SEPTEMBER_MONDAY, courseId, true, true); } @@ -170,7 +165,7 @@ void update_periodChange_deleteTutorialGroupFreePeriodsAndIndividualSessionsAndR * The problem was that jackson tried to deserialize the date and time with the date and time format checkers active, which failed. These checkers * should only be active in a direct create / update case to ensure uuuu-MM-dd format in the database. * - * @throws Exception + * @throws Exception if the request fails */ @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") diff --git a/src/test/javascript/spec/component/admin/cleanup-service/cleanup-service.component.spec.ts b/src/test/javascript/spec/component/admin/cleanup-service/cleanup-service.component.spec.ts new file mode 100644 index 000000000000..271315ee64a0 --- /dev/null +++ b/src/test/javascript/spec/component/admin/cleanup-service/cleanup-service.component.spec.ts @@ -0,0 +1,113 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { of, throwError } from 'rxjs'; +import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; +import dayjs from 'dayjs/esm'; + +import { ArtemisTestModule } from '../../../test.module'; +import { CleanupServiceComponent } from 'app/admin/cleanup-service/cleanup-service.component'; +import { CleanupOperation } from 'app/admin/cleanup-service/cleanup-operation.model'; +import { CleanupServiceExecutionRecordDTO, DataCleanupService } from 'app/admin/cleanup-service/data-cleanup.service'; +import { signal } from '@angular/core'; + +describe('CleanupServiceComponent', () => { + let comp: CleanupServiceComponent; + let fixture: ComponentFixture; + let cleanupService: DataCleanupService; + + beforeEach(() => { + const mockCleanupService = { + getLastExecutions: jest.fn(), + deleteOrphans: jest.fn(), + deletePlagiarismComparisons: jest.fn(), + deleteNonRatedResults: jest.fn(), + deleteOldRatedResults: jest.fn(), + deleteOldSubmissionVersions: jest.fn(), + deleteOldFeedback: jest.fn(), + }; + + TestBed.configureTestingModule({ + imports: [ArtemisTestModule, CleanupServiceComponent], + providers: [{ provide: DataCleanupService, useValue: mockCleanupService }], + }) + .compileComponents() + .then(() => { + fixture = TestBed.createComponent(CleanupServiceComponent); + comp = fixture.componentInstance; + cleanupService = TestBed.inject(DataCleanupService); + }); + }); + + it('should load last executions on init', () => { + const executionRecord: CleanupServiceExecutionRecordDTO[] = [{ executionDate: dayjs(), jobType: 'deleteOrphans' }]; + const response = new HttpResponse({ + body: executionRecord, + }); + + jest.spyOn(cleanupService, 'getLastExecutions').mockReturnValue(of(response)); + + comp.ngOnInit(); + + expect(cleanupService.getLastExecutions).toHaveBeenCalledOnce(); + expect(comp.cleanupOperations[0].lastExecuted).toEqual(dayjs(executionRecord[0].executionDate)); + }); + + it('should execute a cleanup operation successfully', () => { + const operation = comp.cleanupOperations[0]; + const response = new HttpResponse({ + body: { executionDate: dayjs(), jobType: 'deleteOrphans' }, + }); + + jest.spyOn(cleanupService, 'deleteOrphans').mockReturnValue(of(response)); + + comp.executeCleanupOperation(operation); + + expect(cleanupService.deleteOrphans).toHaveBeenCalledOnce(); + expect(operation.lastExecuted).toEqual(dayjs(response.body!.executionDate)); + }); + + it('should handle error when executing cleanup operation', () => { + const operation = comp.cleanupOperations[0]; + const errorResponse = new HttpErrorResponse({ + status: 500, + statusText: 'Internal Server Error', + error: 'Some error message', + url: 'https://artemis.ase.in.tum.de/api/admin/orphans', // Adding a mock URL + }); + + jest.spyOn(cleanupService, 'deleteOrphans').mockReturnValue(throwError(() => errorResponse)); + + let errorMessage: string | undefined; + comp.dialogError.subscribe((error) => { + errorMessage = error; + }); + + comp.executeCleanupOperation(operation); + + expect(cleanupService.deleteOrphans).toHaveBeenCalledOnce(); + expect(errorMessage).toBe('Http failure response for https://artemis.ase.in.tum.de/api/admin/orphans: 500 Internal Server Error'); + }); + + it('should validate date ranges correctly', () => { + const validOperation: CleanupOperation = { + name: 'deleteOrphans', + deleteFrom: dayjs().subtract(6, 'months'), + deleteTo: dayjs(), + lastExecuted: undefined, + datesValid: signal(true), + }; + + const invalidOperation: CleanupOperation = { + name: 'deleteOrphans', + deleteFrom: dayjs(), + deleteTo: dayjs().subtract(6, 'months'), + lastExecuted: undefined, + datesValid: signal(true), + }; + + comp.validateDates(validOperation); + comp.validateDates(invalidOperation); + + expect(validOperation.datesValid()).toBeTrue(); + expect(invalidOperation.datesValid()).toBeFalse(); + }); +}); diff --git a/src/test/javascript/spec/component/admin/cleanup-service/cleanup-service.service.spec.ts b/src/test/javascript/spec/component/admin/cleanup-service/cleanup-service.service.spec.ts new file mode 100644 index 000000000000..f64609872275 --- /dev/null +++ b/src/test/javascript/spec/component/admin/cleanup-service/cleanup-service.service.spec.ts @@ -0,0 +1,106 @@ +import { TestBed } from '@angular/core/testing'; +import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing'; +import dayjs from 'dayjs/esm'; +import { CleanupServiceExecutionRecordDTO, DataCleanupService } from 'app/admin/cleanup-service/data-cleanup.service'; +import { provideHttpClient } from '@angular/common/http'; + +describe('DataCleanupService', () => { + let service: DataCleanupService; + let httpMock: HttpTestingController; + + const mockDate = dayjs(); + const mockExecutionRecord: CleanupServiceExecutionRecordDTO = { executionDate: mockDate, jobType: 'deleteOrphans' }; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [], + providers: [DataCleanupService, provideHttpClient(), provideHttpClientTesting()], + }); + + service = TestBed.inject(DataCleanupService); + httpMock = TestBed.inject(HttpTestingController); + }); + + afterEach(() => { + httpMock.verify(); + }); + + it('should send DELETE request to delete orphans', () => { + service.deleteOrphans().subscribe((res) => { + expect(res.body).toEqual(mockExecutionRecord); + }); + + const req = httpMock.expectOne({ method: 'DELETE', url: 'api/admin/cleanup/orphans' }); + expect(req.request.method).toBe('DELETE'); + req.flush(mockExecutionRecord); + }); + + it('should send DELETE request to delete plagiarism comparisons with date range', () => { + const deleteFrom = '2024-03-07T13:06:36.100Z'; + const deleteTo = '2024-03-08T13:06:36.100Z'; + + service.deletePlagiarismComparisons(dayjs(deleteFrom), dayjs(deleteTo)).subscribe((res) => { + expect(res.body).toEqual(mockExecutionRecord); + }); + + const req = httpMock.expectOne({ + method: 'DELETE', + url: `api/admin/cleanup/plagiarism-comparisons?deleteFrom=${deleteFrom}&deleteTo=${deleteTo}`, + }); + + expect(req.request.method).toBe('DELETE'); + expect(req.request.params.get('deleteFrom')).toBe(deleteFrom); + expect(req.request.params.get('deleteTo')).toBe(deleteTo); + req.flush(mockExecutionRecord); + }); + + it('should send DELETE request to delete non-rated results with date range', () => { + const deleteFrom = '2024-03-07T13:06:36.100Z'; + const deleteTo = '2024-03-08T13:06:36.100Z'; + + service.deleteNonRatedResults(dayjs(deleteFrom), dayjs(deleteTo)).subscribe((res) => { + expect(res.body).toEqual(mockExecutionRecord); + }); + + const req = httpMock.expectOne({ + method: 'DELETE', + url: `api/admin/cleanup/non-rated-results?deleteFrom=${deleteFrom}&deleteTo=${deleteTo}`, + }); + + expect(req.request.method).toBe('DELETE'); + expect(req.request.params.get('deleteFrom')).toBe(deleteFrom); + expect(req.request.params.get('deleteTo')).toBe(deleteTo); + req.flush(mockExecutionRecord); + }); + + it('should send DELETE request to delete old rated results with date range', () => { + const deleteFrom = '2024-03-07T13:06:36.100Z'; + const deleteTo = '2024-03-08T13:06:36.100Z'; + + service.deleteOldRatedResults(dayjs(deleteFrom), dayjs(deleteTo)).subscribe((res) => { + expect(res.body).toEqual(mockExecutionRecord); + }); + + const req = httpMock.expectOne({ + method: 'DELETE', + url: `api/admin/cleanup/old-rated-results?deleteFrom=${deleteFrom}&deleteTo=${deleteTo}`, + }); + + expect(req.request.method).toBe('DELETE'); + expect(req.request.params.get('deleteFrom')).toBe(deleteFrom); + expect(req.request.params.get('deleteTo')).toBe(deleteTo); + req.flush(mockExecutionRecord); + }); + + it('should send GET request to get last executions', () => { + const mockExecutionRecords = [mockExecutionRecord]; + + service.getLastExecutions().subscribe((res) => { + expect(res.body).toEqual(mockExecutionRecords); + }); + + const req = httpMock.expectOne({ method: 'GET', url: 'api/admin/cleanup/last-executions' }); + expect(req.request.method).toBe('GET'); + req.flush(mockExecutionRecords); + }); +}); diff --git a/src/test/javascript/spec/component/competencies/competency-management/competency-management-table.component.spec.ts b/src/test/javascript/spec/component/competencies/competency-management/competency-management-table.component.spec.ts index e15cefdbc52d..52f2e52d587e 100644 --- a/src/test/javascript/spec/component/competencies/competency-management/competency-management-table.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/competency-management/competency-management-table.component.spec.ts @@ -52,6 +52,8 @@ describe('CompetencyManagementTableComponent', () => { }); it('should handle import all data', () => { + fixture.componentRef.setInput('allCompetencies', []); + fixture.detectChanges(); component.courseCompetencies = []; const responseBody: CompetencyWithTailRelationDTO[] = [ diff --git a/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts b/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts index b292d1f5145e..86b505b1f78e 100644 --- a/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/competency-management/competency-management.component.spec.ts @@ -2,11 +2,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; -import { Competency, CompetencyLectureUnitLink, CompetencyWithTailRelationDTO, CourseCompetencyProgress, CourseCompetencyType } from 'app/entities/competency.model'; +import { Competency, CompetencyWithTailRelationDTO, CourseCompetencyProgress, CourseCompetencyType } from 'app/entities/competency.model'; import { CompetencyManagementComponent } from 'app/course/competencies/competency-management/competency-management.component'; import { ActivatedRoute, provideRouter } from '@angular/router'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; -import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; import { AccountService } from 'app/core/auth/account.service'; import { ArtemisTestModule } from '../../../test.module'; import { NgbModal, NgbModalRef, NgbProgressbar } from '@ng-bootstrap/ng-bootstrap'; @@ -31,6 +30,8 @@ import { ImportAllCourseCompetenciesModalComponent, ImportAllCourseCompetenciesResult, } from 'app/course/competencies/components/import-all-course-competencies-modal/import-all-course-competencies-modal.component'; +import { MockProfileService } from '../../../helpers/mocks/service/mock-profile.service'; +import { MockAlertService } from '../../../helpers/mocks/service/mock-alert.service'; describe('CompetencyManagementComponent', () => { let fixture: ComponentFixture; @@ -39,11 +40,14 @@ describe('CompetencyManagementComponent', () => { let profileService: ProfileService; let irisSettingsService: IrisSettingsService; let modalService: NgbModal; + let alertService: AlertService; - let getAllForCourseSpy: any; + let getProfileInfoSpy: jest.SpyInstance; + let getAllForCourseSpy: jest.SpyInstance; + let getIrisSettingsSpy: jest.SpyInstance; - beforeEach(() => { - TestBed.configureTestingModule({ + beforeEach(async () => { + await TestBed.configureTestingModule({ imports: [ArtemisTestModule, NgbProgressbar], declarations: [ CompetencyManagementComponent, @@ -60,6 +64,14 @@ describe('CompetencyManagementComponent', () => { provideRouter([]), MockProvider(AccountService), MockProvider(AlertService), + { + provide: AlertService, + useClass: MockAlertService, + }, + { + provide: ProfileService, + useClass: MockProfileService, + }, { provide: NgbModal, useClass: MockNgbModalService }, { provide: ActivatedRoute, @@ -73,34 +85,42 @@ describe('CompetencyManagementComponent', () => { }, ], schemas: [], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(CompetencyManagementComponent); - component = fixture.componentInstance; - courseCompetencyApiService = TestBed.inject(CourseCompetencyApiService); - modalService = fixture.debugElement.injector.get(NgbModal); - - const competency: Competency = new Competency(); - const textUnit = new TextUnit(); - competency.id = 1; - competency.description = 'test'; - competency.lectureUnitLinks = [new CompetencyLectureUnitLink(competency, textUnit, 1)]; - const courseCompetencyProgress = new CourseCompetencyProgress(); - courseCompetencyProgress.competencyId = 1; - courseCompetencyProgress.numberOfStudents = 8; - courseCompetencyProgress.numberOfMasteredStudents = 5; - courseCompetencyProgress.averageStudentScore = 90; - - getAllForCourseSpy = jest.spyOn(courseCompetencyApiService, 'getCourseCompetenciesByCourseId').mockResolvedValue([ - competency, - { id: 5, type: CourseCompetencyType.COMPETENCY } as Competency, - { - id: 3, - type: CourseCompetencyType.PREREQUISITE, - } as Prerequisite, - ]); - }); + }).compileComponents(); + + courseCompetencyApiService = TestBed.inject(CourseCompetencyApiService); + irisSettingsService = TestBed.inject(IrisSettingsService); + profileService = TestBed.inject(ProfileService); + alertService = TestBed.inject(AlertService); + + const competency: Competency = new Competency(); + competency.id = 1; + competency.description = 'test'; + const courseCompetencyProgress = new CourseCompetencyProgress(); + courseCompetencyProgress.competencyId = 1; + courseCompetencyProgress.numberOfStudents = 8; + courseCompetencyProgress.numberOfMasteredStudents = 5; + courseCompetencyProgress.averageStudentScore = 90; + + getAllForCourseSpy = jest.spyOn(courseCompetencyApiService, 'getCourseCompetenciesByCourseId').mockResolvedValue([ + competency, + { id: 5, type: CourseCompetencyType.COMPETENCY } as Competency, + { + id: 3, + type: CourseCompetencyType.PREREQUISITE, + } as Prerequisite, + ]); + + const profileInfoResponse = { + activeProfiles: [PROFILE_IRIS], + } as ProfileInfo; + getProfileInfoSpy = jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(profileInfoResponse)); + + getIrisSettingsSpy = jest.spyOn(irisSettingsService, 'getCombinedCourseSettings'); + + fixture = TestBed.createComponent(CompetencyManagementComponent); + component = fixture.componentInstance; + + modalService = fixture.debugElement.injector.get(NgbModal); }); afterEach(() => { @@ -108,20 +128,15 @@ describe('CompetencyManagementComponent', () => { }); it('should show generate button if IRIS is enabled', async () => { - profileService = TestBed.inject(ProfileService); - irisSettingsService = TestBed.inject(IrisSettingsService); - const profileInfoResponse = { - activeProfiles: [PROFILE_IRIS], - } as ProfileInfo; const irisSettingsResponse = { irisCompetencyGenerationSettings: { enabled: true, }, } as IrisCourseSettings; - const getProfileInfoSpy = jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(profileInfoResponse)); - const getIrisSettingsSpy = jest.spyOn(irisSettingsService, 'getCombinedCourseSettings').mockReturnValue(of(irisSettingsResponse)); + getIrisSettingsSpy.mockReturnValue(of(irisSettingsResponse)); - component['loadIrisEnabled'](); + fixture.detectChanges(); + await fixture.whenStable(); fixture.detectChanges(); const generateButton = fixture.nativeElement.querySelector('#generateButton'); @@ -132,12 +147,52 @@ describe('CompetencyManagementComponent', () => { }); it('should load competencies and prerequisites', async () => { - await component.loadData(); + fixture.detectChanges(); + await fixture.whenStable(); - expect(getAllForCourseSpy).toHaveBeenCalledOnce(); + expect(getAllForCourseSpy).toHaveBeenCalledExactlyOnceWith(1); - expect(component.competencies).toHaveLength(2); - expect(component.prerequisites).toHaveLength(1); + expect(component.competencies()).toHaveLength(2); + expect(component.prerequisites()).toHaveLength(1); + }); + + it('should set isLoading correctly', async () => { + const isLoadingSpy = jest.spyOn(component.isLoading, 'set'); + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(isLoadingSpy).toHaveBeenNthCalledWith(1, true); + expect(isLoadingSpy).toHaveBeenNthCalledWith(2, false); + }); + + it('should show alert when loading iris settings fails', async () => { + const errorSpy = jest.spyOn(alertService, 'error'); + getIrisSettingsSpy.mockRejectedValueOnce({}); + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(errorSpy).toHaveBeenCalledOnce(); + }); + + it('should show alert when loading course competencies fails', async () => { + const errorSpy = jest.spyOn(alertService, 'error'); + getAllForCourseSpy.mockRejectedValueOnce({}); + + fixture.detectChanges(); + await fixture.whenStable(); + + expect(errorSpy).toHaveBeenCalledOnce(); + }); + + it('should open course competency explanation', () => { + sessionStorage.setItem('lastTimeVisitedCourseCompetencyExplanation', Date.now().toString()); + const openModalSpy = jest.spyOn(modalService, 'open'); + fixture.detectChanges(); + + component.openCourseCompetencyExplanation(); + expect(openModalSpy).toHaveBeenCalledOnce(); }); it('should open import modal and update values', async () => { @@ -163,20 +218,17 @@ describe('CompetencyManagementComponent', () => { jest.spyOn(modalService, 'open').mockReturnValue(modalRef); jest.spyOn(courseCompetencyApiService, 'importAllByCourseId').mockResolvedValue(importedCompetencies); - await component.loadData(); - const existingCompetencies = component.competencies.length; + const existingCompetencies = component.competencies().length; const importButton = fixture.debugElement.query(By.css('#courseCompetencyImportAllButton')); importButton.nativeElement.click(); fixture.detectChanges(); await fixture.whenStable(); - expect(modalService.open).toHaveBeenCalledWith(ImportAllCourseCompetenciesModalComponent, { + expect(modalService.open).toHaveBeenCalledExactlyOnceWith(ImportAllCourseCompetenciesModalComponent, { size: 'lg', backdrop: 'static', }); - fixture.detectChanges(); - await fixture.whenStable(); - expect(component.competencies).toHaveLength(existingCompetencies + 2); + expect(component.competencies()).toHaveLength(existingCompetencies + 2); }); }); diff --git a/src/test/javascript/spec/component/competencies/create-competency.component.spec.ts b/src/test/javascript/spec/component/competencies/create-competency.component.spec.ts index 2e12c077e859..2989e0865b16 100644 --- a/src/test/javascript/spec/component/competencies/create-competency.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/create-competency.component.spec.ts @@ -8,7 +8,6 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { CompetencyService } from 'app/course/competencies/competency.service'; import { LectureService } from 'app/lecture/lecture.service'; import { MockRouter } from '../../helpers/mocks/mock-router'; -import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; import { HttpResponse } from '@angular/common/http'; import { Competency } from 'app/entities/competency.model'; import { By } from '@angular/platform-browser'; @@ -106,12 +105,11 @@ describe('CreateCompetency', () => { const router: Router = TestBed.inject(Router); const competencyService = TestBed.inject(CompetencyService); - const textUnit: TextUnit = new TextUnit(); - textUnit.id = 1; const formData: CourseCompetencyFormData = { title: 'Test', description: 'Lorem Ipsum', optional: true, + masteryThreshold: 100, }; const response: HttpResponse = new HttpResponse({ diff --git a/src/test/javascript/spec/component/competencies/create-prerequisite.component.spec.ts b/src/test/javascript/spec/component/competencies/create-prerequisite.component.spec.ts index 56815999e7e4..dd0835b82149 100644 --- a/src/test/javascript/spec/component/competencies/create-prerequisite.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/create-prerequisite.component.spec.ts @@ -6,7 +6,6 @@ import { of } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { LectureService } from 'app/lecture/lecture.service'; import { MockRouter } from '../../helpers/mocks/mock-router'; -import { TextUnit } from 'app/entities/lecture-unit/textUnit.model'; import { HttpResponse } from '@angular/common/http'; import { By } from '@angular/platform-browser'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; @@ -111,12 +110,11 @@ describe('CreatePrerequisite', () => { const router: Router = TestBed.inject(Router); const prerequisiteService = TestBed.inject(PrerequisiteService); - const textUnit: TextUnit = new TextUnit(); - textUnit.id = 1; const formData: CourseCompetencyFormData = { title: 'Test', description: 'Lorem Ipsum', optional: true, + masteryThreshold: 100, }; const response: HttpResponse = new HttpResponse({ diff --git a/src/test/javascript/spec/component/course/course-dashboard.component.spec.ts b/src/test/javascript/spec/component/course/course-dashboard.component.spec.ts new file mode 100644 index 000000000000..08b610235354 --- /dev/null +++ b/src/test/javascript/spec/component/course/course-dashboard.component.spec.ts @@ -0,0 +1,109 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { CourseDashboardComponent } from 'app/overview/course-dashboard/course-dashboard.component'; +import { By } from '@angular/platform-browser'; +import { DebugElement } from '@angular/core'; +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { provideHttpClient } from '@angular/common/http'; +import { MockTranslateService, TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service'; +import { TranslateService } from '@ngx-translate/core'; +import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route'; +import { ActivatedRoute } from '@angular/router'; +import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; +import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; +import { MockComponent, MockDirective } from 'ng-mocks'; +import { CourseChatbotComponent } from 'app/iris/course-chatbot/course-chatbot.component'; +import { CourseExerciseLatenessComponent } from 'app/overview/course-dashboard/course-exercise-lateness/course-exercise-lateness.component'; +import { CourseExercisePerformanceComponent } from 'app/overview/course-dashboard/course-exercise-performance/course-exercise-performance.component'; +import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive'; +import { FeatureToggleHideDirective } from 'app/shared/feature-toggle/feature-toggle-hide.directive'; +import { NgbProgressbar } from '@ng-bootstrap/ng-bootstrap'; + +describe('CourseDashboardComponent', () => { + let component: CourseDashboardComponent; + let fixture: ComponentFixture; + let debugElement: DebugElement; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ + CourseDashboardComponent, + MockComponent(CourseChatbotComponent), + NgbProgressbar, + TranslatePipeMock, + MockComponent(CourseExerciseLatenessComponent), + MockComponent(CourseExercisePerformanceComponent), + MockDirective(FeatureToggleDirective), + MockDirective(FeatureToggleHideDirective), + ], + imports: [], + providers: [ + provideHttpClient(), + provideHttpClientTesting(), + { provide: TranslateService, useClass: MockTranslateService }, + { provide: ActivatedRoute, useValue: new MockActivatedRoute({ course: '123' }) }, + { provide: LocalStorageService, useClass: MockSyncStorage }, + { provide: SessionStorageService, useClass: MockSyncStorage }, + ], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CourseDashboardComponent); + component = fixture.componentInstance; + debugElement = fixture.debugElement; + fixture.detectChanges(); + }); + + it('should display chatbot when iris is enabled', () => { + component.irisEnabled = true; + fixture.detectChanges(); + + const chatContainer = debugElement.query(By.css('.chat-container')); + expect(chatContainer).toBeTruthy(); + }); + + it('should show loading spinner when isLoading is true', () => { + component.isLoading = true; + fixture.detectChanges(); + + const spinner = debugElement.query(By.css('.spinner-border')); + expect(spinner).toBeTruthy(); + }); + + it('should show learning paths button if course has learningPathsEnabled', () => { + component.course = { learningPathsEnabled: true }; + fixture.detectChanges(); + + const learningPathButton = debugElement.query(By.css('button.btn-primary')); + expect(learningPathButton).toBeTruthy(); + expect(learningPathButton.attributes['jhiTranslate']).toBe('artemisApp.studentAnalyticsDashboard.button.showLearningPath'); + }); + + it('should navigate to learning paths when button is clicked', () => { + component.course = { learningPathsEnabled: true }; + fixture.detectChanges(); + + const navigateSpy = jest.spyOn(component, 'navigateToLearningPaths'); + const learningPathButton = debugElement.query(By.css('.btn.btn-primary')); + + learningPathButton.triggerEventHandler('click', null); + expect(navigateSpy).toHaveBeenCalled(); + }); + + it('should display competency accordion title when hasCompetencies is true', () => { + component.hasCompetencies = true; + fixture.detectChanges(); + + const competencyTitle = debugElement.query(By.css('h3')); + expect(competencyTitle).toBeTruthy(); + expect(competencyTitle.attributes['jhiTranslate']).toBe('artemisApp.studentAnalyticsDashboard.competencyAccordion.title'); + }); + + it('should show no data message when hasCompetencies is false', () => { + component.hasCompetencies = false; + fixture.detectChanges(); + + const noDataMessage = debugElement.query(By.css('[jhiTranslate="artemisApp.studentAnalyticsDashboard.competencyAccordion.noData"]')); + expect(noDataMessage).toBeTruthy(); + }); +}); diff --git a/src/test/javascript/spec/component/detail-overview-list.component.spec.ts b/src/test/javascript/spec/component/detail-overview-list.component.spec.ts index 61e891b11e35..8d5998e3053a 100644 --- a/src/test/javascript/spec/component/detail-overview-list.component.spec.ts +++ b/src/test/javascript/spec/component/detail-overview-list.component.spec.ts @@ -56,7 +56,7 @@ describe('DetailOverviewList', () => { }); it('should initialize and destroy', () => { - component.sections = sections; + fixture.componentRef.setInput('sections', sections); fixture.detectChanges(); expect(component.headlines).toStrictEqual([{ id: 'headline-1', translationKey: 'headline.1' }]); expect(component.headlinesRecord).toStrictEqual({ 'headline.1': 'headline-1' }); @@ -67,7 +67,7 @@ describe('DetailOverviewList', () => { }); it('should escape all falsy values', () => { - component.sections = [ + fixture.componentRef.setInput('sections', [ { headline: 'some-section', details: [ @@ -81,7 +81,7 @@ describe('DetailOverviewList', () => { }, ], }, - ]; + ]); fixture.detectChanges(); const detailListTitleDOMElements = fixture.nativeElement.querySelectorAll('dt[id^=detail-title]'); expect(detailListTitleDOMElements).toHaveLength(1); diff --git a/src/test/javascript/spec/component/emoji/emoji-picker.component.spec.ts b/src/test/javascript/spec/component/emoji/emoji-picker.component.spec.ts index fce5fe967272..4e4d76f5a019 100644 --- a/src/test/javascript/spec/component/emoji/emoji-picker.component.spec.ts +++ b/src/test/javascript/spec/component/emoji/emoji-picker.component.spec.ts @@ -11,7 +11,6 @@ describe('EmojiPickerComponent', () => { let fixture: ComponentFixture; let comp: EmojiPickerComponent; let mockThemeService: ThemeService; - let themeSpy: jest.SpyInstance; beforeEach(() => { TestBed.configureTestingModule({ @@ -21,7 +20,6 @@ describe('EmojiPickerComponent', () => { .compileComponents() .then(() => { mockThemeService = TestBed.inject(ThemeService); - themeSpy = jest.spyOn(mockThemeService, 'getCurrentThemeObservable'); fixture = TestBed.createComponent(EmojiPickerComponent); comp = fixture.componentInstance; }); @@ -31,19 +29,14 @@ describe('EmojiPickerComponent', () => { jest.restoreAllMocks(); }); - it('should subscribe and unsubscribe to the theme service and react to changes', () => { - expect(themeSpy).toHaveBeenCalledOnce(); - expect(comp.dark).toBeFalse(); - expect(comp.themeSubscription).toBeDefined(); + it('should react to theme changes', () => { + expect(comp.dark()).toBeFalse(); + expect(comp.singleImageFunction()({ unified: '1F519' } as EmojiData)).toBe(''); - expect(comp.singleImageFunction({ unified: '1F519' } as EmojiData)).toBe(''); - mockThemeService.applyThemeExplicitly(Theme.DARK); - expect(comp.singleImageFunction({ unified: '1F519' } as EmojiData)).toBe('public/emoji/1f519.png'); + mockThemeService.applyThemePreference(Theme.DARK); - const subSpy = jest.spyOn(comp.themeSubscription, 'unsubscribe'); - - comp.ngOnDestroy(); - expect(subSpy).toHaveBeenCalledOnce(); + expect(comp.dark()).toBeTrue(); + expect(comp.singleImageFunction()({ unified: '1F519' } as EmojiData)).toBe('public/emoji/1f519.png'); }); it('should emit an event on emoji select', () => { diff --git a/src/test/javascript/spec/component/emoji/emoji.component.spec.ts b/src/test/javascript/spec/component/emoji/emoji.component.spec.ts deleted file mode 100644 index 887a27a7686d..000000000000 --- a/src/test/javascript/spec/component/emoji/emoji.component.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ArtemisTestModule } from '../../test.module'; -import { EmojiComponent } from 'app/shared/metis/emoji/emoji.component'; -import { Theme, ThemeService } from 'app/core/theme/theme.service'; -import { of } from 'rxjs'; - -describe('EmojiComponent', () => { - let fixture: ComponentFixture; - let comp: EmojiComponent; - let mockThemeService: ThemeService; - let themeSpy: jest.SpyInstance; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule], - declarations: [], - providers: [], - }) - .compileComponents() - .then(() => { - mockThemeService = TestBed.inject(ThemeService); - themeSpy = jest.spyOn(mockThemeService, 'getCurrentThemeObservable').mockReturnValue(of(Theme.DARK)); - fixture = TestBed.createComponent(EmojiComponent); - comp = fixture.componentInstance; - }); - }); - - afterEach(() => { - jest.restoreAllMocks(); - }); - - it('should subscribe and unsubscribe to the theme service and set dark flag', () => { - expect(themeSpy).toHaveBeenCalledOnce(); - expect(comp.dark).toBeTrue(); - expect(comp.themeSubscription).toBeDefined(); - - const subSpy = jest.spyOn(comp.themeSubscription, 'unsubscribe'); - - comp.ngOnDestroy(); - expect(subSpy).toHaveBeenCalledOnce(); - }); -}); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/exercise-save-button.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/exercise-save-button.component.spec.ts new file mode 100644 index 000000000000..c99743924bb6 --- /dev/null +++ b/src/test/javascript/spec/component/exam/participate/exercises/exercise-save-button.component.spec.ts @@ -0,0 +1,95 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { TranslateService } from '@ngx-translate/core'; +import { input } from '@angular/core'; +import { MockPipe } from 'ng-mocks'; +import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service'; +import { ArtemisTestModule } from '../../../../test.module'; +import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; +import { By } from '@angular/platform-browser'; +import { ExerciseSaveButtonComponent } from '../../../../../../../main/webapp/app/exam/participate/exercises/exercise-save-button/exercise-save-button.component'; +import { Submission } from '../../../../../../../main/webapp/app/entities/submission.model'; +import { facSaveSuccess } from '../../../../../../../main/webapp/content/icons/icons'; +import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { faFloppyDisk } from '@fortawesome/free-solid-svg-icons'; + +describe('ExerciseSaveButtonComponent', () => { + let component: ExerciseSaveButtonComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ArtemisTestModule], + declarations: [ExerciseSaveButtonComponent, MockPipe(ArtemisTranslatePipe)], + providers: [{ provide: TranslateService, useClass: MockTranslateService }], + }) + .compileComponents() + .then(() => { + fixture = TestBed.createComponent(ExerciseSaveButtonComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should create the component', () => { + expect(component).toBeTruthy(); + }); + + it('should disable the button if submission is synced', () => { + TestBed.runInInjectionContext(() => { + component.submission = input({ isSynced: true, submitted: false } as Submission); + }); + + fixture.detectChanges(); + + const button = fixture.debugElement.query(By.css('#save-exam')); + expect(button.nativeElement.disabled).toBeTrue(); + }); + + it('should enable the button if submission is not synced', () => { + TestBed.runInInjectionContext(() => { + component.submission = input({ isSynced: false, submitted: false } as Submission); + }); + fixture.detectChanges(); + + const button = fixture.debugElement.query(By.css('#save-exam')); + expect(button.nativeElement.disabled).toBeFalse(); + }); + + it('should display facSaveSuccess icon if submission is synced and submitted', () => { + TestBed.runInInjectionContext(() => { + component.submission = input({ isSynced: true, submitted: true } as Submission); + }); + fixture.detectChanges(); + + const icon = fixture.debugElement.query(By.directive(FaIconComponent)); + expect(icon.componentInstance.icon).toBe(facSaveSuccess); + }); + + it('should display faFloppyDisk icon if submission is not synced and submitted', () => { + TestBed.runInInjectionContext(() => { + component.submission = input({ isSynced: false, submitted: false } as Submission); + }); + fixture.detectChanges(); + + const icon = fixture.debugElement.query(By.directive(FaIconComponent)); + expect(icon.componentInstance.icon).toBe(faFloppyDisk); + }); + + it('should call onSave when the button is clicked and submission is not synced', () => { + TestBed.runInInjectionContext(() => { + component.submission = input({ isSynced: false, submitted: false } as Submission); + }); + fixture.detectChanges(); + + const onSaveSpy = jest.spyOn(component, 'onSave'); + + const button = fixture.debugElement.query(By.css('#save-exam')); + button.nativeElement.click(); + + expect(onSaveSpy).toHaveBeenCalled(); + }); +}); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts index 9c10ec5ca996..90a35bd8a76b 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/file-upload-exam-submission.component.spec.ts @@ -6,7 +6,7 @@ import { Course } from 'app/entities/course.model'; import { FullscreenComponent } from 'app/shared/fullscreen/fullscreen.component'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { ResizeableContainerComponent } from 'app/shared/resizeable-container/resizeable-container.component'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { MockTranslateService, TranslatePipeMock } from '../../../../helpers/mocks/service/mock-translate.service'; import { ArtemisTestModule } from '../../../../test.module'; import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; @@ -22,6 +22,7 @@ import { FileUploadSubmissionService } from 'app/exercises/file-upload/participa import { HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { ExamExerciseUpdateHighlighterComponent } from 'app/exam/participate/exercises/exam-exercise-update-highlighter/exam-exercise-update-highlighter.component'; +import { TranslateDirective } from '../../../../../../../main/webapp/app/shared/language/translate.directive'; describe('FileUploadExamSubmissionComponent', () => { let fixture: ComponentFixture; @@ -52,10 +53,11 @@ describe('FileUploadExamSubmissionComponent', () => { FileUploadExamSubmissionComponent, FullscreenComponent, ResizeableContainerComponent, - TranslatePipeMock, MockPipe(HtmlForMarkdownPipe, (markdown) => markdown as SafeHtml), + TranslatePipeMock, MockComponent(IncludedInScoreBadgeComponent), MockComponent(ExamExerciseUpdateHighlighterComponent), + MockDirective(TranslateDirective), ], providers: [MockProvider(ChangeDetectorRef), { provide: TranslateService, useClass: MockTranslateService }], }) @@ -78,6 +80,7 @@ describe('FileUploadExamSubmissionComponent', () => { }); it('should show static text in header', () => { + comp.examTimeline = false; fixture.detectChanges(); const el = fixture.debugElement.query((de) => de.nativeElement.textContent === 'artemisApp.exam.yourSolution'); expect(el).not.toBeNull(); @@ -87,8 +90,12 @@ describe('FileUploadExamSubmissionComponent', () => { const maxScore = 30; comp.exercise.maxPoints = maxScore; fixture.detectChanges(); - const el = fixture.debugElement.query((de) => de.nativeElement.textContent.includes(`(${maxScore} artemisApp.examParticipation.points)`)); + const el = fixture.debugElement.query(By.directive(TranslateDirective)); expect(el).not.toBeNull(); + + const directiveInstance = el.injector.get(TranslateDirective); + expect(directiveInstance.jhiTranslate).toBe('artemisApp.examParticipation.points'); + expect(directiveInstance.translateValues).toEqual({ points: maxScore, bonusPoints: 0 }); }); it('should show exercise bonus score if any', () => { @@ -97,11 +104,14 @@ describe('FileUploadExamSubmissionComponent', () => { const bonusPoints = 55; comp.exercise.bonusPoints = bonusPoints; fixture.detectChanges(); - const el = fixture.debugElement.query((de) => - de.nativeElement.textContent.includes(`(${maxScore} artemisApp.examParticipation.points, ${bonusPoints} artemisApp.examParticipation.bonus)`), - ); + const el = fixture.debugElement.query(By.directive(TranslateDirective)); expect(el).not.toBeNull(); + + const directiveInstance = el.injector.get(TranslateDirective); + expect(directiveInstance.jhiTranslate).toBe('artemisApp.examParticipation.bonus'); + expect(directiveInstance.translateValues).toEqual({ points: maxScore, bonusPoints: bonusPoints }); }); + it('should show problem statement if there is any', () => { fixture.detectChanges(); const el = fixture.debugElement.query((de) => de.nativeElement.textContent === mockExercise.problemStatement); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts index 60731362866e..5b2845a76b22 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/modeling-exam-submission.component.spec.ts @@ -10,13 +10,15 @@ import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling- import { FullscreenComponent } from 'app/shared/fullscreen/fullscreen.component'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { ResizeableContainerComponent } from 'app/shared/resizeable-container/resizeable-container.component'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { TranslatePipeMock } from '../../../../helpers/mocks/service/mock-translate.service'; import { ArtemisTestModule } from '../../../../test.module'; import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; import { ExamExerciseUpdateHighlighterComponent } from 'app/exam/participate/exercises/exam-exercise-update-highlighter/exam-exercise-update-highlighter.component'; import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module'; import { SubmissionVersion } from 'app/entities/submission-version.model'; +import { ExerciseSaveButtonComponent } from 'app/exam/participate/exercises/exercise-save-button/exercise-save-button.component'; +import { TranslateDirective } from '../../../../../../../main/webapp/app/shared/language/translate.directive'; describe('ModelingExamSubmissionComponent', () => { let fixture: ComponentFixture; @@ -49,6 +51,8 @@ describe('ModelingExamSubmissionComponent', () => { MockPipe(HtmlForMarkdownPipe, (markdown) => markdown as SafeHtml), MockComponent(IncludedInScoreBadgeComponent), MockComponent(ExamExerciseUpdateHighlighterComponent), + MockComponent(ExerciseSaveButtonComponent), + MockDirective(TranslateDirective), ], providers: [MockProvider(ChangeDetectorRef)], }) @@ -78,8 +82,12 @@ describe('ModelingExamSubmissionComponent', () => { const maxScore = 30; comp.exercise.maxPoints = maxScore; fixture.detectChanges(); - const el = fixture.debugElement.query((de) => de.nativeElement.textContent.includes(`(${maxScore} artemisApp.examParticipation.points)`)); + const el = fixture.debugElement.query(By.directive(TranslateDirective)); expect(el).not.toBeNull(); + + const directiveInstance = el.injector.get(TranslateDirective); + expect(directiveInstance.jhiTranslate).toBe('artemisApp.examParticipation.points'); + expect(directiveInstance.translateValues).toEqual({ points: maxScore, bonusPoints: 0 }); }); it('should show exercise bonus score if any', () => { @@ -88,10 +96,20 @@ describe('ModelingExamSubmissionComponent', () => { const bonusPoints = 55; comp.exercise.bonusPoints = bonusPoints; fixture.detectChanges(); - const el = fixture.debugElement.query((de) => - de.nativeElement.textContent.includes(`(${maxScore} artemisApp.examParticipation.points, ${bonusPoints} artemisApp.examParticipation.bonus)`), - ); + const el = fixture.debugElement.query(By.directive(TranslateDirective)); expect(el).not.toBeNull(); + + const directiveInstance = el.injector.get(TranslateDirective); + expect(directiveInstance.jhiTranslate).toBe('artemisApp.examParticipation.bonus'); + expect(directiveInstance.translateValues).toEqual({ points: maxScore, bonusPoints: bonusPoints }); + }); + + it('should call triggerSave if save exercise button is clicked', () => { + fixture.detectChanges(); + const saveExerciseSpy = jest.spyOn(comp, 'notifyTriggerSave'); + const saveButton = fixture.debugElement.query(By.directive(ExerciseSaveButtonComponent)); + saveButton.triggerEventHandler('save', null); + expect(saveExerciseSpy).toHaveBeenCalledOnce(); }); it('should show modeling editor with correct props when there is submission and exercise', () => { diff --git a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts index c83015c99c75..e3e9c1a94556 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/quiz-exam-submission.component.spec.ts @@ -15,7 +15,7 @@ import { QuizExamSubmissionComponent } from 'app/exam/participate/exercises/quiz import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ArtemisQuizService } from 'app/shared/quiz/quiz.service'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { MultipleChoiceQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component'; import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component'; import { ShortAnswerQuestionComponent } from 'app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component'; @@ -25,6 +25,9 @@ import { ModelingSubmission } from 'app/entities/modeling-submission.model'; import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import { Course } from 'app/entities/course.model'; import { provideRouter } from '@angular/router'; +import { ExerciseSaveButtonComponent } from 'app/exam/participate/exercises/exercise-save-button/exercise-save-button.component'; +import { TranslateDirective } from '../../../../../../../main/webapp/app/shared/language/translate.directive'; +import { By } from '@angular/platform-browser'; describe('QuizExamSubmissionComponent', () => { let fixture: ComponentFixture; @@ -55,6 +58,8 @@ describe('QuizExamSubmissionComponent', () => { MockComponent(MultipleChoiceQuestionComponent), MockComponent(DragAndDropQuestionComponent), MockComponent(ShortAnswerQuestionComponent), + MockComponent(ExerciseSaveButtonComponent), + MockDirective(TranslateDirective), ], providers: [provideRouter([]), MockProvider(ArtemisQuizService)], }) @@ -211,4 +216,21 @@ describe('QuizExamSubmissionComponent', () => { expect(component.dragAndDropMappings.size).toBe(1); expect(component.shortAnswerSubmittedTexts.size).toBe(0); }); + + it('should call triggerSave if save exercise button is clicked', () => { + const submissionVersion = { + content: + '[ {\r\n "quizQuestion" : {\r\n "type" : "drag-and-drop",\r\n "id" : 2,\r\n "title" : "dnd image",\r\n "text" : "Enter your long question if needed",\r\n "hint" : "Add a hint here (visible during the quiz via ?-Button)",\r\n "points" : 1,\r\n "scoringType" : "PROPORTIONAL_WITH_PENALTY",\r\n "randomizeOrder" : true,\r\n "invalid" : false,\r\n "backgroundFilePath" : "/api/files/drag-and-drop/backgrounds/14/DragAndDropBackground_2023-07-08T19-35-26-953_a3265da6.jpg",\r\n "dropLocations" : [ {\r\n "id" : 12,\r\n "posX" : 45.0,\r\n "posY" : 120.0,\r\n "width" : 62.0,\r\n "height" : 52.0,\r\n "invalid" : false\r\n } ],\r\n "dragItems" : [ {\r\n "id" : 11,\r\n "pictureFilePath" : "/api/files/drag-and-drop/drag-items/11/DragItem_2023-07-08T19-35-26-956_2ffe94ba.jpg",\r\n "invalid" : false\r\n } ]\r\n },\r\n "mappings" : [ {\r\n "invalid" : false,\r\n "dragItem" : {\r\n "id" : 11,\r\n "pictureFilePath" : "/api/files/drag-and-drop/drag-items/11/DragItem_2023-07-08T19-35-26-956_2ffe94ba.jpg",\r\n "invalid" : false\r\n },\r\n "dropLocation" : {\r\n "id" : 12,\r\n "posX" : 45.0,\r\n "posY" : 120.0,\r\n "width" : 62.0,\r\n "height" : 52.0,\r\n "invalid" : false\r\n }\r\n } ]\r\n} ]', + } as unknown as SubmissionVersion; + component.studentSubmission = new ModelingSubmission(); + component.exercise = new QuizExercise(new Course(), undefined); + component.exercise.quizQuestions = [dragAndDropQuestion]; + component.quizConfiguration = { quizQuestions: [dragAndDropQuestion] }; + component.setSubmissionVersion(submissionVersion); + fixture.detectChanges(); + const saveExerciseSpy = jest.spyOn(component, 'notifyTriggerSave'); + const saveButton = fixture.debugElement.query(By.directive(ExerciseSaveButtonComponent)); + saveButton.triggerEventHandler('save', null); + expect(saveExerciseSpy).toHaveBeenCalledOnce(); + }); }); diff --git a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts index 176692131b10..a0850296fc26 100644 --- a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts @@ -17,6 +17,7 @@ import { ArtemisTestModule } from '../../../../test.module'; import { ResizeableContainerComponent } from 'app/shared/resizeable-container/resizeable-container.component'; import dayjs from 'dayjs/esm'; import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { ExerciseSaveButtonComponent } from 'app/exam/participate/exercises/exercise-save-button/exercise-save-button.component'; describe('TextExamSubmissionComponent', () => { let fixture: ComponentFixture; @@ -39,6 +40,7 @@ describe('TextExamSubmissionComponent', () => { MockComponent(IncludedInScoreBadgeComponent), MockComponent(ExamExerciseUpdateHighlighterComponent), MockComponent(ResizeableContainerComponent), + MockComponent(ExerciseSaveButtonComponent), MockDirective(TranslateDirective), ], providers: [MockProvider(TextEditorService), MockProvider(ArtemisMarkdownService)], @@ -140,4 +142,15 @@ describe('TextExamSubmissionComponent', () => { expect(component.answer).toBe('submission version'); expect(component.submissionVersion).toBe(submissionVersion); }); + + it('should call triggerSave if save exercise button is clicked', () => { + component.exercise = exercise; + textSubmission.text = 'Hello World'; + component.studentSubmission = textSubmission; + fixture.detectChanges(); + const saveExerciseSpy = jest.spyOn(component, 'notifyTriggerSave'); + const saveButton = fixture.debugElement.query(By.directive(ExerciseSaveButtonComponent)); + saveButton.triggerEventHandler('save', null); + expect(saveExerciseSpy).toHaveBeenCalledOnce(); + }); }); diff --git a/src/test/javascript/spec/component/exercises/shared/headers/exercise-headers-information.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/exercise-headers-information.component.spec.ts new file mode 100644 index 000000000000..6c908d1b2b66 --- /dev/null +++ b/src/test/javascript/spec/component/exercises/shared/headers/exercise-headers-information.component.spec.ts @@ -0,0 +1,296 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; + +import { ExerciseHeadersInformationComponent } from 'app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component'; +import { MockProvider } from 'ng-mocks'; +import { ArtemisTestModule } from '../../../../test.module'; +import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; +import { DifficultyLevel, Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { of } from 'rxjs'; +import dayjs from 'dayjs/esm'; +import { Course } from 'app/entities/course.model'; +import { Result } from 'app/entities/result.model'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { SubmissionPolicy } from 'app/entities/submission-policy.model'; +import { ComplaintService } from 'app/complaints/complaint.service'; +import { SubmissionType } from 'app/entities/submission.model'; +import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model'; +import { LockRepositoryPolicy } from 'app/entities/submission-policy.model'; +import { DateContent, InformationBox, StringNumberContent } from 'app/shared/information-box/information-box.component'; + +describe('ExerciseHeadersInformationComponent', () => { + let component: ExerciseHeadersInformationComponent; + let fixture: ComponentFixture; + let exerciseService: ExerciseService; + let getExerciseDetailsMock: jest.SpyInstance; + + const exercise = { + id: 42, + type: ExerciseType.TEXT, + studentParticipations: [], + course: {}, + dueDate: dayjs().subtract(1, 'weeks'), + assessmentDueDate: dayjs().add(1, 'weeks'), + } as unknown as Exercise; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ExerciseHeadersInformationComponent, ArtemisTestModule, TranslateModule.forRoot(), NgbTooltipModule], + providers: [MockProvider(ExerciseService), MockProvider(ComplaintService)], + }) + .compileComponents() + .then(() => { + fixture = TestBed.createComponent(ExerciseHeadersInformationComponent); + component = fixture.componentInstance; + exerciseService = fixture.debugElement.injector.get(ExerciseService); + getExerciseDetailsMock = jest.spyOn(exerciseService, 'getExerciseDetails'); + getExerciseDetailsMock.mockReturnValue(of({ body: { exercise: exercise } })); + component.exercise = { ...exercise }; + fixture.detectChanges(); + }); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should display the information box items', () => { + component.informationBoxItems = [ + { + title: 'Test Title 1', + tooltip: 'Test Tooltip 1', + tooltipParams: {}, + isContentComponent: false, + content: { type: 'string', value: 'Test Content' }, + contentColor: 'primary', + }, + { + title: 'Test Title 2', + tooltip: 'Test Tooltip 2', + tooltipParams: {}, + isContentComponent: false, + content: { type: 'string', value: 'Test Content' }, + }, + ]; + fixture.detectChanges(); + + const compiled = fixture.nativeElement as HTMLElement; + const informationBoxes = compiled.querySelectorAll('jhi-information-box'); + expect(informationBoxes).toHaveLength(2); + }); + + it('should display difficulty level component when content type is difficultyLevel', () => { + component.informationBoxItems = [ + { + title: 'Difficulty Level', + tooltip: 'Difficulty Tooltip', + tooltipParams: {}, + isContentComponent: true, + content: { type: 'difficultyLevel', value: DifficultyLevel.EASY }, + }, + ]; + fixture.detectChanges(); + + const compiled = fixture.nativeElement as HTMLElement; + const difficultyLevelComponent = compiled.querySelector('jhi-difficulty-level'); + expect(difficultyLevelComponent).toBeTruthy(); + }); + + it('should set individualComplaintDueDate if course.maxComplaintTimeDays is defined', () => { + const course: Course = { id: 1, maxComplaintTimeDays: 7 } as Course; + const result: Result = { id: 1, completionDate: dayjs().subtract(2, 'day') } as Result; + const studentParticipation: StudentParticipation = { id: 1, results: [result] } as StudentParticipation; + + component.course = course; + component.studentParticipation = studentParticipation; + + const expectedDueDate = dayjs().add(7, 'days'); + jest.spyOn(ComplaintService, 'getIndividualComplaintDueDate').mockReturnValue(expectedDueDate); + + if (component.course?.maxComplaintTimeDays) { + component.individualComplaintDueDate = ComplaintService.getIndividualComplaintDueDate( + component.exercise, + component.course.maxComplaintTimeDays, + component.studentParticipation?.results?.last(), + component.studentParticipation, + ); + } + }); + + it('should add points item to informationBoxItems', () => { + const maxPoints = 10; + const achievedPoints = 5; + const pointsContent: StringNumberContent = { type: 'string', value: maxPoints }; + const pointsItem: InformationBox = { title: 'Points', content: pointsContent }; + + jest.spyOn(component, 'getPointsItem').mockReturnValue(pointsItem); + + component.informationBoxItems = []; + component.informationBoxItems.push(component.getPointsItem('points', maxPoints, achievedPoints)); + + expect(component.informationBoxItems).toHaveLength(1); + expect(component.informationBoxItems[0]).toEqual(pointsItem); + }); + + it('should add bonus points item to informationBoxItems', () => { + const bonusPoints = 5; + const achievedBonusPoints = 2; + const pointsContent: StringNumberContent = { type: 'string', value: bonusPoints }; + const pointsItem: InformationBox = { title: 'Bonus Points', content: pointsContent }; + + jest.spyOn(component, 'getPointsItem').mockReturnValue(pointsItem); + + component.informationBoxItems = []; + component.informationBoxItems.push(component.getPointsItem('bonus', bonusPoints, achievedBonusPoints)); + + expect(component.informationBoxItems).toHaveLength(1); + expect(component.informationBoxItems[0]).toEqual(pointsItem); + }); + + it('should add start date item to informationBoxItems if startDate is in the future', () => { + const exercise = { + id: 43, + type: ExerciseType.TEXT, + studentParticipations: [], + course: {}, + dueDate: dayjs().add(1, 'weeks'), + assessmentDueDate: dayjs().add(1, 'weeks'), + startDate: dayjs().add(3, 'days'), + } as unknown as Exercise; + + component.exercise = { ...exercise }; + const startDateContent: DateContent = { + type: 'dateTime', + value: dayjs().add(3, 'days'), + }; + const startDateItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.startDate', + content: startDateContent, + isContentComponent: true, + }; + component.informationBoxItems = []; + + fixture.detectChanges(); + + if (component.exercise.startDate && dayjs().isBefore(component.exercise.startDate)) { + component.informationBoxItems.push(startDateItem); + } + + expect(component.informationBoxItems).toHaveLength(1); + expect(component.informationBoxItems[0]).toEqual(startDateItem); + }); + + it('should return correct submission color based on submissions left', () => { + const submissionPolicyWithLimit = { submissionLimit: 3 } as SubmissionPolicy; + const submissionPolicyWithoutLimit = { submissionLimit: undefined } as SubmissionPolicy; + + // Case 1: More than 1 submission left + component.submissionPolicy = submissionPolicyWithLimit; + component.numberOfSubmissions = 1; + expect(component.getSubmissionColor()).toBe('body-color'); + + // Case 2: Exactly 1 submission left + component.numberOfSubmissions = 2; + expect(component.getSubmissionColor()).toBe('warning'); + + // Case 3: No submissions left + component.numberOfSubmissions = 3; + expect(component.getSubmissionColor()).toBe('danger'); + + // Case 4: One more than the limit + component.numberOfSubmissions = 4; + expect(component.getSubmissionColor()).toBe('danger'); + + // Case 5: Unlimited submissions left + component.submissionPolicy = submissionPolicyWithoutLimit; + component.numberOfSubmissions = 0; + expect(component.getSubmissionColor()).toBe('body-color'); + + // Case 6: Unlimited submissions with 1 submission done + component.numberOfSubmissions = 1; + expect(component.getSubmissionColor()).toBe('body-color'); + + // Case 7: Unlimited submissions with 2 submissions done + component.numberOfSubmissions = 2; + expect(component.getSubmissionColor()).toBe('body-color'); + }); + + it('should add assessment due date item to informationBoxItems if dueDate is in the past and assessmentDueDate is in the future', () => { + const now = dayjs(); + const dueDate = now.subtract(1, 'day'); + + const assessmentDueContent: DateContent = { type: 'dateTime', value: dayjs().add(1, 'weeks') }; + const assessmentDueItem: InformationBox = { + title: 'artemisApp.courseOverview.exerciseDetails.assessmentDue', + content: assessmentDueContent, + isContentComponent: true, + tooltip: 'artemisApp.courseOverview.exerciseDetails.assessmentDueTooltip', + }; + component.dueDate = dueDate; + component.informationBoxItems = []; + + if (component.dueDate?.isBefore(now) && component.exercise.assessmentDueDate?.isAfter(now)) { + component.informationBoxItems.push(assessmentDueItem); + } + + expect(component.informationBoxItems).toHaveLength(1); + expect(component.informationBoxItems[0]).toEqual(assessmentDueItem); + }); + + it('should update submission policy item in informationBoxItems', () => { + // Mock the countSubmissions method + jest.spyOn(component, 'countSubmissions').mockImplementation(() => {}); + + // Mock the getSubmissionPolicyItem method + const mockSubmissionPolicyItem: InformationBox = { + title: 'artemisApp.programmingExercise.submissionPolicy.submissionLimitTitle', + content: { type: 'string', value: 'Updated Item' } as StringNumberContent, + }; + jest.spyOn(component, 'getSubmissionPolicyItem').mockReturnValue(mockSubmissionPolicyItem); + + // Initialize informationBoxItems with a mock item + component.informationBoxItems = [ + { title: 'artemisApp.programmingExercise.submissionPolicy.submissionLimitTitle', content: { type: 'string', value: 'Original Item' } as StringNumberContent }, + ]; + + // Call the function + component.updateSubmissionPolicyItem(); + + // Verify that countSubmissions was called + expect(component.countSubmissions).toHaveBeenCalled(); + + // Verify that the item in informationBoxItems was updated + expect(component.informationBoxItems).toHaveLength(1); + expect(component.informationBoxItems[0]).toEqual(mockSubmissionPolicyItem); + }); + + it('should correctly count unique manual submissions', () => { + const mockResults: Result[] = [ + { submission: { type: SubmissionType.MANUAL, commitHash: 'hash1' } as ProgrammingSubmission } as Result, + { submission: { type: SubmissionType.MANUAL, commitHash: 'hash2' } as ProgrammingSubmission } as Result, + { submission: { type: SubmissionType.MANUAL, commitHash: 'hash1' } as ProgrammingSubmission } as Result, // Duplicate commit hash + { submission: { type: SubmissionType.INSTRUCTOR, commitHash: 'hash3' } as ProgrammingSubmission } as Result, // Different submission type + ]; + + const mockStudentParticipation: StudentParticipation = { + results: mockResults, + } as StudentParticipation; + + component.studentParticipation = mockStudentParticipation; + component.countSubmissions(); + expect(component.numberOfSubmissions).toBe(2); + }); + + it('should call updateSubmissionPolicyItem if submissionPolicy is active and has a submission limit', () => { + component.submissionPolicy = new LockRepositoryPolicy(); + component.submissionPolicy.active = true; + component.submissionPolicy.submissionLimit = 5; + + const updateSubmissionPolicyItemSpy = jest.spyOn(component, 'updateSubmissionPolicyItem'); + + component.ngOnChanges(); + + expect(updateSubmissionPolicyItemSpy).toHaveBeenCalled(); + }); +}); diff --git a/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts b/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts index 3c4d22ecbf22..19b21643e037 100644 --- a/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts +++ b/src/test/javascript/spec/component/learning-paths/pages/learning-path-student-page.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { LearningPathStudentPageComponent } from 'app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component'; -import { provideHttpClient } from '@angular/common/http'; +import { HttpErrorResponse, provideHttpClient } from '@angular/common/http'; import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; @@ -12,7 +12,6 @@ import { MockTranslateService } from '../../../helpers/mocks/service/mock-transl import { LearningPathApiService } from 'app/course/learning-paths/services/learning-path-api.service'; import { AlertService } from 'app/core/util/alert.service'; import { MockAlertService } from '../../../helpers/mocks/service/mock-alert.service'; -import { EntityNotFoundError } from 'app/course/learning-paths/exceptions/entity-not-found.error'; import { LearningPathDTO } from 'app/entities/competency/learning-path.model'; import { provideHttpClientTesting } from '@angular/common/http/testing'; @@ -127,7 +126,7 @@ describe('LearningPathStudentPageComponent', () => { }); it('should generate learning path on start when not found', async () => { - jest.spyOn(learningPathApiService, 'getLearningPathForCurrentUser').mockReturnValueOnce(Promise.reject(new EntityNotFoundError())); + jest.spyOn(learningPathApiService, 'getLearningPathForCurrentUser').mockReturnValueOnce(Promise.reject(new HttpErrorResponse({ status: 404 }))); const generateLearningPathSpy = jest.spyOn(learningPathApiService, 'generateLearningPathForCurrentUser').mockResolvedValue(learningPath); const startSpy = jest.spyOn(learningPathApiService, 'startLearningPathForCurrentUser'); diff --git a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit-form.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit-form.component.spec.ts index 7235e4bba660..6de2fc97f18e 100644 --- a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit-form.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit-form.component.spec.ts @@ -5,10 +5,11 @@ import { AttachmentUnitFormComponent, AttachmentUnitFormData } from 'app/lecture import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import dayjs from 'dayjs/esm'; -import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockModule, MockPipe } from 'ng-mocks'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component'; import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; describe('AttachmentUnitFormComponent', () => { let attachmentUnitFormComponentFixture: ComponentFixture; @@ -16,11 +17,11 @@ describe('AttachmentUnitFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, FormsModule, MockDirective(NgbTooltip)], + imports: [ReactiveFormsModule, FormsModule, MockDirective(NgbTooltip), MockModule(OwlDateTimeModule), MockModule(OwlNativeDateTimeModule)], declarations: [ AttachmentUnitFormComponent, + FormDateTimePickerComponent, MockPipe(ArtemisTranslatePipe), - MockComponent(FormDateTimePickerComponent), MockComponent(FaIconComponent), MockComponent(CompetencySelectionComponent), ], diff --git a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.component.spec.ts index fac921fd99ac..a65980b3725a 100644 --- a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.component.spec.ts @@ -9,7 +9,21 @@ import { MockProvider } from 'ng-mocks'; import { provideHttpClient } from '@angular/common/http'; import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service'; import { ScienceService } from 'app/shared/science/science.service'; -import { IconDefinition, faFile, faFileCsv, faFileImage, faFilePdf } from '@fortawesome/free-solid-svg-icons'; +import { + IconDefinition, + faFile, + faFileArchive, + faFileCode, + faFileCsv, + faFileExcel, + faFileImage, + faFileLines, + faFilePdf, + faFilePen, + faFilePowerpoint, + faFileWord, +} from '@fortawesome/free-solid-svg-icons'; +import { MockFileService } from '../../../helpers/mocks/service/mock-file.service'; describe('AttachmentUnitComponent', () => { let scienceService: ScienceService; @@ -39,7 +53,7 @@ describe('AttachmentUnitComponent', () => { provide: TranslateService, useClass: MockTranslateService, }, - MockProvider(FileService), + { provide: FileService, useClass: MockFileService }, MockProvider(ScienceService), ], }).compileComponents(); @@ -82,6 +96,13 @@ describe('AttachmentUnitComponent', () => { ['pdf', faFilePdf], ['csv', faFileCsv], ['png', faFileImage], + ['zip', faFileArchive], + ['txt', faFileLines], + ['doc', faFileWord], + ['json', faFileCode], + ['xls', faFileExcel], + ['ppt', faFilePowerpoint], + ['odf', faFilePen], ['exotic', faFile], ])('should use correct icon for extension', async (extension: string, icon: IconDefinition) => { const getAttachmentIconSpy = jest.spyOn(component, 'getAttachmentIcon'); diff --git a/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit-form.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit-form.component.spec.ts index 8f4411cd4f40..3032bb1cf7a0 100644 --- a/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit-form.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/online-unit/online-unit-form.component.spec.ts @@ -3,7 +3,7 @@ import { OnlineUnitFormComponent, OnlineUnitFormData } from 'app/lecture/lecture import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { OnlineUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/onlineUnit.service'; @@ -11,6 +11,9 @@ import { OnlineResourceDTO } from 'app/lecture/lecture-unit/lecture-unit-managem import { HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; +import { ArtemisTestModule } from '../../../test.module'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; describe('OnlineUnitFormComponent', () => { let onlineUnitFormComponentFixture: ComponentFixture; @@ -18,11 +21,11 @@ describe('OnlineUnitFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, FormsModule], + imports: [ArtemisTestModule, ReactiveFormsModule, FormsModule, MockModule(NgbTooltipModule), MockModule(OwlDateTimeModule), MockModule(OwlNativeDateTimeModule)], declarations: [ OnlineUnitFormComponent, + FormDateTimePickerComponent, MockPipe(ArtemisTranslatePipe), - MockComponent(FormDateTimePickerComponent), MockComponent(FaIconComponent), MockComponent(CompetencySelectionComponent), ], diff --git a/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts index fae301e74331..e54974801b5f 100644 --- a/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts @@ -8,9 +8,12 @@ import { TextUnitFormComponent, TextUnitFormData } from 'app/lecture/lecture-uni import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import dayjs from 'dayjs/esm'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component'; +import { ArtemisTestModule } from '../../../test.module'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; @Component({ selector: 'jhi-markdown-editor-monaco', template: '' }) class MarkdownEditorStubComponent { @@ -43,11 +46,11 @@ describe('TextUnitFormComponent', () => { }); TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, FormsModule], + imports: [ArtemisTestModule, ReactiveFormsModule, FormsModule, MockModule(NgbTooltipModule), MockModule(OwlDateTimeModule), MockModule(OwlNativeDateTimeModule)], declarations: [ TextUnitFormComponent, MarkdownEditorStubComponent, - MockComponent(FormDateTimePickerComponent), + FormDateTimePickerComponent, MockPipe(ArtemisTranslatePipe), MockComponent(CompetencySelectionComponent), ], diff --git a/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit-form.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit-form.component.spec.ts index 445163b967ff..84180448c005 100644 --- a/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit-form.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/video-unit/video-unit-form.component.spec.ts @@ -3,10 +3,13 @@ import { VideoUnitFormComponent, VideoUnitFormData } from 'app/lecture/lecture-u import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockModule, MockPipe } from 'ng-mocks'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component'; +import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker'; +import { ArtemisTestModule } from '../../../test.module'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; describe('VideoUnitFormComponent', () => { const validYouTubeUrl = 'https://www.youtube.com/watch?v=8iU8LPEa4o0'; @@ -16,11 +19,11 @@ describe('VideoUnitFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, FormsModule], + imports: [ArtemisTestModule, ReactiveFormsModule, FormsModule, MockModule(NgbTooltipModule), MockModule(OwlDateTimeModule), MockModule(OwlNativeDateTimeModule)], declarations: [ VideoUnitFormComponent, + FormDateTimePickerComponent, MockPipe(ArtemisTranslatePipe), - MockComponent(FormDateTimePickerComponent), MockComponent(FaIconComponent), MockComponent(CompetencySelectionComponent), ], diff --git a/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts index 72bab398d1f1..83509866f1d9 100644 --- a/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts @@ -119,7 +119,7 @@ describe('LectureAttachmentsComponent', () => { }); it('should load existing lecture', fakeAsync(() => { - comp.lectureId = 42; + fixture.componentRef.setInput('lectureId', 42); const findWithDetailsStub = jest.spyOn(lectureService, 'findWithDetails').mockReturnValue( of( new HttpResponse({ diff --git a/src/test/javascript/spec/component/lecture/pdf-preview.component.spec.ts b/src/test/javascript/spec/component/lecture/pdf-preview.component.spec.ts index 03e494ccbd41..e3b8a248fb9f 100644 --- a/src/test/javascript/spec/component/lecture/pdf-preview.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/pdf-preview.component.spec.ts @@ -1,4 +1,33 @@ import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; +import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; +import { of, throwError } from 'rxjs'; +import { AttachmentService } from 'app/lecture/attachment.service'; +import { AttachmentUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service'; +import { PdfPreviewComponent } from 'app/lecture/pdf-preview/pdf-preview.component'; +import { signal } from '@angular/core'; +import { AlertService } from 'app/core/util/alert.service'; +import { HttpClientModule, HttpErrorResponse } from '@angular/common/http'; +import { TranslateService } from '@ngx-translate/core'; +import { PDFDocument } from 'pdf-lib'; + +jest.mock('pdf-lib', () => { + const originalModule = jest.requireActual('pdf-lib'); + + return { + ...originalModule, + PDFDocument: { + ...originalModule.PDFDocument, + load: jest.fn(), + create: jest.fn(), + prototype: { + removePage: jest.fn(), + save: jest.fn(), + }, + }, + }; +}); jest.mock('pdfjs-dist', () => { return { @@ -32,17 +61,6 @@ function createMockEvent(target: Element, eventType = 'click'): MouseEvent { return event; } -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ActivatedRoute } from '@angular/router'; -import { of, throwError } from 'rxjs'; -import { AttachmentService } from 'app/lecture/attachment.service'; -import { AttachmentUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service'; -import { PdfPreviewComponent } from 'app/lecture/pdf-preview/pdf-preview.component'; -import { ElementRef } from '@angular/core'; -import { AlertService } from 'app/core/util/alert.service'; -import { HttpErrorResponse } from '@angular/common/http'; -import { TranslateService } from '@ngx-translate/core'; - describe('PdfPreviewComponent', () => { let component: PdfPreviewComponent; let fixture: ComponentFixture; @@ -59,24 +77,27 @@ describe('PdfPreviewComponent', () => { global.URL.createObjectURL = jest.fn().mockReturnValue('mocked_blob_url'); attachmentServiceMock = { getAttachmentFile: jest.fn().mockReturnValue(of(new Blob([''], { type: 'application/pdf' }))), + update: jest.fn().mockReturnValue(of({})), }; attachmentUnitServiceMock = { getAttachmentFile: jest.fn().mockReturnValue(of(new Blob([''], { type: 'application/pdf' }))), + update: jest.fn().mockReturnValue(of({})), }; routeMock = { data: of({ course: { id: 1, name: 'Example Course' }, - attachment: { id: 1, name: 'Example PDF' }, - attachmentUnit: { id: 1, name: 'Chapter 1' }, + attachment: { id: 1, name: 'Example PDF', lecture: { id: 1 } }, + attachmentUnit: { id: 1, name: 'Chapter 1', lecture: { id: 1 } }, }), }; alertServiceMock = { addAlert: jest.fn(), error: jest.fn(), + success: jest.fn(), }; await TestBed.configureTestingModule({ - imports: [PdfPreviewComponent], + imports: [PdfPreviewComponent, HttpClientModule], providers: [ { provide: ActivatedRoute, useValue: routeMock }, { provide: AttachmentService, useValue: attachmentServiceMock }, @@ -98,12 +119,12 @@ describe('PdfPreviewComponent', () => { mockCanvasElement.height = 600; jest.spyOn(component, 'updateEnlargedCanvas').mockImplementation(() => { - component.enlargedCanvas.nativeElement = mockCanvasElement; + component.enlargedCanvas()!.nativeElement = mockCanvasElement; }); mockEnlargedCanvas = document.createElement('canvas'); mockEnlargedCanvas.classList.add('enlarged-canvas'); - component.enlargedCanvas = new ElementRef(mockEnlargedCanvas); + component.enlargedCanvas = signal({ nativeElement: mockEnlargedCanvas }); mockContext = { clearRect: jest.fn(), @@ -118,11 +139,13 @@ describe('PdfPreviewComponent', () => { mockOverlay = document.createElement('div'); mockOverlay.style.opacity = '0'; mockCanvasElement.appendChild(mockOverlay); + component.currentPdfBlob.set(new Blob(['dummy content'], { type: 'application/pdf' })); + global.URL.createObjectURL = jest.fn().mockReturnValue('blob-url'); fixture.detectChanges(); - component.pdfContainer = new ElementRef(document.createElement('div')); - component.enlargedCanvas = new ElementRef(document.createElement('canvas')); + component.pdfContainer = signal({ nativeElement: document.createElement('div') }); + component.enlargedCanvas = signal({ nativeElement: document.createElement('canvas') }); fixture.detectChanges(); }); @@ -160,7 +183,7 @@ describe('PdfPreviewComponent', () => { component.ngOnInit(); fixture.detectChanges(); - expect(alertServiceSpy).toHaveBeenCalledOnce(); + expect(alertServiceSpy).toHaveBeenCalled(); }); it('should handle errors and trigger alert when loading an attachment unit file fails', () => { @@ -181,59 +204,63 @@ describe('PdfPreviewComponent', () => { component.ngOnInit(); fixture.detectChanges(); - expect(alertServiceSpy).toHaveBeenCalledOnce(); + expect(alertServiceSpy).toHaveBeenCalled(); }); - it('should load PDF and verify rendering of pages', () => { - const mockBlob = new Blob(['PDF content'], { type: 'application/pdf' }); + it('should load PDF and verify rendering of pages', async () => { + const spyCreateCanvas = jest.spyOn(component, 'createCanvas'); + const spyCreateCanvasContainer = jest.spyOn(component, 'createCanvasContainer'); + const spyAppendChild = jest.spyOn(component.pdfContainer()!.nativeElement, 'appendChild'); - attachmentServiceMock.getAttachmentFile.mockReturnValue(of(mockBlob)); - component.ngOnInit(); + await component.loadOrAppendPdf('fake-url'); - expect(URL.createObjectURL).toHaveBeenCalledWith(mockBlob); - expect(attachmentServiceMock.getAttachmentFile).toHaveBeenCalledWith(1, 1); - expect(component.totalPages).toBeGreaterThan(0); + expect(spyCreateCanvas).toHaveBeenCalled(); + expect(spyCreateCanvasContainer).toHaveBeenCalled(); + expect(spyAppendChild).toHaveBeenCalled(); + expect(component.totalPages()).toBe(1); + expect(component.isPdfLoading()).toBeFalsy(); + expect(component.fileInput()!.nativeElement.value).toBe(''); }); it('should navigate through pages using keyboard in enlarged view', () => { - component.isEnlargedView = true; - component.totalPages = 5; - component.currentPage = 3; + component.isEnlargedView.set(true); + component.totalPages.set(5); + component.currentPage.set(3); const eventRight = new KeyboardEvent('keydown', { key: 'ArrowRight' }); const eventLeft = new KeyboardEvent('keydown', { key: 'ArrowLeft' }); component.handleKeyboardEvents(eventRight); - expect(component.currentPage).toBe(4); + expect(component.currentPage()).toBe(4); component.handleKeyboardEvents(eventLeft); - expect(component.currentPage).toBe(3); + expect(component.currentPage()).toBe(3); }); it('should toggle enlarged view state', () => { const mockCanvas = document.createElement('canvas'); - component.displayEnlargedCanvas(mockCanvas, 1); - expect(component.isEnlargedView).toBeTrue(); + component.displayEnlargedCanvas(mockCanvas); + expect(component.isEnlargedView()).toBeTruthy(); const clickEvent = new MouseEvent('click', { button: 0, }); component.closeEnlargedView(clickEvent); - expect(component.isEnlargedView).toBeFalse(); + expect(component.isEnlargedView()).toBeFalsy(); }); it('should prevent scrolling when enlarged view is active', () => { component.toggleBodyScroll(true); - expect(component.pdfContainer.nativeElement.style.overflow).toBe('hidden'); + expect(component.pdfContainer()!.nativeElement.style.overflow).toBe('hidden'); component.toggleBodyScroll(false); - expect(component.pdfContainer.nativeElement.style.overflow).toBe('auto'); + expect(component.pdfContainer()!.nativeElement.style.overflow).toBe('auto'); }); it('should not update canvas size if not in enlarged view', () => { - component.isEnlargedView = false; - component.currentPage = 3; + component.isEnlargedView.set(false); + component.currentPage.set(3); const spy = jest.spyOn(component, 'updateEnlargedCanvas'); component.adjustCanvasSize(); @@ -242,8 +269,8 @@ describe('PdfPreviewComponent', () => { }); it('should not update canvas size if the current page canvas does not exist', () => { - component.isEnlargedView = true; - component.currentPage = 10; + component.isEnlargedView.set(true); + component.currentPage.set(10); const spy = jest.spyOn(component, 'updateEnlargedCanvas'); component.adjustCanvasSize(); @@ -252,17 +279,18 @@ describe('PdfPreviewComponent', () => { }); it('should prevent navigation beyond last page', () => { - component.currentPage = component.totalPages = 5; + component.currentPage.set(5); + component.totalPages.set(5); component.handleKeyboardEvents(new KeyboardEvent('keydown', { key: 'ArrowRight' })); - expect(component.currentPage).toBe(5); + expect(component.currentPage()).toBe(5); }); it('should prevent navigation before first page', () => { - component.currentPage = 1; + component.currentPage.set(1); component.handleKeyboardEvents(new KeyboardEvent('keydown', { key: 'ArrowLeft' })); - expect(component.currentPage).toBe(1); + expect(component.currentPage()).toBe(1); }); it('should unsubscribe attachment subscription during component destruction', () => { @@ -295,16 +323,14 @@ describe('PdfPreviewComponent', () => { }); it('should call updateEnlargedCanvas when window is resized and conditions are met', () => { - component.isEnlargedView = true; - component.currentPage = 1; + component.isEnlargedView.set(true); + component.currentPage.set(1); const canvas = document.createElement('canvas'); const pdfContainer = document.createElement('div'); - pdfContainer.className = 'pdf-page-container'; + pdfContainer.classList.add('pdf-canvas-container'); pdfContainer.appendChild(canvas); - component.pdfContainer = { - nativeElement: pdfContainer, - } as ElementRef; + component.pdfContainer = signal({ nativeElement: pdfContainer }); const updateEnlargedCanvasSpy = jest.spyOn(component, 'updateEnlargedCanvas'); const adjustCanvasSizeSpy = jest.spyOn(component, 'adjustCanvasSize'); @@ -319,20 +345,20 @@ describe('PdfPreviewComponent', () => { target.classList.add('enlarged-container'); const mockEvent = createMockEvent(target); - component.isEnlargedView = true; + component.isEnlargedView.set(true); const closeSpy = jest.spyOn(component, 'closeEnlargedView'); component.closeIfOutside(mockEvent); expect(closeSpy).toHaveBeenCalled(); - expect(component.isEnlargedView).toBeFalse(); + expect(component.isEnlargedView()).toBeFalsy(); }); it('should not close the enlarged view if the click is on the canvas itself', () => { const mockEvent = createMockEvent(mockEnlargedCanvas); Object.defineProperty(mockEvent, 'target', { value: mockEnlargedCanvas, writable: false }); - component.isEnlargedView = true; + component.isEnlargedView.set(true); const closeSpy = jest.spyOn(component, 'closeEnlargedView'); @@ -341,15 +367,32 @@ describe('PdfPreviewComponent', () => { expect(closeSpy).not.toHaveBeenCalled(); }); - it('should calculate the correct scale factor based on container and canvas dimensions', () => { - Object.defineProperty(component.pdfContainer.nativeElement, 'clientWidth', { value: 1000, configurable: true }); - Object.defineProperty(component.pdfContainer.nativeElement, 'clientHeight', { value: 800, configurable: true }); + it('should calculate the correct scale factor for horizontal slides', () => { + // Mock container dimensions + Object.defineProperty(component.pdfContainer()!.nativeElement, 'clientWidth', { value: 1000, configurable: true }); + Object.defineProperty(component.pdfContainer()!.nativeElement, 'clientHeight', { value: 800, configurable: true }); + // Mock a horizontal canvas (width > height) mockCanvasElement.width = 500; mockCanvasElement.height = 400; + const scaleFactor = component.calculateScaleFactor(mockCanvasElement); + + // Expect scale factor to be based on width (scaleX) and height (scaleY), whichever is smaller + expect(scaleFactor).toBe(2); // Min of 1000/500 (scaleX = 2) and 800/400 (scaleY = 2) + }); + it('should calculate the correct scale factor for vertical slides', () => { + Object.defineProperty(component.pdfContainer()!.nativeElement, 'clientWidth', { value: 1000, configurable: true }); + Object.defineProperty(component.pdfContainer()!.nativeElement, 'clientHeight', { value: 800, configurable: true }); + + // Mock a vertical canvas (height > width) + mockCanvasElement.width = 400; + mockCanvasElement.height = 500; const scaleFactor = component.calculateScaleFactor(mockCanvasElement); - expect(scaleFactor).toBe(2); + + // For vertical slides, scaleY is based on DEFAULT_SLIDE_HEIGHT, and scaleX is based on containerWidth + // Expect scaleY to be 800/500 = 1.6 and scaleX to be 1000/400 = 2.5 + expect(scaleFactor).toBe(1.6); // Min of 1.6 (scaleY) and 2.5 (scaleX) }); it('should resize the canvas based on the given scale factor', () => { @@ -357,8 +400,8 @@ describe('PdfPreviewComponent', () => { mockCanvasElement.height = 400; component.resizeCanvas(mockCanvasElement, 2); - expect(component.enlargedCanvas.nativeElement.width).toBe(1000); - expect(component.enlargedCanvas.nativeElement.height).toBe(800); + expect(component.enlargedCanvas()!.nativeElement.width).toBe(1000); + expect(component.enlargedCanvas()!.nativeElement.height).toBe(800); }); it('should clear and redraw the canvas with the new dimensions', () => { @@ -371,8 +414,8 @@ describe('PdfPreviewComponent', () => { component.resizeCanvas(mockCanvasElement, 2); component.redrawCanvas(mockCanvasElement); - expect(component.enlargedCanvas.nativeElement.width).toBe(1000); // 500 * 2 - expect(component.enlargedCanvas.nativeElement.height).toBe(800); // 400 * 2 + expect(component.enlargedCanvas()!.nativeElement.width).toBe(1000); // 500 * 2 + expect(component.enlargedCanvas()!.nativeElement.height).toBe(800); // 400 * 2 expect(mockContext.clearRect).toHaveBeenCalledWith(0, 0, 1000, 800); expect(mockContext.drawImage).toHaveBeenCalledWith(mockCanvasElement, 0, 0, 1000, 800); @@ -380,8 +423,14 @@ describe('PdfPreviewComponent', () => { it('should correctly position the canvas', () => { const parent = document.createElement('div'); - component.pdfContainer = { nativeElement: { clientWidth: 1000, clientHeight: 800, scrollTop: 500 } } as ElementRef; - const canvasElem = component.enlargedCanvas.nativeElement; + + const mockDivElement = document.createElement('div'); + Object.defineProperty(mockDivElement, 'clientWidth', { value: 1000 }); + Object.defineProperty(mockDivElement, 'clientHeight', { value: 800 }); + Object.defineProperty(mockDivElement, 'scrollTop', { value: 500, writable: true }); + + component.pdfContainer = signal({ nativeElement: mockDivElement }); + const canvasElem = component.enlargedCanvas()!.nativeElement; parent.appendChild(canvasElem); canvasElem.width = 500; canvasElem.height = 400; @@ -396,22 +445,22 @@ describe('PdfPreviewComponent', () => { mockCanvas.style.width = '600px'; mockCanvas.style.height = '400px'; - const container = component.createContainer(mockCanvas, 1); + const container = component.createCanvasContainer(mockCanvas, 1); expect(container.tagName).toBe('DIV'); - expect(container.classList.contains('pdf-page-container')).toBeTruthy(); + expect(container.classList.contains('pdf-canvas-container')).toBeTruthy(); expect(container.style.position).toBe('relative'); expect(container.style.display).toBe('inline-block'); expect(container.style.width).toBe('600px'); expect(container.style.height).toBe('400px'); expect(container.style.margin).toBe('20px'); - expect(container.children).toHaveLength(2); + expect(container.children).toHaveLength(3); expect(container.firstChild).toBe(mockCanvas); }); it('should handle mouseenter and mouseleave events correctly', () => { const mockCanvas = document.createElement('canvas'); - const container = component.createContainer(mockCanvas, 1); + const container = component.createCanvasContainer(mockCanvas, 1); const overlay = container.children[1] as HTMLElement; // Trigger mouseenter @@ -428,10 +477,237 @@ describe('PdfPreviewComponent', () => { it('should handle click event on overlay to trigger displayEnlargedCanvas', () => { jest.spyOn(component, 'displayEnlargedCanvas'); const mockCanvas = document.createElement('canvas'); - const container = component.createContainer(mockCanvas, 1); + const container = component.createCanvasContainer(mockCanvas, 1); const overlay = container.children[1]; overlay.dispatchEvent(new Event('click')); - expect(component.displayEnlargedCanvas).toHaveBeenCalledWith(mockCanvas, 1); + expect(component.displayEnlargedCanvas).toHaveBeenCalledWith(mockCanvas); + }); + + it('should trigger the file input click event', () => { + const mockFileInput = document.createElement('input'); + mockFileInput.type = 'file'; + component.fileInput = signal({ nativeElement: mockFileInput }); + + const clickSpy = jest.spyOn(component.fileInput()!.nativeElement, 'click'); + component.triggerFileInput(); + expect(clickSpy).toHaveBeenCalled(); + }); + + it('should merge PDF files correctly and update the component state', async () => { + const mockFile = new File(['new pdf'], 'test.pdf', { type: 'application/pdf' }); + mockFile.arrayBuffer = jest.fn().mockResolvedValue(new ArrayBuffer(8)); // Return an empty ArrayBuffer for simplicity + const mockEvent = { target: { files: [mockFile] } }; + + const existingPdfDoc = { + copyPages: jest.fn().mockResolvedValue(['page']), + addPage: jest.fn(), + save: jest.fn().mockResolvedValue(new Uint8Array([1, 2, 3])), + }; + + const newPdfDoc = { + getPageIndices: jest.fn().mockReturnValue([0]), + }; + + PDFDocument.load = jest + .fn() + .mockImplementationOnce(() => Promise.resolve(existingPdfDoc)) + .mockImplementationOnce(() => Promise.resolve(newPdfDoc)); + + component.currentPdfBlob.set(new Blob(['existing pdf'], { type: 'application/pdf' })); + component.currentPdfBlob()!.arrayBuffer = jest.fn().mockResolvedValue(new ArrayBuffer(8)); // Return an empty ArrayBuffer for simplicity + + component.selectedPages.set(new Set([1])); // Assume there is initially a selected page + + await component.mergePDF(mockEvent as any); + + expect(PDFDocument.load).toHaveBeenCalledTimes(2); + expect(existingPdfDoc.copyPages).toHaveBeenCalledWith(newPdfDoc, [0]); + expect(existingPdfDoc.addPage).toHaveBeenCalled(); + expect(existingPdfDoc.save).toHaveBeenCalled(); + expect(component.currentPdfBlob).toBeDefined(); + expect(component.selectedPages()!.size).toBe(0); + expect(component.isPdfLoading()).toBeFalsy(); + expect(URL.createObjectURL).toHaveBeenCalledWith(new Blob([new Uint8Array([1, 2, 3])], { type: 'application/pdf' })); + }); + + it('should handle errors when merging PDFs fails', async () => { + const mockFile = new File(['new pdf'], 'test.pdf', { type: 'application/pdf' }); + + // Mock the arrayBuffer method for the file object + mockFile.arrayBuffer = jest.fn().mockResolvedValue(new ArrayBuffer(8)); // Return an empty ArrayBuffer for simplicity + + const mockEvent = { target: { files: [mockFile] } }; + const error = new Error('Error loading PDF'); + + component.currentPdfBlob.set(new Blob(['existing pdf'], { type: 'application/pdf' })); + component.currentPdfBlob()!.arrayBuffer = jest.fn().mockResolvedValue(new ArrayBuffer(8)); // Return an empty ArrayBuffer for simp + + // Mock PDFDocument.load to throw an error on the first call + PDFDocument.load = jest + .fn() + .mockImplementationOnce(() => Promise.reject(error)) // First call throws an error + .mockImplementationOnce(() => Promise.resolve({})); // Second call (not actually needed here) + + await component.mergePDF(mockEvent as any); + + expect(alertServiceMock.error).toHaveBeenCalledWith('artemisApp.attachment.pdfPreview.mergeFailedError', { error: error.message }); + expect(component.isPdfLoading()).toBeFalsy(); + }); + + it('should update the IDs of remaining pages after some have been removed', () => { + const mockContainer = document.createElement('div'); + + for (let i = 1; i <= 3; i++) { + const mockPageContainer = document.createElement('div'); + mockPageContainer.classList.add('pdf-canvas-container'); + mockPageContainer.id = `pdf-page-${i}`; + + const mockCanvas = document.createElement('canvas'); + mockCanvas.id = String(i); + mockPageContainer.appendChild(mockCanvas); + + const mockOverlay = document.createElement('div'); + mockOverlay.innerHTML = `${i}`; + mockPageContainer.appendChild(mockOverlay); + + const mockCheckbox = document.createElement('input'); + mockCheckbox.type = 'checkbox'; + mockCheckbox.id = String(i); + mockPageContainer.appendChild(mockCheckbox); + + mockContainer.appendChild(mockPageContainer); + } + + component.pdfContainer = signal({ nativeElement: mockContainer }); + component.updatePageIDs(); + + const remainingPages = component.pdfContainer()!.nativeElement.querySelectorAll('.pdf-canvas-container'); + remainingPages.forEach((pageContainer, index) => { + const pageIndex = index + 1; + const canvas = pageContainer.querySelector('canvas'); + const overlay = pageContainer.querySelector('div'); + const checkbox = pageContainer.querySelector('input[type="checkbox"]'); + + expect(pageContainer.id).toBe(`pdf-page-${pageIndex}`); + expect(canvas!.id).toBe(String(pageIndex)); + expect(overlay!.innerHTML).toBe(`${pageIndex}`); + expect(checkbox!.id).toBe(String(pageIndex)); + }); + while (mockContainer.firstChild) { + mockContainer.removeChild(mockContainer.firstChild); + } + }); + + it('should update attachment successfully and show success alert', () => { + component.attachment.set({ id: 1, version: 1 }); + component.updateAttachmentWithFile(); + + expect(attachmentServiceMock.update).toHaveBeenCalled(); + expect(alertServiceMock.success).toHaveBeenCalledWith('artemisApp.attachment.pdfPreview.attachmentUpdateSuccess'); + }); + + it('should not update attachment if file size exceeds the limit and show an error alert', () => { + const oversizedData = new Uint8Array(MAX_FILE_SIZE + 1).fill(0); + component.currentPdfBlob.set(new Blob([oversizedData], { type: 'application/pdf' })); + + component.updateAttachmentWithFile(); + + expect(attachmentServiceMock.update).not.toHaveBeenCalled(); + expect(alertServiceMock.error).toHaveBeenCalledWith('artemisApp.attachment.pdfPreview.fileSizeError'); + }); + + it('should handle errors when updating an attachment fails', () => { + attachmentServiceMock.update.mockReturnValue(throwError(() => new Error('Update failed'))); + component.attachment.set({ id: 1, version: 1 }); + + component.updateAttachmentWithFile(); + + expect(attachmentServiceMock.update).toHaveBeenCalled(); + expect(alertServiceMock.error).toHaveBeenCalledWith('artemisApp.attachment.pdfPreview.attachmentUpdateError', { error: 'Update failed' }); + }); + + it('should update attachment unit successfully and show success alert', () => { + component.attachment.set(undefined); + component.attachmentUnit.set({ + id: 1, + lecture: { id: 1 }, + attachment: { id: 1, version: 1 }, + }); + attachmentUnitServiceMock.update.mockReturnValue(of({})); + + component.updateAttachmentWithFile(); + + expect(attachmentUnitServiceMock.update).toHaveBeenCalledWith(1, 1, expect.any(FormData)); + expect(alertServiceMock.success).toHaveBeenCalledWith('artemisApp.attachment.pdfPreview.attachmentUpdateSuccess'); + }); + + it('should handle errors when updating an attachment unit fails', () => { + component.attachment.set(undefined); + component.attachmentUnit.set({ + id: 1, + lecture: { id: 1 }, + attachment: { id: 1, version: 1 }, + }); + const errorResponse = { message: 'Update failed' }; + attachmentUnitServiceMock.update.mockReturnValue(throwError(() => errorResponse)); + + component.updateAttachmentWithFile(); + + expect(attachmentUnitServiceMock.update).toHaveBeenCalledWith(1, 1, expect.any(FormData)); + expect(alertServiceMock.error).toHaveBeenCalledWith('artemisApp.attachment.pdfPreview.attachmentUpdateError', { error: 'Update failed' }); + }); + + it('should delete selected slides and update the PDF', async () => { + const existingPdfDoc = { + removePage: jest.fn(), + save: jest.fn().mockResolvedValue(new Uint8Array([1, 2, 3])), + }; + + PDFDocument.load = jest.fn().mockResolvedValue(existingPdfDoc); + const mockArrayBuffer = new ArrayBuffer(8); + component.currentPdfBlob.set(new Blob(['existing pdf'], { type: 'application/pdf' })); + component.currentPdfBlob()!.arrayBuffer = jest.fn().mockResolvedValue(mockArrayBuffer); + + const objectUrl = 'blob-url'; + global.URL.createObjectURL = jest.fn().mockReturnValue(objectUrl); + global.URL.revokeObjectURL = jest.fn(); + + component.selectedPages.set(new Set([1, 2])); // Pages 1 and 2 selected + + const loadOrAppendPdfSpy = jest.spyOn(component, 'loadOrAppendPdf'); + const alertServiceErrorSpy = jest.spyOn(alertServiceMock, 'error'); + + await component.deleteSelectedSlides(); + + expect(PDFDocument.load).toHaveBeenCalledWith(mockArrayBuffer); + expect(existingPdfDoc.removePage).toHaveBeenCalledWith(1); + expect(existingPdfDoc.removePage).toHaveBeenCalledWith(0); + expect(existingPdfDoc.removePage).toHaveBeenCalledTimes(2); + expect(existingPdfDoc.save).toHaveBeenCalled(); + expect(component.currentPdfBlob()).toEqual(new Blob([new Uint8Array([1, 2, 3])], { type: 'application/pdf' })); + expect(loadOrAppendPdfSpy).toHaveBeenCalledWith(objectUrl, false); + expect(component.selectedPages()!.size).toBe(0); + expect(alertServiceErrorSpy).not.toHaveBeenCalled(); + expect(URL.revokeObjectURL).toHaveBeenCalledWith(objectUrl); + expect(component.isPdfLoading()).toBeFalsy(); + }); + + it('should handle errors when deleting slides', async () => { + // Mock the arrayBuffer method for the current PDF Blob + component.currentPdfBlob.set(new Blob(['existing pdf'], { type: 'application/pdf' })); + component.currentPdfBlob()!.arrayBuffer = jest.fn().mockRejectedValue(new Error('Failed to load PDF')); + + // Spy on the alert service + const alertServiceErrorSpy = jest.spyOn(alertServiceMock, 'error'); + + // Call the method + await component.deleteSelectedSlides(); + + // Ensure the alert service was called with the correct error message + expect(alertServiceErrorSpy).toHaveBeenCalledWith('artemisApp.attachment.pdfPreview.pageDeleteError', { error: 'Failed to load PDF' }); + + // Verify that the loading state is set to false after the operation + expect(component.isPdfLoading()).toBeFalsy(); }); }); diff --git a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts index 6abf0ee067bd..c850a83f6ecc 100644 --- a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts @@ -95,7 +95,7 @@ describe('LectureWizardUnitComponent', () => { unitCreationCard.onUnitCreationCardClicked.emit(LectureUnitType.VIDEO); wizardUnitComponentFixture.whenStable().then(() => { - expect(wizardUnitComponent.isVideoUnitFormOpen).toBeTrue(); + expect(wizardUnitComponent.isVideoUnitFormOpen()).toBeTrue(); }); })); @@ -106,7 +106,7 @@ describe('LectureWizardUnitComponent', () => { unitCreationCard.onUnitCreationCardClicked.emit(LectureUnitType.ONLINE); wizardUnitComponentFixture.whenStable().then(() => { - expect(wizardUnitComponent.isOnlineUnitFormOpen).toBeTrue(); + expect(wizardUnitComponent.isOnlineUnitFormOpen()).toBeTrue(); }); })); @@ -117,7 +117,7 @@ describe('LectureWizardUnitComponent', () => { unitCreationCard.onUnitCreationCardClicked.emit(LectureUnitType.ATTACHMENT); wizardUnitComponentFixture.whenStable().then(() => { - expect(wizardUnitComponent.isAttachmentUnitFormOpen).toBeTrue(); + expect(wizardUnitComponent.isAttachmentUnitFormOpen()).toBeTrue(); }); })); @@ -128,7 +128,7 @@ describe('LectureWizardUnitComponent', () => { unitCreationCard.onUnitCreationCardClicked.emit(LectureUnitType.TEXT); wizardUnitComponentFixture.whenStable().then(() => { - expect(wizardUnitComponent.isTextUnitFormOpen).toBeTrue(); + expect(wizardUnitComponent.isTextUnitFormOpen()).toBeTrue(); }); })); @@ -139,7 +139,7 @@ describe('LectureWizardUnitComponent', () => { unitCreationCard.onUnitCreationCardClicked.emit(LectureUnitType.EXERCISE); wizardUnitComponentFixture.whenStable().then(() => { - expect(wizardUnitComponent.isExerciseUnitFormOpen).toBeTrue(); + expect(wizardUnitComponent.isExerciseUnitFormOpen()).toBeTrue(); }); })); @@ -149,11 +149,11 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponent.onCloseLectureUnitForms(); wizardUnitComponentFixture.whenStable().then(() => { - expect(wizardUnitComponent.isOnlineUnitFormOpen).toBeFalse(); - expect(wizardUnitComponent.isTextUnitFormOpen).toBeFalse(); - expect(wizardUnitComponent.isExerciseUnitFormOpen).toBeFalse(); - expect(wizardUnitComponent.isAttachmentUnitFormOpen).toBeFalse(); - expect(wizardUnitComponent.isVideoUnitFormOpen).toBeFalse(); + expect(wizardUnitComponent.isOnlineUnitFormOpen()).toBeFalse(); + expect(wizardUnitComponent.isTextUnitFormOpen()).toBeFalse(); + expect(wizardUnitComponent.isExerciseUnitFormOpen()).toBeFalse(); + expect(wizardUnitComponent.isAttachmentUnitFormOpen()).toBeFalse(); + expect(wizardUnitComponent.isVideoUnitFormOpen()).toBeFalse(); }); })); @@ -194,7 +194,7 @@ describe('LectureWizardUnitComponent', () => { const updateSpy = jest.spyOn(wizardUnitComponent.unitManagementComponent, 'loadData'); - wizardUnitComponent.isVideoUnitFormOpen = true; + wizardUnitComponent.isVideoUnitFormOpen.set(true); wizardUnitComponent.createEditVideoUnit(formData); @@ -226,7 +226,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isVideoUnitFormOpen = true; + wizardUnitComponent.isVideoUnitFormOpen.set(true); wizardUnitComponent.createEditVideoUnit(formData); @@ -277,7 +277,7 @@ describe('LectureWizardUnitComponent', () => { const updateSpy = jest.spyOn(wizardUnitComponent.unitManagementComponent, 'loadData'); - wizardUnitComponent.isTextUnitFormOpen = true; + wizardUnitComponent.isTextUnitFormOpen.set(true); wizardUnitComponent.createEditTextUnit(formData); @@ -308,7 +308,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isTextUnitFormOpen = true; + wizardUnitComponent.isTextUnitFormOpen.set(true); wizardUnitComponent.createEditTextUnit(formData); @@ -333,7 +333,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isTextUnitFormOpen = true; + wizardUnitComponent.isTextUnitFormOpen.set(true); wizardUnitComponent.createEditTextUnit(formData); @@ -360,7 +360,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isVideoUnitFormOpen = true; + wizardUnitComponent.isVideoUnitFormOpen.set(true); wizardUnitComponent.createEditVideoUnit(formData); @@ -387,7 +387,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isOnlineUnitFormOpen = true; + wizardUnitComponent.isOnlineUnitFormOpen.set(true); wizardUnitComponent.createEditOnlineUnit(formData); @@ -434,7 +434,7 @@ describe('LectureWizardUnitComponent', () => { const updateSpy = jest.spyOn(wizardUnitComponent.unitManagementComponent, 'loadData'); - wizardUnitComponent.isOnlineUnitFormOpen = true; + wizardUnitComponent.isOnlineUnitFormOpen.set(true); wizardUnitComponent.createEditOnlineUnit(formDate); @@ -466,7 +466,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isOnlineUnitFormOpen = true; + wizardUnitComponent.isOnlineUnitFormOpen.set(true); wizardUnitComponent.createEditOnlineUnit(formData); @@ -538,7 +538,7 @@ describe('LectureWizardUnitComponent', () => { const updateSpy = jest.spyOn(wizardUnitComponent.unitManagementComponent, 'loadData'); - wizardUnitComponent.isAttachmentUnitFormOpen = true; + wizardUnitComponent.isAttachmentUnitFormOpen.set(true); wizardUnitComponent.createEditAttachmentUnit(attachmentUnitFormData); @@ -607,7 +607,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponent.isEditingLectureUnit = true; wizardUnitComponent.currentlyProcessedAttachmentUnit = new AttachmentUnit(); wizardUnitComponent.currentlyProcessedAttachmentUnit.attachment = new Attachment(); - wizardUnitComponent.isAttachmentUnitFormOpen = true; + wizardUnitComponent.isAttachmentUnitFormOpen.set(true); wizardUnitComponent.createEditAttachmentUnit(attachmentUnitFormData); @@ -663,7 +663,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isAttachmentUnitFormOpen = true; + wizardUnitComponent.isAttachmentUnitFormOpen.set(true); wizardUnitComponent.createEditAttachmentUnit(attachmentUnitFormData); @@ -719,7 +719,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isAttachmentUnitFormOpen = true; + wizardUnitComponent.isAttachmentUnitFormOpen.set(true); wizardUnitComponent.createEditAttachmentUnit(attachmentUnitFormData); @@ -742,7 +742,7 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); tick(); - wizardUnitComponent.isAttachmentUnitFormOpen = true; + wizardUnitComponent.isAttachmentUnitFormOpen.set(true); wizardUnitComponent.createEditAttachmentUnit(formData); @@ -839,6 +839,6 @@ describe('LectureWizardUnitComponent', () => { wizardUnitComponentFixture.detectChanges(); expect(wizardUnitComponent).not.toBeNull(); - expect(wizardUnitComponent.isExerciseUnitFormOpen).toBeTrue(); + expect(wizardUnitComponent.isExerciseUnitFormOpen()).toBeTrue(); })); }); diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts index e4ea05f90064..d1afbe9f83f1 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.spec.ts @@ -14,7 +14,6 @@ import { AddUsersFormData } from 'app/overview/course-conversations/dialogs/conv import { initializeDialog } from '../dialog-test-helpers'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { ChannelIconComponent } from 'app/overview/course-conversations/other/channel-icon/channel-icon.component'; -import { GroupChatIconComponent } from 'app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component'; import { UserPublicInfoDTO } from 'app/core/user/user.model'; import { By } from '@angular/platform-browser'; import { isChannelDTO } from 'app/entities/metis/conversation/channel.model'; @@ -42,13 +41,7 @@ examples.forEach((activeConversation) => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ - ConversationAddUsersDialogComponent, - ConversationAddUsersFormStubComponent, - MockPipe(ArtemisTranslatePipe), - MockComponent(ChannelIconComponent), - MockComponent(GroupChatIconComponent), - ], + declarations: [ConversationAddUsersDialogComponent, ConversationAddUsersFormStubComponent, MockPipe(ArtemisTranslatePipe), MockComponent(ChannelIconComponent)], providers: [ MockProvider(AlertService), MockProvider(NgbActiveModal), diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.spec.ts index 0f4590fc99b4..07100e45f567 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.spec.ts @@ -1,6 +1,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Course } from 'app/entities/course.model'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { ConversationDetailDialogComponent, ConversationDetailTabs, @@ -9,7 +10,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { ChannelIconComponent } from 'app/overview/course-conversations/other/channel-icon/channel-icon.component'; -import { GroupChatIconComponent } from 'app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ConversationService } from 'app/shared/metis/conversations/conversation.service'; import { generateExampleChannelDTO, generateExampleGroupChatDTO, generateOneToOneChatDTO } from '../../helpers/conversationExampleModels'; @@ -82,8 +82,8 @@ examples.forEach((activeConversation) => { ConversationInfoStubComponent, MockPipe(ArtemisTranslatePipe), MockComponent(ChannelIconComponent), - MockComponent(GroupChatIconComponent), ], + imports: [FontAwesomeModule], providers: [MockProvider(NgbActiveModal), MockProvider(ConversationService)], }).compileComponents(); })); diff --git a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts index 1bec632a62d4..32644d2b20b5 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-header/conversation-header.component.spec.ts @@ -3,7 +3,6 @@ import { ConversationHeaderComponent } from 'app/overview/course-conversations/l import { Location } from '@angular/common'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { ChannelIconComponent } from 'app/overview/course-conversations/other/channel-icon/channel-icon.component'; -import { GroupChatIconComponent } from 'app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; @@ -28,6 +27,7 @@ import { MetisModule } from 'app/shared/metis/metis.module'; import { MockTranslateService } from '../../../../../helpers/mocks/service/mock-translate.service'; import { TranslateService } from '@ngx-translate/core'; import { provideRouter } from '@angular/router'; +import { ProfilePictureComponent } from '../../../../../../../../main/webapp/app/shared/profile-picture/profile-picture.component'; const examples: ConversationDTO[] = [ generateOneToOneChatDTO({}), @@ -51,7 +51,7 @@ examples.forEach((activeConversation) => { declarations: [ ConversationHeaderComponent, MockComponent(ChannelIconComponent), - MockComponent(GroupChatIconComponent), + MockComponent(ProfilePictureComponent), MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe), ], @@ -138,6 +138,19 @@ examples.forEach((activeConversation) => { }); })); + it('should set otherUser to the non-requesting user in a one-to-one conversation', () => { + const oneToOneChat = generateOneToOneChatDTO({}); + oneToOneChat.members = [ + { id: 1, isRequestingUser: true }, + { id: 2, isRequestingUser: false }, + ]; + + component.activeConversation = oneToOneChat; + component.getOtherUser(); + + expect(component.otherUser).toEqual(oneToOneChat.members[1]); + }); + if (activeConversation instanceof ChannelDTO && activeConversation.subType !== ChannelSubType.GENERAL) { it( 'should navigate to ' + activeConversation.subType, diff --git a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts index a2cfe53d5cb4..407333ead201 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/layout/conversation-messages/conversation-messages.component.spec.ts @@ -14,7 +14,7 @@ import { Post } from 'app/entities/metis/post.model'; import { BehaviorSubject } from 'rxjs'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; import { generateExampleChannelDTO, generateExampleGroupChatDTO, generateOneToOneChatDTO } from '../../helpers/conversationExampleModels'; -import { Directive, EventEmitter, Input, Output } from '@angular/core'; +import { Directive, EventEmitter, Input, Output, QueryList } from '@angular/core'; import { By } from '@angular/platform-browser'; import { Course } from 'app/entities/course.model'; import { getAsChannelDTO } from 'app/entities/metis/conversation/channel.model'; @@ -87,6 +87,15 @@ examples.forEach((activeConversation) => { fixture = TestBed.createComponent(ConversationMessagesComponent); component = fixture.componentInstance; component.course = course; + component.messages = { + toArray: jest.fn().mockReturnValue([]), + } as any; + component.content = { + nativeElement: { + getBoundingClientRect: jest.fn().mockReturnValue({ top: 0, bottom: 100 }), + }, + } as any; + component.canStartSaving = true; fixture.detectChanges(); }); @@ -96,8 +105,6 @@ examples.forEach((activeConversation) => { it('should create', fakeAsync(() => { expect(component).toBeTruthy(); - component.handleScrollOnNewMessage(); - tick(); })); it('should set initial values correctly', fakeAsync(() => { @@ -132,6 +139,83 @@ examples.forEach((activeConversation) => { expect(getFilteredPostSpy).toHaveBeenCalledOnce(); })); + it('should save the scroll position in sessionStorage', fakeAsync(() => { + const setItemSpy = jest.spyOn(sessionStorage, 'setItem'); + component.ngOnInit(); + component.saveScrollPosition(15); + tick(100); + const expectedKey = `${component.sessionStorageKey}${component._activeConversation?.id}`; + const expectedValue = '15'; + expect(setItemSpy).toHaveBeenCalledWith(expectedKey, expectedValue); + expect(setItemSpy).toHaveBeenCalledTimes(2); + })); + + it('should scroll to the last selected element or fetch next page if not found', fakeAsync(() => { + const mockMessages = [ + { post: { id: 1 }, elementRef: { nativeElement: { scrollIntoView: jest.fn() } } }, + { post: { id: 2 }, elementRef: { nativeElement: { scrollIntoView: jest.fn() } } }, + ] as unknown as PostingThreadComponent[]; + component.messages = { + toArray: () => mockMessages, + } as QueryList; + + const fetchNextPageSpy = jest.spyOn(component, 'fetchNextPage').mockImplementation(() => {}); + const existingScrollPosition = 1; + + component.goToLastSelectedElement(existingScrollPosition); + tick(); + expect(fetchNextPageSpy).not.toHaveBeenCalled(); + + const nonExistingScrollPosition = 999; + component.goToLastSelectedElement(nonExistingScrollPosition); + tick(); + + expect(fetchNextPageSpy).toHaveBeenCalled(); + })); + + it('should find visible elements at the scroll position and save scroll position', () => { + // Mock des Containers + component.content.nativeElement = { + getBoundingClientRect: jest.fn().mockReturnValue({ top: 0, bottom: 100 }), + scrollTop: 0, + scrollHeight: 200, + removeEventListener: jest.fn(), + }; + const mockMessages = [ + { post: { id: 1 }, elementRef: { nativeElement: { getBoundingClientRect: jest.fn().mockReturnValue({ top: 10, bottom: 90 }) } } }, + { post: { id: 2 }, elementRef: { nativeElement: { getBoundingClientRect: jest.fn().mockReturnValue({ top: 100, bottom: 200 }) } } }, + ] as unknown as PostingThreadComponent[]; + component.messages.toArray = jest.fn().mockReturnValue(mockMessages); + component.canStartSaving = true; + const nextSpy = jest.spyOn(component.scrollSubject, 'next'); + component.findElementsAtScrollPosition(); + expect(component.elementsAtScrollPosition).toEqual([mockMessages[0]]); + expect(nextSpy).toHaveBeenCalledWith(1); + }); + + it('should not save scroll position if no elements are visible', () => { + const mockMessages = [ + { + post: { id: 1 }, + elementRef: { nativeElement: { getBoundingClientRect: jest.fn().mockReturnValue({ top: 200, bottom: 300 }) } }, + }, + ] as unknown as PostingThreadComponent[]; + + component.messages.toArray = jest.fn().mockReturnValue(mockMessages); + const nextSpy = jest.spyOn(component.scrollSubject, 'next'); + component.findElementsAtScrollPosition(); + expect(component.elementsAtScrollPosition).toEqual([]); + expect(nextSpy).not.toHaveBeenCalled(); + }); + + it('should scroll to the bottom when a new message is created', fakeAsync(() => { + component.content.nativeElement.scrollTop = 100; + fixture.detectChanges(); + component.handleNewMessageCreated(); + tick(300); + expect(component.content.nativeElement.scrollTop).toBe(component.content.nativeElement.scrollHeight); + })); + it('should create empty post with the correct conversation type', fakeAsync(() => { const createEmptyPostForContextSpy = jest.spyOn(metisService, 'createEmptyPostForContext').mockReturnValue(new Post()); component.createEmptyPost(); diff --git a/src/test/javascript/spec/component/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.spec.ts deleted file mode 100644 index 3ad916f52f04..000000000000 --- a/src/test/javascript/spec/component/overview/course-conversations/other/group-chat-icon/group-chat-icon.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { GroupChatIconComponent } from 'app/overview/course-conversations/other/group-chat-icon/group-chat-icon.component'; -import { MockComponent } from 'ng-mocks'; -import { FaIconComponent } from '@fortawesome/angular-fontawesome'; - -describe('GroupChatIconComponent', () => { - let component: GroupChatIconComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ declarations: [GroupChatIconComponent, MockComponent(FaIconComponent)] }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(GroupChatIconComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts index efb66d508837..4f2a2c9b8331 100644 --- a/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts +++ b/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts @@ -64,6 +64,7 @@ import { ProgrammingExerciseExampleSolutionRepoDownloadComponent } from 'app/exe import { ResetRepoButtonComponent } from 'app/shared/components/reset-repo-button/reset-repo-button.component'; import { ProblemStatementComponent } from 'app/overview/exercise-details/problem-statement/problem-statement.component'; import { ExerciseInfoComponent } from 'app/exercises/shared/exercise-info/exercise-info.component'; +import { ExerciseHeadersInformationComponent } from 'app/exercises/shared/exercise-headers/exercise-headers-information/exercise-headers-information.component'; import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model'; import { ScienceService } from 'app/shared/science/science.service'; @@ -164,6 +165,7 @@ describe('CourseExerciseDetailsComponent', () => { MockComponent(LtiInitializerComponent), MockComponent(ModelingEditorComponent), MockComponent(ExerciseInfoComponent), + MockComponent(ExerciseHeadersInformationComponent), ], providers: [ provideHttpClient(), diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts index 00ab084dd543..09d22ab65dd6 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts @@ -8,6 +8,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { LocalStorageService } from 'ngx-webstorage'; import '@angular/localize/init'; import { FeedbackFilterModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-filter-modal.component'; +import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; describe('FeedbackAnalysisComponent', () => { let fixture: ComponentFixture; @@ -17,15 +18,32 @@ describe('FeedbackAnalysisComponent', () => { let localStorageService: LocalStorageService; const feedbackMock: FeedbackDetail[] = [ - { detailText: 'Test feedback 1 detail', testCaseName: 'test1', count: 10, relativeCount: 50, taskNumber: '1', errorCategory: 'StudentError' }, - { detailText: 'Test feedback 2 detail', testCaseName: 'test2', count: 5, relativeCount: 25, taskNumber: '2', errorCategory: 'StudentError' }, + { + concatenatedFeedbackIds: [1, 2], + detailText: 'Test feedback 1 detail', + testCaseName: 'test1', + count: 10, + relativeCount: 50, + taskName: '1', + errorCategory: 'Student Error', + }, + { + concatenatedFeedbackIds: [3, 4], + detailText: 'Test feedback 2 detail', + testCaseName: 'test2', + count: 5, + relativeCount: 25, + taskName: '2', + errorCategory: 'AST Error', + }, ]; const feedbackResponseMock: FeedbackAnalysisResponse = { feedbackDetails: { resultsOnPage: feedbackMock, numberOfPages: 1 }, totalItems: 2, - totalAmountOfTasks: 1, + taskNames: ['task1', 'task2'], testCaseNames: ['test1', 'test2'], + errorCategories: ['Student Error', 'AST Error', 'Ares Error'], }; beforeEach(async () => { @@ -47,9 +65,9 @@ describe('FeedbackAnalysisComponent', () => { localStorageService = fixture.debugElement.injector.get(LocalStorageService); jest.spyOn(localStorageService, 'retrieve').mockReturnValue([]); - searchSpy = jest.spyOn(feedbackAnalysisService, 'search').mockResolvedValue(feedbackResponseMock); + // Initial input setup fixture.componentRef.setInput('exerciseId', 1); fixture.componentRef.setInput('exerciseTitle', 'Sample Exercise Title'); @@ -66,6 +84,7 @@ describe('FeedbackAnalysisComponent', () => { expect(searchSpy).toHaveBeenCalledOnce(); expect(component.content().resultsOnPage).toEqual(feedbackMock); expect(component.totalItems()).toBe(2); + expect(component.errorCategories()).toEqual(feedbackResponseMock.errorCategories); }); }); @@ -75,6 +94,7 @@ describe('FeedbackAnalysisComponent', () => { expect(searchSpy).toHaveBeenCalledTimes(2); expect(component.content().resultsOnPage).toEqual(feedbackMock); expect(component.totalItems()).toBe(2); + expect(component.errorCategories()).toEqual(feedbackResponseMock.errorCategories); }); it('should handle error while loading feedback details', async () => { @@ -89,59 +109,6 @@ describe('FeedbackAnalysisComponent', () => { }); }); - describe('setPage', () => { - it('should update page and reload data', async () => { - const loadDataSpy = jest.spyOn(component, 'loadData' as any); - - component.setPage(2); - expect(component.page()).toBe(2); - expect(loadDataSpy).toHaveBeenCalledOnce(); - }); - }); - - describe('setSortedColumn', () => { - it('should update sortedColumn and sortingOrder, and reload data', async () => { - const loadDataSpy = jest.spyOn(component, 'loadData' as any); - - component.setSortedColumn('testCaseName'); - expect(component.sortedColumn()).toBe('testCaseName'); - expect(component.sortingOrder()).toBe('ASCENDING'); - expect(loadDataSpy).toHaveBeenCalledOnce(); - - component.setSortedColumn('testCaseName'); - expect(component.sortingOrder()).toBe('DESCENDING'); - expect(loadDataSpy).toHaveBeenCalledTimes(2); - }); - }); - - describe('search', () => { - beforeEach(() => { - jest.spyOn(component, 'debounceLoadData' as any).mockImplementation(() => { - component['loadData'](); - }); - }); - - it('should reset page and load data when searching', async () => { - const loadDataSpy = jest.spyOn(component, 'loadData' as any); - component.searchTerm.set('test'); - await component.search(component.searchTerm()); - expect(component.page()).toBe(1); - expect(loadDataSpy).toHaveBeenCalledOnce(); - }); - }); - - describe('openFeedbackModal', () => { - it('should open feedback modal with correct feedback detail', () => { - const modalService = fixture.debugElement.injector.get(NgbModal); - const modalSpy = jest.spyOn(modalService, 'open').mockReturnValue({ componentInstance: {} } as any); - - const feedbackDetail = feedbackMock[0]; - component.openFeedbackModal(feedbackDetail); - - expect(modalSpy).toHaveBeenCalledOnce(); - }); - }); - describe('openFilterModal', () => { it('should open filter modal and pass correct form values and properties', async () => { const modalService = fixture.debugElement.injector.get(NgbModal); @@ -151,7 +118,11 @@ describe('FeedbackAnalysisComponent', () => { }, } as any); const getMaxCountSpy = jest.spyOn(feedbackAnalysisService, 'getMaxCount').mockResolvedValue(10); - jest.spyOn(localStorageService, 'retrieve').mockReturnValueOnce(['task1']).mockReturnValueOnce(['testCase1']).mockReturnValueOnce([component.minCount(), 5]); + jest.spyOn(localStorageService, 'retrieve') + .mockReturnValueOnce(['task1']) + .mockReturnValueOnce(['testCase1']) + .mockReturnValueOnce([component.minCount(), 5]) + .mockReturnValueOnce(['Student Error']); component.maxCount.set(5); component.selectedFiltersCount.set(1); @@ -164,8 +135,9 @@ describe('FeedbackAnalysisComponent', () => { tasks: ['task1'], testCases: ['testCase1'], occurrence: [component.minCount(), 5], + errorCategories: ['Student Error'], }); - expect(modalInstance.totalAmountOfTasks).toBe(component.totalAmountOfTasks); + expect(modalInstance.taskArray).toBe(component.taskNames); expect(modalInstance.testCaseNames).toBe(component.testCaseNames); expect(modalInstance.exerciseId).toBe(component.exerciseId); expect(modalInstance.maxCount).toBe(component.maxCount); @@ -181,6 +153,7 @@ describe('FeedbackAnalysisComponent', () => { tasks: ['task1'], testCases: ['testCase1'], occurrence: [component.minCount(), 10], + errorCategories: ['Student Error'], }; component.applyFilters(filters); @@ -197,10 +170,11 @@ describe('FeedbackAnalysisComponent', () => { tasks: ['task1', 'task2'], testCases: ['testCase1'], occurrence: [component.minCount(), component.maxCount()], + errorCategories: ['AST Error'], }; const count = component.countAppliedFilters(filters); - expect(count).toBe(3); + expect(count).toBe(4); }); it('should return 0 if no filters are applied', () => { @@ -208,9 +182,76 @@ describe('FeedbackAnalysisComponent', () => { tasks: [], testCases: [], occurrence: [component.minCount(), component.maxCount()], + errorCategories: [], }; const count = component.countAppliedFilters(filters); expect(count).toBe(0); }); }); + + describe('setPage', () => { + it('should update page and reload data', async () => { + const loadDataSpy = jest.spyOn(component, 'loadData' as any); + + component.setPage(2); + expect(component.page()).toBe(2); + expect(loadDataSpy).toHaveBeenCalledOnce(); + }); + }); + + describe('setSortedColumn', () => { + it('should update sortedColumn and sortingOrder, and reload data', async () => { + const loadDataSpy = jest.spyOn(component, 'loadData' as any); + + component.setSortedColumn('testCaseName'); + expect(component.sortedColumn()).toBe('testCaseName'); + expect(component.sortingOrder()).toBe('ASCENDING'); + expect(loadDataSpy).toHaveBeenCalledOnce(); + + component.setSortedColumn('testCaseName'); + expect(component.sortingOrder()).toBe('DESCENDING'); + expect(loadDataSpy).toHaveBeenCalledTimes(2); + }); + }); + + describe('search', () => { + beforeEach(() => { + jest.spyOn(component, 'debounceLoadData' as any).mockImplementation(() => { + component['loadData'](); + }); + }); + + it('should reset page and load data when searching', async () => { + const loadDataSpy = jest.spyOn(component, 'loadData' as any); + component.searchTerm.set('test'); + await component.search(component.searchTerm()); + expect(component.page()).toBe(1); + expect(loadDataSpy).toHaveBeenCalledOnce(); + }); + }); + + describe('openFeedbackModal', () => { + it('should open feedback modal with correct feedback detail', () => { + const modalService = fixture.debugElement.injector.get(NgbModal); + const modalSpy = jest.spyOn(modalService, 'open').mockReturnValue({ componentInstance: {} } as any); + + const feedbackDetail = feedbackMock[0]; + component.openFeedbackModal(feedbackDetail); + + expect(modalSpy).toHaveBeenCalledOnce(); + }); + }); + + describe('openAffectedStudentsModal', () => { + it('should open affected students modal with the correct feedback detail', () => { + const modalService = fixture.debugElement.injector.get(NgbModal); + const modalSpy = jest.spyOn(modalService, 'open').mockReturnValue({ componentInstance: {} } as any); + + const feedbackDetail = feedbackMock[1]; + component.openAffectedStudentsModal(feedbackDetail); + + expect(modalSpy).toHaveBeenCalledWith(AffectedStudentsModalComponent, { centered: true, size: 'lg' }); + expect(modalSpy).toHaveBeenCalledOnce(); + }); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts index 5233bfbd52bf..23b9bfaf0f49 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts @@ -9,15 +9,32 @@ describe('FeedbackAnalysisService', () => { let httpMock: HttpTestingController; const feedbackDetailsMock: FeedbackDetail[] = [ - { detailText: 'Feedback 1', testCaseName: 'test1', count: 5, relativeCount: 25.0, taskNumber: '1', errorCategory: 'StudentError' }, - { detailText: 'Feedback 2', testCaseName: 'test2', count: 3, relativeCount: 15.0, taskNumber: '2', errorCategory: 'StudentError' }, + { + concatenatedFeedbackIds: [1, 2], + detailText: 'Feedback 1', + testCaseName: 'test1', + count: 5, + relativeCount: 25.0, + taskName: '1', + errorCategory: 'StudentError', + }, + { + concatenatedFeedbackIds: [3, 4], + detailText: 'Feedback 2', + testCaseName: 'test2', + count: 3, + relativeCount: 15.0, + taskName: '2', + errorCategory: 'StudentError', + }, ]; const feedbackAnalysisResponseMock = { feedbackDetails: { resultsOnPage: feedbackDetailsMock, numberOfPages: 1 }, totalItems: 2, - totalAmountOfTasks: 2, + taskNames: ['task1', 'task2'], testCaseNames: ['test1', 'test2'], + errorCategories: ['StudentError'], }; beforeEach(() => { @@ -34,7 +51,7 @@ describe('FeedbackAnalysisService', () => { }); describe('search', () => { - it('should retrieve feedback details for a given exercise', async () => { + it('should retrieve feedback details for a given exercise with concatenatedFeedbackIds', async () => { const pageable = { page: 1, pageSize: 10, @@ -42,17 +59,19 @@ describe('FeedbackAnalysisService', () => { sortingOrder: SortingOrder.ASCENDING, sortedColumn: 'detailText', }; - const filters = { tasks: [], testCases: [], occurrence: [] }; + const filters = { tasks: [], testCases: [], occurrence: [], errorCategories: [] }; const responsePromise = service.search(pageable, { exerciseId: 1, filters }); const req = httpMock.expectOne( - 'api/exercises/1/feedback-details?page=1&pageSize=10&searchTerm=&sortingOrder=ASCENDING&sortedColumn=detailText&filterTasks=&filterTestCases=&filterOccurrence=', + 'api/exercises/1/feedback-details?page=1&pageSize=10&searchTerm=&sortingOrder=ASCENDING&sortedColumn=detailText&filterTasks=&filterTestCases=&filterOccurrence=&filterErrorCategories=', ); expect(req.request.method).toBe('GET'); req.flush(feedbackAnalysisResponseMock); const result = await responsePromise; expect(result).toEqual(feedbackAnalysisResponseMock); + expect(result.feedbackDetails.resultsOnPage[0].concatenatedFeedbackIds).toStrictEqual([1, 2]); + expect(result.feedbackDetails.resultsOnPage[1].concatenatedFeedbackIds).toStrictEqual([3, 4]); }); }); @@ -68,4 +87,49 @@ describe('FeedbackAnalysisService', () => { expect(result).toBe(10); }); }); + + describe('getParticipationForFeedbackIds', () => { + it('should retrieve paginated participation details for specified feedback IDs', async () => { + const feedbackIds = [1, 2]; + const pageable = { + page: 1, + pageSize: 10, + sortedColumn: 'participationId', + sortingOrder: SortingOrder.ASCENDING, + }; + const participationResponseMock = { + content: [ + { + courseId: 1, + participationId: 101, + firstName: 'John', + lastName: 'Doe', + login: 'johndoe', + repositoryName: 'repo1', + }, + { + courseId: 1, + participationId: 102, + firstName: 'Jane', + lastName: 'Smith', + login: 'janesmith', + repositoryName: 'repo2', + }, + ], + numberOfPages: 1, + totalItems: 2, + }; + + const responsePromise = service.getParticipationForFeedbackIds(1, feedbackIds, pageable); + + const req = httpMock.expectOne('api/exercises/1/feedback-details-participation?page=1&pageSize=10&sortedColumn=participationId&sortingOrder=ASCENDING'); + expect(req.request.method).toBe('GET'); + req.flush(participationResponseMock); + + const result = await responsePromise; + expect(result).toEqual(participationResponseMock); + expect(result.content[0].firstName).toBe('John'); + expect(result.content[1].firstName).toBe('Jane'); + }); + }); }); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts new file mode 100644 index 000000000000..bf8b1b77141a --- /dev/null +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-affected-students-modal.component.spec.ts @@ -0,0 +1,75 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { AffectedStudentsModalComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/Modal/feedback-affected-students-modal.component'; +import { FeedbackAffectedStudentDTO, FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { TranslateModule } from '@ngx-translate/core'; +import { of } from 'rxjs'; +import { provideHttpClient } from '@angular/common/http'; +import '@angular/localize/init'; + +describe('AffectedStudentsModalComponent', () => { + let fixture: ComponentFixture; + let component: AffectedStudentsModalComponent; + let feedbackService: FeedbackAnalysisService; + + const feedbackDetailMock: FeedbackDetail = { + concatenatedFeedbackIds: [1, 2], + count: 5, + relativeCount: 25.0, + detailText: 'Some feedback detail', + testCaseName: 'testCase1', + taskName: '1', + errorCategory: 'StudentError', + }; + + const participationMock: FeedbackAffectedStudentDTO[] = [ + { courseId: 1, participationId: 101, firstName: 'John', lastName: 'Doe', login: 'johndoe', repositoryURI: 'repo1' }, + { courseId: 1, participationId: 102, firstName: 'Jane', lastName: 'Smith', login: 'janesmith', repositoryURI: 'repo2' }, + ]; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), AffectedStudentsModalComponent], + providers: [ + provideHttpClient(), + NgbActiveModal, + { + provide: FeedbackAnalysisService, + useValue: { + getParticipationForFeedbackIds: jest.fn().mockReturnValue(of({ content: participationMock, totalPages: 1, totalElements: 2 })), + }, + }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(AffectedStudentsModalComponent); + component = fixture.componentInstance; + feedbackService = TestBed.inject(FeedbackAnalysisService); + + fixture.componentRef.setInput('exerciseId', 1); + fixture.componentRef.setInput('feedbackDetail', feedbackDetailMock); + fixture.detectChanges(); + }); + + it('should update page and reload data when setPage is called', async () => { + const loadAffectedSpy = jest.spyOn(component as any, 'loadAffected'); + + component.setPage(2); + expect(component.page()).toBe(2); + expect(loadAffectedSpy).toHaveBeenCalledOnce(); + }); + + it('should handle error when loadAffected fails', async () => { + jest.spyOn(feedbackService, 'getParticipationForFeedbackIds').mockReturnValueOnce(Promise.reject(new Error('Error loading data'))); + const alertServiceSpy = jest.spyOn(component.alertService, 'error'); + const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {}); + + await component['loadAffected'](); + + expect(component.participation().content).toEqual([]); + expect(alertServiceSpy).toHaveBeenCalled(); + expect(consoleErrorSpy).toHaveBeenCalled(); + + consoleErrorSpy.mockRestore(); + }); +}); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-filter-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-filter-modal.component.spec.ts index 369f7c42231e..ab1a83b24b9f 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-filter-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-filter-modal.component.spec.ts @@ -32,12 +32,14 @@ describe('FeedbackFilterModalComponent', () => { tasks: [], testCases: [], occurrence: [component.minCount(), component.maxCount()], + errorCategories: [], }; expect(component.filters).toEqual({ tasks: [], testCases: [], occurrence: [0, 10], + errorCategories: [], }); }); @@ -47,11 +49,13 @@ describe('FeedbackFilterModalComponent', () => { const closeSpy = jest.spyOn(activeModal, 'close'); component.filters.occurrence = [component.minCount(), component.maxCount()]; + component.filters.errorCategories = ['Student Error', 'Ares Error']; component.applyFilter(); expect(storeSpy).toHaveBeenCalledWith(component.FILTER_TASKS_KEY, []); expect(storeSpy).toHaveBeenCalledWith(component.FILTER_TEST_CASES_KEY, []); expect(storeSpy).toHaveBeenCalledWith(component.FILTER_OCCURRENCE_KEY, [0, 10]); + expect(storeSpy).toHaveBeenCalledWith(component.FILTER_ERROR_CATEGORIES_KEY, ['Student Error', 'Ares Error']); expect(emitSpy).toHaveBeenCalledOnce(); expect(closeSpy).toHaveBeenCalledOnce(); }); @@ -66,29 +70,44 @@ describe('FeedbackFilterModalComponent', () => { expect(clearSpy).toHaveBeenCalledWith(component.FILTER_TASKS_KEY); expect(clearSpy).toHaveBeenCalledWith(component.FILTER_TEST_CASES_KEY); expect(clearSpy).toHaveBeenCalledWith(component.FILTER_OCCURRENCE_KEY); + expect(clearSpy).toHaveBeenCalledWith(component.FILTER_ERROR_CATEGORIES_KEY); expect(component.filters).toEqual({ tasks: [], testCases: [], occurrence: [0, 10], + errorCategories: [], }); expect(emitSpy).toHaveBeenCalledOnce(); expect(closeSpy).toHaveBeenCalledOnce(); }); - it('should update filters when checkboxes change', () => { + it('should update filters when checkboxes change for tasks', () => { const event = { target: { checked: true, value: 'test-task' } } as unknown as Event; component.onCheckboxChange(event, 'tasks'); expect(component.filters.tasks).toEqual(['test-task']); }); - it('should remove the value from filters when checkbox is unchecked', () => { + it('should update filters when checkboxes change for errorCategories', () => { + const event = { target: { checked: true, value: 'Student Error' } } as unknown as Event; + component.onCheckboxChange(event, 'errorCategories'); + expect(component.filters.errorCategories).toEqual(['Student Error']); + }); + + it('should remove the value from filters when checkbox is unchecked for tasks', () => { component.filters.tasks = ['test-task', 'task-2']; const event = { target: { checked: false, value: 'test-task' } } as unknown as Event; component.onCheckboxChange(event, 'tasks'); expect(component.filters.tasks).toEqual(['task-2']); }); + it('should remove the value from filters when checkbox is unchecked for errorCategories', () => { + component.filters.errorCategories = ['Student Error', 'Ares Error']; + const event = { target: { checked: false, value: 'Student Error' } } as unknown as Event; + component.onCheckboxChange(event, 'errorCategories'); + expect(component.filters.errorCategories).toEqual(['Ares Error']); + }); + it('should dismiss modal when closeModal is called', () => { const dismissSpy = jest.spyOn(activeModal, 'dismiss'); component.closeModal(); diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts index 66f0d3d33aeb..cf31d3b2b9e0 100644 --- a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/modals/feedback-modal.component.spec.ts @@ -10,11 +10,12 @@ describe('FeedbackModalComponent', () => { let activeModal: NgbActiveModal; const mockFeedbackDetail: FeedbackDetail = { + concatenatedFeedbackIds: [1, 2], count: 5, relativeCount: 25.0, detailText: 'Some feedback detail', testCaseName: 'testCase1', - taskNumber: '1', + taskName: '1', errorCategory: 'StudentError', }; diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts index 8563723b42b8..f355ba91a806 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts @@ -22,9 +22,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockProgrammingExerciseGradingService } from '../../helpers/mocks/service/mock-programming-exercise-grading.service'; -import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; -import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto'; import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model'; import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model'; import { HttpResponse } from '@angular/common/http'; @@ -34,17 +32,24 @@ import { ProgrammingLanguageFeatureService, } from 'app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service'; import { MockRouter } from '../../helpers/mocks/mock-router'; +import { BuildConfig } from '../../../../../main/webapp/app/entities/programming/build-config.model'; +import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model'; +import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto'; +import { SubmissionPolicyService } from '../../../../../main/webapp/app/exercises/programming/manage/services/submission-policy.service'; -describe('ProgrammingExercise Management Detail Component', () => { +describe('ProgrammingExerciseDetailComponent', () => { let comp: ProgrammingExerciseDetailComponent; let fixture: ComponentFixture; let statisticsService: StatisticsService; let exerciseService: ProgrammingExerciseService; let alertService: AlertService; let profileService: ProfileService; + let submissionPolicyService: SubmissionPolicyService; let programmingLanguageFeatureService: ProgrammingLanguageFeatureService; let statisticsServiceStub: jest.SpyInstance; let gitDiffReportStub: jest.SpyInstance; + let profileServiceStub: jest.SpyInstance; + let submissionPolicyServiceStub: jest.SpyInstance; let buildLogStatisticsStub: jest.SpyInstance; let findWithTemplateAndSolutionParticipationStub: jest.SpyInstance; let router: Router; @@ -59,6 +64,9 @@ describe('ProgrammingExercise Management Detail Component', () => { solutionParticipation: { id: 2, } as SolutionProgrammingExerciseParticipation, + buildConfig: { + testwiseCoverageEnabled: true, + } as BuildConfig, } as ProgrammingExercise; const exerciseStatistics = { @@ -128,6 +136,8 @@ describe('ProgrammingExercise Management Detail Component', () => { alertService = fixture.debugElement.injector.get(AlertService); exerciseService = fixture.debugElement.injector.get(ProgrammingExerciseService); profileService = fixture.debugElement.injector.get(ProfileService); + submissionPolicyService = fixture.debugElement.injector.get(SubmissionPolicyService); + programmingLanguageFeatureService = fixture.debugElement.injector.get(ProgrammingLanguageFeatureService); router = fixture.debugElement.injector.get(Router); modalService = fixture.debugElement.injector.get(NgbModal); @@ -136,6 +146,8 @@ describe('ProgrammingExercise Management Detail Component', () => { .spyOn(exerciseService, 'findWithTemplateAndSolutionParticipationAndLatestResults') .mockReturnValue(of(new HttpResponse({ body: mockProgrammingExercise }))); gitDiffReportStub = jest.spyOn(exerciseService, 'getDiffReport').mockReturnValue(of(gitDiffReport)); + profileServiceStub = jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(profileInfo)); + submissionPolicyServiceStub = jest.spyOn(submissionPolicyService, 'getSubmissionPolicyOfProgrammingExercise').mockReturnValue(of(undefined)); buildLogStatisticsStub = jest.spyOn(exerciseService, 'getBuildLogStatistics').mockReturnValue(of(buildLogStatistics)); jest.spyOn(profileService, 'getProfileInfo').mockReturnValue(of(profileInfo)); @@ -148,6 +160,19 @@ describe('ProgrammingExercise Management Detail Component', () => { jest.restoreAllMocks(); }); + it('should reload on participation change', fakeAsync(() => { + const loadDiffSpy = jest.spyOn(comp, 'loadGitDiffReport'); + jest.spyOn(exerciseService, 'getLatestResult').mockReturnValue({ successful: true }); + jest.spyOn(exerciseService, 'getLatestFullTestwiseCoverageReport').mockReturnValue(of({ coveredLineRatio: 0.5 })); + comp.programmingExercise = mockProgrammingExercise; + comp.programmingExerciseBuildConfig = mockProgrammingExercise.buildConfig; + comp.onParticipationChange(); + tick(); + expect(loadDiffSpy).toHaveBeenCalledOnce(); + expect(gitDiffReportStub).toHaveBeenCalledOnce(); + expect(comp.programmingExercise.coveredLinesRatio).toBe(0.5); + })); + describe('onInit for course exercise', () => { const programmingExercise = new ProgrammingExercise(new Course(), undefined); programmingExercise.id = 123; @@ -163,6 +188,8 @@ describe('ProgrammingExercise Management Detail Component', () => { // THEN expect(findWithTemplateAndSolutionParticipationStub).toHaveBeenCalledOnce(); + expect(profileServiceStub).toHaveBeenCalledTimes(2); + expect(submissionPolicyServiceStub).toHaveBeenCalledOnce(); expect(gitDiffReportStub).toHaveBeenCalledOnce(); expect(statisticsServiceStub).toHaveBeenCalledOnce(); await Promise.resolve(); @@ -285,18 +312,6 @@ describe('ProgrammingExercise Management Detail Component', () => { expect(comp.isBuildPlanEditable).toBe(editable); }); - it('should reload on participation change', fakeAsync(() => { - const loadDiffSpy = jest.spyOn(comp, 'loadGitDiffReport'); - jest.spyOn(exerciseService, 'getLatestResult').mockReturnValue({ successful: true }); - jest.spyOn(exerciseService, 'getLatestFullTestwiseCoverageReport').mockReturnValue(of({ coveredLineRatio: 0.5 })); - comp.programmingExercise = mockProgrammingExercise; - comp.programmingExercise.buildConfig!.testwiseCoverageEnabled = true; - comp.onParticipationChange(); - tick(); - expect(loadDiffSpy).toHaveBeenCalledOnce(); - expect(comp.programmingExercise.coveredLinesRatio).toBe(0.5); - })); - it('should combine template commit', () => { const combineCommitsSpy = jest.spyOn(exerciseService, 'combineTemplateRepositoryCommits').mockReturnValue(of(new HttpResponse({ body: null }))); const successSpy = jest.spyOn(alertService, 'success'); diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts index 3cfff55d7749..d0233fde1827 100644 --- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts @@ -210,6 +210,7 @@ describe('ProgrammingExerciseInstructionComponent', () => { comp.participation = participation; comp.isInitial = false; triggerChanges(comp, { property: 'exercise', currentValue: { ...comp.exercise, problemStatement: newProblemStatement }, firstChange: false }); + fixture.detectChanges(); expect(comp.markdownExtensions).toHaveLength(2); expect(updateMarkdownStub).toHaveBeenCalledOnce(); expect(loadInitialResult).not.toHaveBeenCalled(); @@ -426,7 +427,6 @@ describe('ProgrammingExerciseInstructionComponent', () => { comp.updateMarkdown(); - fixture.detectChanges(); tick(); // first test should be green (successful), second red (failed) @@ -447,7 +447,13 @@ describe('ProgrammingExerciseInstructionComponent', () => { it('should update the markdown on a theme change', () => { const updateMarkdownStub = jest.spyOn(comp, 'updateMarkdown'); - themeService.applyThemeExplicitly(Theme.DARK); + + comp.isInitial = false; + themeService.applyThemePreference(Theme.DARK); + + fixture.detectChanges(); + + // toObservable triggers a effect in the background on initial detectChanges expect(updateMarkdownStub).toHaveBeenCalledOnce(); }); diff --git a/src/test/javascript/spec/component/shared/code-button.component.spec.ts b/src/test/javascript/spec/component/shared/code-button.component.spec.ts index 181fda044dad..97e503b609dc 100644 --- a/src/test/javascript/spec/component/shared/code-button.component.spec.ts +++ b/src/test/javascript/spec/component/shared/code-button.component.spec.ts @@ -19,7 +19,7 @@ import { SafeUrlPipe } from 'app/shared/pipes/safe-url.pipe'; import dayjs from 'dayjs/esm'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { LocalStorageService } from 'ngx-webstorage'; -import { BehaviorSubject, Subject, of, throwError } from 'rxjs'; +import { BehaviorSubject, of, throwError } from 'rxjs'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; import { MockFeatureToggleService } from '../../helpers/mocks/service/mock-feature-toggle.service'; import { MockProfileService } from '../../helpers/mocks/service/mock-profile.service'; @@ -36,9 +36,6 @@ describe('CodeButtonComponent', () => { let profileService: ProfileService; let accountService: AccountService; - let localStorageUseSshRetrieveStub: jest.SpyInstance; - let localStorageUseSshObserveStub: jest.SpyInstance; - let localStorageUseSshObserveStubSubject: Subject; let localStorageUseSshStoreStub: jest.SpyInstance; let getVcsAccessTokenSpy: jest.SpyInstance; let hasSshKeySpy: jest.SpyInstance; @@ -119,16 +116,11 @@ describe('CodeButtonComponent', () => { accountService = TestBed.inject(AccountService); const localStorageMock = fixture.debugElement.injector.get(LocalStorageService); - localStorageUseSshRetrieveStub = jest.spyOn(localStorageMock, 'retrieve'); - localStorageUseSshObserveStub = jest.spyOn(localStorageMock, 'observe'); localStorageUseSshStoreStub = jest.spyOn(localStorageMock, 'store'); getVcsAccessTokenSpy = jest.spyOn(accountService, 'getVcsAccessToken'); hasSshKeySpy = jest.spyOn(accountService, 'hasUserSshPublicKeys'); createVcsAccessTokenSpy = jest.spyOn(accountService, 'createVcsAccessToken'); - localStorageUseSshObserveStubSubject = new Subject(); - localStorageUseSshObserveStub.mockReturnValue(localStorageUseSshObserveStubSubject); - participation = {}; component.user = user; }); @@ -151,10 +143,8 @@ describe('CodeButtonComponent', () => { it('should initialize', async () => { stubServices(); - component.ngOnInit(); + await component.ngOnInit(); - await fixture.whenStable(); - fixture.detectChanges(); expect(component.sshSettingsUrl).toBe(`${window.location.origin}/user-settings/ssh`); expect(component.sshTemplateUrl).toBe(info.sshCloneURLTemplate); expect(component.sshEnabled).toBe(!!info.sshCloneURLTemplate); @@ -169,9 +159,8 @@ describe('CodeButtonComponent', () => { component.useParticipationVcsAccessToken = true; component.participations = [participation]; await component.ngOnInit(); - await fixture.whenStable(); + component.ngOnChanges(); - await fixture.whenStable(); expect(component.accessTokensEnabled).toBeTrue(); expect(component.user.vcsAccessToken).toEqual(vcsToken); @@ -185,9 +174,8 @@ describe('CodeButtonComponent', () => { component.useParticipationVcsAccessToken = true; stubServices(); await component.ngOnInit(); - await fixture.whenStable(); + component.ngOnChanges(); - await fixture.whenStable(); expect(component.accessTokensEnabled).toBeTrue(); expect(component.user.vcsAccessToken).toEqual(vcsToken); @@ -371,12 +359,10 @@ describe('CodeButtonComponent', () => { component.participations = [participation]; component.activeParticipation = participation; component.sshEnabled = true; - await component.ngOnInit(); - await fixture.whenStable(); + component.accessTokensEnabled = true; + fixture.detectChanges(); - expect(localStorageUseSshRetrieveStub).toHaveBeenNthCalledWith(1, 'useSsh'); - expect(localStorageUseSshObserveStub).toHaveBeenNthCalledWith(1, 'useSsh'); expect(component.useSsh).toBeFalse(); fixture.debugElement.query(By.css('.code-button')).nativeElement.click(); @@ -393,13 +379,7 @@ describe('CodeButtonComponent', () => { expect(localStorageUseSshStoreStub).toHaveBeenCalledWith('useSsh', false); expect(component.useSsh).toBeFalse(); expect(component.useToken).toBeTrue(); - - localStorageUseSshObserveStubSubject.next(true); - expect(component.useSsh).toBeTrue(); - - localStorageUseSshObserveStubSubject.next(false); - expect(component.useSsh).toBeFalse(); - }); + })); it.each([ [ diff --git a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts index ffb59f1825a3..74693eb15ba5 100644 --- a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts +++ b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts @@ -6,7 +6,7 @@ import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; -import { MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component'; @@ -14,6 +14,7 @@ import { UserPublicInfoDTO } from 'app/core/user/user.model'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { TranslateModule } from '@ngx-translate/core'; +import { ProfilePictureComponent } from 'app/shared/profile-picture/profile-picture.component'; @Component({ template: ` @@ -48,7 +49,7 @@ describe('CourseUsersSelectorComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [CommonModule, FormsModule, ReactiveFormsModule, NgbTypeaheadModule, ArtemisSharedModule, ArtemisSharedComponentModule, TranslateModule.forRoot()], - declarations: [CourseUsersSelectorComponent, WrapperComponent, MockPipe(ArtemisTranslatePipe)], + declarations: [CourseUsersSelectorComponent, WrapperComponent, MockPipe(ArtemisTranslatePipe), MockComponent(ProfilePictureComponent)], providers: [MockProvider(CourseManagementService)], }).compileComponents(); })); @@ -142,6 +143,18 @@ describe('CourseUsersSelectorComponent', () => { expect(userSelectorComponent.selectedUsers).toEqual([exampleUserPublicInfoDTO]); expect(fixture.debugElement.query(By.css('.delete-user'))).toBeFalsy(); })); + + it('should render profile picture for users in dropdown', fakeAsync(() => { + const user = generateExampleUserPublicInfoDTO({}); + searchUsersSpy.mockReturnValue(of(new HttpResponse({ body: [user], status: 200 }))); + + changeInput(fixture.debugElement.nativeElement, 'test'); + tick(1000); + fixture.detectChanges(); + + const profilePicture = fixture.debugElement.query(By.directive(MockComponent(ProfilePictureComponent))); + expect(profilePicture).not.toBeNull(); + })); }); function getNativeInput(element: HTMLElement): HTMLInputElement { diff --git a/src/test/javascript/spec/component/shared/difficulty-level.component.spec.ts b/src/test/javascript/spec/component/shared/difficulty-level.component.spec.ts new file mode 100644 index 000000000000..7fbad5566f3e --- /dev/null +++ b/src/test/javascript/spec/component/shared/difficulty-level.component.spec.ts @@ -0,0 +1,74 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { DifficultyLevelComponent } from 'app/shared/difficulty-level/difficulty-level.component'; +import { ArtemisTestModule } from '../../test.module'; + +describe('DifficultyLevelComponent', () => { + let component: DifficultyLevelComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [DifficultyLevelComponent, NgbTooltipModule, ArtemisTestModule], + }).compileComponents(); + fixture = TestBed.createComponent(DifficultyLevelComponent); + component = fixture.componentInstance; + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set coloredDifficultyLevel correctly for EASY', () => { + component.difficultyLevel = 'EASY'; + fixture.detectChanges(); + + expect(component.coloredDifficultyLevel.label).toBe('artemisApp.exercise.easy'); + expect(component.coloredDifficultyLevel.color).toEqual(['success', 'body', 'body']); + }); + + it('should set coloredDifficultyLevel correctly for MEDIUM', () => { + component.difficultyLevel = 'MEDIUM'; + fixture.detectChanges(); + + expect(component.coloredDifficultyLevel.label).toBe('artemisApp.exercise.medium'); + expect(component.coloredDifficultyLevel.color).toEqual(['warning', 'warning', 'body']); + }); + + it('should set coloredDifficultyLevel correctly for HARD', () => { + component.difficultyLevel = 'HARD'; + fixture.detectChanges(); + + expect(component.coloredDifficultyLevel.label).toBe('artemisApp.exercise.hard'); + expect(component.coloredDifficultyLevel.color).toEqual(['danger', 'danger', 'danger']); + }); + + it('should set coloredDifficultyLevel correctly for no level', () => { + component.difficultyLevel = 'UNKNOWN'; + fixture.detectChanges(); + + expect(component.coloredDifficultyLevel.label).toBe('artemisApp.exercise.noLevel'); + expect(component.coloredDifficultyLevel.color).toEqual(['body', 'body', 'body']); + }); + it('should display the correct tooltip label', () => { + component.difficultyLevel = 'EASY'; + fixture.detectChanges(); + + const tooltipElement: HTMLElement = fixture.nativeElement.querySelector('#difficulty-level'); + tooltipElement.dispatchEvent(new Event('mouseenter')); + fixture.detectChanges(); + + const tooltipContent = document.querySelector('.tooltip-inner'); + expect(tooltipContent?.textContent).toBe('artemisApp.exercise.easy'); + }); + + it('should apply the correct classes for difficulty colors', () => { + component.difficultyLevel = 'EASY'; + fixture.detectChanges(); + const skillBars: NodeListOf = fixture.nativeElement.querySelectorAll('.skill-bar'); + expect(skillBars).toHaveLength(3); + expect(skillBars[0].classList).toContain('bg-success'); + expect(skillBars[1].classList).toContain('bg-body'); + expect(skillBars[2].classList).toContain('bg-body'); + }); +}); diff --git a/src/test/javascript/spec/component/shared/information-box.component.spec.ts b/src/test/javascript/spec/component/shared/information-box.component.spec.ts new file mode 100644 index 000000000000..2a69d6587e8f --- /dev/null +++ b/src/test/javascript/spec/component/shared/information-box.component.spec.ts @@ -0,0 +1,56 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { InformationBoxComponent } from '../../../../../main/webapp/app/shared/information-box/information-box.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { ArtemisTestModule } from '../../test.module'; + +describe('InformationBoxComponent', () => { + let component: InformationBoxComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [InformationBoxComponent, ArtemisTestModule, TranslateModule.forRoot(), NgbTooltipModule], + }).compileComponents(); + fixture = TestBed.createComponent(InformationBoxComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should display the title', () => { + component.informationBoxData = { + title: 'Test Title', + tooltip: 'Test Tooltip', + tooltipParams: {}, + isContentComponent: false, + content: { type: 'string', value: 'Test Content' }, + contentColor: 'primary', + }; + fixture.detectChanges(); + + const compiled = fixture.nativeElement as HTMLElement; + const titleElement = compiled.querySelector('#test-title'); + expect(titleElement?.textContent).toContain('Test Title'); + }); + + it('should display the content', () => { + component.informationBoxData = { + title: 'Test Title', + tooltip: 'Test Tooltip', + tooltipParams: {}, + isContentComponent: false, + content: { type: 'string', value: 'Test Content' }, + contentColor: 'primary', + }; + fixture.detectChanges(); + + const compiled = fixture.nativeElement as HTMLElement; + const contentElement = compiled.querySelector('#test-text'); + expect(contentElement?.textContent).toContain('Test Content'); + }); +}); diff --git a/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts b/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts index cdcc598b7988..c7c9cf4f24db 100644 --- a/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/post/post.component.spec.ts @@ -170,6 +170,15 @@ describe('PostComponent', () => { expect(postFooterOpenCreateAnswerPostModal).toHaveBeenCalledOnce(); }); + it('should close create answer post modal', () => { + component.posting = metisPostExerciseUser1; + component.ngOnInit(); + fixture.detectChanges(); + const postFooterOpenCreateAnswerPostModal = jest.spyOn(component.postFooterComponent, 'closeCreateAnswerPostModal'); + component.closeCreateAnswerPostModal(); + expect(postFooterOpenCreateAnswerPostModal).toHaveBeenCalledOnce(); + }); + it('should create or navigate to oneToOneChat when not on messaging page', () => { const navigateSpy = jest.spyOn(router, 'navigate'); const oneToOneChatService = TestBed.inject(OneToOneChatService); diff --git a/src/test/javascript/spec/component/shared/metis/postings-footer/post-footer/post-footer.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-footer/post-footer/post-footer.component.spec.ts index 45c38925db52..8071b5a84a95 100644 --- a/src/test/javascript/spec/component/shared/metis/postings-footer/post-footer/post-footer.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/postings-footer/post-footer/post-footer.component.spec.ts @@ -151,4 +151,13 @@ describe('PostFooterComponent', () => { component.openCreateAnswerPostModal(); expect(createAnswerPostModalOpen).toHaveBeenCalledOnce(); }); + + it('should close create answer post modal', () => { + component.posting = metisPostExerciseUser1; + component.ngOnInit(); + fixture.detectChanges(); + const createAnswerPostModalClose = jest.spyOn(component.createAnswerPostModalComponent, 'close'); + component.closeCreateAnswerPostModal(); + expect(createAnswerPostModalClose).toHaveBeenCalledOnce(); + }); }); diff --git a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts index 8e5b51590166..a3b889e8d146 100644 --- a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/answer-post-reactions-bar/answer-post-reactions-bar.component.spec.ts @@ -193,15 +193,6 @@ describe('AnswerPostReactionsBarComponent', () => { expect(answerNowButton).toBeNull(); }); - it('answer now button should be visible if answer is the last one', () => { - component.posting = post; - component.isLastAnswer = true; - component.ngOnInit(); - fixture.detectChanges(); - const answerNowButton = fixture.debugElement.query(By.css('.reply-btn')).nativeElement; - expect(answerNowButton.innerHTML).toContain('reply'); - }); - it('should invoke metis service when toggle resolve is clicked', () => { metisServiceUserPostingAuthorMock.mockReturnValue(true); fixture.detectChanges(); diff --git a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts index f5ccda3ada15..d1b1607ffb1d 100644 --- a/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/metis/postings-reactions-bar/post-reactions-bar/post-reactions-bar.component.spec.ts @@ -3,7 +3,7 @@ import { MetisService } from 'app/shared/metis/metis.service'; import { DebugElement } from '@angular/core'; import { Post } from 'app/entities/metis/post.model'; import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; -import { getElement, getElements } from '../../../../../helpers/utils/general.utils'; +import { getElement } from '../../../../../helpers/utils/general.utils'; import { PostReactionsBarComponent } from 'app/shared/metis/posting-reactions-bar/post-reactions-bar/post-reactions-bar.component'; import { OverlayModule } from '@angular/cdk/overlay'; import { Reaction } from 'app/entities/metis/reaction.model'; @@ -239,9 +239,8 @@ describe('PostReactionsBarComponent', () => { component.posting = post; component.ngOnInit(); + component.isEmojiCount = true; fixture.detectChanges(); - const reactions = getElements(debugElement, 'jhi-emoji'); - expect(reactions).toHaveLength(2); expect(component.reactionMetaDataMap).toEqual({ smile: { count: 1, @@ -311,14 +310,6 @@ describe('PostReactionsBarComponent', () => { expect(component.pinTooltip).toBe('artemisApp.metis.pinnedPostTooltip'); }); - it('start discussion button should be visible if post does not yet have any answers', () => { - component.posting = post; - component.sortedAnswerPosts = []; - fixture.detectChanges(); - const startDiscussion = fixture.debugElement.query(By.css('.reply-btn')).nativeElement; - expect(startDiscussion.innerHTML).toContain('reply'); - }); - it('should display button to show single answer', () => { component.posting = post; component.sortedAnswerPosts = [metisPostExerciseUser1]; @@ -343,4 +334,24 @@ describe('PostReactionsBarComponent', () => { const answerNowButton = fixture.debugElement.query(By.css('.collapse-answers-btn')).nativeElement; expect(answerNowButton.innerHTML).toContain('collapseAnswers'); }); + + it('should emit showAnswersChange and openPostingCreateEditModal when openAnswerView is called', () => { + const showAnswersChangeSpy = jest.spyOn(component.showAnswersChange, 'emit'); + const openPostingCreateEditModalSpy = jest.spyOn(component.openPostingCreateEditModal, 'emit'); + + component.openAnswerView(); + + expect(showAnswersChangeSpy).toHaveBeenCalledWith(true); + expect(openPostingCreateEditModalSpy).toHaveBeenCalled(); + }); + + it('should emit showAnswersChange and closePostingCreateEditModal when closeAnswerView is called', () => { + const showAnswersChangeSpy = jest.spyOn(component.showAnswersChange, 'emit'); + const closePostingCreateEditModalSpy = jest.spyOn(component.closePostingCreateEditModal, 'emit'); + + component.closeAnswerView(); + + expect(showAnswersChangeSpy).toHaveBeenCalledWith(false); + expect(closePostingCreateEditModalSpy).toHaveBeenCalled(); + }); }); diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.service.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.service.spec.ts index 1a5a59e69436..4951d70833b4 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.service.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.service.spec.ts @@ -1,10 +1,9 @@ import { TestBed } from '@angular/core/testing'; import * as monaco from 'monaco-editor'; import { Theme, ThemeService } from 'app/core/theme/theme.service'; -import { MonacoEditorService } from '../../../../../../main/webapp/app/shared/monaco-editor/monaco-editor.service'; +import { MonacoEditorService } from 'app/shared/monaco-editor/monaco-editor.service'; import { ArtemisTestModule } from '../../../test.module'; import { CUSTOM_MARKDOWN_LANGUAGE_ID } from 'app/shared/monaco-editor/model/languages/monaco-custom-markdown.language'; -import { BehaviorSubject } from 'rxjs'; import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; import { MONACO_LIGHT_THEME_DEFINITION } from 'app/shared/monaco-editor/model/themes/monaco-light.theme'; import { MONACO_DARK_THEME_DEFINITION } from 'app/shared/monaco-editor/model/themes/monaco-dark.theme'; @@ -13,7 +12,8 @@ describe('MonacoEditorService', () => { let monacoEditorService: MonacoEditorService; let setThemeSpy: jest.SpyInstance; let registerLanguageSpy: jest.SpyInstance; - const themeSubject = new BehaviorSubject(Theme.LIGHT); + + let themeService: ThemeService; beforeEach(() => { TestBed.configureTestingModule({ @@ -25,8 +25,7 @@ describe('MonacoEditorService', () => { }); registerLanguageSpy = jest.spyOn(monaco.languages, 'register'); setThemeSpy = jest.spyOn(monaco.editor, 'setTheme'); - const themeService = TestBed.inject(ThemeService); - jest.spyOn(themeService, 'getCurrentThemeObservable').mockReturnValue(themeSubject.asObservable()); + themeService = TestBed.inject(ThemeService); monacoEditorService = TestBed.inject(MonacoEditorService); }); @@ -44,20 +43,26 @@ describe('MonacoEditorService', () => { // Initialization: The editor should be in light mode since that is what we initialized the themeSubject with expect(setThemeSpy).toHaveBeenCalledExactlyOnceWith(MONACO_LIGHT_THEME_DEFINITION.id); // Switch to dark theme - themeSubject.next(Theme.DARK); + themeService.applyThemePreference(Theme.DARK); TestBed.flushEffects(); expect(setThemeSpy).toHaveBeenCalledTimes(2); expect(setThemeSpy).toHaveBeenNthCalledWith(2, MONACO_DARK_THEME_DEFINITION.id); // Switch back to light theme - themeSubject.next(Theme.LIGHT); + themeService.applyThemePreference(Theme.LIGHT); TestBed.flushEffects(); expect(setThemeSpy).toHaveBeenCalledTimes(3); expect(setThemeSpy).toHaveBeenNthCalledWith(3, MONACO_LIGHT_THEME_DEFINITION.id); }); it.each([ - { className: 'monaco-editor', createFn: (element: HTMLElement) => monacoEditorService.createStandaloneCodeEditor(element) }, - { className: 'monaco-diff-editor', createFn: (element: HTMLElement) => monacoEditorService.createStandaloneDiffEditor(element) }, + { + className: 'monaco-editor', + createFn: (element: HTMLElement) => monacoEditorService.createStandaloneCodeEditor(element), + }, + { + className: 'monaco-diff-editor', + createFn: (element: HTMLElement) => monacoEditorService.createStandaloneDiffEditor(element), + }, ])( 'should insert an editor ($className) into the provided DOM element', ({ className, createFn }: { className: string; createFn: (element: HTMLElement) => monaco.editor.IStandaloneCodeEditor | monaco.editor.IStandaloneDiffEditor }) => { diff --git a/src/test/javascript/spec/component/shared/navbar.component.spec.ts b/src/test/javascript/spec/component/shared/navbar.component.spec.ts index 8b37f25b6f19..bc2e7cb37b92 100644 --- a/src/test/javascript/spec/component/shared/navbar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/navbar.component.spec.ts @@ -26,7 +26,6 @@ import { JhiConnectionWarningComponent } from 'app/shared/connection-warning/con import { AccountService } from 'app/core/auth/account.service'; import { MockAccountService } from '../../helpers/mocks/service/mock-account.service'; import { EntityTitleService, EntityType } from 'app/shared/layouts/navbar/entity-title.service'; -import { ThemeSwitchComponent } from 'app/core/theme/theme-switch.component'; import { Authority } from 'app/shared/constants/authority.constants'; import { User } from 'app/core/user/user.model'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; @@ -39,6 +38,9 @@ import { NgbCollapseMocksModule } from '../../helpers/mocks/directive/ngbCollaps import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module'; import { provideHttpClientTesting } from '@angular/common/http/testing'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; +import { ThemeSwitchComponent } from 'app/core/theme/theme-switch.component'; +import { mockThemeSwitcherComponentViewChildren } from '../../helpers/mocks/mock-instance.helper'; class MockBreadcrumb { label: string; @@ -91,6 +93,9 @@ describe('NavbarComponent', () => { activeProfiles: ['test'], } as ProfileInfo; + // Workaround for an error with MockComponent(). You can remove this once https://github.com/help-me-mom/ng-mocks/issues/8634 is resolved. + mockThemeSwitcherComponentViewChildren(); + beforeEach(() => { return TestBed.configureTestingModule({ imports: [NgbTooltipMocksModule, NgbCollapseMocksModule, NgbDropdownMocksModule], @@ -107,9 +112,9 @@ describe('NavbarComponent', () => { MockComponent(GuidedTourComponent), MockComponent(LoadingNotificationComponent), MockComponent(JhiConnectionWarningComponent), - MockComponent(ThemeSwitchComponent), MockComponent(SystemNotificationComponent), MockComponent(FaIconComponent), + MockComponent(ThemeSwitchComponent), ], providers: [ provideHttpClient(), @@ -123,12 +128,23 @@ describe('NavbarComponent', () => { { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: TranslateService, useClass: MockTranslateService }, { provide: Router, useValue: router }, + { + provide: GuidedTourService, + useValue: { + getGuidedTourAvailabilityStream: () => of(false), + }, + }, { provide: ActivatedRoute, useValue: new MockActivatedRoute({ id: 123 }), }, ], }) + .overrideComponent(NavbarComponent, { + remove: { + imports: [ThemeSwitchComponent], + }, + }) .compileComponents() .then(() => { fixture = TestBed.createComponent(NavbarComponent); @@ -216,10 +232,22 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs).toHaveLength(3); - const systemBreadcrumb = { label: 'artemisApp.systemNotification.systemNotifications', translate: true, uri: '/admin/system-notification-management/' } as MockBreadcrumb; + const systemBreadcrumb = { + label: 'artemisApp.systemNotification.systemNotifications', + translate: true, + uri: '/admin/system-notification-management/', + } as MockBreadcrumb; expect(component.breadcrumbs[0]).toEqual(systemBreadcrumb); - expect(component.breadcrumbs[1]).toEqual({ label: '1', translate: false, uri: '/admin/system-notification-management/1/' } as MockBreadcrumb); - expect(component.breadcrumbs[2]).toEqual({ label: 'global.generic.edit', translate: true, uri: '/admin/system-notification-management/1/edit/' } as MockBreadcrumb); + expect(component.breadcrumbs[1]).toEqual({ + label: '1', + translate: false, + uri: '/admin/system-notification-management/1/', + } as MockBreadcrumb); + expect(component.breadcrumbs[2]).toEqual({ + label: 'global.generic.edit', + translate: true, + uri: '/admin/system-notification-management/1/edit/', + } as MockBreadcrumb); }); it('should build breadcrumbs for user management', () => { @@ -230,8 +258,16 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs).toHaveLength(2); - expect(component.breadcrumbs[0]).toEqual({ label: 'artemisApp.userManagement.home.title', translate: true, uri: '/admin/user-management/' } as MockBreadcrumb); - expect(component.breadcrumbs[1]).toEqual({ label: 'test_user', translate: false, uri: '/admin/user-management/test_user/' } as MockBreadcrumb); + expect(component.breadcrumbs[0]).toEqual({ + label: 'artemisApp.userManagement.home.title', + translate: true, + uri: '/admin/user-management/', + } as MockBreadcrumb); + expect(component.breadcrumbs[1]).toEqual({ + label: 'test_user', + translate: false, + uri: '/admin/user-management/test_user/', + } as MockBreadcrumb); }); it('should build breadcrumbs for organization management', () => { @@ -244,8 +280,16 @@ describe('NavbarComponent', () => { expect(entityTitleServiceStub).toHaveBeenCalledWith(EntityType.ORGANIZATION, [1]); expect(component.breadcrumbs).toHaveLength(2); - expect(component.breadcrumbs[0]).toEqual({ label: 'artemisApp.organizationManagement.title', translate: true, uri: '/admin/organization-management/' } as MockBreadcrumb); - expect(component.breadcrumbs[1]).toEqual({ label: 'Test Organization', translate: false, uri: '/admin/organization-management/1/' } as MockBreadcrumb); + expect(component.breadcrumbs[0]).toEqual({ + label: 'artemisApp.organizationManagement.title', + translate: true, + uri: '/admin/organization-management/', + } as MockBreadcrumb); + expect(component.breadcrumbs[1]).toEqual({ + label: 'Test Organization', + translate: false, + uri: '/admin/organization-management/1/', + } as MockBreadcrumb); }); it('should not error without translation', () => { @@ -256,7 +300,11 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs).toHaveLength(1); - expect(component.breadcrumbs[0]).toEqual({ label: 'route-without-translation', translate: false, uri: '/admin/route-without-translation/' } as MockBreadcrumb); + expect(component.breadcrumbs[0]).toEqual({ + label: 'route-without-translation', + translate: false, + uri: '/admin/route-without-translation/', + } as MockBreadcrumb); }); it('should hide breadcrumb when exam is started', () => { @@ -358,7 +406,11 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs[0]).toEqual(courseManagementCrumb); expect(component.breadcrumbs[1]).toEqual(testCourseCrumb); expect(component.breadcrumbs[2]).toEqual(programmingExercisesCrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Exercise', translate: false, uri: '/course-management/1/programming-exercises/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Exercise', + translate: false, + uri: '/course-management/1/programming-exercises/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(gradingCrumb); }); @@ -383,7 +435,11 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs[0]).toEqual(courseManagementCrumb); expect(component.breadcrumbs[1]).toEqual(testCourseCrumb); expect(component.breadcrumbs[2]).toEqual(programmingExercisesCrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Exercise', translate: false, uri: '/course-management/1/programming-exercises/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Exercise', + translate: false, + uri: '/course-management/1/programming-exercises/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(assessmentCrumb); }); @@ -391,9 +447,14 @@ describe('NavbarComponent', () => { const testUrl = '/course-management/1/exercises/2/exercise-hints/3'; router.setUrl(testUrl); - const findStub = jest - .spyOn(exerciseService, 'find') - .mockReturnValue(of({ body: { title: 'Test Exercise', type: ExerciseType.PROGRAMMING } } as HttpResponse)); + const findStub = jest.spyOn(exerciseService, 'find').mockReturnValue( + of({ + body: { + title: 'Test Exercise', + type: ExerciseType.PROGRAMMING, + }, + } as HttpResponse), + ); fixture.detectChanges(); @@ -419,8 +480,16 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs[0]).toEqual(courseManagementCrumb); expect(component.breadcrumbs[1]).toEqual(testCourseCrumb); - expect(component.breadcrumbs[2]).toEqual({ label: 'artemisApp.course.exercises', translate: true, uri: '/course-management/1/exercises/' } as MockBreadcrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Exercise', translate: false, uri: '/course-management/1/programming-exercises/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[2]).toEqual({ + label: 'artemisApp.course.exercises', + translate: true, + uri: '/course-management/1/exercises/', + } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Exercise', + translate: false, + uri: '/course-management/1/programming-exercises/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(hintsCrumb); expect(component.breadcrumbs[5]).toEqual(hintCrumb); }); @@ -484,7 +553,11 @@ describe('NavbarComponent', () => { translate: true, uri: '/course-management/1/modeling-exercises/', } as MockBreadcrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Exercise', translate: false, uri: '/course-management/1/modeling-exercises/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Exercise', + translate: false, + uri: '/course-management/1/modeling-exercises/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(submissionCrumb); expect(component.breadcrumbs[5]).toEqual(editorSubmissionCrumb); }); @@ -520,7 +593,11 @@ describe('NavbarComponent', () => { translate: true, uri: '/course-management/1/modeling-exercises/', } as MockBreadcrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Exercise', translate: false, uri: '/course-management/1/modeling-exercises/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Exercise', + translate: false, + uri: '/course-management/1/modeling-exercises/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(submissionCrumb); expect(component.breadcrumbs[5]).toEqual(editorSubmissionCrumb); }); @@ -551,8 +628,16 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs[0]).toEqual(courseManagementCrumb); expect(component.breadcrumbs[1]).toEqual(testCourseCrumb); - expect(component.breadcrumbs[2]).toEqual({ label: 'artemisApp.lecture.home.title', translate: true, uri: '/course-management/1/lectures/' } as MockBreadcrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Lecture', translate: false, uri: '/course-management/1/lectures/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[2]).toEqual({ + label: 'artemisApp.lecture.home.title', + translate: true, + uri: '/course-management/1/lectures/', + } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Lecture', + translate: false, + uri: '/course-management/1/lectures/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(unitManagementCrumb); expect(component.breadcrumbs[5]).toEqual(createCrumb); }); @@ -576,7 +661,11 @@ describe('NavbarComponent', () => { translate: true, uri: '/course-management/1/apollon-diagrams/', } as MockBreadcrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Diagram', translate: false, uri: '/course-management/1/apollon-diagrams/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Diagram', + translate: false, + uri: '/course-management/1/apollon-diagrams/2/', + } as MockBreadcrumb); }); it('exam exercise groups', () => { @@ -604,8 +693,16 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs[0]).toEqual(courseManagementCrumb); expect(component.breadcrumbs[1]).toEqual(testCourseCrumb); - expect(component.breadcrumbs[2]).toEqual({ label: 'artemisApp.examManagement.title', translate: true, uri: '/course-management/1/exams/' } as MockBreadcrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Exam', translate: false, uri: '/course-management/1/exams/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[2]).toEqual({ + label: 'artemisApp.examManagement.title', + translate: true, + uri: '/course-management/1/exams/', + } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Exam', + translate: false, + uri: '/course-management/1/exams/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(exerciseGroupsCrumb); expect(component.breadcrumbs[5]).toEqual(createCrumb); }); @@ -641,8 +738,16 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs[0]).toEqual(courseManagementCrumb); expect(component.breadcrumbs[1]).toEqual(testCourseCrumb); - expect(component.breadcrumbs[2]).toEqual({ label: 'artemisApp.examManagement.title', translate: true, uri: '/course-management/1/exams/' } as MockBreadcrumb); - expect(component.breadcrumbs[3]).toEqual({ label: 'Test Exam', translate: false, uri: '/course-management/1/exams/2/' } as MockBreadcrumb); + expect(component.breadcrumbs[2]).toEqual({ + label: 'artemisApp.examManagement.title', + translate: true, + uri: '/course-management/1/exams/', + } as MockBreadcrumb); + expect(component.breadcrumbs[3]).toEqual({ + label: 'Test Exam', + translate: false, + uri: '/course-management/1/exams/2/', + } as MockBreadcrumb); expect(component.breadcrumbs[4]).toEqual(exerciseGroupsCrumb); expect(component.breadcrumbs[5]).toEqual(exerciseCrumb); expect(component.breadcrumbs[6]).toEqual(plagiarismCrumb); @@ -663,28 +768,111 @@ describe('NavbarComponent', () => { expect(component.breadcrumbs).toHaveLength(4); expect(component.breadcrumbs[0]).toMatchObject({ uri: '/courses/', label: 'artemisApp.course.home.title' }); expect(component.breadcrumbs[1]).toMatchObject({ uri: '/courses/1/', label: 'Test Course' }); - expect(component.breadcrumbs[2]).toMatchObject({ uri: '/courses/1/exercises/', label: 'artemisApp.courseOverview.menu.exercises' }); + expect(component.breadcrumbs[2]).toMatchObject({ + uri: '/courses/1/exercises/', + label: 'artemisApp.courseOverview.menu.exercises', + }); expect(component.breadcrumbs[3]).toMatchObject({ uri: '/courses/1/exercises/2/', label: 'Test Exercise' }); }); }); it.each([ - { width: 1200, account: { login: 'test' }, roles: [Authority.ADMIN], expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 1100, account: { login: 'test' }, roles: [Authority.ADMIN], expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 600, account: { login: 'test' }, roles: [Authority.ADMIN], expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: true } }, - { width: 550, account: { login: 'test' }, roles: [Authority.ADMIN], expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true } }, - { width: 1000, account: { login: 'test' }, roles: [Authority.INSTRUCTOR], expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 850, account: { login: 'test' }, roles: [Authority.INSTRUCTOR], expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 600, account: { login: 'test' }, roles: [Authority.INSTRUCTOR], expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: true } }, - { width: 470, account: { login: 'test' }, roles: [Authority.INSTRUCTOR], expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true } }, - { width: 800, account: { login: 'test' }, roles: [Authority.USER], expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 650, account: { login: 'test' }, roles: [Authority.USER], expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 600, account: { login: 'test' }, roles: [Authority.USER], expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: true } }, - { width: 470, account: { login: 'test' }, roles: [Authority.USER], expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true } }, - { width: 520, account: undefined, roles: [], expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 500, account: undefined, roles: [], expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false } }, - { width: 450, account: undefined, roles: [], expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: false } }, - { width: 400, account: undefined, roles: [], expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true } }, + { + width: 1200, + account: { login: 'test' }, + roles: [Authority.ADMIN], + expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 1100, + account: { login: 'test' }, + roles: [Authority.ADMIN], + expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 600, + account: { login: 'test' }, + roles: [Authority.ADMIN], + expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: true }, + }, + { + width: 550, + account: { login: 'test' }, + roles: [Authority.ADMIN], + expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true }, + }, + { + width: 1000, + account: { login: 'test' }, + roles: [Authority.INSTRUCTOR], + expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 850, + account: { login: 'test' }, + roles: [Authority.INSTRUCTOR], + expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 600, + account: { login: 'test' }, + roles: [Authority.INSTRUCTOR], + expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: true }, + }, + { + width: 470, + account: { login: 'test' }, + roles: [Authority.INSTRUCTOR], + expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true }, + }, + { + width: 800, + account: { login: 'test' }, + roles: [Authority.USER], + expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 650, + account: { login: 'test' }, + roles: [Authority.USER], + expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 600, + account: { login: 'test' }, + roles: [Authority.USER], + expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: true }, + }, + { + width: 470, + account: { login: 'test' }, + roles: [Authority.USER], + expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true }, + }, + { + width: 520, + account: undefined, + roles: [], + expected: { isCollapsed: false, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 500, + account: undefined, + roles: [], + expected: { isCollapsed: true, isNavbarNavVertical: false, iconsMovedToMenu: false }, + }, + { + width: 450, + account: undefined, + roles: [], + expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: false }, + }, + { + width: 400, + account: undefined, + roles: [], + expected: { isCollapsed: true, isNavbarNavVertical: true, iconsMovedToMenu: true }, + }, ])('should calculate correct breakpoints', ({ width, account, roles, expected }) => { const accountService = TestBed.inject(AccountService); jest.spyOn(accountService, 'hasAnyAuthorityDirect').mockImplementation((authArray) => authArray.some((auth) => (roles as string[]).includes(auth))); @@ -694,6 +882,10 @@ describe('NavbarComponent', () => { component.onResize(); - expect({ isCollapsed: component.isCollapsed, isNavbarNavVertical: component.isNavbarNavVertical, iconsMovedToMenu: component.iconsMovedToMenu }).toEqual(expected); + expect({ + isCollapsed: component.isCollapsed, + isNavbarNavVertical: component.isNavbarNavVertical, + iconsMovedToMenu: component.iconsMovedToMenu, + }).toEqual(expected); }); }); diff --git a/src/test/javascript/spec/component/shared/progress-bar.component.spec.ts b/src/test/javascript/spec/component/shared/progress-bar.component.spec.ts index 8fc59c1a7e0e..e7d1805953df 100644 --- a/src/test/javascript/spec/component/shared/progress-bar.component.spec.ts +++ b/src/test/javascript/spec/component/shared/progress-bar.component.spec.ts @@ -5,6 +5,7 @@ import { ArtemisTestModule } from '../../test.module'; import { SimpleChange } from '@angular/core'; import { MockDirective } from 'ng-mocks'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; +import { MockThemeService } from '../../helpers/mocks/service/mock-theme.service'; describe('ProgressBarComponent', () => { let fixture: ComponentFixture; @@ -14,6 +15,12 @@ describe('ProgressBarComponent', () => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, MockDirective(NgbTooltip)], declarations: [ProgressBarComponent], + providers: [ + { + class: ThemeService, + useClass: MockThemeService, + }, + ], }) .compileComponents() .then(() => { @@ -49,7 +56,10 @@ describe('ProgressBarComponent', () => { component.ngOnChanges({ percentage: {} as SimpleChange }); expect(component.foregroundColorClass).toBe('text-dark'); - themeService.applyThemeExplicitly(Theme.DARK); + themeService.applyThemePreference(Theme.DARK); + + fixture.detectChanges(); + expect(component.foregroundColorClass).toBe('text-white'); }); diff --git a/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts index 9e7fe5427253..54015cb0ff41 100644 --- a/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts +++ b/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts @@ -39,22 +39,23 @@ describe('SidebarAccordionComponent', () => { component.groupedData = { current: { - entityData: [{ title: 'Title 1', type: 'Type A', id: 1, size: 'M' }], + entityData: [{ title: 'Title 1', type: 'Type A', id: 1, size: 'M', conversation: { unreadMessagesCount: 1 } }], }, past: { - entityData: [{ title: 'Title 2', type: 'Type B', id: 2, size: 'M' }], + entityData: [{ title: 'Title 2', type: 'Type B', id: 2, size: 'M', conversation: { unreadMessagesCount: 0 } }], }, future: { - entityData: [{ title: 'Title 3', type: 'Type C', id: 3, size: 'M' }], + entityData: [{ title: 'Title 3', type: 'Type C', id: 3, size: 'M', conversation: { unreadMessagesCount: 1 } }], }, noDate: { - entityData: [{ title: 'Title 4', type: 'Type D', id: 4, size: 'M' }], + entityData: [{ title: 'Title 4', type: 'Type D', id: 4, size: 'M', conversation: { unreadMessagesCount: 0 } }], }, }; component.routeParams = { exerciseId: 3 }; component.collapseState = { current: false, dueSoon: false, past: false, future: true, noDate: true }; fixture.componentRef.setInput('sidebarItemAlwaysShow', { current: false, dueSoon: false, past: false, future: false, noDate: false }); fixture.detectChanges(); + component.calculateUnreadMessagesOfGroup(); }); afterEach(() => { @@ -144,4 +145,11 @@ describe('SidebarAccordionComponent', () => { component.expandGroupWithSelectedItem(); expect(component.collapseState['future']).toBeFalse(); }); + + it('should calculate unread messages of each group correctly', () => { + expect(component.totalUnreadMessagesPerGroup['current']).toBe(1); + expect(component.totalUnreadMessagesPerGroup['past']).toBe(0); + expect(component.totalUnreadMessagesPerGroup['future']).toBe(1); + expect(component.totalUnreadMessagesPerGroup['noDate']).toBe(0); + }); }); diff --git a/src/test/javascript/spec/component/shared/sidebar/sidebar-card-item.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/sidebar-card-item.component.spec.ts index b82e9af01815..80c64cbad634 100644 --- a/src/test/javascript/spec/component/shared/sidebar/sidebar-card-item.component.spec.ts +++ b/src/test/javascript/spec/component/shared/sidebar/sidebar-card-item.component.spec.ts @@ -3,22 +3,41 @@ import { SidebarCardItemComponent } from 'app/shared/sidebar/sidebar-card-item/s import { SidebarCardSize } from 'app/types/sidebar'; import { ArtemisTestModule } from '../../../test.module'; import { DifficultyLevel } from 'app/entities/exercise.model'; +import { OneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; import { input, runInInjectionContext } from '@angular/core'; +import { faPeopleGroup } from '@fortawesome/free-solid-svg-icons'; +import { ProfilePictureComponent } from '../../../../../../main/webapp/app/shared/profile-picture/profile-picture.component'; +import { MockComponent } from 'ng-mocks'; describe('SidebarCardItemComponent', () => { let component: SidebarCardItemComponent; let fixture: ComponentFixture; + let sidebarItemMock: any; beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule], - declarations: [SidebarCardItemComponent], + declarations: [SidebarCardItemComponent, MockComponent(ProfilePictureComponent)], }).compileComponents(); - }); - beforeEach(() => { fixture = TestBed.createComponent(SidebarCardItemComponent); component = fixture.componentInstance; + + sidebarItemMock = { + title: 'testTitle', + id: 'testId', + size: 'M' as SidebarCardSize, + difficulty: DifficultyLevel.EASY, + type: 'oneToOneChat', + conversation: { + members: [ + { id: 2, name: 'RequestingUser', isRequestingUser: true }, + { id: 1, name: 'User1', isRequestingUser: false }, + ], + } as OneToOneChatDTO, + }; + + component.sidebarItem = sidebarItemMock; fixture.detectChanges(); }); @@ -27,16 +46,8 @@ describe('SidebarCardItemComponent', () => { }); it('should display item title', () => { - const testItem = { - title: 'testTitle', - id: 'testId', - size: 'M' as SidebarCardSize, - difficulty: DifficultyLevel.EASY, - }; - component.sidebarItem = testItem; - fixture.detectChanges(); const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('#test-sidebar-card-title').textContent).toContain(testItem.title); + expect(compiled.querySelector('#test-sidebar-card-title').textContent).toContain(sidebarItemMock.title); }); it('should format unreadCount correctly when count is less than 99', () => { @@ -54,4 +65,16 @@ describe('SidebarCardItemComponent', () => { expect(component.formattedUnreadCount).toBe('99+'); }); }); + + it('should set group icon for group chats in extractMessageUser', () => { + component.sidebarItem.type = 'groupChat'; + component.sidebarItem.icon = undefined; + component.extractMessageUser(); + expect(component.sidebarItem.icon).toBe(faPeopleGroup); + }); + + it('should set otherUser for one-to-one chat in extractMessageUser', () => { + component.extractMessageUser(); + expect(component.otherUser).toEqual(sidebarItemMock.conversation.members[1]); + }); }); diff --git a/src/test/javascript/spec/component/theme/theme-switch.component.spec.ts b/src/test/javascript/spec/component/theme/theme-switch.component.spec.ts index 3bc9282cb8ed..4fccadf8b4e0 100644 --- a/src/test/javascript/spec/component/theme/theme-switch.component.spec.ts +++ b/src/test/javascript/spec/component/theme/theme-switch.component.spec.ts @@ -1,94 +1,85 @@ import { ArtemisTestModule } from '../../test.module'; import { ThemeSwitchComponent } from 'app/core/theme/theme-switch.component'; -import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing'; -import { ThemeService } from 'app/core/theme/theme.service'; +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { Theme, ThemeService } from 'app/core/theme/theme.service'; import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local-storage.service'; import { LocalStorageService } from 'ngx-webstorage'; import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'; import { MockDirective } from 'ng-mocks'; +import { MockThemeService } from '../../helpers/mocks/service/mock-theme.service'; describe('ThemeSwitchComponent', () => { let component: ThemeSwitchComponent; let fixture: ComponentFixture; let themeService: ThemeService; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, MockDirective(NgbPopover)], - declarations: [ThemeSwitchComponent], - providers: [{ provide: LocalStorageService, useClass: MockLocalStorageService }], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(ThemeSwitchComponent); - themeService = TestBed.inject(ThemeService); - component = fixture.componentInstance; - // @ts-ignore - component.popover = { open: jest.fn(), close: jest.fn() }; - }); - }); + let openSpy: jest.SpyInstance; + let closeSpy: jest.SpyInstance; - afterEach(() => jest.restoreAllMocks()); + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [ArtemisTestModule, ThemeSwitchComponent, MockDirective(NgbPopover)], + declarations: [], + providers: [ + { provide: LocalStorageService, useClass: MockLocalStorageService }, + { + provide: ThemeService, + useClass: MockThemeService, + }, + ], + }).compileComponents(); - it('oninit: subscribe to theme service', fakeAsync(() => { - const subscribeSpy = jest.spyOn(themeService, 'getCurrentThemeObservable'); + themeService = TestBed.inject(ThemeService); - component.ngOnInit(); - expect(subscribeSpy).toHaveBeenCalledOnce(); - })); + fixture = TestBed.createComponent(ThemeSwitchComponent); + component = fixture.componentInstance; + + openSpy = jest.spyOn(component.popover(), 'open'); + closeSpy = jest.spyOn(component.popover(), 'close'); + + fixture.componentRef.setInput('popoverPlacement', ['bottom']); + }); + + afterEach(() => jest.restoreAllMocks()); it('theme toggles correctly', fakeAsync(() => { - component.ngOnInit(); - component.toggleTheme(); - expect(component.animate).toBeFalse(); - expect(component.openPopupAfterNextChange).toBeTrue(); + const applyThemePreferenceSpy = jest.spyOn(themeService, 'applyThemePreference'); - tick(); + component.toggleTheme(); - expectSwitchToDark(); + expect(applyThemePreferenceSpy).toHaveBeenCalledWith(Theme.DARK); - flush(); + expect(component.isDarkTheme()).toBeTrue(); + tick(250); + expect(openSpy).toHaveBeenCalledOnce(); })); it('os sync toggles correctly', fakeAsync(() => { - component.ngOnInit(); - component.toggleSynced(); - - tick(); + const applyThemePreferenceSpy = jest.spyOn(themeService, 'applyThemePreference'); - expect(component.isSynced).toBeFalse(); component.toggleSynced(); - tick(); - - expect(component.isSynced).toBeTrue(); + expect(applyThemePreferenceSpy).toHaveBeenCalledWith(Theme.LIGHT); + expect(component.isSyncedWithOS()).toBeFalse(); + component.toggleSynced(); - flush(); + expect(applyThemePreferenceSpy).toHaveBeenCalledWith(undefined); + expect(component.isSyncedWithOS()).toBeTrue(); })); it('opens and closes the popover', fakeAsync(() => { component.openPopover(); - expect(component.popover.open).toHaveBeenCalledOnce(); + expect(openSpy).toHaveBeenCalledOnce(); component.closePopover(); - expect(component.popover.close).toHaveBeenCalledOnce(); + expect(closeSpy).toHaveBeenCalledOnce(); })); it('closes on mouse leave after 200ms', fakeAsync(() => { component.openPopover(); - expect(component.popover.open).toHaveBeenCalledOnce(); + expect(openSpy).toHaveBeenCalledOnce(); component.mouseLeave(); - expect(component.popover.close).not.toHaveBeenCalled(); + expect(closeSpy).not.toHaveBeenCalled(); tick(250); - expect(component.popover.close).toHaveBeenCalledOnce(); + expect(closeSpy).toHaveBeenCalledOnce(); })); - - function expectSwitchToDark() { - expect(component.isDark).toBeTrue(); - expect(component.animate).toBeTrue(); - expect(component.openPopupAfterNextChange).toBeFalse(); - - tick(250); - - expect(component.popover.open).toHaveBeenCalledOnce(); - } }); diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts index 95738abdc115..529ed21fd035 100644 --- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts @@ -19,6 +19,7 @@ import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { CourseOverviewService } from 'app/overview/course-overview.service'; describe('CourseTutorialGroupsComponent', () => { let fixture: ComponentFixture; @@ -26,6 +27,7 @@ describe('CourseTutorialGroupsComponent', () => { let tutorialGroupOne: TutorialGroup; let tutorialGroupTwo: TutorialGroup; + let courseOverviewService: CourseOverviewService; const router = new MockRouter(); @@ -60,6 +62,7 @@ describe('CourseTutorialGroupsComponent', () => { .then(() => { fixture = TestBed.createComponent(CourseTutorialGroupsComponent); component = fixture.componentInstance; + courseOverviewService = TestBed.inject(CourseOverviewService); component.sidebarData = { groupByCategory: true, sidebarType: 'default', storageId: 'tutorialGroup' }; tutorialGroupOne = generateExampleTutorialGroup({ id: 1, isUserTutor: true }); tutorialGroupTwo = generateExampleTutorialGroup({ id: 2, isUserRegistered: true }); @@ -115,4 +118,14 @@ describe('CourseTutorialGroupsComponent', () => { expect(getAllOfCourseSpy).not.toHaveBeenCalled(); expect(updateCourseSpy).not.toHaveBeenCalled(); }); + + it('should toggle isCollapsed and call setSidebarCollapseState with the correct arguments', () => { + const initialCollapseState = component.isCollapsed; + const detectChangesSpy = jest.spyOn(component['cdr'], 'detectChanges'); + jest.spyOn(courseOverviewService, 'setSidebarCollapseState'); + component.toggleSidebar(); + expect(component.isCollapsed).toBe(!initialCollapseState); + expect(courseOverviewService.setSidebarCollapseState).toHaveBeenCalledWith('tutorialGroup', component.isCollapsed); + expect(detectChangesSpy).toHaveBeenCalled(); + }); }); diff --git a/src/test/javascript/spec/helpers/mocks/mock-instance.helper.ts b/src/test/javascript/spec/helpers/mocks/mock-instance.helper.ts index 8f7c213e5f6b..b84969f15363 100644 --- a/src/test/javascript/spec/helpers/mocks/mock-instance.helper.ts +++ b/src/test/javascript/spec/helpers/mocks/mock-instance.helper.ts @@ -1,6 +1,7 @@ import { MockInstance } from 'ng-mocks'; import { CodeEditorMonacoComponent } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component'; import { signal } from '@angular/core'; +import { ThemeSwitchComponent } from 'app/core/theme/theme-switch.component'; /* * This file contains mock instances for the tests where they would otherwise fail due to the use of a signal-based viewChild or contentChild with MockComponent(SomeComponent). @@ -19,3 +20,10 @@ export function mockCodeEditorMonacoViewChildren() { inlineFeedbackSuggestionComponents: signal([]), })); } + +export function mockThemeSwitcherComponentViewChildren() { + MockInstance.scope('case'); + MockInstance(ThemeSwitchComponent, () => ({ + popover: signal({}), + })); +} diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-file.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-file.service.ts index 82565adce6de..ae528e16f0ea 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-file.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-file.service.ts @@ -12,4 +12,7 @@ export class MockFileService { getTemplateFile = () => { return of(); }; + + replaceLectureAttachmentPrefixAndUnderscores = (link: string) => link; + replaceAttachmentPrefixAndUnderscores = (link: string) => link; } diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-theme.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-theme.service.ts index 1bb4519a3ff0..a5ff955560b7 100644 --- a/src/test/javascript/spec/helpers/mocks/service/mock-theme.service.ts +++ b/src/test/javascript/spec/helpers/mocks/service/mock-theme.service.ts @@ -1,31 +1,16 @@ +import { signal } from '@angular/core'; import { Theme } from 'app/core/theme/theme.service'; -import { BehaviorSubject, Observable } from 'rxjs'; export class MockThemeService { - private currentTheme: Theme = Theme.LIGHT; - private currentThemeSubject: BehaviorSubject = new BehaviorSubject(Theme.LIGHT); - private preferenceSubject: BehaviorSubject = new BehaviorSubject(undefined); + private _currentTheme = signal(Theme.LIGHT); + public readonly currentTheme = this._currentTheme.asReadonly(); - public isByAutoDetection = false; + private _userPreference = signal(undefined); + public readonly userPreference = this._userPreference.asReadonly(); - public getCurrentTheme(): Theme { - return this.currentTheme; - } - - public getCurrentThemeObservable(): Observable { - return this.currentThemeSubject.asObservable(); - } - - public getPreferenceObservable(): Observable { - return this.preferenceSubject.asObservable(); - } - - public restoreTheme() {} - - public applyThemeExplicitly(theme: Theme) { - this.currentTheme = theme; - this.currentThemeSubject.next(theme); - this.preferenceSubject.next(theme); + public applyThemePreference(preference: Theme | undefined) { + this._userPreference.set(preference); + this._currentTheme.set(preference ?? Theme.LIGHT); } public print() {} diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts index a8ba374dd6b6..2569e345ff4c 100644 --- a/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts +++ b/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts @@ -3,7 +3,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { TranslateModule } from '@ngx-translate/core'; import { JhiLanguageHelper } from 'app/core/language/language.helper'; import { AccountService } from 'app/core/auth/account.service'; -import { ChangeDetectorRef, DebugElement } from '@angular/core'; +import { DebugElement } from '@angular/core'; import { ActivatedRoute, Params, Router } from '@angular/router'; import { BehaviorSubject, Subject, of, throwError } from 'rxjs'; import { ArtemisTestModule } from '../../test.module'; @@ -122,7 +122,6 @@ describe('CodeEditorInstructorIntegration', () => { ], providers: [ JhiLanguageHelper, - ChangeDetectorRef, { provide: Router, useClass: MockRouter }, { provide: AccountService, useClass: MockAccountService }, { provide: ActivatedRoute, useClass: MockActivatedRouteWithSubjects }, diff --git a/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts b/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts index d439a5cb2347..07bb7bc471b9 100644 --- a/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts +++ b/src/test/javascript/spec/integration/guided-tour/guided-tour.integration.spec.ts @@ -87,7 +87,8 @@ describe('Guided tour integration', () => { MockComponent(CoursesComponent), MockComponent(SecuredImageComponent), MockComponent(SystemNotificationComponent), - MockComponent(ThemeSwitchComponent), + // Component can not be mocked at the moment https://github.com/help-me-mom/ng-mocks/issues/8634 + ThemeSwitchComponent, MockComponent(DocumentationButtonComponent), MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), diff --git a/src/test/javascript/spec/service/metis/post.service.spec.ts b/src/test/javascript/spec/service/metis/post.service.spec.ts index dae7803858b5..7a9de630d53f 100644 --- a/src/test/javascript/spec/service/metis/post.service.spec.ts +++ b/src/test/javascript/spec/service/metis/post.service.spec.ts @@ -4,7 +4,7 @@ import { take } from 'rxjs/operators'; import { Post } from 'app/entities/metis/post.model'; import { PostService } from 'app/shared/metis/post.service'; import { DisplayPriority } from 'app/shared/metis/metis.util'; -import { metisCourse, metisCoursePosts, metisPostExerciseUser1, metisPostToCreateUser1, metisTags } from '../../helpers/sample/metis-sample-data'; +import { metisCourse, metisCoursePosts, metisPostExerciseUser1, metisPostToCreateUser1 } from '../../helpers/sample/metis-sample-data'; import { provideHttpClient } from '@angular/common/http'; describe('Post Service', () => { @@ -33,18 +33,6 @@ describe('Post Service', () => { tick(); })); - it('should return all similar posts in a course', fakeAsync(() => { - const returnedFromService = metisCoursePosts.slice(0, 4); - const expected = returnedFromService; - service - .computeSimilarityScoresWithCoursePosts(metisPostExerciseUser1, metisCourse.id!) - .pipe(take(2)) - .subscribe((resp) => expect(resp.body).toEqual(expected)); - const req = httpMock.expectOne({ method: 'POST' }); - req.flush(returnedFromService); - tick(); - })); - it('should update a Post', fakeAsync(() => { const returnedFromService = { ...metisPostExerciseUser1, content: 'This is another test post' }; const expected = { ...returnedFromService }; @@ -102,18 +90,6 @@ describe('Post Service', () => { tick(); })); - it('should return all post tags for a course', fakeAsync(() => { - const returnedFromService = metisTags; - const expected = returnedFromService; - service - .getAllPostTagsByCourseId(metisCourse.id!) - .pipe(take(2)) - .subscribe((resp) => expect(resp.body).toEqual(expected)); - const req = httpMock.expectOne({ method: 'GET' }); - req.flush(returnedFromService); - tick(); - })); - it('should use /posts endpoints if plagiarismCaseId is provided in the postContextFilter', fakeAsync(() => { const plagiarismCaseId = 123; const expectedUrl = `${service.resourceUrl}${metisCourse.id}/posts?plagiarismCaseId=${plagiarismCaseId}`; diff --git a/src/test/javascript/spec/service/text-editor.service.spec.ts b/src/test/javascript/spec/service/text-editor.service.spec.ts index 4171441cdcc0..c701dad2f618 100644 --- a/src/test/javascript/spec/service/text-editor.service.spec.ts +++ b/src/test/javascript/spec/service/text-editor.service.spec.ts @@ -1,21 +1,19 @@ import { TextEditorService } from 'app/exercises/text/participate/text-editor.service'; -import { HttpClient, HttpEvent, HttpHandler } from '@angular/common/http'; -import { Observable } from 'rxjs'; +import { provideHttpClient } from '@angular/common/http'; import { Language } from 'app/entities/course.model'; - -class MockHttpHandler implements HttpHandler { - handle(): Observable> { - return new Observable>(); - } -} +import { provideHttpClientTesting } from '@angular/common/http/testing'; +import { TestBed } from '@angular/core/testing'; describe('TextEditorService', () => { let textEditorService: TextEditorService; - let httpClient: HttpClient; + beforeEach(() => { - httpClient = new HttpClient(new MockHttpHandler()); - textEditorService = new TextEditorService(httpClient); + TestBed.configureTestingModule({ + imports: [], + providers: [provideHttpClient(), provideHttpClientTesting()], + }); + textEditorService = TestBed.inject(TextEditorService); }); it('Can detect a short German string', () => { const testString = 'Das ist ein kurzer, deutscher Satz'; diff --git a/src/test/javascript/spec/service/theme.service.spec.ts b/src/test/javascript/spec/service/theme.service.spec.ts index 16441b4c4bd8..3ff8f86499ba 100644 --- a/src/test/javascript/spec/service/theme.service.spec.ts +++ b/src/test/javascript/spec/service/theme.service.spec.ts @@ -10,7 +10,7 @@ describe('ThemeService', () => { let linkElement: HTMLElement; let documentGetElementMock: jest.SpyInstance; let headElement: HTMLElement; - let documentgetElementsByTagNameMock: jest.SpyInstance; + let documentGetElementsByTagNameMock: jest.SpyInstance; let newElement: HTMLLinkElement; let documentCreateElementMock: jest.SpyInstance; let storeSpy: jest.SpyInstance; @@ -36,7 +36,7 @@ describe('ThemeService', () => { getElementsByTagName: jest.fn().mockReturnValue([{}, {}]), insertBefore: jest.fn(), } as any as HTMLElement; - documentgetElementsByTagNameMock = jest.spyOn(document, 'getElementsByTagName').mockReturnValue([headElement] as unknown as HTMLCollectionOf); + documentGetElementsByTagNameMock = jest.spyOn(document, 'getElementsByTagName').mockReturnValue([headElement] as unknown as HTMLCollectionOf); newElement = {} as HTMLLinkElement; documentCreateElementMock = jest.spyOn(document, 'createElement').mockReturnValue(newElement); @@ -61,13 +61,17 @@ describe('ThemeService', () => { }); it('applies theme changes correctly', () => { - service.applyThemeExplicitly(Theme.DARK); - + TestBed.flushEffects(); expect(documentGetElementMock).toHaveBeenCalledOnce(); + + service.applyThemePreference(Theme.DARK); + TestBed.flushEffects(); + + expect(documentGetElementMock).toHaveBeenCalledTimes(2); expect(documentGetElementMock).toHaveBeenCalledWith(THEME_OVERRIDE_ID); - expect(documentgetElementsByTagNameMock).toHaveBeenCalledOnce(); - expect(documentgetElementsByTagNameMock).toHaveBeenCalledWith('head'); + expect(documentGetElementsByTagNameMock).toHaveBeenCalledOnce(); + expect(documentGetElementsByTagNameMock).toHaveBeenCalledWith('head'); expect(documentCreateElementMock).toHaveBeenCalledOnce(); expect(documentCreateElementMock).toHaveBeenCalledWith('link'); @@ -80,30 +84,29 @@ describe('ThemeService', () => { expect(headElement.insertBefore).toHaveBeenCalledOnce(); expect(headElement.insertBefore).toHaveBeenCalledWith(newElement, undefined); - expect(service.getCurrentTheme()).toBe(Theme.LIGHT); + expect(service.currentTheme()).toBe(Theme.DARK); expect(storeSpy).toHaveBeenCalledWith(THEME_LOCAL_STORAGE_KEY, 'DARK'); - // @ts-ignore - newElement.onload(); - expect(linkElement.remove).toHaveBeenCalledOnce(); - expect(service.getCurrentTheme()).toBe(Theme.DARK); + expect(service.currentTheme()).toBe(Theme.DARK); - service.applyThemeExplicitly(Theme.LIGHT); + service.applyThemePreference(Theme.LIGHT); + TestBed.flushEffects(); - expect(documentGetElementMock).toHaveBeenCalledTimes(2); - expect(documentGetElementMock).toHaveBeenNthCalledWith(2, THEME_OVERRIDE_ID); + expect(documentGetElementMock).toHaveBeenCalledTimes(3); + expect(documentGetElementMock).toHaveBeenNthCalledWith(3, THEME_OVERRIDE_ID); expect(linkElement.remove).toHaveBeenCalledTimes(2); - expect(service.getCurrentTheme()).toBe(Theme.LIGHT); + expect(service.currentTheme()).toBe(Theme.LIGHT); }); it('restores stored theme correctly', () => { const retrieveSpy = jest.spyOn(localStorageService, 'retrieve').mockReturnValue('LIGHT'); service.initialize(); + TestBed.flushEffects(); - expect(retrieveSpy).toHaveBeenCalledTimes(2); - expect(service.getCurrentTheme()).toBe(Theme.LIGHT); + expect(retrieveSpy).toHaveBeenCalledOnce(); + expect(service.currentTheme()).toBe(Theme.LIGHT); }); it('applies dark OS preferences', () => { @@ -120,24 +123,26 @@ describe('ThemeService', () => { }); service.initialize(); + TestBed.flushEffects(); // @ts-ignore newElement?.onload(); - expect(retrieveSpy).toHaveBeenCalledTimes(2); + expect(retrieveSpy).toHaveBeenCalledOnce(); expect(windowMatchMediaSpy).toHaveBeenCalledOnce(); expect(windowMatchMediaSpy).toHaveBeenNthCalledWith(1, '(prefers-color-scheme: dark)'); - expect(service.getCurrentTheme()).toBe(Theme.DARK); + expect(service.currentTheme()).toBe(Theme.DARK); }); it('applies light OS preferences', () => { const retrieveSpy = jest.spyOn(localStorageService, 'retrieve').mockReturnValue(undefined); service.initialize(); + TestBed.flushEffects(); - expect(retrieveSpy).toHaveBeenCalledTimes(2); + expect(retrieveSpy).toHaveBeenCalledOnce(); expect(windowMatchMediaSpy).toHaveBeenCalledOnce(); expect(windowMatchMediaSpy).toHaveBeenNthCalledWith(1, '(prefers-color-scheme: dark)'); - expect(service.getCurrentTheme()).toBe(Theme.LIGHT); + expect(service.currentTheme()).toBe(Theme.LIGHT); }); it('does print correctly', fakeAsync(() => { @@ -149,12 +154,12 @@ describe('ThemeService', () => { service.print(); - expect(docSpy).toHaveBeenCalledOnce(); + expect(docSpy).toHaveBeenCalledTimes(2); expect(docSpy).toHaveBeenCalledWith(THEME_OVERRIDE_ID); expect(returnedElement.rel).toBe('none-tmp'); tick(250); expect(docSpy).toHaveBeenCalledWith('notification-sidebar'); - expect(docSpy).toHaveBeenCalledTimes(3); // 1x for theme override, 2x for notification sidebar (changing style to display: none and back to initial value) + expect(docSpy).toHaveBeenCalledTimes(4); // 1x for theme override, 2x for notification sidebar (changing style to display: none and back to initial value) expect(winSpy).toHaveBeenCalledOnce(); tick(250); expect(returnedElement.rel).toBe('stylesheet'); diff --git a/src/test/javascript/spec/util/date.utils.spec.ts b/src/test/javascript/spec/util/date.utils.spec.ts index 1c8bed2cb753..d9b7819d2e63 100644 --- a/src/test/javascript/spec/util/date.utils.spec.ts +++ b/src/test/javascript/spec/util/date.utils.spec.ts @@ -1,4 +1,11 @@ -import { convertDateFromClient, convertDateFromServer, dayOfWeekZeroSundayToZeroMonday, toISO8601DateString, toISO8601DateTimeString } from 'app/utils/date.utils'; +import { + convertDateFromClient, + convertDateFromServer, + dayOfWeekZeroSundayToZeroMonday, + isDateLessThanAWeekInTheFuture, + toISO8601DateString, + toISO8601DateTimeString, +} from 'app/utils/date.utils'; import dayjs from 'dayjs/esm'; describe('DateUtils', () => { @@ -69,4 +76,21 @@ describe('DateUtils', () => { expect(() => dayOfWeekZeroSundayToZeroMonday(7)).toThrow(); }); }); + + describe('isDateLessThanAWeekInTheFuture', () => { + it('should return true if date is less than a week away', () => { + const date = dayjs().add(6, 'days'); + expect(isDateLessThanAWeekInTheFuture(date)).toBeTrue(); + }); + + it('should return false if date is more than a week away', () => { + const date = dayjs().add(8, 'days'); + expect(isDateLessThanAWeekInTheFuture(date)).toBeFalse(); + }); + + it('should return false if date is more than a week ago', () => { + const date = dayjs().subtract(8, 'days'); + expect(isDateLessThanAWeekInTheFuture(date)).toBeFalse(); + }); + }); }); diff --git a/src/test/javascript/spec/util/shared/sort-icon.component.spec.ts b/src/test/javascript/spec/util/shared/sort-icon.component.spec.ts new file mode 100644 index 000000000000..e7a9aac70bd9 --- /dev/null +++ b/src/test/javascript/spec/util/shared/sort-icon.component.spec.ts @@ -0,0 +1,39 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { SortIconComponent } from 'app/shared/sort/sort-icon.component'; +import { SortingOrder } from 'app/shared/table/pageable-table'; + +describe('SortIconComponent', () => { + let component: SortIconComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [SortIconComponent, FontAwesomeModule], + }).compileComponents(); + + fixture = TestBed.createComponent(SortIconComponent); + component = fixture.componentInstance; + }); + + it('should set isAscending to true when direction is Ascending', () => { + fixture.componentRef.setInput('direction', SortingOrder.ASCENDING); + fixture.detectChanges(); + expect(component.isAscending()).toBeTrue(); + expect(component.isDescending()).toBeFalse(); + }); + + it('should set isDescending to true when direction is Descending', () => { + fixture.componentRef.setInput('direction', SortingOrder.DESCENDING); + fixture.detectChanges(); + expect(component.isDescending()).toBeTrue(); + expect(component.isAscending()).toBeFalse(); + }); + + it('should set both isAscending and isDescending to false when direction is "none"', () => { + fixture.componentRef.setInput('direction', 'none'); + fixture.detectChanges(); + expect(component.isAscending()).toBeFalse(); + expect(component.isDescending()).toBeFalse(); + }); +}); diff --git a/src/test/playwright/e2e/Login.spec.ts b/src/test/playwright/e2e/Login.spec.ts index b084440df47c..9a8177f4301b 100644 --- a/src/test/playwright/e2e/Login.spec.ts +++ b/src/test/playwright/e2e/Login.spec.ts @@ -3,7 +3,7 @@ import { test } from '../support/fixtures'; import { studentOne } from '../support/users'; import { BASE_API } from '../support/constants'; -test.describe('Login page tests', () => { +test.describe('Login page tests', { tag: '@fast' }, () => { test('Logs in via the UI', async ({ page, loginPage }) => { await page.goto('/'); await loginPage.login(studentOne); diff --git a/src/test/playwright/e2e/SystemHealth.spec.ts b/src/test/playwright/e2e/SystemHealth.spec.ts index 5660044957f2..4fb69ece8ba3 100644 --- a/src/test/playwright/e2e/SystemHealth.spec.ts +++ b/src/test/playwright/e2e/SystemHealth.spec.ts @@ -14,7 +14,7 @@ const healthChecks = [ { selector: '#websocketConnection', name: 'websocket connection', expectedStatus: 'Connected' }, ]; -test.describe('Check artemis system health', () => { +test.describe('Check artemis system health', { tag: '@fast' }, () => { let page: Page; test.beforeAll('Login as admin and visit system health page', async ({ browser }) => { diff --git a/src/test/playwright/e2e/course/CourseExercise.spec.ts b/src/test/playwright/e2e/course/CourseExercise.spec.ts index e3e755612c99..462d42ff3c17 100644 --- a/src/test/playwright/e2e/course/CourseExercise.spec.ts +++ b/src/test/playwright/e2e/course/CourseExercise.spec.ts @@ -5,7 +5,7 @@ import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model'; import multipleChoiceQuizTemplate from '../../fixtures/exercise/quiz/multiple_choice/template.json'; import { expect } from '@playwright/test'; -test.describe('Course exercise', () => { +test.describe('Course exercise', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/course/CourseManagement.spec.ts b/src/test/playwright/e2e/course/CourseManagement.spec.ts index 5c011a02b499..fe2b5e1bf937 100644 --- a/src/test/playwright/e2e/course/CourseManagement.spec.ts +++ b/src/test/playwright/e2e/course/CourseManagement.spec.ts @@ -41,7 +41,7 @@ const editedCourseData = { const allowGroupCustomization = process.env.ALLOW_GROUP_CUSTOMIZATION; const dateFormat = 'MMM D, YYYY HH:mm'; -test.describe('Course management', () => { +test.describe('Course management', { tag: '@fast' }, () => { test.describe('Manual student selection', () => { let course: Course; diff --git a/src/test/playwright/e2e/course/CourseMessages.spec.ts b/src/test/playwright/e2e/course/CourseMessages.spec.ts index b75773522eaf..62823545744e 100644 --- a/src/test/playwright/e2e/course/CourseMessages.spec.ts +++ b/src/test/playwright/e2e/course/CourseMessages.spec.ts @@ -6,7 +6,7 @@ import { generateUUID, titleLowercase } from '../../support/utils'; import { Channel } from 'app/entities/metis/conversation/channel.model'; import { GroupChat } from 'app/entities/metis/conversation/group-chat.model'; -test.describe('Course messages', () => { +test.describe('Course messages', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests, courseMessages }) => { diff --git a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts index 4cd492e86daa..ea6e00a07aea 100644 --- a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts +++ b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts @@ -54,11 +54,12 @@ test.beforeAll('Create course', async ({ browser }) => { }); test.describe('Exam assessment', () => { + test.describe.configure({ mode: 'serial' }); let programmingAssessmentSuccessful = false; let modelingAssessmentSuccessful = false; let textAssessmentSuccessful = false; - test.describe.serial('Programming exercise assessment', () => { + test.describe.serial('Programming exercise assessment', { tag: '@sequential' }, () => { test.beforeAll('Prepare exam', async ({ browser }) => { examEnd = dayjs().add(2, 'minutes'); const page = await newBrowserPage(browser); @@ -85,7 +86,7 @@ test.describe('Exam assessment', () => { }); }); - test.describe.serial('Modeling exercise assessment', () => { + test.describe.serial('Modeling exercise assessment', { tag: '@slow' }, () => { test.beforeAll('Prepare exam', async ({ browser }) => { examEnd = dayjs().add(45, 'seconds'); const page = await newBrowserPage(browser); @@ -126,7 +127,7 @@ test.describe('Exam assessment', () => { }); }); - test.describe.serial('Text exercise assessment', () => { + test.describe.serial('Text exercise assessment', { tag: '@slow' }, () => { test.beforeAll('Prepare exam', async ({ browser }) => { examEnd = dayjs().add(40, 'seconds'); const page = await newBrowserPage(browser); @@ -153,7 +154,7 @@ test.describe('Exam assessment', () => { }); }); - test.describe('Quiz exercise assessment', () => { + test.describe('Quiz exercise assessment', { tag: '@slow' }, () => { let resultDate: Dayjs; test.beforeAll('Prepare exam', async ({ browser }) => { @@ -183,7 +184,7 @@ test.describe('Exam assessment', () => { }); }); -test.describe('Exam grading', () => { +test.describe('Exam grading', { tag: '@fast' }, () => { test.describe.serial('Instructor sets grades and student receives a grade', () => { let exam: Exam; @@ -222,7 +223,7 @@ test.describe('Exam grading', () => { }); }); -test.describe('Exam statistics', () => { +test.describe('Exam statistics', { tag: '@sequential' }, () => { let exercise: Exercise; const students = [studentOne, studentTwo, studentThree, studentFour]; diff --git a/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts b/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts index 757665204a13..a17426823b20 100644 --- a/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts +++ b/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts @@ -37,7 +37,7 @@ const editedExamData = { const dateFormat = 'MMM D, YYYY HH:mm'; -test.describe('Exam creation/deletion', () => { +test.describe('Exam creation/deletion', { tag: '@fast' }, () => { let course: Course; let examId: number; diff --git a/src/test/playwright/e2e/exam/ExamDateVerification.spec.ts b/src/test/playwright/e2e/exam/ExamDateVerification.spec.ts index 48d80de67065..f6cb7d547210 100644 --- a/src/test/playwright/e2e/exam/ExamDateVerification.spec.ts +++ b/src/test/playwright/e2e/exam/ExamDateVerification.spec.ts @@ -6,7 +6,7 @@ import { admin, studentOne } from '../../support/users'; import { generateUUID } from '../../support/utils'; import { Fixtures } from '../../fixtures/fixtures'; -test.describe('Exam date verification', () => { +test.describe('Exam date verification', { tag: '@fast' }, () => { let course: Course; let examTitle: string; @@ -92,7 +92,8 @@ test.describe('Exam date verification', () => { await examNavigation.openOrSaveExerciseByTitle(exercise.exerciseGroup!.title!); await page.hover('.fa-save-success'); - await expect(page.getByText('Exercise saved')).toBeVisible(); + // nth(0) is the button, nth(1) is the ngtooltip, which is tested + await expect(page.getByText('Exercise saved').nth(1)).toBeVisible(); }); test('Exam ends after end time', async ({ page, login, examAPIRequests, exerciseAPIRequests, examStartEnd, examNavigation, textExerciseEditor, examParticipation }) => { diff --git a/src/test/playwright/e2e/exam/ExamManagement.spec.ts b/src/test/playwright/e2e/exam/ExamManagement.spec.ts index d95fed568bbc..81b0d599f24d 100644 --- a/src/test/playwright/e2e/exam/ExamManagement.spec.ts +++ b/src/test/playwright/e2e/exam/ExamManagement.spec.ts @@ -10,7 +10,7 @@ import { CourseManagementAPIRequests } from '../../support/requests/CourseManage import { ExamAPIRequests } from '../../support/requests/ExamAPIRequests'; import { ExerciseAPIRequests } from '../../support/requests/ExerciseAPIRequests'; -test.describe('Exam management', () => { +test.describe('Exam management', { tag: '@fast' }, () => { test.describe('Exercise group', () => { let course: Course; let exam: Exam; diff --git a/src/test/playwright/e2e/exam/ExamParticipation.spec.ts b/src/test/playwright/e2e/exam/ExamParticipation.spec.ts index a27ffe2c25ab..0e137ed96528 100644 --- a/src/test/playwright/e2e/exam/ExamParticipation.spec.ts +++ b/src/test/playwright/e2e/exam/ExamParticipation.spec.ts @@ -43,7 +43,7 @@ test.describe('Exam participation', () => { studentFourName = studentFourInfo.name!; }); - test.describe('Early Hand-in', () => { + test.describe('Early Hand-in', { tag: '@slow' }, () => { let exam: Exam; const examTitle = 'exam' + generateUUID(); @@ -107,7 +107,6 @@ test.describe('Exam participation', () => { await examParticipation.startParticipation(studentFour, course, exam); for (let j = 0; j < exerciseArray.length; j++) { const exercise = exerciseArray[j]; - // await await examNavigation.openFromOverviewByTitle(exercise.exerciseGroup!.title!); await examNavigation.openOverview(); } @@ -118,7 +117,7 @@ test.describe('Exam participation', () => { }); }); - test.describe('Early hand-in with continue and reload page', () => { + test.describe('Early hand-in with continue and reload page', { tag: '@slow' }, () => { let exam: Exam; const examTitle = 'exam' + generateUUID(); @@ -222,7 +221,7 @@ test.describe('Exam participation', () => { }); }); - test.describe('Normal Hand-in', () => { + test.describe('Normal Hand-in', { tag: '@sequential' }, () => { let exam: Exam; const examTitle = 'exam' + generateUUID(); @@ -259,7 +258,7 @@ test.describe('Exam participation', () => { }); }); - test.describe('Exam announcements', () => { + test.describe('Exam announcements', { tag: '@slow' }, () => { let exam: Exam; const students = [studentOne, studentTwo]; diff --git a/src/test/playwright/e2e/exam/ExamResults.spec.ts b/src/test/playwright/e2e/exam/ExamResults.spec.ts index 23168d2be415..4b57dfc2e196 100644 --- a/src/test/playwright/e2e/exam/ExamResults.spec.ts +++ b/src/test/playwright/e2e/exam/ExamResults.spec.ts @@ -126,44 +126,48 @@ test.describe('Exam Results', () => { }, ); - test(`Check exam ${exerciseTypeString} exercise results`, async ({ page, login, examParticipation, examResultsPage }) => { - await login(studentOne); - await waitForExamEnd(examEndDate, page); - await page.goto(`/courses/${course.id}/exams/${exam.id}`); - await examParticipation.checkResultScore(testCase.resultScore, exercise.id!); + test( + `Check exam ${exerciseTypeString} exercise results`, + { tag: testCase.exerciseType === ExerciseType.PROGRAMMING ? '@sequential' : '@slow' }, + async ({ page, login, examParticipation, examResultsPage }) => { + await login(studentOne); + await waitForExamEnd(examEndDate, page); + await page.goto(`/courses/${course.id}/exams/${exam.id}`); + await examParticipation.checkResultScore(testCase.resultScore, exercise.id!); - switch (testCase.exerciseType) { - case ExerciseType.TEXT: - await examResultsPage.checkTextExerciseContent(exercise.id!, exercise.additionalData!.textFixture!); - await examResultsPage.checkAdditionalFeedback(exercise.id!, 7, 'Good job'); - break; - case ExerciseType.PROGRAMMING: - await examResultsPage.checkProgrammingExerciseAssessments(exercise.id!, 'Wrong', 7); - await examResultsPage.checkProgrammingExerciseAssessments(exercise.id!, 'Correct', 6); - const taskStatuses: ProgrammingExerciseTaskStatus[] = [ - ProgrammingExerciseTaskStatus.SUCCESS, - ProgrammingExerciseTaskStatus.SUCCESS, - ProgrammingExerciseTaskStatus.SUCCESS, - ProgrammingExerciseTaskStatus.FAILURE, - ProgrammingExerciseTaskStatus.FAILURE, - ProgrammingExerciseTaskStatus.FAILURE, - ProgrammingExerciseTaskStatus.FAILURE, - ]; - await examResultsPage.checkProgrammingExerciseTasks(exercise.id!, taskStatuses); - break; - case ExerciseType.QUIZ: - await examResultsPage.checkQuizExerciseScore(exercise.id!, 5, 10); - const studentAnswers = [true, false, true, false]; - const correctAnswers = [true, true, false, false]; - await examResultsPage.checkQuizExerciseAnswers(exercise.id!, studentAnswers, correctAnswers); - break; - case ExerciseType.MODELING: - await examResultsPage.checkAdditionalFeedback(exercise.id!, 5, 'Good'); - await examResultsPage.checkModellingExerciseAssessment(exercise.id!, 'class Class', 'Wrong', -1); - await examResultsPage.checkModellingExerciseAssessment(exercise.id!, 'abstract class Abstract', 'Neutral', 0); - break; - } - }); + switch (testCase.exerciseType) { + case ExerciseType.TEXT: + await examResultsPage.checkTextExerciseContent(exercise.id!, exercise.additionalData!.textFixture!); + await examResultsPage.checkAdditionalFeedback(exercise.id!, 7, 'Good job'); + break; + case ExerciseType.PROGRAMMING: + await examResultsPage.checkProgrammingExerciseAssessments(exercise.id!, 'Wrong', 7); + await examResultsPage.checkProgrammingExerciseAssessments(exercise.id!, 'Correct', 6); + const taskStatuses: ProgrammingExerciseTaskStatus[] = [ + ProgrammingExerciseTaskStatus.SUCCESS, + ProgrammingExerciseTaskStatus.SUCCESS, + ProgrammingExerciseTaskStatus.SUCCESS, + ProgrammingExerciseTaskStatus.FAILURE, + ProgrammingExerciseTaskStatus.FAILURE, + ProgrammingExerciseTaskStatus.FAILURE, + ProgrammingExerciseTaskStatus.FAILURE, + ]; + await examResultsPage.checkProgrammingExerciseTasks(exercise.id!, taskStatuses); + break; + case ExerciseType.QUIZ: + await examResultsPage.checkQuizExerciseScore(exercise.id!, 5, 10); + const studentAnswers = [true, false, true, false]; + const correctAnswers = [true, true, false, false]; + await examResultsPage.checkQuizExerciseAnswers(exercise.id!, studentAnswers, correctAnswers); + break; + case ExerciseType.MODELING: + await examResultsPage.checkAdditionalFeedback(exercise.id!, 5, 'Good'); + await examResultsPage.checkModellingExerciseAssessment(exercise.id!, 'class Class', 'Wrong', -1); + await examResultsPage.checkModellingExerciseAssessment(exercise.id!, 'abstract class Abstract', 'Neutral', 0); + break; + } + }, + ); if (testCase.exerciseType === ExerciseType.TEXT) { test('Check exam result overview', async ({ page, login, examAPIRequests, examResultsPage }) => { diff --git a/src/test/playwright/e2e/exam/ExamTestRun.spec.ts b/src/test/playwright/e2e/exam/ExamTestRun.spec.ts index 42e873ca2427..7b15b93ebc5f 100644 --- a/src/test/playwright/e2e/exam/ExamTestRun.spec.ts +++ b/src/test/playwright/e2e/exam/ExamTestRun.spec.ts @@ -15,7 +15,7 @@ import { expect } from '@playwright/test'; const textFixture = 'loremIpsum-short.txt'; const examTitle = 'exam' + generateUUID(); -test.describe('Exam test run', () => { +test.describe('Exam test run', { tag: '@fast' }, () => { let course: Course; let exam: Exam; let exerciseArray: Array = []; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts index d3f340fcb917..c60d95177283 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts @@ -23,7 +23,7 @@ const examData = { confirmationEndText: 'Exam confirmation end text', }; -test.describe('Test Exam creation/deletion', () => { +test.describe('Test Exam creation/deletion', { tag: '@fast' }, () => { let course: Course; let exam: Exam; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts index bfdb05fd831b..0b9ec4e08385 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts @@ -11,7 +11,7 @@ import { expect } from '@playwright/test'; const uid = generateUUID(); const examTitle = 'test-exam' + uid; -test.describe('Test Exam management', () => { +test.describe('Test Exam management', { tag: '@fast' }, () => { let course: Course; let exam: Exam; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts index c66d2966576f..5b2824dbf8f6 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts @@ -14,7 +14,7 @@ import { expect } from '@playwright/test'; // Common primitives const textFixture = 'loremIpsum-short.txt'; -test.describe('Test exam participation', () => { +test.describe('Test exam participation', { tag: '@slow' }, () => { let course: Course; let exerciseArray: Array = []; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts index 806e5054f551..3ce0a4ef2365 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts @@ -17,7 +17,7 @@ const studentNames = new Map(); let examExercise: Exercise; -test.describe('Test Exam - student exams', () => { +test.describe('Test Exam - student exams', { tag: '@slow' }, () => { let course: Course; let exam: Exam; diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts index 66b13ff3af12..35e37b163b9d 100644 --- a/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts +++ b/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts @@ -13,7 +13,7 @@ import { expect } from '@playwright/test'; const textFixture = 'loremIpsum.txt'; const examTitle = 'exam' + generateUUID(); -test.describe('Test exam test run', () => { +test.describe('Test exam test run', { tag: '@slow' }, () => { let course: Course; let exam: Exam; let exerciseArray: Array = []; diff --git a/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts b/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts index 8290457c32b9..d54c4f4268db 100644 --- a/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts +++ b/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts @@ -39,7 +39,7 @@ test.describe('Import exercises', () => { }); test.describe('Imports exercises', () => { - test('Imports text exercise', async ({ login, page, courseManagementExercises, textExerciseCreation, courseOverview, textExerciseEditor }) => { + test('Imports text exercise', { tag: '@fast' }, async ({ login, page, courseManagementExercises, textExerciseCreation, courseOverview, textExerciseEditor }) => { await login(instructor, `/course-management/${secondCourse.id}/exercises`); await courseManagementExercises.importTextExercise(); await courseManagementExercises.clickImportExercise(textExercise.id!); @@ -69,7 +69,7 @@ test.describe('Import exercises', () => { expect(submissionResponse.status()).toBe(200); }); - test('Imports quiz exercise', async ({ login, page, courseManagementExercises, quizExerciseCreation, courseOverview, quizExerciseMultipleChoice }) => { + test('Imports quiz exercise', { tag: '@fast' }, async ({ login, page, courseManagementExercises, quizExerciseCreation, courseOverview, quizExerciseMultipleChoice }) => { await login(instructor, `/course-management/${secondCourse.id}/exercises`); await courseManagementExercises.importQuizExercise(); await courseManagementExercises.clickImportExercise(quizExercise.id!); @@ -92,54 +92,62 @@ test.describe('Import exercises', () => { expect(submitResponse.status()).toBe(200); }); - test('Imports modeling exercise', async ({ login, page, courseManagementExercises, modelingExerciseCreation, courseOverview, modelingExerciseEditor }) => { - await login(instructor, `/course-management/${secondCourse.id}/exercises`); - await courseManagementExercises.importModelingExercise(); - await courseManagementExercises.clickImportExercise(modelingExercise.id!); - - await page.waitForTimeout(10000); - await expect(page.locator('#field_title')).toHaveValue(modelingExercise.title!); - await expect(page.locator('#field_points')).toHaveValue(`${modelingExercise.maxPoints!}`); - - await modelingExerciseCreation.setReleaseDate(dayjs()); - await modelingExerciseCreation.setDueDate(dayjs().add(1, 'days')); - await modelingExerciseCreation.setAssessmentDueDate(dayjs().add(2, 'days')); - - const importResponse = await modelingExerciseCreation.import(); - const exercise: ModelingExercise = await importResponse.json(); - await login(studentOne, `/courses/${secondCourse.id}/exercises/${exercise.id}`); - await courseOverview.startExercise(exercise.id!); - await courseOverview.openRunningExercise(exercise.id!); - await modelingExerciseEditor.addComponentToModel(exercise.id!, 1); - await modelingExerciseEditor.addComponentToModel(exercise.id!, 2); - await modelingExerciseEditor.addComponentToModel(exercise.id!, 3); - const submitResponse = await modelingExerciseEditor.submit(); - const submission: ModelingSubmission = await submitResponse.json(); - expect(submission.submitted).toBe(true); - expect(submitResponse.status()).toBe(200); - }); - - test('Imports programming exercise', async ({ login, page, courseManagementExercises, programmingExerciseCreation, courseOverview, programmingExerciseEditor }) => { - await login(instructor, `/course-management/${secondCourse.id}/exercises`); - await courseManagementExercises.importProgrammingExercise(); - await courseManagementExercises.clickImportExercise(programmingExercise.id!); - - await expect(page.locator('#field_points')).toHaveValue(`${programmingExercise.maxPoints!}`); - - await programmingExerciseCreation.setTitle('Import Test'); - await programmingExerciseCreation.setShortName('importtest' + generateUUID()); - await programmingExerciseCreation.setDueDate(dayjs().add(3, 'days')); - - const importResponse = await programmingExerciseCreation.import(); - const exercise: ProgrammingExercise = await importResponse.json(); - await login(studentOne, `/courses/${secondCourse.id}/exercises/${exercise.id}`); - await courseOverview.startExercise(exercise.id!); - await courseOverview.openRunningExercise(exercise.id!); - await programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, javaPartiallySuccessfulSubmission, async () => { - const resultScore = await programmingExerciseEditor.getResultScore(); - await expect(resultScore.getByText(javaPartiallySuccessfulSubmission.expectedResult)).toBeVisible(); - }); - }); + test( + 'Imports modeling exercise', + { tag: '@fast' }, + async ({ login, page, courseManagementExercises, modelingExerciseCreation, courseOverview, modelingExerciseEditor }) => { + await login(instructor, `/course-management/${secondCourse.id}/exercises`); + await courseManagementExercises.importModelingExercise(); + await courseManagementExercises.clickImportExercise(modelingExercise.id!); + + await page.waitForTimeout(10000); + await expect(page.locator('#field_title')).toHaveValue(modelingExercise.title!); + await expect(page.locator('#field_points')).toHaveValue(`${modelingExercise.maxPoints!}`); + + await modelingExerciseCreation.setReleaseDate(dayjs()); + await modelingExerciseCreation.setDueDate(dayjs().add(1, 'days')); + await modelingExerciseCreation.setAssessmentDueDate(dayjs().add(2, 'days')); + + const importResponse = await modelingExerciseCreation.import(); + const exercise: ModelingExercise = await importResponse.json(); + await login(studentOne, `/courses/${secondCourse.id}/exercises/${exercise.id}`); + await courseOverview.startExercise(exercise.id!); + await courseOverview.openRunningExercise(exercise.id!); + await modelingExerciseEditor.addComponentToModel(exercise.id!, 1); + await modelingExerciseEditor.addComponentToModel(exercise.id!, 2); + await modelingExerciseEditor.addComponentToModel(exercise.id!, 3); + const submitResponse = await modelingExerciseEditor.submit(); + const submission: ModelingSubmission = await submitResponse.json(); + expect(submission.submitted).toBe(true); + expect(submitResponse.status()).toBe(200); + }, + ); + + test( + 'Imports programming exercise', + { tag: '@sequential' }, + async ({ login, page, courseManagementExercises, programmingExerciseCreation, courseOverview, programmingExerciseEditor }) => { + await login(instructor, `/course-management/${secondCourse.id}/exercises`); + await courseManagementExercises.importProgrammingExercise(); + await courseManagementExercises.clickImportExercise(programmingExercise.id!); + + await expect(page.locator('#field_points')).toHaveValue(`${programmingExercise.maxPoints!}`); + + await programmingExerciseCreation.setTitle('Import Test'); + await programmingExerciseCreation.setShortName('importtest' + generateUUID()); + await programmingExerciseCreation.setDueDate(dayjs().add(3, 'days')); + + const importResponse = await programmingExerciseCreation.import(); + const exercise: ProgrammingExercise = await importResponse.json(); + await login(studentOne, `/courses/${secondCourse.id}/exercises/${exercise.id}`); + await courseOverview.startExercise(exercise.id!); + await courseOverview.openRunningExercise(exercise.id!); + await programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, javaPartiallySuccessfulSubmission, async () => { + const resultScore = await programmingExerciseEditor.getResultScore(); + await expect(resultScore.getByText(javaPartiallySuccessfulSubmission.expectedResult)).toBeVisible(); + }); + }, + ); }); test.afterEach('Delete Courses', async ({ courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseAssessment.spec.ts index 02eb0438eb32..3b3e2fd5ffdc 100644 --- a/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseAssessment.spec.ts @@ -16,7 +16,7 @@ const tutorFeedback = 'Try to use some newlines next time!'; const tutorFeedbackPoints = 4; const complaint = "That feedback wasn't very useful!"; -test.describe('File upload exercise assessment', () => { +test.describe('File upload exercise assessment', { tag: '@fast' }, () => { let course: Course; let exercise: FileUploadExercise; diff --git a/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseManagement.spec.ts index 851ceb201e06..d6d5d318b510 100644 --- a/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseManagement.spec.ts @@ -8,7 +8,7 @@ import { generateUUID } from '../../../support/utils'; import { test } from '../../../support/fixtures'; import { expect } from '@playwright/test'; -test.describe('File upload exercise management', () => { +test.describe('File upload exercise management', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseParticipation.spec.ts index 3785d7261595..0f91c6174fa6 100644 --- a/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseParticipation.spec.ts +++ b/src/test/playwright/e2e/exercise/file-upload/FileUploadExerciseParticipation.spec.ts @@ -6,7 +6,7 @@ import { test } from '../../../support/fixtures'; import { expect } from '@playwright/test'; import { FileUploadSubmission } from 'app/entities/file-upload-submission.model'; -test.describe('File upload exercise participation', () => { +test.describe('File upload exercise participation', { tag: '@fast' }, () => { let course: Course; let exercise: FileUploadExercise; diff --git a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts index e990c05fa6a8..47569e73a3b4 100644 --- a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseAssessment.spec.ts @@ -11,7 +11,7 @@ import { ExerciseAPIRequests } from '../../../support/requests/ExerciseAPIReques import { Commands } from '../../../support/commands'; import { newBrowserPage } from '../../../support/utils'; -test.describe('Modeling Exercise Assessment', () => { +test.describe('Modeling Exercise Assessment', { tag: '@fast' }, () => { let course: Course; let modelingExercise: ModelingExercise; diff --git a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts index cd30ff8cf24b..dec709eadd8c 100644 --- a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts @@ -9,7 +9,7 @@ import { generateUUID } from '../../../support/utils'; import { test } from '../../../support/fixtures'; import { expect } from '@playwright/test'; -test.describe('Modeling Exercise Management', () => { +test.describe('Modeling Exercise Management', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseParticipation.spec.ts index 7e22814ca8ce..c51fe9fc3f76 100644 --- a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseParticipation.spec.ts +++ b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseParticipation.spec.ts @@ -4,7 +4,7 @@ import { ModelingExercise } from 'app/entities/modeling-exercise.model'; import { admin, studentOne } from '../../../support/users'; import { test } from '../../../support/fixtures'; -test.describe('Modeling Exercise Participation', () => { +test.describe('Modeling Exercise Participation', { tag: '@fast' }, () => { let course: Course; let modelingExercise: ModelingExercise; diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts index ba4e95fbb241..0299bd423774 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts @@ -17,7 +17,7 @@ const tutorCodeFeedback = 'The input parameter should be mentioned in javadoc!'; const tutorCodeFeedbackPoints = -2; const complaint = "That feedback wasn't very useful!"; -test.describe('Programming exercise assessment', () => { +test.describe('Programming exercise assessment', { tag: '@sequential' }, () => { let course: Course; let exercise: ProgrammingExercise; let dueDate: dayjs.Dayjs; diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts index 81743451a031..aa8d06f10c7b 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts @@ -7,7 +7,7 @@ import { generateUUID } from '../../../support/utils'; import { expect } from '@playwright/test'; import { Exercise, ExerciseMode } from '../../../support/constants'; -test.describe('Programming Exercise Management', () => { +test.describe('Programming Exercise Management', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts index 0a36076081ea..cd28fe48b5b0 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts @@ -20,7 +20,7 @@ import { Team } from 'app/entities/team.model'; import { ProgrammingExerciseOverviewPage } from '../../../support/pageobjects/exercises/programming/ProgrammingExerciseOverviewPage'; import { Participation } from 'app/entities/participation/participation.model'; -test.describe('Programming exercise participation', () => { +test.describe('Programming exercise participation', { tag: '@sequential' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts index c11dac9b557e..a5da3a899584 100644 --- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts +++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts @@ -6,7 +6,7 @@ import { admin, studentOne } from '../../../support/users'; import { test } from '../../../support/fixtures'; import { expect } from '@playwright/test'; -test.describe('Static code analysis tests', () => { +test.describe('Static code analysis tests', { tag: '@sequential' }, () => { let course: Course; let exercise: ProgrammingExercise; diff --git a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseAssessment.spec.ts index fd5ec4011cf2..594169db22ec 100644 --- a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseAssessment.spec.ts @@ -4,7 +4,7 @@ import shortAnswerQuizTemplate from '../../../fixtures/exercise/quiz/short_answe import { admin, studentOne, tutor } from '../../../support/users'; import { test } from '../../../support/fixtures'; -test.describe('Quiz Exercise Assessment', () => { +test.describe('Quiz Exercise Assessment', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseDropLocation.spec.ts b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseDropLocation.spec.ts index fea604c654b9..143f77f86c73 100644 --- a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseDropLocation.spec.ts +++ b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseDropLocation.spec.ts @@ -7,7 +7,7 @@ import { expect } from '@playwright/test'; let course: Course; -test.describe('Quiz Exercise Drop Location Spec', () => { +test.describe('Quiz Exercise Drop Location Spec', { tag: '@fast' }, () => { test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { await login(admin); course = await courseManagementAPIRequests.createCourse(); diff --git a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseManagement.spec.ts index 2dc4558c4745..5648d8b4d519 100644 --- a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseManagement.spec.ts @@ -7,7 +7,7 @@ import { test } from '../../../support/fixtures'; import { expect } from '@playwright/test'; import { promises as fs } from 'fs'; -test.describe('Quiz Exercise Management', () => { +test.describe('Quiz Exercise Management', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseParticipation.spec.ts index c9e70d97213a..8a0a7f735062 100644 --- a/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseParticipation.spec.ts +++ b/src/test/playwright/e2e/exercise/quiz-exercise/QuizExerciseParticipation.spec.ts @@ -8,7 +8,7 @@ import { expect } from '@playwright/test'; import dayjs from 'dayjs'; import { QuizMode } from '../../../support/constants'; -test.describe('Quiz Exercise Participation', () => { +test.describe('Quiz Exercise Participation', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts index 512aa43a4b97..ef80849596fa 100644 --- a/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts +++ b/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts @@ -17,7 +17,7 @@ const tutorTextFeedback = 'Nice ending of the sentence!'; const tutorTextFeedbackPoints = 2; const complaint = "That feedback wasn't very useful!"; -test.describe('Text exercise assessment', () => { +test.describe('Text exercise assessment', { tag: '@fast' }, () => { let course: Course; let exercise: TextExercise; let dueDate: dayjs.Dayjs; diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts index 5bf800e36484..c8a4b0a26dba 100644 --- a/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts +++ b/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts @@ -8,7 +8,7 @@ import { expect } from '@playwright/test'; import { ExampleSubmission } from 'app/entities/example-submission.model'; import { TextSubmission } from 'app/entities/text/text-submission.model'; -test.describe('Text exercise management', () => { +test.describe('Text exercise management', { tag: '@fast' }, () => { let course: Course; test.beforeEach('Create course', async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts index b2ac84ef3284..891e8e320ba5 100644 --- a/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts +++ b/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts @@ -7,7 +7,7 @@ import { Fixtures } from '../../../fixtures/fixtures'; import { expect } from '@playwright/test'; import { TextSubmission } from 'app/entities/text/text-submission.model'; -test.describe('Text exercise participation', () => { +test.describe('Text exercise participation', { tag: '@fast' }, () => { let course: Course; let exercise: TextExercise; diff --git a/src/test/playwright/e2e/lecture/LectureManagement.spec.ts b/src/test/playwright/e2e/lecture/LectureManagement.spec.ts index f9f654d3aa62..74590f2f5e14 100644 --- a/src/test/playwright/e2e/lecture/LectureManagement.spec.ts +++ b/src/test/playwright/e2e/lecture/LectureManagement.spec.ts @@ -19,7 +19,7 @@ const lectureData = { endDate: dayjs().add(1, 'hour'), }; -test.describe('Lecture management', () => { +test.describe('Lecture management', { tag: '@fast' }, () => { let course: Course; test.beforeEach(async ({ login, courseManagementAPIRequests }) => { diff --git a/src/test/playwright/package-lock.json b/src/test/playwright/package-lock.json index fd42e5bf37f0..5f42b3c5cf00 100644 --- a/src/test/playwright/package-lock.json +++ b/src/test/playwright/package-lock.json @@ -7,68 +7,15 @@ "name": "artemis_playwright", "license": "MIT", "devDependencies": { - "@playwright/test": "1.44.1", - "dayjs": "1.11.11", + "@playwright/test": "1.48.2", + "cross-env": "7.0.3", + "dayjs": "1.11.13", "dotenv": "16.4.5", - "npm-check-updates": "16.14.20", - "simple-git": "3.24.0", - "uuid": "9.0.1" - } - }, - "node_modules/@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.1.90" - } - }, - "node_modules/@gar/promisify": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", - "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "dev": true - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "junit-merge": "2.0.0", + "npm-check-updates": "17.1.11", + "npm-run-all": "4.1.5", + "simple-git": "3.27.0", + "uuid": "11.0.3" } }, "node_modules/@kwsites/file-exists": { @@ -76,6 +23,7 @@ "resolved": "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz", "integrity": "sha512-m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.1.1" } @@ -84,4024 +32,1894 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz", "integrity": "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==", - "dev": true - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, - "engines": { - "node": ">= 8" - } + "license": "MIT" }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "node_modules/@playwright/test": { + "version": "1.48.2", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.2.tgz", + "integrity": "sha512-54w1xCWfXuax7dz4W2M9uw0gDyh+ti/0K/MxcCUxChFh37kkdxPdfZDw5QBbuPUJHr1CiHJ1hXgSs+GgeQc5Zw==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "playwright": "1.48.2" + }, + "bin": { + "playwright": "cli.js" }, "engines": { - "node": ">= 8" + "node": ">=18" } }, - "node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, + "license": "MIT", "dependencies": { - "semver": "^7.3.5" + "color-convert": "^1.9.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=4" } }, - "node_modules/@npmcli/git": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.1.0.tgz", - "integrity": "sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==", + "node_modules/array-buffer-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, + "license": "MIT", "dependencies": { - "@npmcli/promise-spawn": "^6.0.0", - "lru-cache": "^7.4.4", - "npm-pick-manifest": "^8.0.0", - "proc-log": "^3.0.0", - "promise-inflight": "^1.0.1", - "promise-retry": "^2.0.1", - "semver": "^7.3.5", - "which": "^3.0.0" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@npmcli/git/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, + "license": "MIT", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", + "is-shared-array-buffer": "^1.0.2" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@npmcli/installed-package-contents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", - "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "license": "MIT", "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "bin": { - "installed-package-contents": "bin/index.js" + "possible-typed-array-names": "^1.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@npmcli/move-file": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz", - "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==", - "deprecated": "This functionality has been moved to @npmcli/fs", + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true, - "dependencies": { - "mkdirp": "^1.0.4", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } + "license": "MIT" }, - "node_modules/@npmcli/move-file/node_modules/brace-expansion": { + "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "node_modules/@npmcli/move-file/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, + "license": "MIT", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" }, "engines": { - "node": "*" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@npmcli/move-file/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, + "license": "MIT", "dependencies": { - "brace-expansion": "^1.1.7" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "engines": { - "node": "*" + "node": ">=4" } }, - "node_modules/@npmcli/move-file/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, + "license": "MIT", "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "color-name": "1.1.3" } }, - "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "license": "MIT" }, - "node_modules/@npmcli/promise-spawn": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz", - "integrity": "sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==", + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, - "dependencies": { - "which": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "license": "MIT" }, - "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true, + "license": "MIT" + }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "license": "MIT", "dependencies": { - "isexe": "^2.0.0" + "cross-spawn": "^7.0.1" }, "bin": { - "node-which": "bin/which.js" + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" } }, - "node_modules/@npmcli/run-script": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.2.tgz", - "integrity": "sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA==", + "node_modules/cross-spawn": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", + "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", "dev": true, + "license": "MIT", "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/promise-spawn": "^6.0.0", - "node-gyp": "^9.0.0", - "read-package-json-fast": "^3.0.0", - "which": "^3.0.0" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 8" } }, - "node_modules/@npmcli/run-script/node_modules/which": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-3.0.1.tgz", - "integrity": "sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==", + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", "dev": true, + "license": "MIT", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/which.js" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", "dev": true, - "optional": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, "engines": { - "node": ">=14" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@playwright/test": { - "version": "1.44.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.44.1.tgz", - "integrity": "sha512-1hZ4TNvD5z9VuhNJ/walIjvMVvYkZKf71axoF/uiAqpntQJXpG64dlXhoDXE3OczPuTuvjf/M5KWFg5VAVUS3Q==", + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", "dev": true, + "license": "MIT", "dependencies": { - "playwright": "1.44.1" - }, - "bin": { - "playwright": "cli.js" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" }, "engines": { - "node": ">=16" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@pnpm/config.env-replace": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", - "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", + "node_modules/dayjs": { + "version": "1.11.13", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", + "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", "dev": true, - "engines": { - "node": ">=12.22.0" - } + "license": "MIT" }, - "node_modules/@pnpm/network.ca-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", + "node_modules/debug": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, + "license": "MIT", "dependencies": { - "graceful-fs": "4.2.10" + "ms": "^2.1.3" }, "engines": { - "node": ">=12.22.0" + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, - "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "node_modules/@pnpm/npm-conf": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz", - "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==", + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, + "license": "MIT", "dependencies": { - "@pnpm/config.env-replace": "^1.1.0", - "@pnpm/network.ca-file": "^1.0.1", - "config-chain": "^1.1.11" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { - "node": ">=12" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@sigstore/bundle": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz", - "integrity": "sha512-PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==", + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, + "license": "MIT", "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0" + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@sigstore/protobuf-specs": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz", - "integrity": "sha512-XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==", + "node_modules/dotenv": { + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", "dev": true, + "license": "BSD-2-Clause", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" } }, - "node_modules/@sigstore/sign": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz", - "integrity": "sha512-INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==", + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, + "license": "MIT", "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "make-fetch-happen": "^11.0.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "is-arrayish": "^0.2.1" } }, - "node_modules/@sigstore/tuf": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", - "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", + "node_modules/es-abstract": { + "version": "1.23.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz", + "integrity": "sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==", "dev": true, + "license": "MIT", "dependencies": { - "@sigstore/protobuf-specs": "^0.2.0", - "tuf-js": "^1.1.7" + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", + "globalthis": "^1.0.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.3", + "has-symbols": "^1.0.3", + "hasown": "^2.0.2", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.3", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.13", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.2", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.6", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.15" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@sindresorhus/is": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", - "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", - "dev": true, - "engines": { - "node": ">=14.16" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/@szmarczak/http-timer": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz", - "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==", + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", "dev": true, + "license": "MIT", "dependencies": { - "defer-to-connect": "^2.0.1" + "get-intrinsic": "^1.2.4" }, "engines": { - "node": ">=14.16" + "node": ">= 0.4" } }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, + "license": "MIT", "engines": { - "node": ">= 10" + "node": ">= 0.4" } }, - "node_modules/@tufjs/canonical-json": { + "node_modules/es-object-atoms": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", - "integrity": "sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/@tufjs/models": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz", - "integrity": "sha512-qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", "dev": true, + "license": "MIT", "dependencies": { - "@tufjs/canonical-json": "1.0.0", - "minimatch": "^9.0.0" + "es-errors": "^1.3.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" } }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==", - "dev": true - }, - "node_modules/@types/semver-utils": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@types/semver-utils/-/semver-utils-1.1.3.tgz", - "integrity": "sha512-T+YwkslhsM+CeuhYUxyAjWm7mJ5am/K10UX40RuA6k6Lc7eGtq8iY2xOzy7Vq0GOqhl/xZl5l2FwURZMTPTUww==", - "dev": true - }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "node_modules/es-set-tostringtag": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, + "license": "MIT", "dependencies": { - "debug": "4" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { - "node": ">= 6.0.0" + "node": ">= 0.4" } }, - "node_modules/agentkeepalive": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz", - "integrity": "sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==", + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, + "license": "MIT", "dependencies": { - "humanize-ms": "^1.2.1" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" }, "engines": { - "node": ">= 8.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=0.8.0" } }, - "node_modules/ansi-align": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, + "license": "MIT", "dependencies": { - "string-width": "^4.1.0" + "is-callable": "^1.1.3" } }, - "node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "node_modules/fs-readdir-recursive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", + "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==", "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } + "license": "MIT" }, - "node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/aproba": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", - "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", - "dev": true + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "node_modules/are-we-there-yet": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz", - "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==", - "deprecated": "This package is no longer supported.", + "node_modules/function.prototype.name": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, + "license": "MIT", "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^3.6.0" + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, - "engines": { - "node": ">=8" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/boxen": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz", - "integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==", + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-align": "^3.0.1", - "camelcase": "^7.0.1", - "chalk": "^5.2.0", - "cli-boxes": "^3.0.0", - "string-width": "^5.1.2", - "type-fest": "^2.13.0", - "widest-line": "^4.0.1", - "wrap-ansi": "^8.1.0" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "engines": { - "node": ">=14.16" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/boxen/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/boxen/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "node_modules/get-symbol-description": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, + "license": "MIT", "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", "dev": true, + "license": "MIT", "dependencies": { - "fill-range": "^7.1.1" + "define-properties": "^1.2.1", + "gopd": "^1.0.1" }, "engines": { - "node": ">=8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/cacache": { - "version": "17.1.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz", - "integrity": "sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==", + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, + "license": "MIT", "dependencies": { - "@npmcli/fs": "^3.1.0", - "fs-minipass": "^3.0.0", - "glob": "^10.2.2", - "lru-cache": "^7.7.1", - "minipass": "^7.0.3", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" + "get-intrinsic": "^1.1.3" }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/cacache/node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } + "license": "ISC" }, - "node_modules/cacheable-lookup": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz", - "integrity": "sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==", + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true, - "engines": { - "node": ">=14.16" + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/cacheable-request": { - "version": "10.2.14", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.14.tgz", - "integrity": "sha512-zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ==", + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "dependencies": { - "@types/http-cache-semantics": "^4.0.2", - "get-stream": "^6.0.1", - "http-cache-semantics": "^4.1.1", - "keyv": "^4.5.3", - "mimic-response": "^4.0.0", - "normalize-url": "^8.0.0", - "responselike": "^3.0.0" - }, + "license": "MIT", "engines": { - "node": ">=14.16" + "node": ">=4" } }, - "node_modules/camelcase": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-7.0.1.tgz", - "integrity": "sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw==", + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, - "engines": { - "node": ">=14.16" + "license": "MIT", + "dependencies": { + "es-define-property": "^1.0.0" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/cli-boxes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", - "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, + "license": "MIT", "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/cli-table3": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", - "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, + "license": "MIT", "dependencies": { - "string-width": "^4.2.0" + "has-symbols": "^1.0.3" }, "engines": { - "node": "10.* || >= 12.*" + "node": ">= 0.4" }, - "optionalDependencies": { - "@colors/colors": "1.5.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "function-bind": "^1.1.2" }, "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "bin": { - "color-support": "bin.js" + "node": ">= 0.4" } }, - "node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "license": "ISC" }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "node_modules/internal-slot": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, + "license": "MIT", "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" + "es-errors": "^1.3.0", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" } }, - "node_modules/config-chain/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/configstore": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz", - "integrity": "sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==", + "node_modules/is-array-buffer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, + "license": "MIT", "dependencies": { - "dot-prop": "^6.0.1", - "graceful-fs": "^4.2.6", - "unique-string": "^3.0.0", - "write-file-atomic": "^3.0.3", - "xdg-basedir": "^5.0.1" + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/yeoman/configstore?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", - "dev": true + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, + "license": "MIT", "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "has-bigints": "^1.0.1" }, - "engines": { - "node": ">= 8" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/crypto-random-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", - "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, + "license": "MIT", "dependencies": { - "type-fest": "^1.0.1" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/crypto-random-string/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, + "license": "MIT", "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/dayjs": { - "version": "1.11.11", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz", - "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==", - "dev": true - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "node_modules/is-core-module": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "dev": true, + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "hasown": "^2.0.2" }, "engines": { - "node": ">=6.0" + "node": ">= 0.4" }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", "dev": true, + "license": "MIT", "dependencies": { - "mimic-response": "^3.1.0" + "is-typed-array": "^1.1.13" }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, + "license": "MIT", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "node_modules/is-negative-zero": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, + "license": "MIT", "engines": { - "node": ">=4.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, + "license": "MIT", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, "engines": { - "node": ">=10" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", - "dev": true - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, + "license": "MIT", "dependencies": { - "path-type": "^4.0.0" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" }, "engines": { - "node": ">=8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", + "node_modules/is-shared-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, + "license": "MIT", "dependencies": { - "is-obj": "^2.0.0" + "call-bind": "^1.0.7" }, "engines": { - "node": ">=10" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/dotenv": { - "version": "16.4.5", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", - "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, + "license": "MIT", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://dotenvx.com" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, - "optional": true, + "license": "MIT", "dependencies": { - "iconv-lite": "^0.6.2" + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "node_modules/is-typed-array": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, + "license": "MIT", + "dependencies": { + "which-typed-array": "^1.1.14" + }, "engines": { - "node": ">=6" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, - "node_modules/escape-goat": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz", - "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==", + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, - "engines": { - "node": ">=12" + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/exponential-backoff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-memoize": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz", - "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==", - "dev": true + "license": "MIT" }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } + "license": "ISC" }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } + "license": "MIT" }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "node_modules/junit-merge": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/junit-merge/-/junit-merge-2.0.0.tgz", + "integrity": "sha512-qwENzBWcdHPazNqPO0fKyFIqEyaSKyO0iyBeIU4Y/scjkXYpwTi88P2S/PWecqgMhzG2MOCwXk8QB9ucvXeIPw==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" + "commander": "^2.18.0", + "fs-readdir-recursive": "^1.1.0", + "mkdirp": "^0.5.1", + "xmldoc": "^1.1.2" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "bin": { + "junit-merge": "bin/junit-merge" } }, - "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "node_modules/load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==", "dev": true, + "license": "MIT", "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" }, "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data-encoder": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.1.4.tgz", - "integrity": "sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==", - "dev": true, - "engines": { - "node": ">= 14.17" + "node": ">=4" } }, - "node_modules/fp-and-or": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.4.tgz", - "integrity": "sha512-+yRYRhpnFPWXSly/6V4Lw9IfOV26uu30kynGJ03PW+MnjOEQe45RZ141QcS0aJehYBYA50GfCDnsRbFJdhssRw==", + "node_modules/memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==", "dev": true, "engines": { - "node": ">=10" + "node": ">= 0.10.0" } }, - "node_modules/fs-minipass": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { - "minipass": "^7.0.3" + "brace-expansion": "^1.1.7" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + "node": "*" } }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gauge": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz", - "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==", - "deprecated": "This package is no longer supported.", + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, + "license": "MIT", "dependencies": { - "aproba": "^1.0.3 || ^2.0.0", - "color-support": "^1.1.3", - "console-control-strings": "^1.1.0", - "has-unicode": "^2.0.1", - "signal-exit": "^3.0.7", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "wide-align": "^1.1.5" + "minimist": "^1.2.6" }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "bin": { + "mkdirp": "bin/cmd.js" } }, - "node_modules/gauge/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, - "engines": { - "node": ">=8" - } + "license": "MIT" }, - "node_modules/gauge/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true, + "license": "MIT" }, - "node_modules/gauge/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, - "node_modules/get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "node_modules/npm-check-updates": { + "version": "17.1.11", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.11.tgz", + "integrity": "sha512-TR2RuGIH7P3Qrb0jfdC/nT7JWqXPKjDlxuNQt3kx4oNVf1Pn5SBRB7KLypgYZhruivJthgTtfkkyK4mz342VjA==", "dev": true, - "engines": { - "node": ">=10" + "license": "Apache-2.0", + "bin": { + "ncu": "build/cli.js", + "npm-check-updates": "build/cli.js" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^18.18.0 || >=20.0.0", + "npm": ">=8.12.1" } }, - "node_modules/glob": { - "version": "10.3.16", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.16.tgz", - "integrity": "sha512-JDKXl1DiuuHJ6fVS2FXjownaavciiHNUU4mOvV/B793RLh05vZL1rcPnCSaOgv1hDT6RDlY7AB7ZUvFYAtPgAw==", + "node_modules/npm-run-all": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz", + "integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==", "dev": true, + "license": "MIT", "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^3.1.2", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.11.0" + "ansi-styles": "^3.2.1", + "chalk": "^2.4.1", + "cross-spawn": "^6.0.5", + "memorystream": "^0.3.1", + "minimatch": "^3.0.4", + "pidtree": "^0.3.0", + "read-pkg": "^3.0.0", + "shell-quote": "^1.6.1", + "string.prototype.padend": "^3.0.0" }, "bin": { - "glob": "dist/esm/bin.mjs" + "npm-run-all": "bin/npm-run-all/index.js", + "run-p": "bin/run-p/index.js", + "run-s": "bin/run-s/index.js" }, "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">= 4" } }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "node_modules/npm-run-all/node_modules/cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, + "license": "MIT", "dependencies": { - "is-glob": "^4.0.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, "engines": { - "node": ">= 6" + "node": ">=4.8" } }, - "node_modules/glob/node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", + "node_modules/npm-run-all/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", "dev": true, + "license": "MIT", "engines": { - "node": ">=16 || 14 >=14.17" + "node": ">=4" } }, - "node_modules/global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", + "node_modules/npm-run-all/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", "dev": true, + "license": "MIT", "dependencies": { - "ini": "2.0.0" - }, - "engines": { - "node": ">=10" + "shebang-regex": "^1.0.0" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/global-dirs/node_modules/ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true, "engines": { - "node": ">=10" + "node": ">=0.10.0" } }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "node_modules/npm-run-all/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, + "license": "MIT", "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=0.10.0" } }, - "node_modules/got": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", - "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", + "node_modules/npm-run-all/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, + "license": "ISC", "dependencies": { - "@sindresorhus/is": "^5.2.0", - "@szmarczak/http-timer": "^5.0.1", - "cacheable-lookup": "^7.0.0", - "cacheable-request": "^10.2.8", - "decompress-response": "^6.0.0", - "form-data-encoder": "^2.1.2", - "get-stream": "^6.0.1", - "http2-wrapper": "^2.1.10", - "lowercase-keys": "^3.0.0", - "p-cancelable": "^3.0.0", - "responselike": "^3.0.0" - }, - "engines": { - "node": ">=14.16" + "isexe": "^2.0.0" }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" + "bin": { + "which": "bin/which" } }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "node_modules/has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", - "dev": true - }, - "node_modules/has-yarn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz", - "integrity": "sha512-IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA==", + "node_modules/object-inspect": { + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", "dev": true, + "license": "MIT", "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, - "dependencies": { - "function-bind": "^1.1.2" - }, + "license": "MIT", "engines": { "node": ">= 0.4" } }, - "node_modules/hosted-git-info": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.2.1.tgz", - "integrity": "sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", - "dev": true - }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/http2-wrapper": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.2.1.tgz", - "integrity": "sha512-V5nVw1PAOgfI3Lmeaj2Exmeg7fenjhRUgz1lPSezy1CuhPYbgQtbQj4jZfEAEMlaL+vupsvhjqCyjzob0yxsmQ==", - "dev": true, - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.2.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "node_modules/object.assign": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, + "license": "MIT", "dependencies": { - "agent-base": "6", - "debug": "4" + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" }, "engines": { - "node": ">= 6" - } - }, - "node_modules/humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==", - "dev": true, - "dependencies": { - "ms": "^2.0.0" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" + "node": ">= 0.4" }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, - "engines": { - "node": ">= 4" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/ignore-walk": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", - "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", + "node_modules/parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==", "dev": true, + "license": "MIT", "dependencies": { - "minimatch": "^9.0.0" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" + "node": ">=4" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/ini": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", - "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } + "license": "MIT" }, - "node_modules/ip-address": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", - "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, + "license": "MIT", "dependencies": { - "jsbn": "1.1.0", - "sprintf-js": "^1.1.3" + "pify": "^3.0.0" }, "engines": { - "node": ">= 12" + "node": ">=4" } }, - "node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", + "node_modules/pidtree": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.3.1.tgz", + "integrity": "sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==", "dev": true, - "dependencies": { - "ci-info": "^3.2.0" - }, + "license": "MIT", "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" + "pidtree": "bin/pidtree.js" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=0.10" } }, - "node_modules/is-fullwidth-code-point": { + "node_modules/pify": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==", "dev": true, + "license": "MIT", "engines": { - "node": ">=8" + "node": ">=4" } }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "node_modules/playwright": { + "version": "1.48.2", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.2.tgz", + "integrity": "sha512-NjYvYgp4BPmiwfe31j4gHLa3J7bD2WiBz8Lk2RoSsmX38SVIARZ18VYjxLjAcDsAhA+F4iSEXTSGgjua0rrlgQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "is-extglob": "^2.1.1" + "playwright-core": "1.48.2" }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "dependencies": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" + "bin": { + "playwright": "cli.js" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, - "node_modules/is-npm": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz", - "integrity": "sha512-JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true - }, - "node_modules/is-yarn-global": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.1.tgz", - "integrity": "sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==", - "dev": true - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/jsbn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", - "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==", - "dev": true - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "node_modules/json-parse-even-better-errors": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/json-parse-helpfulerror": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz", - "integrity": "sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==", - "dev": true, - "dependencies": { - "jju": "^1.1.0" - } - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonlines": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz", - "integrity": "sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA==", - "dev": true - }, - "node_modules/jsonparse": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", - "dev": true, - "engines": [ - "node >= 0.2.0" - ] - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/latest-version": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz", - "integrity": "sha512-KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==", - "dev": true, - "dependencies": { - "package-json": "^8.1.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lowercase-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz", - "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lru-cache": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz", - "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/make-fetch-happen": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", - "integrity": "sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^17.0.0", - "http-cache-semantics": "^4.1.1", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^10.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", - "dev": true, - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mimic-response": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-4.0.0.tgz", - "integrity": "sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-collect/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", - "dev": true, - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minipass-flush/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-json-stream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz", - "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==", - "dev": true, - "dependencies": { - "jsonparse": "^1.3.1", - "minipass": "^3.0.0" - } - }, - "node_modules/minipass-json-stream/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-pipeline/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minipass-sized/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/node-gyp": { - "version": "9.4.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz", - "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==", - "dev": true, - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^10.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/node-gyp/node_modules/@npmcli/fs": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz", - "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==", - "dev": true, - "dependencies": { - "@gar/promisify": "^1.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/node-gyp/node_modules/cacache": { - "version": "16.1.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz", - "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==", - "dev": true, - "dependencies": { - "@npmcli/fs": "^2.1.0", - "@npmcli/move-file": "^2.0.0", - "chownr": "^2.0.0", - "fs-minipass": "^2.1.0", - "glob": "^8.0.1", - "infer-owner": "^1.0.4", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "mkdirp": "^1.0.4", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^9.0.0", - "tar": "^6.1.11", - "unique-filename": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/cacache/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/node-gyp/node_modules/cacache/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/node-gyp/node_modules/cacache/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/node-gyp/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/node-gyp/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/node-gyp/node_modules/make-fetch-happen": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz", - "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==", - "dev": true, - "dependencies": { - "agentkeepalive": "^4.2.1", - "cacache": "^16.1.0", - "http-cache-semantics": "^4.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.0", - "is-lambda": "^1.0.1", - "lru-cache": "^7.7.1", - "minipass": "^3.1.6", - "minipass-collect": "^1.0.2", - "minipass-fetch": "^2.0.3", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "promise-retry": "^2.0.1", - "socks-proxy-agent": "^7.0.0", - "ssri": "^9.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/node-gyp/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/node-gyp/node_modules/minipass-fetch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz", - "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==", - "dev": true, - "dependencies": { - "minipass": "^3.1.6", - "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/node-gyp/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/node-gyp/node_modules/ssri": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz", - "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==", - "dev": true, - "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/unique-filename": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz", - "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==", - "dev": true, - "dependencies": { - "unique-slug": "^3.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/node-gyp/node_modules/unique-slug": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz", - "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==", - "dev": true, - "dependencies": { - "imurmurhash": "^0.1.4" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/nopt": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz", - "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==", - "dev": true, - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/normalize-package-data": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz", - "integrity": "sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==", - "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "is-core-module": "^2.8.1", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-package-data/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-url": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz", - "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/npm-bundled": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", - "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", - "dev": true, - "dependencies": { - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-check-updates": { - "version": "16.14.20", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.14.20.tgz", - "integrity": "sha512-sYbIhun4DrjO7NFOTdvs11nCar0etEhZTsEjL47eM0TuiGMhmYughRCxG2SpGRmGAQ7AkwN7bw2lWzoE7q6yOQ==", - "dev": true, - "dependencies": { - "@types/semver-utils": "^1.1.1", - "chalk": "^5.3.0", - "cli-table3": "^0.6.3", - "commander": "^10.0.1", - "fast-memoize": "^2.5.2", - "find-up": "5.0.0", - "fp-and-or": "^0.1.4", - "get-stdin": "^8.0.0", - "globby": "^11.0.4", - "hosted-git-info": "^5.1.0", - "ini": "^4.1.1", - "js-yaml": "^4.1.0", - "json-parse-helpfulerror": "^1.0.3", - "jsonlines": "^0.1.1", - "lodash": "^4.17.21", - "make-fetch-happen": "^11.1.1", - "minimatch": "^9.0.3", - "p-map": "^4.0.0", - "pacote": "15.2.0", - "parse-github-url": "^1.0.2", - "progress": "^2.0.3", - "prompts-ncu": "^3.0.0", - "rc-config-loader": "^4.1.3", - "remote-git-tags": "^3.0.0", - "rimraf": "^5.0.5", - "semver": "^7.5.4", - "semver-utils": "^1.1.4", - "source-map-support": "^0.5.21", - "spawn-please": "^2.0.2", - "strip-ansi": "^7.1.0", - "strip-json-comments": "^5.0.1", - "untildify": "^4.0.0", - "update-notifier": "^6.0.2" - }, - "bin": { - "ncu": "build/src/bin/cli.js", - "npm-check-updates": "build/src/bin/cli.js" - }, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/npm-install-checks": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", - "dev": true, - "dependencies": { - "semver": "^7.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz", - "integrity": "sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==", - "dev": true, - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-package-arg/node_modules/hosted-git-info": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz", - "integrity": "sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==", - "dev": true, - "dependencies": { - "lru-cache": "^7.5.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-packlist": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz", - "integrity": "sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==", - "dev": true, - "dependencies": { - "ignore-walk": "^6.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-pick-manifest": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.2.tgz", - "integrity": "sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==", - "dev": true, - "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npm-registry-fetch": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz", - "integrity": "sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==", - "dev": true, - "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/npmlog": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz", - "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==", - "deprecated": "This package is no longer supported.", - "dev": true, - "dependencies": { - "are-we-there-yet": "^3.0.0", - "console-control-strings": "^1.1.0", - "gauge": "^4.0.3", - "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/p-cancelable": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz", - "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==", - "dev": true, - "engines": { - "node": ">=12.20" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/package-json": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz", - "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==", - "dev": true, - "dependencies": { - "got": "^12.1.0", - "registry-auth-token": "^5.0.1", - "registry-url": "^6.0.0", - "semver": "^7.3.7" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pacote": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.2.0.tgz", - "integrity": "sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA==", - "dev": true, - "dependencies": { - "@npmcli/git": "^4.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/promise-spawn": "^6.0.1", - "@npmcli/run-script": "^6.0.0", - "cacache": "^17.0.0", - "fs-minipass": "^3.0.0", - "minipass": "^5.0.0", - "npm-package-arg": "^10.0.0", - "npm-packlist": "^7.0.0", - "npm-pick-manifest": "^8.0.0", - "npm-registry-fetch": "^14.0.0", - "proc-log": "^3.0.0", - "promise-retry": "^2.0.1", - "read-package-json": "^6.0.0", - "read-package-json-fast": "^3.0.0", - "sigstore": "^1.3.0", - "ssri": "^10.0.0", - "tar": "^6.1.11" - }, - "bin": { - "pacote": "lib/bin.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/parse-github-url": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz", - "integrity": "sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==", - "dev": true, - "bin": { - "parse-github-url": "cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-scurry": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/playwright": { - "version": "1.44.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.44.1.tgz", - "integrity": "sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==", - "dev": true, - "dependencies": { - "playwright-core": "1.44.1" - }, - "bin": { - "playwright": "cli.js" - }, - "engines": { - "node": ">=16" - }, - "optionalDependencies": { - "fsevents": "2.3.2" - } - }, - "node_modules/playwright-core": { - "version": "1.44.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.44.1.tgz", - "integrity": "sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==", - "dev": true, - "bin": { - "playwright-core": "cli.js" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/proc-log": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", - "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==", - "dev": true, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/prompts-ncu": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-3.0.0.tgz", - "integrity": "sha512-qyz9UxZ5MlPKWVhWrCmSZ1ahm2GVYdjLb8og2sg0IPth1KRuhcggHGuijz0e41dkx35p1t1q3GRISGH7QGALFA==", - "dev": true, - "dependencies": { - "kleur": "^4.0.1", - "sisteransi": "^1.0.5" - }, - "engines": { - "node": ">= 14" - } - }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", - "dev": true - }, - "node_modules/pupa": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz", - "integrity": "sha512-FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==", - "dev": true, - "dependencies": { - "escape-goat": "^4.0.0" - }, - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/rc-config-loader": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-4.1.3.tgz", - "integrity": "sha512-kD7FqML7l800i6pS6pvLyIE2ncbk9Du8Q0gp/4hMPhJU6ZxApkoLcGD8ZeqgiAlfwZ6BlETq6qqe+12DUL207w==", - "dev": true, - "dependencies": { - "debug": "^4.3.4", - "js-yaml": "^4.1.0", - "json5": "^2.2.2", - "require-from-string": "^2.0.2" - } - }, - "node_modules/rc/node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "node_modules/rc/node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/read-package-json": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz", - "integrity": "sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==", - "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.", - "dev": true, - "dependencies": { - "glob": "^10.2.2", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^5.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/read-package-json-fast": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", - "dev": true, - "dependencies": { - "json-parse-even-better-errors": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/registry-auth-token": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.2.tgz", - "integrity": "sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==", - "dev": true, - "dependencies": { - "@pnpm/npm-conf": "^2.1.0" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/registry-url": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", - "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", - "dev": true, - "dependencies": { - "rc": "1.2.8" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/remote-git-tags": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/remote-git-tags/-/remote-git-tags-3.0.0.tgz", - "integrity": "sha512-C9hAO4eoEsX+OXA4rla66pXZQ+TLQ8T9dttgQj18yuKlPMTVkIkdYXvlMC55IuUsIkV6DpmQYi10JKFLaU+l7w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", - "dev": true - }, - "node_modules/responselike": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-3.0.0.tgz", - "integrity": "sha512-40yHxbNcl2+rzXvZuVkrYohathsSJlMTXKryG5y8uciHv1+xDLHQpgjG64JUO9nrEq2jGLH6IZ8BcZyw3wrweg==", - "dev": true, - "dependencies": { - "lowercase-keys": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz", - "integrity": "sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==", - "dev": true, - "dependencies": { - "glob": "^10.3.7" - }, - "bin": { - "rimraf": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=14.18" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true, - "optional": true - }, - "node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz", - "integrity": "sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==", - "dev": true, - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/semver-utils": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.4.tgz", - "integrity": "sha512-EjnoLE5OGmDAVV/8YDoN5KiajNadjzIp9BAHOhYeQHt7j0UWxjmgsx4YD48wp4Ue1Qogq38F1GNUJNqF1kKKxA==", - "dev": true - }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/sigstore": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz", - "integrity": "sha512-0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==", - "dev": true, - "dependencies": { - "@sigstore/bundle": "^1.1.0", - "@sigstore/protobuf-specs": "^0.2.0", - "@sigstore/sign": "^1.0.0", - "@sigstore/tuf": "^1.0.3", - "make-fetch-happen": "^11.0.1" - }, - "bin": { - "sigstore": "bin/sigstore.js" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/simple-git": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.24.0.tgz", - "integrity": "sha512-QqAKee9Twv+3k8IFOFfPB2hnk6as6Y6ACUpwCtQvRYBAes23Wv3SZlHVobAzqcE8gfsisCvPw3HGW3HYM+VYYw==", - "dev": true, - "dependencies": { - "@kwsites/file-exists": "^1.1.1", - "@kwsites/promise-deferred": "^1.1.1", - "debug": "^4.3.4" - }, - "funding": { - "type": "github", - "url": "https://github.com/steveukx/git-js?sponsor=1" - } - }, - "node_modules/sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", - "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", - "dev": true, - "dependencies": { - "ip-address": "^9.0.5", - "smart-buffer": "^4.2.0" - }, - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/socks-proxy-agent": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz", - "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==", - "dev": true, - "dependencies": { - "agent-base": "^6.0.2", - "debug": "^4.3.3", - "socks": "^2.6.2" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/spawn-please": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/spawn-please/-/spawn-please-2.0.2.tgz", - "integrity": "sha512-KM8coezO6ISQ89c1BzyWNtcn2V2kAVtwIXd3cN/V5a0xPYc1F/vydrRc01wsKFEQ/p+V1a4sw4z2yMITIXrgGw==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3" - }, - "engines": { - "node": ">=14" - } - }, - "node_modules/spdx-correct": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", - "dev": true, - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-exceptions": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", - "dev": true - }, - "node_modules/spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "node_modules/spdx-license-ids": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", - "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", - "dev": true - }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true - }, - "node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", - "dev": true, - "dependencies": { - "minipass": "^7.0.3" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/ssri/node_modules/minipass": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.1.tgz", - "integrity": "sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" } }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "node_modules/playwright-core": { + "version": "1.48.2", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.2.tgz", + "integrity": "sha512-sjjw+qrLFlriJo64du+EK0kJgZzoQPsabGF4lBvsid+3CNIZIYLgnMj9V6JY5VhM2Peh20DJWIVpVljLLnlawA==", "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" }, "engines": { - "node": ">=8" + "node": ">=18" } }, - "node_modules/string-width-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", "dev": true, + "license": "MIT", "engines": { - "node": ">=8" + "node": ">= 0.4" } }, - "node_modules/string-width-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" }, "engines": { - "node": ">=8" + "node": ">=4" } }, - "node_modules/string-width/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/regexp.prototype.flags": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz", + "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==", "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.2" + }, "engines": { - "node": ">=8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/string-width/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" }, - "engines": { - "node": ">=8" + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "node_modules/safe-array-concat": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": "^6.0.1" + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" }, "engines": { - "node": ">=12" + "node": ">=0.4" }, "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/safe-regex-test": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-regex": "^5.0.1" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-regex": "^1.1.4" }, "engines": { - "node": ">=8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/sax": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz", + "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==", "dev": true, - "engines": { - "node": ">=8" - } + "license": "ISC" }, - "node_modules/strip-json-comments": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.1.tgz", - "integrity": "sha512-0fk9zBqO67Nq5M/m45qHCJxylV/DhBlIOVExqgOMiCCrzrhU6tCibRXNqE3jwJLftzE9SNuZtYbpzcO+i9FiKw==", + "node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "license": "ISC", + "bin": { + "semver": "bin/semver" } }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, + "license": "MIT", "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" }, "engines": { - "node": ">=10" + "node": ">= 0.4" } }, - "node_modules/tar/node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, + "license": "MIT", "dependencies": { - "minipass": "^3.0.0" + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" }, "engines": { - "node": ">= 8" + "node": ">= 0.4" } }, - "node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { - "yallist": "^4.0.0" + "shebang-regex": "^3.0.0" }, "engines": { "node": ">=8" } }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, + "license": "MIT", "engines": { - "node": ">=8.0" + "node": ">=8" + } + }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/tuf-js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", - "integrity": "sha512-i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==", + "node_modules/side-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, + "license": "MIT", "dependencies": { - "@tufjs/models": "1.0.4", - "debug": "^4.3.4", - "make-fetch-happen": "^11.1.1" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", + "node_modules/simple-git": { + "version": "3.27.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.27.0.tgz", + "integrity": "sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA==", "dev": true, - "engines": { - "node": ">=12.20" + "license": "MIT", + "dependencies": { + "@kwsites/file-exists": "^1.1.1", + "@kwsites/promise-deferred": "^1.1.1", + "debug": "^4.3.5" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "github", + "url": "https://github.com/steveukx/git-js?sponsor=1" } }, - "node_modules/typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "node_modules/spdx-correct": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "is-typedarray": "^1.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, - "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true, + "license": "CC-BY-3.0" + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, + "license": "MIT", "dependencies": { - "unique-slug": "^4.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, - "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "node_modules/spdx-license-ids": { + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/string.prototype.padend": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.6.tgz", + "integrity": "sha512-XZpspuSB7vJWhvJc9DLSlrXl1mcA2BdoY5jjnS135ydXqLoqhs96JjDtCkjJEQHvfqZIp9hBuBMgI589peyx9Q==", "dev": true, + "license": "MIT", "dependencies": { - "imurmurhash": "^0.1.4" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/unique-string": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", - "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", + "node_modules/string.prototype.trim": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", "dev": true, + "license": "MIT", "dependencies": { - "crypto-random-string": "^4.0.0" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", + "node_modules/string.prototype.trimend": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", "dev": true, - "engines": { - "node": ">=8" + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/update-notifier": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz", - "integrity": "sha512-EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==", + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, + "license": "MIT", "dependencies": { - "boxen": "^7.0.0", - "chalk": "^5.0.1", - "configstore": "^6.0.0", - "has-yarn": "^3.0.0", - "import-lazy": "^4.0.0", - "is-ci": "^3.0.1", - "is-installed-globally": "^0.4.0", - "is-npm": "^6.0.0", - "is-yarn-global": "^0.4.0", - "latest-version": "^7.0.0", - "pupa": "^3.1.0", - "semver": "^7.3.7", - "semver-diff": "^4.0.0", - "xdg-basedir": "^5.1.0" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { - "node": ">=14.16" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/yeoman/update-notifier?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "bin": { - "uuid": "dist/bin/uuid" + "license": "MIT", + "engines": { + "node": ">=4" } }, - "node_modules/validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" } }, - "node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "node_modules/typed-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, + "license": "MIT", "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { - "node": ">= 8" - } - }, - "node_modules/wide-align": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", - "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", - "dev": true, - "dependencies": { - "string-width": "^1.0.2 || 2 || 3 || 4" + "node": ">= 0.4" } }, - "node_modules/widest-line": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz", - "integrity": "sha512-o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig==", + "node_modules/typed-array-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, + "license": "MIT", "dependencies": { - "string-width": "^5.0.1" + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/widest-line/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/widest-line/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "node_modules/typed-array-byte-offset": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, + "license": "MIT", "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "node_modules/typed-array-length": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" }, "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/uuid": { + "version": "11.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-11.0.3.tgz", + "integrity": "sha512-d0z310fCWv5dJwnX1Y/MncBAqGMKEzlBb1AOf7z9K8ALnd0utBX/msg/fA0+sbyN1ihbMsLhrBlnl1ak7Wa0rg==", "dev": true, - "engines": { - "node": ">=8" + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/esm/bin/uuid" } }, - "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, - "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { - "ansi-regex": "^5.0.1" + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" }, "engines": { - "node": ">=8" + "node": ">= 8" } }, - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, + "license": "MIT", "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "node_modules/write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "node_modules/which-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, + "license": "MIT", "dependencies": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "node_modules/write-file-atomic/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "node_modules/xdg-basedir": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", - "dev": true, + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.2" + }, "engines": { - "node": ">=12" + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "node_modules/xmldoc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/xmldoc/-/xmldoc-1.3.0.tgz", + "integrity": "sha512-y7IRWW6PvEnYQZNZFMRLNJw+p3pezM4nKYPfr15g4OOW9i8VpeydycFuipE2297OvZnh3jSb2pxOt9QpkZUVng==", "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "license": "MIT", + "dependencies": { + "sax": "^1.2.4" } } } diff --git a/src/test/playwright/package.json b/src/test/playwright/package.json index 0488bd63ed40..f3161e557b77 100644 --- a/src/test/playwright/package.json +++ b/src/test/playwright/package.json @@ -4,17 +4,23 @@ "private": true, "license": "MIT", "devDependencies": { - "@playwright/test": "1.44.1", - "dayjs": "1.11.11", + "@playwright/test": "1.48.2", + "cross-env": "7.0.3", + "dayjs": "1.11.13", "dotenv": "16.4.5", - "npm-check-updates": "16.14.20", - "simple-git": "3.24.0", - "uuid": "9.0.1" + "junit-merge": "2.0.0", + "npm-check-updates": "17.1.11", + "npm-run-all": "4.1.5", + "simple-git": "3.27.0", + "uuid": "11.0.3" }, "scripts": { - "playwright:test": "playwright test e2e", + "playwright:test": "npm-run-all --serial --continue-on-error playwright:test:parallel playwright:test:sequential merge-reports", + "playwright:test:parallel": "cross-env PLAYWRIGHT_JUNIT_OUTPUT_NAME=./test-reports/results-parallel.xml playwright test e2e --project=fast-tests --project=slow-tests", + "playwright:test:sequential": "cross-env PLAYWRIGHT_JUNIT_OUTPUT_NAME=./test-reports/results-sequential.xml playwright test e2e --project=sequential-tests --workers 1", "playwright:open": "playwright test e2e --ui", "playwright:setup": "npx playwright install --with-deps chromium && playwright test init", + "merge-reports": "junit-merge ./test-reports/results-parallel.xml ./test-reports/results-sequential.xml -o ./test-reports/results.xml", "update": "ncu -i --format group" } } diff --git a/src/test/playwright/playwright.config.ts b/src/test/playwright/playwright.config.ts index c99792125d03..a963e42fadcb 100644 --- a/src/test/playwright/playwright.config.ts +++ b/src/test/playwright/playwright.config.ts @@ -19,7 +19,7 @@ export default defineConfig({ retries: parseNumber(process.env.TEST_RETRIES) ?? 2, workers: parseNumber(process.env.TEST_WORKER_PROCESSES) ?? 3, /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: [['junit', { outputFile: './test-reports/results.xml' }]], + reporter: [['junit', { outputFile: process.env.PLAYWRIGHT_JUNIT_OUTPUT_NAME ?? './test-reports/results.xml' }]], /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ use: { @@ -30,10 +30,30 @@ export default defineConfig({ ignoreHTTPSErrors: true, }, - /* Configure projects for major browsers */ + /* Configure projects for fast and slow tests */ projects: [ + // Tests with @fast tag or without any tags. These are the lightweight tests with lower timeout. { - name: 'chromium', + name: 'fast-tests', + grep: /@fast|^[^@]*$/, + timeout: (parseNumber(process.env.FAST_TEST_TIMEOUT_SECONDS) ?? 45) * 1000, + use: { ...devices['Desktop Chrome'] }, + }, + // Tests with @slow tag. These tests are expected to run longer + // than faster tests and have higher timeout. + { + name: 'slow-tests', + grep: /@slow/, + timeout: (parseNumber(process.env.SLOW_TEST_TIMEOUT_SECONDS) ?? 180) * 1000, + use: { ...devices['Desktop Chrome'] }, + }, + // Tests with @sequential tag. These tests are triggering programming exercise submissions. + // Running only one programming exercise evaluation at a time could make the tests more stable. + // Thus, it is recommended to run this project with a single worker. + { + name: 'sequential-tests', + grep: /@sequential/, + timeout: (parseNumber(process.env.SLOW_TEST_TIMEOUT_SECONDS) ?? 180) * 1000, use: { ...devices['Desktop Chrome'] }, }, ], diff --git a/src/test/playwright/playwright.env b/src/test/playwright/playwright.env index f467cea0d81d..b60373794a3b 100644 --- a/src/test/playwright/playwright.env +++ b/src/test/playwright/playwright.env @@ -10,3 +10,5 @@ INSTRUCTOR_GROUP_NAME=instructors CREATE_USERS=true BASE_URL=http://localhost:9000 EXERCISE_REPO_DIRECTORY=test-exercise-repos +FAST_TEST_TIMEOUT_SECONDS=45 +SLOW_TEST_TIMEOUT_SECONDS=180 diff --git a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts index e2f510b6a0f2..4e4379f12817 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupsPage.ts @@ -22,8 +22,9 @@ export class ExamExerciseGroupsPage { async clickEditGroup(groupID: number) { await this.page.click(`#group-${groupID} .edit-group`); } + async clickEditGroupForTestExam() { - await this.page.getByText('Edit').click(); + await this.page.getByRole('link', { name: 'Edit' }).click(); } async clickDeleteGroup(groupID: number, groupName: string) { diff --git a/src/test/playwright/support/pageobjects/exercises/ExerciseResultPage.ts b/src/test/playwright/support/pageobjects/exercises/ExerciseResultPage.ts index 215186d44565..4b72c998fde9 100644 --- a/src/test/playwright/support/pageobjects/exercises/ExerciseResultPage.ts +++ b/src/test/playwright/support/pageobjects/exercises/ExerciseResultPage.ts @@ -26,7 +26,7 @@ export class ExerciseResultPage { async shouldShowScore(percentage: number) { await Commands.reloadUntilFound(this.page, this.page.locator('jhi-course-exercise-details #submission-result-graded'), 4000, 60000); - await expect(this.page.locator('.tab-bar-exercise-details').getByText(`${percentage}%`)).toBeVisible(); + await expect(this.page.locator('#exercise-headers-information').getByText(`${percentage}%`)).toBeVisible(); } async clickOpenExercise(exerciseId: number) { diff --git a/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseOverviewPage.ts b/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseOverviewPage.ts index 1844f838045b..cc7243718a96 100644 --- a/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseOverviewPage.ts +++ b/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseOverviewPage.ts @@ -16,7 +16,7 @@ export class ProgrammingExerciseOverviewPage { } async getResultScore() { - const resultScore = this.page.locator('.tab-bar-exercise-details').locator('#result-score'); + const resultScore = this.page.locator('#exercise-headers-information').locator('#result-score'); await resultScore.waitFor({ state: 'visible' }); return resultScore; } @@ -46,6 +46,6 @@ export class ProgrammingExerciseOverviewPage { } getExerciseDetails() { - return this.page.locator('.tab-bar-exercise-details'); + return this.page.locator('#course-exercise-details'); } }