From d80da3177146fdbcfeab45a0371b4c38a57d88f9 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Tue, 9 Jul 2024 13:30:44 +0200 Subject: [PATCH 01/95] First UI addon's mockup for now --- .../domain/lecture/AttachmentUnit.java | 15 + .../artemis/service/LectureUnitService.java | 13 + .../pyris/PyrisStatusUpdateService.java | 50 ++- .../connectors/pyris/PyrisWebhookService.java | 14 +- .../PyrisLectureIngestionStatusUpdateDTO.java | 2 +- .../PyrisLectureUnitWebhookDTO.java | 4 +- .../PyrisLectureUnitsStatusUpdate.java | 13 + .../pyris/dto/status/IngestionState.java | 8 + .../web/rest/lecture/LectureUnitResource.java | 15 + .../changelog/20240625000000_changelog.xml | 14 + .../resources/config/liquibase/master.xml | 2 + .../competencies-popover.component.scss | 3 +- .../lecture-unit/attachmentUnit.model.ts | 9 + src/main/webapp/app/entities/lecture.model.ts | 34 +- .../lecture-unit-management.component.html | 20 +- .../lecture-unit-management.component.ts | 113 +++++-- .../lectureUnit.service.ts | 12 + .../webapp/app/lecture/lecture.component.html | 5 + .../webapp/app/lecture/lecture.component.ts | 9 +- .../app/overview/course-overview.service.ts | 2 +- .../webapp/app/shared/sort/sort.directive.ts | 14 + src/main/webapp/i18n/de/lecture.json | 1 + src/main/webapp/i18n/en/lecture.json | 1 + .../iris/PyrisLectureIngestionTest.java | 304 ------------------ 24 files changed, 311 insertions(+), 366 deletions(-) create mode 100644 src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java create mode 100644 src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/IngestionState.java create mode 100644 src/main/resources/config/liquibase/changelog/20240625000000_changelog.xml diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java index da84dab34bd5..79149530fa56 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java @@ -8,6 +8,8 @@ import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; @@ -16,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.in.www1.artemis.domain.Attachment; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; @Entity @DiscriminatorValue("A") @@ -26,6 +29,10 @@ public class AttachmentUnit extends LectureUnit { @Column(name = "description") private String description; + @Enumerated(EnumType.STRING) + @Column(name = "pyris_ingestion_state") + private IngestionState pyrisIngestionState = IngestionState.NOT_STARTED; + @OneToOne(mappedBy = "attachmentUnit", cascade = CascadeType.REMOVE, orphanRemoval = true) @JsonIgnoreProperties(value = "attachmentUnit", allowSetters = true) private Attachment attachment; @@ -60,6 +67,14 @@ public void setAttachment(Attachment attachment) { this.attachment = attachment; } + public IngestionState getPyrisIngestionState() { + return pyrisIngestionState; + } + + public void setPyrisIngestionState(IngestionState pyrisIngestionState) { + this.pyrisIngestionState = pyrisIngestionState; + } + public List getSlides() { return slides; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java b/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java index 23e6b3b849de..7be6c26e9d3a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java @@ -232,4 +232,17 @@ public URL validateUrlStringAndReturnUrl(String urlString) { throw new BadRequestException(); } } + + /** + * Ingest the lectureUnit when triggered by the ingest lectureUnit button + * + * @param lectureUnit lectureUnit to be ingested + * @return returns the job token if the operation is successful else it returns null + */ + public boolean ingestLectureUnitInPyris(AttachmentUnit lectureUnit) { + if (pyrisWebhookService.isPresent()) { + return pyrisWebhookService.get().addLectureUnitsToPyrisDB(List.of(lectureUnit)) != null; + } + return false; + } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java index 759e62ca9e35..2f8d1fb19013 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java @@ -1,12 +1,15 @@ package de.tum.in.www1.artemis.service.connectors.pyris; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.List; + import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; +import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; @@ -25,13 +28,15 @@ public class PyrisStatusUpdateService { private final IrisCourseChatSessionService courseChatSessionService; - private static final Logger log = LoggerFactory.getLogger(PyrisStatusUpdateService.class); + private final AttachmentUnitRepository attachmentUnitRepository; - public PyrisStatusUpdateService(PyrisJobService pyrisJobService, IrisExerciseChatSessionService irisExerciseChatSessionService, - IrisCourseChatSessionService courseChatSessionService) { + public PyrisStatusUpdateService(PyrisJobService pyrisJobService, AttachmentUnitRepository attachmentUnitRepository, + IrisExerciseChatSessionService irisExerciseChatSessionService, IrisCourseChatSessionService courseChatSessionService) { this.pyrisJobService = pyrisJobService; this.irisExerciseChatSessionService = irisExerciseChatSessionService; this.courseChatSessionService = courseChatSessionService; + this.attachmentUnitRepository = attachmentUnitRepository; + } /** @@ -43,7 +48,7 @@ public PyrisStatusUpdateService(PyrisJobService pyrisJobService, IrisExerciseCha public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO statusUpdate) { irisExerciseChatSessionService.handleStatusUpdate(job, statusUpdate); - removeJobIfTerminated(statusUpdate, job.jobId()); + removeJobIfTerminated(statusUpdate.stages(), job.jobId()); } /** @@ -56,7 +61,7 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statusUpdate) { courseChatSessionService.handleStatusUpdate(job, statusUpdate); - removeJobIfTerminated(statusUpdate, job.jobId()); + removeJobIfTerminated(statusUpdate.stages(), job.jobId()); } /** @@ -66,29 +71,40 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu * * @see PyrisStageState#isTerminal() * - * @param statusUpdate the status update - * @param job the job to remove + * @param stages the stages of the status update + * @param job the job to remove */ - private void removeJobIfTerminated(PyrisChatStatusUpdateDTO statusUpdate, String job) { - var isDone = statusUpdate.stages().stream().map(PyrisStageDTO::state).allMatch(PyrisStageState::isTerminal); + private boolean removeJobIfTerminated(List stages, String job) { + var isDone = stages.stream().map(PyrisStageDTO::state).allMatch(PyrisStageState::isTerminal); if (isDone) { pyrisJobService.removeJob(job); + return true; } + return false; } /** * Handles the status update of a lecture ingestion job and logs the results for now => will change later - * TODO: Update this method to handle changes beyond logging + * * * @param job the job that is updated * @param statusUpdate the status update */ public void handleStatusUpdate(IngestionWebhookJob job, PyrisLectureIngestionStatusUpdateDTO statusUpdate) { - statusUpdate.stages().forEach(stage -> log.info(stage.name() + ":" + stage.message())); - boolean isDone = statusUpdate.stages().stream().map(PyrisStageDTO::state) - .allMatch(state -> state == PyrisStageState.DONE || state == PyrisStageState.ERROR || state == PyrisStageState.SKIPPED); - if (isDone) { - pyrisJobService.removeJob(job.jobId()); + if (removeJobIfTerminated(statusUpdate.stages(), job.jobId())) { + for (Long id : statusUpdate.ids()) { + if (attachmentUnitRepository.findById(id).isPresent()) { + AttachmentUnit unit = attachmentUnitRepository.findById(id).get(); + if (statusUpdate.stages().getLast().state() == PyrisStageState.DONE) { + unit.setPyrisIngestionState(IngestionState.DONE); + attachmentUnitRepository.save(unit); + } + else if (statusUpdate.stages().getLast().state() == PyrisStageState.ERROR) { + unit.setPyrisIngestionState(IngestionState.ERROR); + attachmentUnitRepository.save(unit); + } + } + } } } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java index 6d8d18b3ae20..23b811258036 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -18,11 +18,13 @@ import de.tum.in.www1.artemis.domain.enumeration.AttachmentType; import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; +import de.tum.in.www1.artemis.repository.LectureUnitRepository; import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; import de.tum.in.www1.artemis.service.FilePathService; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; @@ -40,15 +42,18 @@ public class PyrisWebhookService { private final IrisSettingsRepository irisSettingsRepository; + private final LectureUnitRepository lectureUnitRepository; + @Value("${server.url}") private String artemisBaseUrl; public PyrisWebhookService(PyrisConnectorService pyrisConnectorService, PyrisJobService pyrisJobService, IrisSettingsService irisSettingsService, - IrisSettingsRepository irisSettingsRepository) { + IrisSettingsRepository irisSettingsRepository, LectureUnitRepository lectureUnitRepository) { this.pyrisConnectorService = pyrisConnectorService; this.pyrisJobService = pyrisJobService; this.irisSettingsService = irisSettingsService; this.irisSettingsRepository = irisSettingsRepository; + this.lectureUnitRepository = lectureUnitRepository; } private boolean lectureIngestionEnabled(Course course) { @@ -76,15 +81,16 @@ private PyrisLectureUnitWebhookDTO processAttachmentForUpdate(AttachmentUnit att String courseTitle = attachmentUnit.getLecture().getCourse().getTitle(); String courseDescription = attachmentUnit.getLecture().getCourse().getDescription() == null ? "" : attachmentUnit.getLecture().getCourse().getDescription(); String base64EncodedPdf = attachmentToBase64(attachmentUnit); - return new PyrisLectureUnitWebhookDTO(true, artemisBaseUrl, base64EncodedPdf, lectureUnitId, lectureUnitName, lectureId, lectureTitle, courseId, courseTitle, - courseDescription); + attachmentUnit.setPyrisIngestionState(IngestionState.IN_PROGRESS); + lectureUnitRepository.save(attachmentUnit); + return new PyrisLectureUnitWebhookDTO(true, base64EncodedPdf, lectureUnitId, lectureUnitName, lectureId, lectureTitle, courseId, courseTitle, courseDescription); } private PyrisLectureUnitWebhookDTO processAttachmentForDeletion(AttachmentUnit attachmentUnit) { Long lectureUnitId = attachmentUnit.getId(); Long lectureId = attachmentUnit.getLecture().getId(); Long courseId = attachmentUnit.getLecture().getCourse().getId(); - return new PyrisLectureUnitWebhookDTO(false, artemisBaseUrl, "", lectureUnitId, "", lectureId, "", courseId, "", ""); + return new PyrisLectureUnitWebhookDTO(false, "", lectureUnitId, "", lectureId, "", courseId, "", ""); } /** diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index 959862d3f3f2..0fe0c07813b4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -7,5 +7,5 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages) { +public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages, List ids) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java index b5a956c2463a..6a36b867d16c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java @@ -8,6 +8,6 @@ * providing necessary details such as lecture and course identifiers, names, and descriptions. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisLectureUnitWebhookDTO(Boolean toUpdate, String artemisBaseUrl, String pdfFile, Long lectureUnitId, String lectureUnitName, Long lectureId, String lectureName, - Long courseId, String courseName, String courseDescription) { +public record PyrisLectureUnitWebhookDTO(Boolean toUpdate, String pdfFile, Long lectureUnitId, String lectureUnitName, Long lectureId, String lectureName, Long courseId, + String courseName, String courseDescription) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java new file mode 100644 index 000000000000..2c7312ec6415 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java @@ -0,0 +1,13 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; + +import com.fasterxml.jackson.annotation.JsonInclude; + +/** + * Represents a webhook data transfer object for lecture units in the Pyris system. + * This DTO is used to encapsulate the information related to updates of lecture units, + * providing necessary details such as lecture and course identifiers, names, and descriptions. + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) + +public record PyrisLectureUnitsStatusUpdate(Long lectureUnitId, Long lectureId, Long courseId) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/IngestionState.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/IngestionState.java new file mode 100644 index 000000000000..9090d887a78a --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/IngestionState.java @@ -0,0 +1,8 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto.status; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public enum IngestionState { + NOT_STARTED, IN_PROGRESS, DONE, ERROR +} diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java index d49ec66c1edd..f0e69d0483a6 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java @@ -22,6 +22,7 @@ import de.tum.in.www1.artemis.domain.Lecture; import de.tum.in.www1.artemis.domain.User; +import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; import de.tum.in.www1.artemis.domain.lecture.LectureUnit; import de.tum.in.www1.artemis.repository.LectureRepository; import de.tum.in.www1.artemis.repository.LectureUnitRepository; @@ -188,4 +189,18 @@ public ResponseEntity getLectureUnitFo authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, lectureUnit.getLecture().getCourse(), null); return ResponseEntity.ok(LectureUnitForLearningPathNodeDetailsDTO.of(lectureUnit)); } + + /** + * POST /lectureUnit/{lectureUnitId}/ingest + * This endpoint is for starting the ingestion of one lecture Unit. + * + * @param lectureUnitId The Id of the lecture unit to be ingested. + * @return the ResponseEntity with status 200 (OK) and a message success or null if the operation failed + */ + @PostMapping("lecture-units/{lectureUnitId}/ingest") + public ResponseEntity ingestLectureUnit(@PathVariable Long lectureUnitId) { + log.debug("REST request to ingest lectures of course : {}", lectureUnitId); + LectureUnit lectureUnit = lectureUnitRepository.findByIdWithCompetenciesAndSlidesElseThrow(lectureUnitId); + return ResponseEntity.ok().body(lectureUnitService.ingestLectureUnitInPyris((AttachmentUnit) lectureUnit)); + } } diff --git a/src/main/resources/config/liquibase/changelog/20240625000000_changelog.xml b/src/main/resources/config/liquibase/changelog/20240625000000_changelog.xml new file mode 100644 index 000000000000..20ecf0a3bd52 --- /dev/null +++ b/src/main/resources/config/liquibase/changelog/20240625000000_changelog.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 729d22ca2a4d..11e6be5bf311 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -17,6 +17,8 @@ + + diff --git a/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.scss b/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.scss index af89b79ffb43..508f5f543f01 100644 --- a/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.scss +++ b/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.scss @@ -1,5 +1,6 @@ .competency-button { - width: 100%; + width: 39px !important; + height: 30px !important; } .competency-popover { diff --git a/src/main/webapp/app/entities/lecture-unit/attachmentUnit.model.ts b/src/main/webapp/app/entities/lecture-unit/attachmentUnit.model.ts index 9d1e9986329e..d83c834fe83a 100644 --- a/src/main/webapp/app/entities/lecture-unit/attachmentUnit.model.ts +++ b/src/main/webapp/app/entities/lecture-unit/attachmentUnit.model.ts @@ -6,8 +6,17 @@ export class AttachmentUnit extends LectureUnit { public description?: string; public attachment?: Attachment; public slides?: Slide[]; + public pyrisIngestionState?: IngestionState; constructor() { super(LectureUnitType.ATTACHMENT); } } + +export enum IngestionState { + NOT_STARTED = 'NOT_STARTED', + IN_PROGRESS = 'IN_PROGRESS', + DONE = 'DONE', + ERROR = 'ERROR', + PARTIALLY_INGESTED = 'PARTIALLY_INGESTED', +} diff --git a/src/main/webapp/app/entities/lecture.model.ts b/src/main/webapp/app/entities/lecture.model.ts index 3f039edafe40..989d79852bf2 100644 --- a/src/main/webapp/app/entities/lecture.model.ts +++ b/src/main/webapp/app/entities/lecture.model.ts @@ -4,6 +4,7 @@ import { Attachment } from 'app/entities/attachment.model'; import { Post } from 'app/entities/metis/post.model'; import { Course } from 'app/entities/course.model'; import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model'; +import { AttachmentUnit, IngestionState } from 'app/entities/lecture-unit/attachmentUnit.model'; export class Lecture implements BaseEntity { id?: number; @@ -21,6 +22,37 @@ export class Lecture implements BaseEntity { channelName?: string; isAtLeastEditor?: boolean; isAtLeastInstructor?: boolean; + ingested?: IngestionState; - constructor() {} + constructor() { + this.ingested = this.checkIngestionState(); + } + + private checkIngestionState(): IngestionState { + if (!this.lectureUnits) { + return IngestionState.NOT_STARTED; + } + + const attachmentUnits = this.lectureUnits.filter((unit) => unit.type === 'attachment') as AttachmentUnit[]; + const allDone = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.DONE); + const allNotStarted = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.NOT_STARTED); + const allFailed = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.ERROR); + + if (allDone) { + return IngestionState.DONE; + } + if (allFailed) { + return IngestionState.ERROR; + } + + if (allNotStarted) { + return IngestionState.NOT_STARTED; + } + + return IngestionState.PARTIALLY_INGESTED; + } + + public updateIngestionState(): void { + this.ingested = this.checkIngestionState(); + } } 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 ba9ab05310d2..a8bc88b69797 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 @@ -66,9 +66,23 @@ }
- @if (lecture.course?.id && showCompetencies) { - - } +
+ @if (lecture.course?.id && showCompetencies) { + + } + +
@if (this.emitEditEvents) { @if (editButtonAvailable(lectureUnit)) { diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts index 6b2d25e8a991..596300223022 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts @@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angu import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; import { Lecture } from 'app/entities/lecture.model'; import { LectureService } from 'app/lecture/lecture.service'; -import { debounceTime, filter, finalize, map } from 'rxjs/operators'; +import { debounceTime, filter, finalize, map, switchMap } from 'rxjs/operators'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { LectureUnit, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model'; import { AlertService } from 'app/core/util/alert.service'; @@ -10,10 +10,13 @@ import { onError } from 'app/shared/util/global.utils'; import { Subject, Subscription } from 'rxjs'; import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; -import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model'; +import { AttachmentUnit, IngestionState } from 'app/entities/lecture-unit/attachmentUnit.model'; import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model'; -import { faPencilAlt, faTrash } from '@fortawesome/free-solid-svg-icons'; +import { IconDefinition, faCheckCircle, faFileExport, faPencilAlt, faRepeat, faSpinner, faTrash } from '@fortawesome/free-solid-svg-icons'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; +import { PROFILE_IRIS } from 'app/app.constants'; +import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { IrisSettingsService } from 'app/iris/settings/shared/iris-settings.service'; @Component({ selector: 'jhi-lecture-unit-management', @@ -29,7 +32,6 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { @Output() onEditLectureUnitClicked: EventEmitter = new EventEmitter(); - lectureUnits: LectureUnit[] = []; lecture: Lecture; isLoading = false; @@ -40,6 +42,9 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { readonly ActionType = ActionType; private dialogErrorSource = new Subject(); dialogError$ = this.dialogErrorSource.asObservable(); + private profileInfoSubscription: Subscription; + irisEnabled = false; + lectureIngestionEnabled = false; routerEditLinksBase = { [LectureUnitType.ATTACHMENT]: 'attachment-units', @@ -51,6 +56,10 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { // Icons faTrash = faTrash; faPencilAlt = faPencilAlt; + sendToIris = faFileExport; + resendToIris = faRepeat; + done = faCheckCircle; + loading = faSpinner; constructor( private activatedRoute: ActivatedRoute, @@ -58,6 +67,8 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { private lectureService: LectureService, private alertService: AlertService, public lectureUnitService: LectureUnitService, + private profileService: ProfileService, + private irisSettingsService: IrisSettingsService, ) {} ngOnDestroy(): void { @@ -65,6 +76,7 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { this.updateOrderSubjectSubscription.unsubscribe(); this.dialogErrorSource.unsubscribe(); this.navigationEndSubscription.unsubscribe(); + this.profileInfoSubscription?.unsubscribe(); } ngOnInit(): void { @@ -73,13 +85,17 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { }); this.updateOrderSubject = new Subject(); - this.activatedRoute.parent!.params.subscribe((params) => { - this.lectureId ??= +params['lectureId']; - if (this.lectureId) { - // TODO: the lecture (without units) is already available through the lecture.route.ts resolver, it's not really good that we load it twice - this.loadData(); - } - }); + this.activatedRoute + .parent!.params.pipe( + map((params) => +params['lectureId']), + switchMap((lectureId) => { + this.lectureId = lectureId; + return this.loadData(); + }), + ) + .subscribe(() => { + this.initializeProfileInfo(); + }); // debounceTime limits the amount of put requests sent for updating the lecture unit order this.updateOrderSubjectSubscription = this.updateOrderSubject.pipe(debounceTime(1000)).subscribe(() => { @@ -91,25 +107,17 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { this.isLoading = true; // TODO: we actually would like to have the lecture with all units! Posts and competencies are not required here // we could also simply load all units for the lecture (as the lecture is already available through the route, see TODO above) - this.lectureService - .findWithDetails(this.lectureId!) - .pipe( - map((response: HttpResponse) => response.body!), - finalize(() => { - this.isLoading = false; - }), - ) - .subscribe({ - next: (lecture) => { - this.lecture = lecture; - if (lecture?.lectureUnits) { - this.lectureUnits = lecture?.lectureUnits; - } else { - this.lectureUnits = []; - } - }, - error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse), - }); + return this.lectureService.findWithDetails(this.lectureId!).pipe( + map((response: HttpResponse) => response.body!), + finalize(() => { + this.isLoading = false; + }), + switchMap((lecture) => { + this.lecture = lecture; + this.lectureUnits = lecture?.lectureUnits || []; + return []; + }), + ); } updateOrder() { @@ -125,6 +133,17 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { }); } + initializeProfileInfo() { + this.profileInfoSubscription = this.profileService.getProfileInfo().subscribe(async (profileInfo) => { + this.irisEnabled = profileInfo.activeProfiles.includes(PROFILE_IRIS); + if (this.irisEnabled) { + this.irisSettingsService.getCombinedCourseSettings(this.lecture.course!.id!).subscribe((settings) => { + this.lectureIngestionEnabled = settings?.irisLectureIngestionSettings?.enabled || false; + }); + } + }); + } + drop(event: CdkDragDrop) { moveItemInArray(this.lectureUnits, event.previousIndex, event.currentIndex); this.updateOrderSubject.next(''); @@ -201,6 +220,40 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { onEditButtonClicked(lectureUnit: LectureUnit) { this.onEditLectureUnitClicked.emit(lectureUnit); } + onIngestButtonClicked(lectureUnit: LectureUnit) { + this.lectureUnitService.ingestLectureUnitInPyris(lectureUnit.id!).subscribe({ + error: (error) => console.error('Failed to send Ingestion request', error), + }); + } + getIcon(attachmentUnit: AttachmentUnit): IconDefinition { + console.log(`pyrisIngestionState: ${attachmentUnit.pyrisIngestionState}`); + console.log(`Type of pyrisIngestionState: ${typeof attachmentUnit.pyrisIngestionState}`); + + // @ts-ignore + if (Object.values(IngestionState).includes(attachmentUnit.pyrisIngestionState)) { + console.log('Valid ingestion state'); + } else { + console.log('Invalid ingestion state'); + } + + switch (attachmentUnit.pyrisIngestionState) { + case IngestionState.NOT_STARTED: + console.log('NOT_STARTED'); + return this.sendToIris; + case IngestionState.IN_PROGRESS: + console.log('IN_PROGRESS'); + return this.loading; + case IngestionState.DONE: + console.log('DONE'); + return this.done; + case IngestionState.ERROR: + console.log('ERROR'); + return this.resendToIris; + default: + console.log('DEFAULT'); + return this.sendToIris; + } + } getLectureUnitReleaseDate(lectureUnit: LectureUnit) { switch (lectureUnit.type) { diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts index 66b8b1c849e7..7011e3dae036 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts @@ -160,4 +160,16 @@ export class LectureUnitService { observe: 'response', }); } + /** + * triggers the ingestion of one Lecture Unit + * + * @param lectureId The lecture to be ingested in pyris + */ + ingestLectureUnitInPyris(lectureUnitId: number): Observable> { + const params = new HttpParams(); + return this.httpClient.post(`api/lecture-units/${lectureUnitId}/ingest`, null, { + params: params, + observe: 'response', + }); + } } diff --git a/src/main/webapp/app/lecture/lecture.component.html b/src/main/webapp/app/lecture/lecture.component.html index e507242d7a13..6d69f5dbddab 100644 --- a/src/main/webapp/app/lecture/lecture.component.html +++ b/src/main/webapp/app/lecture/lecture.component.html @@ -118,6 +118,10 @@

+ + + + @@ -134,6 +138,7 @@

{{ lecture.visibleDate | artemisDate }} {{ lecture.startDate | artemisDate }} {{ lecture.endDate | artemisDate }} + {{ lecture.ingested?.toString() }}
diff --git a/src/main/webapp/app/lecture/lecture.component.ts b/src/main/webapp/app/lecture/lecture.component.ts index 6f4d832c5167..cd35af947686 100644 --- a/src/main/webapp/app/lecture/lecture.component.ts +++ b/src/main/webapp/app/lecture/lecture.component.ts @@ -150,14 +150,19 @@ export class LectureComponent implements OnInit, OnDestroy { private loadAll() { this.lectureService - .findAllByCourseId(this.courseId) + .findAllByCourseIdWithSlides(this.courseId) .pipe( filter((res: HttpResponse) => res.ok), map((res: HttpResponse) => res.body), ) .subscribe({ next: (res: Lecture[]) => { - this.lectures = res; + this.lectures = res.map((lectureData) => { + const lecture = new Lecture(); + Object.assign(lecture, lectureData); + lecture.updateIngestionState(); + return lecture; + }); this.applyFilters(); }, error: (res: HttpErrorResponse) => onError(this.alertService, res), diff --git a/src/main/webapp/app/overview/course-overview.service.ts b/src/main/webapp/app/overview/course-overview.service.ts index 79703cada3c8..9fc6d13873ea 100644 --- a/src/main/webapp/app/overview/course-overview.service.ts +++ b/src/main/webapp/app/overview/course-overview.service.ts @@ -172,7 +172,7 @@ export class CourseOverviewService { mapLecturesToSidebarCardElements(lectures: Lecture[]) { return lectures.map((lecture) => this.mapLectureToSidebarCardElement(lecture)); } - mapTutorialGroupsToSidebarCardElements(tutorialGroups: Lecture[]) { + mapTutorialGroupsToSidebarCardElements(tutorialGroups: TutorialGroup[]) { return tutorialGroups.map((tutorialGroup) => this.mapTutorialGroupToSidebarCardElement(tutorialGroup)); } diff --git a/src/main/webapp/app/shared/sort/sort.directive.ts b/src/main/webapp/app/shared/sort/sort.directive.ts index 7633048b9b69..8da860084700 100644 --- a/src/main/webapp/app/shared/sort/sort.directive.ts +++ b/src/main/webapp/app/shared/sort/sort.directive.ts @@ -36,4 +36,18 @@ export class SortDirective { this.ascendingChange.emit(this.ascending); this.sortChange.emit({ predicate: this.predicate, ascending: this.ascending }); } + + getSortedData(data: any[]): any[] { + if (typeof this.predicate === 'function') { + return [...data].sort((a, b) => { + const result = (this.predicate as any)(a) < (this.predicate as any)(b) ? -1 : 1; + return this.ascending ? result : -result; + }); + } else { + return [...data].sort((a, b) => { + const result = a[this.predicate] < b[this.predicate] ? -1 : 1; + return this.ascending ? result : -result; + }); + } + } } diff --git a/src/main/webapp/i18n/de/lecture.json b/src/main/webapp/i18n/de/lecture.json index 61e68defd8e9..9cf0c411de72 100644 --- a/src/main/webapp/i18n/de/lecture.json +++ b/src/main/webapp/i18n/de/lecture.json @@ -31,6 +31,7 @@ "endDate": "Ende", "visibleDate": "Sichtbar ab", "course": "Kurs", + "ingestionState": "Vorlesungsimport in Pyris", "detail": { "title": "Vorlesung", "sections": { diff --git a/src/main/webapp/i18n/en/lecture.json b/src/main/webapp/i18n/en/lecture.json index bb8ddb7ad737..a0a58105f6d0 100644 --- a/src/main/webapp/i18n/en/lecture.json +++ b/src/main/webapp/i18n/en/lecture.json @@ -31,6 +31,7 @@ "endDate": "End Date", "visibleDate": "Visible from", "course": "Course", + "ingestionState": "Ingestion State", "detail": { "title": "Lecture", "sections": { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java index 10ced00f569b..e69de29bb2d1 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java @@ -1,304 +0,0 @@ -package de.tum.in.www1.artemis.iris; - -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.util.LinkedMultiValueMap; - -import de.tum.in.www1.artemis.course.CourseUtilService; -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.Lecture; -import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; -import de.tum.in.www1.artemis.lecture.LectureUtilService; -import de.tum.in.www1.artemis.repository.CourseRepository; -import de.tum.in.www1.artemis.repository.LectureRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; -import de.tum.in.www1.artemis.user.UserUtilService; - -class PyrisLectureIngestionTest extends AbstractIrisIntegrationTest { - - private static final String TEST_PREFIX = "pyrislectureingestiontest"; - - @Autowired - private PyrisWebhookService pyrisWebhookService; - - @Autowired - private CourseRepository courseRepository; - - @Autowired - private LectureRepository lectureRepository; - - @Autowired - private UserUtilService userUtilService; - - @Autowired - private CourseUtilService courseUtilService; - - @Autowired - private LectureUtilService lectureUtilService; - - @Autowired - protected PyrisStatusUpdateService pyrisStatusUpdateService; - - @Autowired - protected PyrisJobService pyrisJobService; - - @Autowired - protected IrisSettingsRepository irisSettingsRepository; - - private Lecture lecture1; - - @BeforeEach - void initTestCase() throws Exception { - userUtilService.addUsers(TEST_PREFIX, 1, 1, 0, 1); - List courses = courseUtilService.createCoursesWithExercisesAndLectures(TEST_PREFIX, true, true, 1); - Course course1 = this.courseRepository.findByIdWithExercisesAndExerciseDetailsAndLecturesElseThrow(courses.getFirst().getId()); - this.lecture1 = course1.getLectures().stream().findFirst().orElseThrow(); - this.lecture1.setTitle("Lecture " + lecture1.getId()); // needed for search by title - this.lecture1 = lectureRepository.save(this.lecture1); - // Add users that are not in the course - userUtilService.createAndSaveUser(TEST_PREFIX + "student42"); - userUtilService.createAndSaveUser(TEST_PREFIX + "tutor42"); - userUtilService.createAndSaveUser(TEST_PREFIX + "instructor42"); - - int numberOfSlides = 2; - AttachmentUnit pdfAttachmentUnitWithSlides = lectureUtilService.createAttachmentUnitWithSlidesAndFile(numberOfSlides, true); - AttachmentUnit imageAttachmentUnitWithSlides = lectureUtilService.createAttachmentUnitWithSlidesAndFile(numberOfSlides, false); - lecture1 = lectureUtilService.addLectureUnitsToLecture(lecture1, List.of(pdfAttachmentUnitWithSlides, imageAttachmentUnitWithSlides)); - this.lecture1 = lectureRepository.findByIdWithLectureUnitsAndAttachmentsElseThrow(lecture1.getId()); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAutoUpdateAttachmentUnitsWithAutoUpdateEnabled() { - activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - courseSettings.getIrisLectureIngestionSettings().setAutoIngestOnLectureAttachmentUpload(true); - this.irisSettingsRepository.save(courseSettings); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst()))).isTrue(); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getLast()))).isFalse(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAutoUpdateAttachmentUnitsWithAutoUpdateDisabled() { - activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - courseSettings.getIrisLectureIngestionSettings().setAutoIngestOnLectureAttachmentUpload(false); - this.irisSettingsRepository.save(courseSettings); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst()))).isFalse(); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getLast()))).isFalse(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAddLectureToPyrisDatabaseWithCourseSettingsDisabled() { - activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - courseSettings.getIrisLectureIngestionSettings().setEnabled(false); - this.irisSettingsRepository.save(courseSettings); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); - assertThat(jobToken).isNull(); - jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getLast())); - assertThat(jobToken).isNull(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testDeleteLecturefromPyrisDatabaseWithCourseSettingsDisabled() { - activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - courseSettings.getIrisLectureIngestionSettings().setEnabled(false); - this.irisSettingsRepository.save(courseSettings); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); - assertThat(jobToken).isNotNull(); - jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getLast())); - assertThat(jobToken).isNull(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testIngestLecturesButtonInPyris() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - Boolean response = request.postWithResponseBody("/api/courses/" + lecture1.getCourse().getId() + "/ingest", Optional.empty(), boolean.class, HttpStatus.OK); - assertThat(response).isTrue(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testDeleteLecturefromPyrisDatabaseWithCourseSettingsEnabled() { - activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - this.irisSettingsRepository.save(courseSettings); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); - assertThat(jobToken).isNotNull(); - jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getLast())); - assertThat(jobToken).isNull(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAddLectureToPyrisDBAddJobWithCourseSettingsEnabled() { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); - assertThat(jobToken).isNotNull(); - jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getLast())); - assertThat(jobToken).isNull(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAllStagesDoneRemovesAdditionIngestionJob() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of(attachmentUnit)); - PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage)); - var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); - request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); - assertThat(pyrisJobService.getJob(jobToken)).isNull(); - } - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAllStagesDoneRemovesDeletionIngestionJob() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(attachmentUnit)); - PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage)); - var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); - request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); - assertThat(pyrisJobService.getJob(jobToken)).isNull(); - } - } - - @Test - void testStageNotDoneKeepsAdditionIngestionJob() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of(attachmentUnit)); - PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage)); - var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); - request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); - assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); - } - } - - @Test - void testStageNotDoneKeepsDeletionIngetionJob() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(attachmentUnit)); - PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage)); - var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); - request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); - assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); - } - } - - @Test - void testErrorStageRemovesDeletionIngetionJob() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(attachmentUnit)); - PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage)); - var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); - request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); - assertThat(pyrisJobService.getJob(jobToken)).isNull(); - } - } - - @Test - void testErrorStageRemovesAdditionIngetionJob() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of(attachmentUnit)); - PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage)); - var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); - request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); - assertThat(pyrisJobService.getJob(jobToken)).isNull(); - } - } - - @Test - void testRunIdIngestionJob() throws Exception { - activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - String newJobToken = pyrisJobService.addIngestionWebhookJob(); - String chatJobToken = pyrisJobService.addCourseChatJob(123L, 123L); - PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage)); - var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + chatJobToken)))); - MockHttpServletResponse response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + newJobToken + "/status", statusUpdate, - HttpStatus.CONFLICT, headers); - assertThat(response.getContentAsString()).contains("Run ID in URL does not match run ID in request body"); - response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + chatJobToken + "/status", statusUpdate, HttpStatus.CONFLICT, headers); - assertThat(response.getContentAsString()).contains("Run ID is not an ingestion job"); - } -} From d5fb0c0415e0209cea74674bf1abc6842ccd5b8b Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Thu, 18 Jul 2024 02:07:20 +0200 Subject: [PATCH 02/95] Add links to citations --- .../artemis/service/LectureUnitService.java | 6 +-- .../pyris/PyrisConnectorService.java | 46 ++++++++++++++++++- .../pyris/PyrisStatusUpdateService.java | 22 ++++----- .../connectors/pyris/PyrisWebhookService.java | 42 ++++++++++++----- .../PyrisLectureIngestionStatusUpdateDTO.java | 3 +- .../PyrisLectureUnitWebhookDTO.java | 4 +- ...risWebhookLectureDeletionExecutionDTO.java | 13 ++++++ ...isWebhookLectureIngestionExecutionDTO.java | 3 +- .../web/rest/lecture/LectureUnitResource.java | 14 ++++++ .../lecture-unit-management.component.html | 2 +- .../lecture-unit-management.component.ts | 4 +- .../lectureUnit.service.ts | 10 ++++ 12 files changed, 132 insertions(+), 37 deletions(-) create mode 100644 src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureDeletionExecutionDTO.java diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java b/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java index 37f2bb59548f..4979e12d322d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java @@ -248,9 +248,9 @@ public URL validateUrlStringAndReturnUrl(String urlString) { * @param lectureUnit lectureUnit to be ingested * @return returns the job token if the operation is successful else it returns null */ - public boolean ingestLectureUnitInPyris(AttachmentUnit lectureUnit) { - if (pyrisWebhookService.isPresent()) { - return pyrisWebhookService.get().addLectureUnitsToPyrisDB(List.of(lectureUnit)) != null; + public boolean ingestLectureUnitInPyris(LectureUnit lectureUnit) { + if (lectureUnit instanceof AttachmentUnit) { + return pyrisWebhookService.filter(webhookService -> webhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lectureUnit)) != null).isPresent(); } return false; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java index bf241bc28837..0e5944eb6e0c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java @@ -2,6 +2,7 @@ import java.util.Arrays; import java.util.List; +import java.util.Optional; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,8 +18,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; +import de.tum.in.www1.artemis.domain.lecture.LectureUnit; +import de.tum.in.www1.artemis.repository.LectureUnitRepository; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureDeletionExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; import de.tum.in.www1.artemis.service.iris.exception.IrisException; import de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; @@ -39,12 +45,16 @@ public class PyrisConnectorService { private final ObjectMapper objectMapper; + private final LectureUnitRepository lectureUnitRepository; + @Value("${artemis.iris.url}") private String pyrisUrl; - public PyrisConnectorService(@Qualifier("pyrisRestTemplate") RestTemplate restTemplate, MappingJackson2HttpMessageConverter springMvcJacksonConverter) { + public PyrisConnectorService(@Qualifier("pyrisRestTemplate") RestTemplate restTemplate, MappingJackson2HttpMessageConverter springMvcJacksonConverter, + LectureUnitRepository lectureUnitRepository) { this.restTemplate = restTemplate; this.objectMapper = springMvcJacksonConverter.getObjectMapper(); + this.lectureUnitRepository = lectureUnitRepository; } /** @@ -93,11 +103,43 @@ public void executePipeline(String feature, String variant, Object executionDTO) * @param variant The variant of the feature to execute * @param executionDTO The DTO sent as a body for the execution */ - public void executeLectureWebhook(String variant, PyrisWebhookLectureIngestionExecutionDTO executionDTO) { + public void executeLectureAddtionWebhook(String variant, PyrisWebhookLectureIngestionExecutionDTO executionDTO) { var endpoint = "/api/v1/webhooks/lectures/" + variant; try { restTemplate.postForEntity(pyrisUrl + endpoint, objectMapper.valueToTree(executionDTO), Void.class); } + catch (HttpStatusCodeException e) { + setIngestionStateToError(executionDTO, e); + throw toIrisException(e); + } + catch (RestClientException | IllegalArgumentException e) { + setIngestionStateToError(executionDTO, e); + throw new PyrisConnectorException("Could not fetch response from Pyris"); + } + } + + private void setIngestionStateToError(PyrisWebhookLectureIngestionExecutionDTO executionDTO, RuntimeException e) { + log.error("Failed to send lectures to Pyris", e); + Optional optionalUnit = lectureUnitRepository.findById(executionDTO.pyrisLectureUnit().lectureUnitId()); + optionalUnit.ifPresent(unit -> { + if (unit instanceof AttachmentUnit) { + AttachmentUnit attachmentUnit = (AttachmentUnit) unit; + attachmentUnit.setPyrisIngestionState(IngestionState.ERROR); + lectureUnitRepository.save(attachmentUnit); + } + }); + } + + /** + * Executes a webhook and send lectures to the webhook with the given variant + * + * @param executionDTO The DTO sent as a body for the execution + */ + public void executeLectureDeletionWebhook(PyrisWebhookLectureDeletionExecutionDTO executionDTO) { + var endpoint = "/api/v1/webhooks/lectures/delete"; + try { + restTemplate.postForEntity(pyrisUrl + endpoint, objectMapper.valueToTree(executionDTO), Void.class); + } catch (HttpStatusCodeException e) { log.error("Failed to send lectures to Pyris", e); throw toIrisException(e); diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java index 2f8d1fb19013..a0e6c629bd12 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java @@ -91,18 +91,16 @@ private boolean removeJobIfTerminated(List stages, String job) { * @param statusUpdate the status update */ public void handleStatusUpdate(IngestionWebhookJob job, PyrisLectureIngestionStatusUpdateDTO statusUpdate) { - if (removeJobIfTerminated(statusUpdate.stages(), job.jobId())) { - for (Long id : statusUpdate.ids()) { - if (attachmentUnitRepository.findById(id).isPresent()) { - AttachmentUnit unit = attachmentUnitRepository.findById(id).get(); - if (statusUpdate.stages().getLast().state() == PyrisStageState.DONE) { - unit.setPyrisIngestionState(IngestionState.DONE); - attachmentUnitRepository.save(unit); - } - else if (statusUpdate.stages().getLast().state() == PyrisStageState.ERROR) { - unit.setPyrisIngestionState(IngestionState.ERROR); - attachmentUnitRepository.save(unit); - } + if (removeJobIfTerminated(statusUpdate.stages(), job.jobId()) && statusUpdate.id().isPresent()) { + if (attachmentUnitRepository.findById(statusUpdate.id().get()).isPresent()) { + AttachmentUnit unit = attachmentUnitRepository.findById(statusUpdate.id().get()).get(); + if (statusUpdate.stages().getLast().state() == PyrisStageState.DONE) { + unit.setPyrisIngestionState(IngestionState.DONE); + attachmentUnitRepository.save(unit); + } + else if (statusUpdate.stages().getLast().state() == PyrisStageState.ERROR || statusUpdate.stages().getLast().state() == PyrisStageState.SKIPPED) { + unit.setPyrisIngestionState(IngestionState.ERROR); + attachmentUnitRepository.save(unit); } } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java index 23b811258036..3b27136c1c45 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -23,6 +23,7 @@ import de.tum.in.www1.artemis.service.FilePathService; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureDeletionExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; @@ -83,14 +84,14 @@ private PyrisLectureUnitWebhookDTO processAttachmentForUpdate(AttachmentUnit att String base64EncodedPdf = attachmentToBase64(attachmentUnit); attachmentUnit.setPyrisIngestionState(IngestionState.IN_PROGRESS); lectureUnitRepository.save(attachmentUnit); - return new PyrisLectureUnitWebhookDTO(true, base64EncodedPdf, lectureUnitId, lectureUnitName, lectureId, lectureTitle, courseId, courseTitle, courseDescription); + return new PyrisLectureUnitWebhookDTO(base64EncodedPdf, lectureUnitId, lectureUnitName, lectureId, lectureTitle, courseId, courseTitle, courseDescription); } private PyrisLectureUnitWebhookDTO processAttachmentForDeletion(AttachmentUnit attachmentUnit) { Long lectureUnitId = attachmentUnit.getId(); Long lectureId = attachmentUnit.getLecture().getId(); Long courseId = attachmentUnit.getLecture().getCourse().getId(); - return new PyrisLectureUnitWebhookDTO(false, "", lectureUnitId, "", lectureId, "", courseId, "", ""); + return new PyrisLectureUnitWebhookDTO("", lectureUnitId, "", lectureId, "", courseId, "", ""); } /** @@ -123,7 +124,7 @@ public String deleteLectureFromPyrisDB(List attachmentUnits) { toUpdateAttachmentUnits.add(processAttachmentForDeletion(unit)); }); if (!toUpdateAttachmentUnits.isEmpty()) { - return executeLectureWebhook(toUpdateAttachmentUnits); + return executeLectureDeletionWebhook(toUpdateAttachmentUnits); } } catch (Exception e) { @@ -143,32 +144,49 @@ public String addLectureUnitsToPyrisDB(List attachmentUnits) { return null; } try { - List toUpdateAttachmentUnits = new ArrayList<>(); attachmentUnits.stream().filter(unit -> unit.getAttachment().getAttachmentType() == AttachmentType.FILE && unit.getAttachment().getLink().endsWith(".pdf")) .forEach(unit -> { - toUpdateAttachmentUnits.add(processAttachmentForUpdate(unit)); + executeLectureAdditionWebhook(processAttachmentForUpdate(unit)); }); - if (!toUpdateAttachmentUnits.isEmpty()) { - return executeLectureWebhook(toUpdateAttachmentUnits); - } + } catch (Exception e) { log.error(e.getMessage()); + attachmentUnits.stream().filter(unit -> unit.getAttachment().getAttachmentType() == AttachmentType.FILE && unit.getAttachment().getLink().endsWith(".pdf")) + .forEach(unit -> { + unit.setPyrisIngestionState(IngestionState.ERROR); + lectureUnitRepository.save(unit); + }); } + ; return null; } /** * executes executeLectureWebhook add or delete lectures from to the vector database on pyris * - * @param toUpdateAttachmentUnits The attachmentUnit that are goin to be Updated / deleted + * @param toUpdateAttachmentUnits The attachmentUnit that are goin to be deleted + * @return jobToken if the job was created + */ + private String executeLectureDeletionWebhook(List toUpdateAttachmentUnits) { + String jobToken = pyrisJobService.addIngestionWebhookJob(); + PyrisPipelineExecutionSettingsDTO settingsDTO = new PyrisPipelineExecutionSettingsDTO(jobToken, List.of(), artemisBaseUrl); + PyrisWebhookLectureDeletionExecutionDTO executionDTO = new PyrisWebhookLectureDeletionExecutionDTO(toUpdateAttachmentUnits, settingsDTO, List.of()); + pyrisConnectorService.executeLectureDeletionWebhook(executionDTO); + return jobToken; + } + + /** + * executes executeLectureAdditionWebhook add lecture from to the vector database on pyris + * + * @param toUpdateAttachmentUnit The attachmentUnit that are going to be Updated * @return jobToken if the job was created */ - private String executeLectureWebhook(List toUpdateAttachmentUnits) { + private String executeLectureAdditionWebhook(PyrisLectureUnitWebhookDTO toUpdateAttachmentUnit) { String jobToken = pyrisJobService.addIngestionWebhookJob(); PyrisPipelineExecutionSettingsDTO settingsDTO = new PyrisPipelineExecutionSettingsDTO(jobToken, List.of(), artemisBaseUrl); - PyrisWebhookLectureIngestionExecutionDTO executionDTO = new PyrisWebhookLectureIngestionExecutionDTO(toUpdateAttachmentUnits, settingsDTO, List.of()); - pyrisConnectorService.executeLectureWebhook("fullIngestion", executionDTO); + PyrisWebhookLectureIngestionExecutionDTO executionDTO = new PyrisWebhookLectureIngestionExecutionDTO(toUpdateAttachmentUnit, settingsDTO, List.of()); + pyrisConnectorService.executeLectureAddtionWebhook("fullIngestion", executionDTO); return jobToken; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index 0fe0c07813b4..444056c6626c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -1,11 +1,12 @@ package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; import java.util.List; +import java.util.Optional; import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages, List ids) { +public record PyrisLectureIngestionStatusUpdateDTO(Optional id, String result, List stages) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java index 6a36b867d16c..b990affda038 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitWebhookDTO.java @@ -8,6 +8,6 @@ * providing necessary details such as lecture and course identifiers, names, and descriptions. */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisLectureUnitWebhookDTO(Boolean toUpdate, String pdfFile, Long lectureUnitId, String lectureUnitName, Long lectureId, String lectureName, Long courseId, - String courseName, String courseDescription) { +public record PyrisLectureUnitWebhookDTO(String pdfFile, Long lectureUnitId, String lectureUnitName, Long lectureId, String lectureName, Long courseId, String courseName, + String courseDescription) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureDeletionExecutionDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureDeletionExecutionDTO.java new file mode 100644 index 000000000000..20b70e4d7f3a --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureDeletionExecutionDTO.java @@ -0,0 +1,13 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; + +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record PyrisWebhookLectureDeletionExecutionDTO(List pyrisLectureUnits, PyrisPipelineExecutionSettingsDTO settings, + List initialStages) { +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java index db1741183826..7b39d640fa59 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisWebhookLectureIngestionExecutionDTO.java @@ -8,6 +8,5 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisWebhookLectureIngestionExecutionDTO(List pyrisLectureUnitWebhookDTOS, PyrisPipelineExecutionSettingsDTO settings, - List initialStages) { +public record PyrisWebhookLectureIngestionExecutionDTO(PyrisLectureUnitWebhookDTO pyrisLectureUnit, PyrisPipelineExecutionSettingsDTO settings, List initialStages) { } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java index 3e3e589c4203..e3048cb23569 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java @@ -207,4 +207,18 @@ public ResponseEntity getLectureUnitById(@PathVariable @Valid Long lectureUnit.setCompleted(lectureUnit.isCompletedFor(userRepository.getUser())); return ResponseEntity.ok(lectureUnit); } + + /** + * POST /courses/{courseId}/ingest + * This endpooint is for starting the ingestion of all lectures or only one lecture when triggered in Artemis. + * + * @param lectureId the ID of the Lecture in which the lecture unit is + * @param lectureUnitId The Id of the Lecture Unit that is ingestLectureUnit(@PathVariable Long lectureId, @PathVariable Long lectureUnitId) { + LectureUnit lectureUnit = this.lectureUnitRepository.findByIdWithCompetenciesAndSlidesElseThrow(lectureUnitId); + return ResponseEntity.ok().body(lectureUnitService.ingestLectureUnitInPyris(lectureUnit)); + } } 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 d45dd226a097..5b5471279b35 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 @@ -79,7 +79,7 @@ error: getIcon(lectureUnit) === resendToIris, 'btn-success': getIcon(lectureUnit) === done, }" - (click)="onIngestButtonClicked(lectureUnit)" + (click)="onIngestButtonClicked(lectureUnit.id!)" [ngbTooltip]="'entity.action.sendToIris' | artemisTranslate" > diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts index 596300223022..4e0d47ccc24e 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts @@ -220,8 +220,8 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { onEditButtonClicked(lectureUnit: LectureUnit) { this.onEditLectureUnitClicked.emit(lectureUnit); } - onIngestButtonClicked(lectureUnit: LectureUnit) { - this.lectureUnitService.ingestLectureUnitInPyris(lectureUnit.id!).subscribe({ + onIngestButtonClicked(lectureUnitId: number) { + this.lectureUnitService.ingestLectureUnitInPyris(lectureUnitId, this.lecture.id!).subscribe({ error: (error) => console.error('Failed to send Ingestion request', error), }); } diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts index 2825fed950e2..df302a87b14c 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts @@ -167,4 +167,14 @@ export class LectureUnitService { getLectureUnitById(lectureUnitId: number): Observable { return this.httpClient.get(`${this.resourceURL}/lecture-units/${lectureUnitId}`); } + /** + * Triggers the ingestion of one lecture unit + */ + ingestLectureUnitInPyris(lectureUnitId: number, lectureId: number): Observable> { + const params = new HttpParams(); + return this.httpClient.post(`${this.resourceURL}/lectures/${lectureId}/lecture-units/${lectureUnitId}/ingest`, null, { + params: params, + observe: 'response', + }); + } } From cadcf14381b2f20c4a6a3c2c0bbd29ec82d78890 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Fri, 19 Jul 2024 16:53:38 +0200 Subject: [PATCH 03/95] Add Ingestion Status server updates. --- .../www1/artemis/service/LectureService.java | 8 +- .../artemis/service/LectureUnitService.java | 8 +- .../pyris/PyrisConnectorService.java | 18 +- .../connectors/pyris/PyrisWebhookService.java | 44 ++- .../PyrisLectureIngestionStatusUpdateDTO.java | 2 +- .../artemis/web/rest/LectureResource.java | 6 +- .../web/rest/lecture/LectureUnitResource.java | 6 +- .../connector/IrisRequestMockProvider.java | 18 ++ .../iris/PyrisConnectorServiceTest.java | 9 +- .../iris/PyrisLectureIngestionTest.java | 263 +++++++++++++----- 10 files changed, 264 insertions(+), 118 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureService.java b/src/main/java/de/tum/in/www1/artemis/service/LectureService.java index d722fd2673da..166a142f3055 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/LectureService.java @@ -168,16 +168,14 @@ public void delete(Lecture lecture, boolean updateCompetencyProgress) { * Ingest the lectures when triggered by the ingest lectures button * * @param lectures set of lectures to be ingested - * @return returns the job token if the operation is successful else it returns null */ - public boolean ingestLecturesInPyris(Set lectures) { + public void ingestLecturesInPyris(Set lectures) { if (pyrisWebhookService.isPresent()) { List attachmentUnitList = lectures.stream().flatMap(lec -> lec.getLectureUnits().stream()).filter(unit -> unit instanceof AttachmentUnit) .map(unit -> (AttachmentUnit) unit).toList(); - if (!attachmentUnitList.isEmpty()) { - return pyrisWebhookService.get().addLectureUnitsToPyrisDB(attachmentUnitList) != null; + for (AttachmentUnit attachmentUnit : attachmentUnitList) { + pyrisWebhookService.get().addLectureUnitToPyrisDB(attachmentUnit); } } - return false; } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java b/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java index 4979e12d322d..544d2bbb902f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/LectureUnitService.java @@ -246,12 +246,10 @@ public URL validateUrlStringAndReturnUrl(String urlString) { * Ingest the lectureUnit when triggered by the ingest lectureUnit button * * @param lectureUnit lectureUnit to be ingested - * @return returns the job token if the operation is successful else it returns null */ - public boolean ingestLectureUnitInPyris(LectureUnit lectureUnit) { - if (lectureUnit instanceof AttachmentUnit) { - return pyrisWebhookService.filter(webhookService -> webhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lectureUnit)) != null).isPresent(); + public void ingestLectureUnitInPyris(LectureUnit lectureUnit) { + if (lectureUnit instanceof AttachmentUnit && pyrisWebhookService.isPresent()) { + pyrisWebhookService.get().addLectureUnitToPyrisDB((AttachmentUnit) lectureUnit); } - return false; } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java index 0e5944eb6e0c..36c4956a2745 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java @@ -120,14 +120,15 @@ public void executeLectureAddtionWebhook(String variant, PyrisWebhookLectureInge private void setIngestionStateToError(PyrisWebhookLectureIngestionExecutionDTO executionDTO, RuntimeException e) { log.error("Failed to send lectures to Pyris", e); - Optional optionalUnit = lectureUnitRepository.findById(executionDTO.pyrisLectureUnit().lectureUnitId()); - optionalUnit.ifPresent(unit -> { - if (unit instanceof AttachmentUnit) { - AttachmentUnit attachmentUnit = (AttachmentUnit) unit; - attachmentUnit.setPyrisIngestionState(IngestionState.ERROR); - lectureUnitRepository.save(attachmentUnit); - } - }); + if (executionDTO != null) { + Optional optionalUnit = lectureUnitRepository.findById(executionDTO.pyrisLectureUnit().lectureUnitId()); + optionalUnit.ifPresent(unit -> { + if (unit instanceof AttachmentUnit attachmentUnit) { + attachmentUnit.setPyrisIngestionState(IngestionState.ERROR); + lectureUnitRepository.save(attachmentUnit); + } + }); + } } /** @@ -143,7 +144,6 @@ public void executeLectureDeletionWebhook(PyrisWebhookLectureDeletionExecutionDT catch (HttpStatusCodeException e) { log.error("Failed to send lectures to Pyris", e); throw toIrisException(e); - // TODO : add error ingestion UI. } catch (RestClientException | IllegalArgumentException e) { log.error("Failed to send lectures to Pyris", e); diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java index 3b27136c1c45..d00fae8c7391 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -99,15 +99,15 @@ private PyrisLectureUnitWebhookDTO processAttachmentForDeletion(AttachmentUnit a * * @param courseId Id of the course where the attachment is added * @param newAttachmentUnits the new attachment Units to be sent to pyris for ingestion - * @return true if the units were sent to pyris */ - public boolean autoUpdateAttachmentUnitsInPyris(Long courseId, List newAttachmentUnits) { + public void autoUpdateAttachmentUnitsInPyris(Long courseId, List newAttachmentUnits) { IrisCourseSettings courseSettings = irisSettingsRepository.findCourseSettings(courseId).isPresent() ? irisSettingsRepository.findCourseSettings(courseId).get() : null; if (courseSettings != null && courseSettings.getIrisLectureIngestionSettings() != null && courseSettings.getIrisLectureIngestionSettings().isEnabled() && courseSettings.getIrisLectureIngestionSettings().getAutoIngestOnLectureAttachmentUpload()) { - return addLectureUnitsToPyrisDB(newAttachmentUnits) != null; + for (AttachmentUnit attachmentUnit : newAttachmentUnits) { + addLectureUnitToPyrisDB(attachmentUnit); + } } - return false; } /** @@ -136,29 +136,23 @@ public String deleteLectureFromPyrisDB(List attachmentUnits) { /** * adds the lectures to the vector database on pyris * - * @param attachmentUnits The attachmentUnit that got Updated / erased - * @return jobToken if the job was created + * @param attachmentUnit The attachmentUnit that got Updated / erased */ - public String addLectureUnitsToPyrisDB(List attachmentUnits) { - if (!lectureIngestionEnabled(attachmentUnits.getFirst().getLecture().getCourse())) { - return null; - } - try { - attachmentUnits.stream().filter(unit -> unit.getAttachment().getAttachmentType() == AttachmentType.FILE && unit.getAttachment().getLink().endsWith(".pdf")) - .forEach(unit -> { - executeLectureAdditionWebhook(processAttachmentForUpdate(unit)); - }); - - } - catch (Exception e) { - log.error(e.getMessage()); - attachmentUnits.stream().filter(unit -> unit.getAttachment().getAttachmentType() == AttachmentType.FILE && unit.getAttachment().getLink().endsWith(".pdf")) - .forEach(unit -> { - unit.setPyrisIngestionState(IngestionState.ERROR); - lectureUnitRepository.save(unit); - }); + public String addLectureUnitToPyrisDB(AttachmentUnit attachmentUnit) { + if (lectureIngestionEnabled(attachmentUnit.getLecture().getCourse())) { + try { + if (attachmentUnit.getAttachment().getAttachmentType() == AttachmentType.FILE && attachmentUnit.getAttachment().getLink().endsWith(".pdf")) { + return executeLectureAdditionWebhook(processAttachmentForUpdate(attachmentUnit)); + } + } + catch (Exception e) { + log.error(e.getMessage()); + if (attachmentUnit.getAttachment().getAttachmentType() == AttachmentType.FILE && attachmentUnit.getAttachment().getLink().endsWith(".pdf")) { + attachmentUnit.setPyrisIngestionState(IngestionState.ERROR); + lectureUnitRepository.save(attachmentUnit); + } + } } - ; return null; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index 444056c6626c..f871570fd6ea 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -8,5 +8,5 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisLectureIngestionStatusUpdateDTO(Optional id, String result, List stages) { +public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages, Optional id) { } diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java index 9aa73d603557..249a2c2b31ec 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java @@ -277,13 +277,15 @@ public ResponseEntity ingestLectures(@PathVariable Long courseId, @Requ if (lectureToIngest.isPresent()) { Set lecturesToIngest = new HashSet<>(); lecturesToIngest.add(lectureToIngest.get()); - return ResponseEntity.ok().body(lectureService.ingestLecturesInPyris(lecturesToIngest)); + lectureService.ingestLecturesInPyris(lecturesToIngest); + return ResponseEntity.ok().body(true); } return ResponseEntity.badRequest() .headers(HeaderUtil.createAlert(applicationName, "Could not send lecture to Iris, no lecture found with the provided id.", "idExists")).body(null); } - return ResponseEntity.ok().body(lectureService.ingestLecturesInPyris(course.getLectures())); + lectureService.ingestLecturesInPyris(course.getLectures()); + return ResponseEntity.ok().body(true); } /** diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java index e3048cb23569..1b503f4f82fb 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java @@ -212,13 +212,13 @@ public ResponseEntity getLectureUnitById(@PathVariable @Valid Long * POST /courses/{courseId}/ingest * This endpooint is for starting the ingestion of all lectures or only one lecture when triggered in Artemis. * - * @param lectureId the ID of the Lecture in which the lecture unit is * @param lectureUnitId The Id of the Lecture Unit that is ingestLectureUnit(@PathVariable Long lectureId, @PathVariable Long lectureUnitId) { + public ResponseEntity ingestLectureUnit(@PathVariable Long lectureUnitId) { LectureUnit lectureUnit = this.lectureUnitRepository.findByIdWithCompetenciesAndSlidesElseThrow(lectureUnitId); - return ResponseEntity.ok().body(lectureUnitService.ingestLectureUnitInPyris(lectureUnit)); + lectureUnitService.ingestLectureUnitInPyris(lectureUnit); + return ResponseEntity.ok().body(true); } } diff --git a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java index 98f3ad4db3eb..09ed5dee613d 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java +++ b/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java @@ -105,6 +105,15 @@ public void mockIngestionWebhookRunResponse(Consumer responseConsumer) { + mockServer.expect(ExpectedCount.once(), requestTo(webhooksApiURL + "/lectures/delete")).andExpect(method(HttpMethod.POST)).andRespond(request -> { + var mockRequest = (MockClientHttpRequest) request; + var dto = mapper.readValue(mockRequest.getBodyAsString(), PyrisWebhookLectureIngestionExecutionDTO.class); + responseConsumer.accept(dto); + return MockRestResponseCreators.withRawStatus(HttpStatus.ACCEPTED.value()).createResponse(request); + }); + } + public void mockRunError(int httpStatus) { // @formatter:off mockServer @@ -123,6 +132,15 @@ public void mockIngestionWebhookRunError(int httpStatus) { // @formatter:on } + public void mockDeletionWebhookRunError(int httpStatus) { + // @formatter:off + mockServer + .expect(ExpectedCount.once(), requestTo(webhooksApiURL + "/lectures/delete")) + .andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.valueOf(httpStatus))); + // @formatter:on + } + public void mockModelsResponse() throws JsonProcessingException { var irisModelDTO = new PyrisModelDTO("TEST_MODEL", "Test model", "Test description"); var irisModelDTOArray = new PyrisModelDTO[] { irisModelDTO }; diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java b/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java index c1ff9d381d47..42ad834cf2a9 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java @@ -46,7 +46,14 @@ void testExceptionV2(int httpStatus, Class exceptionClass) { @MethodSource("irisExceptions") void testExceptionIngestionV2(int httpStatus, Class exceptionClass) { irisRequestMockProvider.mockIngestionWebhookRunError(httpStatus); - assertThatThrownBy(() -> pyrisConnectorService.executeLectureWebhook("fullIngestion", null)).isInstanceOf(exceptionClass); + assertThatThrownBy(() -> pyrisConnectorService.executeLectureAddtionWebhook("fullIngestion", null)).isInstanceOf(exceptionClass); + } + + @ParameterizedTest + @MethodSource("irisExceptions") + void testExceptionLectureDeletionV2(int httpStatus, Class exceptionClass) { + irisRequestMockProvider.mockDeletionWebhookRunError(httpStatus); + assertThatThrownBy(() -> pyrisConnectorService.executeLectureDeletionWebhook(null)).isInstanceOf(exceptionClass); } @Test diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java index 4556660764d3..88d2c1dd6c70 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java @@ -1,32 +1,55 @@ package de.tum.in.www1.artemis.iris; import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Optional; +import jakarta.validation.constraints.NotNull; + +import org.apache.pdfbox.pdmodel.PDDocument; +import org.apache.pdfbox.pdmodel.PDPage; +import org.apache.pdfbox.pdmodel.PDPageContentStream; +import org.apache.pdfbox.pdmodel.font.PDType1Font; +import org.apache.pdfbox.pdmodel.font.Standard14Fonts; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; +import com.fasterxml.jackson.databind.ObjectMapper; + import de.tum.in.www1.artemis.course.CourseUtilService; +import de.tum.in.www1.artemis.domain.Attachment; import de.tum.in.www1.artemis.domain.Course; import de.tum.in.www1.artemis.domain.Lecture; import de.tum.in.www1.artemis.domain.iris.settings.IrisCourseSettings; import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; +import de.tum.in.www1.artemis.domain.lecture.LectureUnit; +import de.tum.in.www1.artemis.lecture.LectureFactory; import de.tum.in.www1.artemis.lecture.LectureUtilService; +import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; import de.tum.in.www1.artemis.repository.LectureRepository; +import de.tum.in.www1.artemis.repository.LectureUnitRepository; import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; import de.tum.in.www1.artemis.user.UserUtilService; @@ -59,6 +82,17 @@ class PyrisLectureIngestionTest extends AbstractIrisIntegrationTest { @Autowired protected IrisSettingsRepository irisSettingsRepository; + @Autowired + protected LectureUnitRepository lectureUnitRepository; + + @Autowired + private ObjectMapper mapper; + + @Autowired + private AttachmentUnitRepository attachmentUnitRepository; + + private Attachment attachment; + private Lecture lecture1; @BeforeEach @@ -83,7 +117,13 @@ void initTestCase() throws Exception { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAutoUpdateAttachmentUnitsWithAutoUpdateEnabled() { + void autoIngestionWhenAttachmentUnitCreatedAndAutoUpdateEnabled() throws Exception { + this.attachment = LectureFactory.generateAttachment(null); + this.attachment.setName(" LoremIpsum "); + this.attachment.setLink("/api/files/temp/example.txt"); + this.lecture1 = lectureUtilService.createCourseWithLecture(true); + AttachmentUnit attachmentUnit = new AttachmentUnit(); + attachmentUnit.setDescription("Lorem Ipsum"); activateIrisFor(lecture1.getCourse()); IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); courseSettings.getIrisLectureIngestionSettings().setAutoIngestOnLectureAttachmentUpload(true); @@ -91,65 +131,61 @@ void testAutoUpdateAttachmentUnitsWithAutoUpdateEnabled() { irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst()))).isTrue(); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getLast()))).isFalse(); - } - - @Test - @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAutoUpdateAttachmentUnitsWithAutoUpdateDisabled() { - activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - courseSettings.getIrisLectureIngestionSettings().setAutoIngestOnLectureAttachmentUpload(false); - this.irisSettingsRepository.save(courseSettings); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { - assertThat(dto.settings().authenticationToken()).isNotNull(); - }); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst()))).isFalse(); - assertThat(pyrisWebhookService.autoUpdateAttachmentUnitsInPyris(lecture1.getCourse().getId(), List.of((AttachmentUnit) lecture1.getLectureUnits().getLast()))).isFalse(); + var result = request.performMvcRequest(buildCreateAttachmentUnit(attachmentUnit, attachment)).andExpect(status().isCreated()).andReturn(); + var persistedAttachmentUnit = mapper.readValue(result.getResponse().getContentAsString(), AttachmentUnit.class); + var updatedAttachmentUnit = attachmentUnitRepository.findById(persistedAttachmentUnit.getId()).orElseThrow(); + assertThat(updatedAttachmentUnit.getPyrisIngestionState()).isEqualTo(IngestionState.IN_PROGRESS); } @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAddLectureToPyrisDatabaseWithCourseSettingsDisabled() { - activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - courseSettings.getIrisLectureIngestionSettings().setEnabled(false); - this.irisSettingsRepository.save(courseSettings); + void noAutoIngestionWhenAttachmentUnitCreatedAndAutoUpdateDisabled() throws Exception { + this.attachment = LectureFactory.generateAttachment(null); + this.attachment.setName(" LoremIpsum "); + this.attachment.setLink("/api/files/temp/example.txt"); + this.lecture1 = lectureUtilService.createCourseWithLecture(true); + AttachmentUnit attachmentUnit = new AttachmentUnit(); + attachmentUnit.setDescription("Lorem Ipsum"); irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); - assertThat(jobToken).isNull(); - jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getLast())); - assertThat(jobToken).isNull(); + var result = request.performMvcRequest(buildCreateAttachmentUnit(attachmentUnit, attachment)).andExpect(status().isCreated()).andReturn(); + var persistedAttachmentUnit = mapper.readValue(result.getResponse().getContentAsString(), AttachmentUnit.class); + var updatedAttachmentUnit = attachmentUnitRepository.findById(persistedAttachmentUnit.getId()).orElseThrow(); + assertThat(updatedAttachmentUnit.getPyrisIngestionState()).isEqualTo(IngestionState.NOT_STARTED); } @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testDeleteLecturefromPyrisDatabaseWithCourseSettingsDisabled() { + void testIngestLecturesButtonInPyris() throws Exception { activateIrisFor(lecture1.getCourse()); - IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); - courseSettings.getIrisLectureIngestionSettings().setEnabled(false); - this.irisSettingsRepository.save(courseSettings); irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); - assertThat(jobToken).isNotNull(); - jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getLast())); - assertThat(jobToken).isNull(); + request.postWithResponseBody("/api/courses/" + lecture1.getCourse().getId() + "/ingest", Optional.empty(), boolean.class, HttpStatus.OK); + Optional optionalUnit = lectureUnitRepository.findById(lecture1.getLectureUnits().getFirst().getId()); + if (optionalUnit.isPresent() && optionalUnit.get() instanceof AttachmentUnit attachmentUnit) { + assertThat(attachmentUnit.getPyrisIngestionState()).isEqualTo(IngestionState.IN_PROGRESS); + } + optionalUnit = lectureUnitRepository.findById(lecture1.getLectureUnits().getLast().getId()); + if (optionalUnit.isPresent() && optionalUnit.get() instanceof AttachmentUnit attachmentUnit) { + assertThat(attachmentUnit.getPyrisIngestionState()).isEqualTo(IngestionState.NOT_STARTED); + } } @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testIngestLecturesButtonInPyris() throws Exception { + void testIngestLectureUnitButtonInPyris() throws Exception { activateIrisFor(lecture1.getCourse()); irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - Boolean response = request.postWithResponseBody("/api/courses/" + lecture1.getCourse().getId() + "/ingest", Optional.empty(), boolean.class, HttpStatus.OK); - assertThat(response).isTrue(); + request.postWithResponseBody("/api/lectures/" + lecture1.getId() + "/lecture-units/" + lecture1.getLectureUnits().getFirst().getId() + "/ingest", Optional.empty(), + boolean.class, HttpStatus.OK); + if (lectureUnitRepository.findById(lecture1.getLectureUnits().getFirst().getId()).isPresent()) { + AttachmentUnit attachmentUnit = (AttachmentUnit) lectureUnitRepository.findById(lecture1.getLectureUnits().getFirst().getId()).get(); + assertThat(attachmentUnit.getPyrisIngestionState() == IngestionState.IN_PROGRESS).isTrue(); + } } @Test @@ -158,7 +194,7 @@ void testDeleteLecturefromPyrisDatabaseWithCourseSettingsEnabled() { activateIrisFor(lecture1.getCourse()); IrisCourseSettings courseSettings = irisSettingsService.getRawIrisSettingsFor(lecture1.getCourse()); this.irisSettingsRepository.save(courseSettings); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { + irisRequestMockProvider.mockDeletionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); @@ -169,31 +205,40 @@ void testDeleteLecturefromPyrisDatabaseWithCourseSettingsEnabled() { @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAddLectureToPyrisDBAddJobWithCourseSettingsEnabled() { + void testAddLectureToPyrisDBAddJobWithCourseSettingsEnabled() throws Exception { activateIrisFor(lecture1.getCourse()); irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getFirst())); - assertThat(jobToken).isNotNull(); - jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of((AttachmentUnit) lecture1.getLectureUnits().getLast())); - assertThat(jobToken).isNull(); + request.postWithResponseBody("/api/courses/" + lecture1.getCourse().getId() + "/ingest", Optional.empty(), boolean.class, HttpStatus.OK); + Optional optionalUnit = lectureUnitRepository.findById(lecture1.getLectureUnits().getFirst().getId()); + if (optionalUnit.isPresent() && optionalUnit.get() instanceof AttachmentUnit unit) { + assertThat(unit.getPyrisIngestionState()).isEqualTo(IngestionState.IN_PROGRESS); + } + optionalUnit = lectureUnitRepository.findById(lecture1.getLectureUnits().getLast().getId()); + if (optionalUnit.isPresent() && optionalUnit.get() instanceof AttachmentUnit unit) { + assertThat(unit.getPyrisIngestionState()).isEqualTo(IngestionState.NOT_STARTED); + } } @Test @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") - void testAllStagesDoneRemovesAdditionIngestionJob() throws Exception { + void testAllStagesDoneIngestionStateDone() throws Exception { activateIrisFor(lecture1.getCourse()); irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of(attachmentUnit)); + if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { + String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage)); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); - assertThat(pyrisJobService.getJob(jobToken)).isNull(); + Optional optionalUnit = lectureUnitRepository.findById(unit.getId()); + if (optionalUnit.isPresent() && optionalUnit.get() instanceof AttachmentUnit attachUnit) { + assertThat(attachUnit.getPyrisIngestionState()).isEqualTo(IngestionState.DONE); + } } } @@ -201,13 +246,14 @@ void testAllStagesDoneRemovesAdditionIngestionJob() throws Exception { @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR") void testAllStagesDoneRemovesDeletionIngestionJob() throws Exception { activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { + irisRequestMockProvider.mockDeletionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(attachmentUnit)); + if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { + String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage)); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); @@ -220,11 +266,12 @@ void testStageNotDoneKeepsAdditionIngestionJob() throws Exception { irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of(attachmentUnit)); + if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { + String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage)); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); @@ -234,14 +281,15 @@ void testStageNotDoneKeepsAdditionIngestionJob() throws Exception { @Test void testStageNotDoneKeepsDeletionIngetionJob() throws Exception { activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { + irisRequestMockProvider.mockDeletionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(attachmentUnit)); + if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { + String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage)); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); @@ -251,16 +299,21 @@ void testStageNotDoneKeepsDeletionIngetionJob() throws Exception { @Test void testErrorStageRemovesDeletionIngetionJob() throws Exception { activateIrisFor(lecture1.getCourse()); - irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { + irisRequestMockProvider.mockDeletionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(attachmentUnit)); + if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { + String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage)); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); + Optional optionalUnit = lectureUnitRepository.findById(unit.getId()); + if (optionalUnit.isPresent() && optionalUnit.get() instanceof AttachmentUnit attachUnit) { + assertThat(attachUnit.getPyrisIngestionState()).isEqualTo(IngestionState.ERROR); + } } } @@ -270,13 +323,18 @@ void testErrorStageRemovesAdditionIngetionJob() throws Exception { irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { assertThat(dto.settings().authenticationToken()).isNotNull(); }); - if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit attachmentUnit) { - String jobToken = pyrisWebhookService.addLectureUnitsToPyrisDB(List.of(attachmentUnit)); + if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { + String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage)); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); + Optional optionalUnit = lectureUnitRepository.findById(unit.getId()); + if (optionalUnit.isPresent() && optionalUnit.get() instanceof AttachmentUnit atUnit) { + assertThat(atUnit.getPyrisIngestionState()).isEqualTo(IngestionState.ERROR); + } } } @@ -289,7 +347,8 @@ void testRunIdIngestionJob() throws Exception { String newJobToken = pyrisJobService.addIngestionWebhookJob(); String chatJobToken = pyrisJobService.addCourseChatJob(123L, 123L); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage)); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + chatJobToken)))); MockHttpServletResponse response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + newJobToken + "/status", statusUpdate, HttpStatus.CONFLICT, headers); @@ -297,4 +356,74 @@ void testRunIdIngestionJob() throws Exception { response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + chatJobToken + "/status", statusUpdate, HttpStatus.CONFLICT, headers); assertThat(response.getContentAsString()).contains("Run ID is not an ingestion job"); } + + @Test + void testIngestionJobDone() throws Exception { + activateIrisFor(lecture1.getCourse()); + irisRequestMockProvider.mockIngestionWebhookRunResponse(dto -> { + assertThat(dto.settings().authenticationToken()).isNotNull(); + }); + String newJobToken = pyrisJobService.addIngestionWebhookJob(); + String chatJobToken = pyrisJobService.addCourseChatJob(123L, 123L); + PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), + Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + chatJobToken)))); + MockHttpServletResponse response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + newJobToken + "/status", statusUpdate, + HttpStatus.CONFLICT, headers); + assertThat(response.getContentAsString()).contains("Run ID in URL does not match run ID in request body"); + response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + chatJobToken + "/status", statusUpdate, HttpStatus.CONFLICT, headers); + assertThat(response.getContentAsString()).contains("Run ID is not an ingestion job"); + } + + /** + * Generates an attachment unit pdf file with 5 pages + * + * @return MockMultipartFile attachment unit pdf file + */ + private MockMultipartFile createAttachmentUnitPdf() throws IOException { + + var font = new PDType1Font(Standard14Fonts.FontName.TIMES_ROMAN); + + try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); PDDocument document = new PDDocument()) { + + for (int i = 1; i <= 3; i++) { + document.addPage(new PDPage()); + PDPageContentStream contentStream = new PDPageContentStream(document, document.getPage(i - 1)); + + if (i == 2) { + contentStream.beginText(); + contentStream.setFont(font, 12); + contentStream.newLineAtOffset(25, -15); + contentStream.showText("itp20.."); + contentStream.newLineAtOffset(25, 500); + contentStream.showText("Outline"); + contentStream.newLineAtOffset(0, -15); + contentStream.showText("First Unit"); + contentStream.close(); + continue; + } + contentStream.beginText(); + contentStream.setFont(font, 12); + contentStream.newLineAtOffset(25, 500); + String text = "This is the sample document"; + contentStream.showText(text); + contentStream.endText(); + contentStream.close(); + } + document.save(outputStream); + document.close(); + return new MockMultipartFile("file", "lectureFile.pdf", "application/json", outputStream.toByteArray()); + } + } + + private MockHttpServletRequestBuilder buildCreateAttachmentUnit(@NotNull AttachmentUnit attachmentUnit, @NotNull Attachment attachment) throws Exception { + var attachmentUnitPart = new MockMultipartFile("attachmentUnit", "", MediaType.APPLICATION_JSON_VALUE, mapper.writeValueAsString(attachmentUnit).getBytes()); + var attachmentPart = new MockMultipartFile("attachment", "", MediaType.APPLICATION_JSON_VALUE, mapper.writeValueAsString(attachment).getBytes()); + var filePart = createAttachmentUnitPdf(); + + return MockMvcRequestBuilders.multipart(HttpMethod.POST, "/api/lectures/" + lecture1.getId() + "/attachment-units").file(attachmentUnitPart).file(attachmentPart) + .file(filePart).contentType(MediaType.MULTIPART_FORM_DATA_VALUE); + } + } From babef53b091ee2cf14f0f5167402fc971eb2b5ef Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Fri, 19 Jul 2024 17:54:44 +0200 Subject: [PATCH 04/95] Linter --- .../connectors/pyris/PyrisWebhookService.java | 1 + src/main/webapp/app/entities/lecture.model.ts | 24 +++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java index d00fae8c7391..da5b89fef0d7 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -137,6 +137,7 @@ public String deleteLectureFromPyrisDB(List attachmentUnits) { * adds the lectures to the vector database on pyris * * @param attachmentUnit The attachmentUnit that got Updated / erased + * @return jobToken if the job was created */ public String addLectureUnitToPyrisDB(AttachmentUnit attachmentUnit) { if (lectureIngestionEnabled(attachmentUnit.getLecture().getCourse())) { diff --git a/src/main/webapp/app/entities/lecture.model.ts b/src/main/webapp/app/entities/lecture.model.ts index 989d79852bf2..dc62cff65ff3 100644 --- a/src/main/webapp/app/entities/lecture.model.ts +++ b/src/main/webapp/app/entities/lecture.model.ts @@ -25,10 +25,10 @@ export class Lecture implements BaseEntity { ingested?: IngestionState; constructor() { - this.ingested = this.checkIngestionState(); + this.ingested = this.checkIngestionState ? this.checkIngestionState() : undefined; } - private checkIngestionState(): IngestionState { + private checkIngestionState?(): IngestionState { if (!this.lectureUnits) { return IngestionState.NOT_STARTED; } @@ -38,21 +38,15 @@ export class Lecture implements BaseEntity { const allNotStarted = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.NOT_STARTED); const allFailed = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.ERROR); - if (allDone) { - return IngestionState.DONE; - } - if (allFailed) { - return IngestionState.ERROR; - } - - if (allNotStarted) { - return IngestionState.NOT_STARTED; - } + if (allDone) return IngestionState.DONE; + if (allFailed) return IngestionState.ERROR; + if (allNotStarted) return IngestionState.NOT_STARTED; return IngestionState.PARTIALLY_INGESTED; } - - public updateIngestionState(): void { - this.ingested = this.checkIngestionState(); + public updateIngestionState?(): void { + if (this.checkIngestionState) { + this.ingested = this.checkIngestionState(); + } } } From 69000696e7bf3dd524fd5ad0467f1aaa2d5d65e4 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Fri, 19 Jul 2024 18:08:37 +0200 Subject: [PATCH 05/95] Linter --- src/main/webapp/app/lecture/lecture.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/lecture/lecture.component.ts b/src/main/webapp/app/lecture/lecture.component.ts index cd35af947686..c8255267e139 100644 --- a/src/main/webapp/app/lecture/lecture.component.ts +++ b/src/main/webapp/app/lecture/lecture.component.ts @@ -160,7 +160,9 @@ export class LectureComponent implements OnInit, OnDestroy { this.lectures = res.map((lectureData) => { const lecture = new Lecture(); Object.assign(lecture, lectureData); - lecture.updateIngestionState(); + if (lecture.updateIngestionState) { + lecture.updateIngestionState(); + } return lecture; }); this.applyFilters(); From 53c3e6d063e8bbd62f34aca360f4ec3a7bc6182f Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sat, 20 Jul 2024 02:07:11 +0200 Subject: [PATCH 06/95] Update tests to the new Lecture initialization method from findAllByCourseId to findAllByCourseIdWithSlides --- .../spec/component/lecture/lecture.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts index 62d315dd67e7..e29c9b109488 100644 --- a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts @@ -134,7 +134,7 @@ describe('Lecture', () => { }, }, MockProvider(LectureService, { - findAllByCourseId: () => { + findAllByCourseIdWithSlides: () => { return of( new HttpResponse({ body: [pastLecture, pastLecture2, currentLecture, currentLecture2, currentLecture3, futureLecture, futureLecture2, unspecifiedLecture], @@ -172,7 +172,7 @@ describe('Lecture', () => { }); it('should fetch lectures when initialized', () => { - const findAllSpy = jest.spyOn(lectureService, 'findAllByCourseId'); + const findAllSpy = jest.spyOn(lectureService, 'findAllByCourseIdWithSlides'); lectureComponentFixture.detectChanges(); From 6e1a67c1f9a0647803d38f91172d2ec1a6674046 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 21 Jul 2024 00:56:34 +0200 Subject: [PATCH 07/95] fix test initialisation, and edit class for ingestion button --- .../lecture-unit-management.component.html | 2 +- .../lecture-unit-management.component.ts | 107 ++++++++---------- .../lecture-unit-management.component.spec.ts | 29 ++++- 3 files changed, 74 insertions(+), 64 deletions(-) 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 5b5471279b35..bb802bd2aa49 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 @@ -74,7 +74,7 @@ }
+ } @else { + @if (lecture.course?.id && showCompetencies) { + + } + }
@if (this.emitEditEvents) { @if (editButtonAvailable(lectureUnit)) { diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts index 93a4d0f93b4c..41b64c4908d2 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts @@ -93,7 +93,6 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { // TODO: the lecture (without units) is already available through the lecture.route.ts resolver, it's not really good that we load it twice this.loadData(); } - this.initializeProfileInfo(); }); // debounceTime limits the amount of put requests sent for updating the lecture unit order @@ -119,6 +118,7 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { this.lecture = lecture; if (lecture?.lectureUnits) { this.lectureUnits = lecture?.lectureUnits; + this.initializeProfileInfo(); } else { this.lectureUnits = []; } @@ -144,8 +144,11 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { this.profileInfoSubscription = this.profileService.getProfileInfo().subscribe(async (profileInfo) => { this.irisEnabled = profileInfo.activeProfiles.includes(PROFILE_IRIS); if (this.irisEnabled && this.lecture.course && this.lecture.course.id) { + console.log('if (this.irisEnabled && this.lecture.course && this.lecture.course.id) {\n'); this.irisSettingsService.getCombinedCourseSettings(this.lecture.course.id).subscribe((settings) => { this.lectureIngestionEnabled = settings?.irisLectureIngestionSettings?.enabled || false; + console.log('updated this.lectureIngestionEnabled'); + console.log(this.lectureIngestionEnabled); }); } }); From 692ffd7d5dc6613c3a19d55490acedc854203d25 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 21 Jul 2024 18:17:54 +0200 Subject: [PATCH 10/95] Add client tests --- .../web/rest/lecture/LectureUnitResource.java | 4 +- .../lecture-unit-management.component.ts | 3 -- .../lectureUnit.service.ts | 12 +++-- .../lecture-unit-management.component.spec.ts | 52 ++++++++++++++++++- .../lecture/lecture.component.spec.ts | 42 +++++++++++++++ 5 files changed, 101 insertions(+), 12 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java index 1b503f4f82fb..7fa249c8bbec 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java @@ -216,9 +216,9 @@ public ResponseEntity getLectureUnitById(@PathVariable @Valid Long * @return the ResponseEntity with status 200 (OK) and a message success or null if the operation failed */ @PostMapping("lectures/{lectureId}/lecture-units/{lectureUnitId}/ingest") - public ResponseEntity ingestLectureUnit(@PathVariable Long lectureUnitId) { + public ResponseEntity ingestLectureUnit(@PathVariable Long lectureUnitId) { LectureUnit lectureUnit = this.lectureUnitRepository.findByIdWithCompetenciesAndSlidesElseThrow(lectureUnitId); lectureUnitService.ingestLectureUnitInPyris(lectureUnit); - return ResponseEntity.ok().body(true); + return ResponseEntity.ok().build(); } } diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts index 41b64c4908d2..7fcd4803c7fb 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts @@ -144,11 +144,8 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { this.profileInfoSubscription = this.profileService.getProfileInfo().subscribe(async (profileInfo) => { this.irisEnabled = profileInfo.activeProfiles.includes(PROFILE_IRIS); if (this.irisEnabled && this.lecture.course && this.lecture.course.id) { - console.log('if (this.irisEnabled && this.lecture.course && this.lecture.course.id) {\n'); this.irisSettingsService.getCombinedCourseSettings(this.lecture.course.id).subscribe((settings) => { this.lectureIngestionEnabled = settings?.irisLectureIngestionSettings?.enabled || false; - console.log('updated this.lectureIngestionEnabled'); - console.log(this.lectureIngestionEnabled); }); } }); diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts index df302a87b14c..87ac1851a6f2 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts @@ -168,12 +168,14 @@ export class LectureUnitService { return this.httpClient.get(`${this.resourceURL}/lecture-units/${lectureUnitId}`); } /** - * Triggers the ingestion of one lecture unit + * Triggers the ingestion of one lecture unit. + * + * @param lectureUnitId - The ID of the lecture unit to be ingested. + * @param lectureId - The ID of the lecture to which the unit belongs. + * @returns An Observable with an HttpResponse 200 if the request was successful . */ - ingestLectureUnitInPyris(lectureUnitId: number, lectureId: number): Observable> { - const params = new HttpParams(); - return this.httpClient.post(`${this.resourceURL}/lectures/${lectureId}/lecture-units/${lectureUnitId}/ingest`, null, { - params: params, + ingestLectureUnitInPyris(lectureUnitId: number, lectureId: number): Observable> { + return this.httpClient.post(`${this.resourceURL}/lectures/${lectureId}/lecture-units/${lectureUnitId}/ingest`, null, { observe: 'response', }); } diff --git a/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts index c85a6728e096..f13c7a117f3f 100644 --- a/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts @@ -21,7 +21,7 @@ import { Lecture } from 'app/entities/lecture.model'; import { HttpResponse } from '@angular/common/http'; import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive'; import { HasAnyAuthorityDirective } from 'app/shared/auth/has-any-authority.directive'; -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { By } from '@angular/platform-browser'; import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model'; import { Competency } from 'app/entities/competency.model'; @@ -38,6 +38,7 @@ import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { IrisCourseSettings } from 'app/entities/iris/settings/iris-settings.model'; import { IrisLectureIngestionSubSettings } from 'app/entities/iris/settings/iris-sub-settings.model'; import { PROFILE_IRIS } from 'app/app.constants'; +import { Course } from 'app/entities/course.model'; @Component({ selector: 'jhi-competencies-popover', template: '' }) class CompetenciesPopoverStubComponent { @@ -147,8 +148,8 @@ describe('LectureUnitManagementComponent', () => { getProfileInfo.mockReturnValue(of(profileInfo)); const irisCourseSettings = new IrisCourseSettings(); irisCourseSettings.irisLectureIngestionSettings = new IrisLectureIngestionSubSettings(); + irisCourseSettings.irisLectureIngestionSettings.enabled = true; getCombinedCourseSettings.mockReturnValue(of(irisCourseSettings)); - lectureUnitManagementComponentFixture.detectChanges(); }); }); @@ -201,4 +202,51 @@ describe('LectureUnitManagementComponent', () => { expect(lectureUnitManagementComponent.getActionType(new VideoUnit())).toEqual(ActionType.Delete); expect(lectureUnitManagementComponent.getActionType(new OnlineUnit())).toEqual(ActionType.Delete); }); + it('should call onIngestButtonClicked when button is clicked', () => { + const ingestLectureUnitInPyris = jest.spyOn(lectureUnitService, 'ingestLectureUnitInPyris'); + const returnValue = of(new HttpResponse({ status: 200 })); + ingestLectureUnitInPyris.mockReturnValue(returnValue); + const lectureUnitId = 1; + lectureUnitManagementComponent.lecture = { id: 2 } as any; + lectureUnitManagementComponent.onIngestButtonClicked(lectureUnitId); + expect(lectureUnitService.ingestLectureUnitInPyris).toHaveBeenCalledWith(lectureUnitId, lectureUnitManagementComponent.lecture.id); + }); + + it('should handle error when ingestLectureUnitInPyris fails', () => { + const ingestLectureUnitInPyris = jest.spyOn(lectureUnitService, 'ingestLectureUnitInPyris'); + const lectureUnitId = 1; + lectureUnitManagementComponent.lecture = { id: 2 } as any; + const error = new Error('Failed to send Ingestion request'); + ingestLectureUnitInPyris.mockReturnValue(throwError(() => error)); + + jest.spyOn(console, 'error').mockImplementation(() => {}); + + lectureUnitManagementComponent.onIngestButtonClicked(lectureUnitId); + + expect(lectureUnitService.ingestLectureUnitInPyris).toHaveBeenCalledWith(lectureUnitId, lectureUnitManagementComponent.lecture.id); + expect(console.error).toHaveBeenCalledWith('Failed to send Ingestion request', error); + }); + + it('should update the icon based on ingestion state', () => { + const attachmentUnit = { pyrisIngestionState: 'NOT_STARTED' } as any; + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.sendToIris); + + attachmentUnit.pyrisIngestionState = 'IN_PROGRESS'; + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.loading); + + attachmentUnit.pyrisIngestionState = 'DONE'; + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.done); + + attachmentUnit.pyrisIngestionState = 'ERROR'; + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.resendToIris); + }); + it('should initialize profile info and check for Iris settings', () => { + const mockCourse: Course = { id: 1, title: 'Test Course' }; + lectureUnitManagementComponent.lecture = { id: 2, course: mockCourse } as Lecture; + lectureUnitManagementComponent.initializeProfileInfo(); + expect(profileService.getProfileInfo).toHaveBeenCalled(); + expect(irisSettingsService.getCombinedCourseSettings).toHaveBeenCalledWith(lectureUnitManagementComponent.lecture!.course!.id); + expect(lectureUnitManagementComponent.irisEnabled).toBeTrue(); + expect(lectureUnitManagementComponent.lectureIngestionEnabled).toBeTrue(); + }); }); diff --git a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts index e29c9b109488..740f47091aa2 100644 --- a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts @@ -28,6 +28,8 @@ import { IrisCourseSettings } from 'app/entities/iris/settings/iris-settings.mod import { PROFILE_IRIS } from 'app/app.constants'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; +import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model'; +import { AttachmentUnit, IngestionState } from 'app/entities/lecture-unit/attachmentUnit.model'; describe('Lecture', () => { let lectureComponentFixture: ComponentFixture; @@ -300,4 +302,44 @@ describe('Lecture', () => { expect(irisSettingsService.getCombinedCourseSettings).toHaveBeenCalledWith(lectureComponent.courseId); expect(lectureComponent.lectureIngestionEnabled).toBeTrue(); }); + it('should correctly update ingestion state based on lecture units', () => { + const mockLectureUnits: LectureUnit[] = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, + { id: 3, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, + ]; + + const lecture = new Lecture(); + lecture.id = 1; + lecture.title = 'Sample Lecture'; + lecture.lectureUnits = mockLectureUnits; + lecture.course = { id: 1, title: 'Sample Course' }; + expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); + + if (lecture.updateIngestionState) { + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.PARTIALLY_INGESTED); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.DONE); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.ERROR); + } + }); }); From 9969fc57d25b3696288f0e542bca0d6ddd56747c Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 21 Jul 2024 18:52:46 +0200 Subject: [PATCH 11/95] Fix lint and erase unused code --- .../lecture-unit-management.component.html | 40 ++++++++++--------- .../webapp/app/shared/sort/sort.directive.ts | 14 ------- 2 files changed, 22 insertions(+), 32 deletions(-) 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 7cb4713b0776..9ae028644ff5 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,24 +68,28 @@
- @if(this.lectureIngestionEnabled){ -
- @if (lecture.course?.id && showCompetencies) { - - } - -
+ @if (this.lectureIngestionEnabled) { +
+ @if (lecture.course?.id && showCompetencies) { + + } + +
} @else { @if (lecture.course?.id && showCompetencies) { diff --git a/src/main/webapp/app/shared/sort/sort.directive.ts b/src/main/webapp/app/shared/sort/sort.directive.ts index 8da860084700..7633048b9b69 100644 --- a/src/main/webapp/app/shared/sort/sort.directive.ts +++ b/src/main/webapp/app/shared/sort/sort.directive.ts @@ -36,18 +36,4 @@ export class SortDirective { this.ascendingChange.emit(this.ascending); this.sortChange.emit({ predicate: this.predicate, ascending: this.ascending }); } - - getSortedData(data: any[]): any[] { - if (typeof this.predicate === 'function') { - return [...data].sort((a, b) => { - const result = (this.predicate as any)(a) < (this.predicate as any)(b) ? -1 : 1; - return this.ascending ? result : -result; - }); - } else { - return [...data].sort((a, b) => { - const result = a[this.predicate] < b[this.predicate] ? -1 : 1; - return this.ascending ? result : -result; - }); - } - } } From 70d945afa03f841dc4192e3e7053e9712442bb36 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Mon, 22 Jul 2024 11:22:53 +0200 Subject: [PATCH 12/95] Fix Css --- .../lecture-unit-management.component.html | 1 + 1 file changed, 1 insertion(+) 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 9ae028644ff5..50ff3700eb37 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 @@ -72,6 +72,7 @@
@if (lecture.course?.id && showCompetencies) { Date: Wed, 21 Aug 2024 00:23:48 +0200 Subject: [PATCH 13/95] Add feedback Server Side --- .../domain/lecture/AttachmentUnit.java | 2 +- .../pyris/PyrisConnectorService.java | 4 +-- .../pyris/PyrisPipelineService.java | 2 +- .../pyris/PyrisStatusUpdateService.java | 28 +++++++++---------- .../connectors/pyris/PyrisWebhookService.java | 4 +-- .../status/IngestionState.java | 2 +- .../status/PyrisStageState.java | 2 +- .../PyrisLectureIngestionStatusUpdateDTO.java | 2 +- .../PyrisLectureUnitsStatusUpdate.java | 13 --------- .../pyris/dto/status/PyrisStageDTO.java | 1 + .../artemis/web/rest/LectureResource.java | 6 ++-- .../resources/config/liquibase/master.xml | 1 - .../iris/IrisChatMessageIntegrationTest.java | 8 +++--- .../iris/PyrisLectureIngestionTest.java | 28 +++++++------------ 14 files changed, 41 insertions(+), 62 deletions(-) rename src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/{dto => domain}/status/IngestionState.java (70%) rename src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/{dto => domain}/status/PyrisStageState.java (85%) delete mode 100644 src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java index 79149530fa56..13e30b05653c 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import de.tum.in.www1.artemis.domain.Attachment; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; @Entity @DiscriminatorValue("A") diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java index 36c4956a2745..cf30e5ac35bf 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java @@ -24,7 +24,7 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureDeletionExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.iris.exception.IrisException; import de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; @@ -119,7 +119,7 @@ public void executeLectureAddtionWebhook(String variant, PyrisWebhookLectureInge } private void setIngestionStateToError(PyrisWebhookLectureIngestionExecutionDTO executionDTO, RuntimeException e) { - log.error("Failed to send lectures to Pyris", e); + log.error("Failed to send lecture unit {} to Pyris: {}", executionDTO.pyrisLectureUnit().lectureUnitId(), e.getMessage()); if (executionDTO != null) { Optional optionalUnit = lectureUnitRepository.findById(executionDTO.pyrisLectureUnit().lectureUnitId()); optionalUnit.ifPresent(unit -> { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java index 54c8d2daf5f3..c4ba7d4b50dd 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java @@ -33,7 +33,7 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.iris.exception.IrisException; import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; import de.tum.in.www1.artemis.service.metrics.LearningMetricsService; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java index a0e6c629bd12..d5c315f35860 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java @@ -5,13 +5,12 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; @@ -91,18 +90,19 @@ private boolean removeJobIfTerminated(List stages, String job) { * @param statusUpdate the status update */ public void handleStatusUpdate(IngestionWebhookJob job, PyrisLectureIngestionStatusUpdateDTO statusUpdate) { - if (removeJobIfTerminated(statusUpdate.stages(), job.jobId()) && statusUpdate.id().isPresent()) { - if (attachmentUnitRepository.findById(statusUpdate.id().get()).isPresent()) { - AttachmentUnit unit = attachmentUnitRepository.findById(statusUpdate.id().get()).get(); - if (statusUpdate.stages().getLast().state() == PyrisStageState.DONE) { - unit.setPyrisIngestionState(IngestionState.DONE); - attachmentUnitRepository.save(unit); - } - else if (statusUpdate.stages().getLast().state() == PyrisStageState.ERROR || statusUpdate.stages().getLast().state() == PyrisStageState.SKIPPED) { - unit.setPyrisIngestionState(IngestionState.ERROR); + if (removeJobIfTerminated(statusUpdate.stages(), job.jobId())) { + attachmentUnitRepository.findById(statusUpdate.id()).ifPresent(unit -> { + PyrisStageState lastState = statusUpdate.stages().getLast().state(); + + if (lastState == PyrisStageState.DONE) { + unit.setPyrisIngestionState(IngestionState.DONE); + } else if (lastState == PyrisStageState.ERROR || lastState == PyrisStageState.SKIPPED) { + unit.setPyrisIngestionState(IngestionState.ERROR); + } + attachmentUnitRepository.save(unit); - } - } + }); } } + } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java index da5b89fef0d7..16b9c22f1de4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -25,7 +25,7 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureDeletionExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; @@ -147,7 +147,7 @@ public String addLectureUnitToPyrisDB(AttachmentUnit attachmentUnit) { } } catch (Exception e) { - log.error(e.getMessage()); + log.error("Error occurred while sending lecture unit {} to Pyris", attachmentUnit.getId(), e); if (attachmentUnit.getAttachment().getAttachmentType() == AttachmentType.FILE && attachmentUnit.getAttachment().getLink().endsWith(".pdf")) { attachmentUnit.setPyrisIngestionState(IngestionState.ERROR); lectureUnitRepository.save(attachmentUnit); diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/IngestionState.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/domain/status/IngestionState.java similarity index 70% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/IngestionState.java rename to src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/domain/status/IngestionState.java index 9090d887a78a..beb3839b8f49 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/IngestionState.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/domain/status/IngestionState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.status; +package de.tum.in.www1.artemis.service.connectors.pyris.domain.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/domain/status/PyrisStageState.java similarity index 85% rename from src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java rename to src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/domain/status/PyrisStageState.java index 10648687f7f2..19d6444191ce 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/domain/status/PyrisStageState.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.status; +package de.tum.in.www1.artemis.service.connectors.pyris.domain.status; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index f871570fd6ea..3278ed7de921 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -8,5 +8,5 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages, Optional id) { +public record PyrisLectureIngestionStatusUpdateDTO(String result, List stages, Long id) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java deleted file mode 100644 index 2c7312ec6415..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureUnitsStatusUpdate.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; - -import com.fasterxml.jackson.annotation.JsonInclude; - -/** - * Represents a webhook data transfer object for lecture units in the Pyris system. - * This DTO is used to encapsulate the information related to updates of lecture units, - * providing necessary details such as lecture and course identifiers, names, and descriptions. - */ -@JsonInclude(JsonInclude.Include.NON_EMPTY) - -public record PyrisLectureUnitsStatusUpdate(Long lectureUnitId, Long lectureId, Long courseId) { -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java index 39728eceb4a1..0544b24eda13 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java @@ -1,6 +1,7 @@ package de.tum.in.www1.artemis.service.connectors.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; @JsonInclude(JsonInclude.Include.NON_EMPTY) public record PyrisStageDTO(String name, int weight, PyrisStageState state, String message) { diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java index 249a2c2b31ec..8a4cebf28405 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/LectureResource.java @@ -269,7 +269,7 @@ public ResponseEntity importLecture(@PathVariable long sourceLectureId, * @return the ResponseEntity with status 200 (OK) and a message success or null if the operation failed */ @PostMapping("courses/{courseId}/ingest") - public ResponseEntity ingestLectures(@PathVariable Long courseId, @RequestParam(required = false) Optional lectureId) { + public ResponseEntity ingestLectures(@PathVariable Long courseId, @RequestParam(required = false) Optional lectureId) { log.debug("REST request to ingest lectures of course : {}", courseId); Course course = courseRepository.findByIdWithLecturesAndLectureUnitsElseThrow(courseId); if (lectureId.isPresent()) { @@ -278,14 +278,14 @@ public ResponseEntity ingestLectures(@PathVariable Long courseId, @Requ Set lecturesToIngest = new HashSet<>(); lecturesToIngest.add(lectureToIngest.get()); lectureService.ingestLecturesInPyris(lecturesToIngest); - return ResponseEntity.ok().body(true); + return ResponseEntity.ok().build(); } return ResponseEntity.badRequest() .headers(HeaderUtil.createAlert(applicationName, "Could not send lecture to Iris, no lecture found with the provided id.", "idExists")).body(null); } lectureService.ingestLecturesInPyris(course.getLectures()); - return ResponseEntity.ok().body(true); + return ResponseEntity.ok().build(); } /** diff --git a/src/main/resources/config/liquibase/master.xml b/src/main/resources/config/liquibase/master.xml index 3ca9adb7e2fa..6293b3a3f7e6 100644 --- a/src/main/resources/config/liquibase/master.xml +++ b/src/main/resources/config/liquibase/master.xml @@ -18,7 +18,6 @@ - diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java index 2726328b19bf..fb6ba1e5d6d2 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java @@ -1,8 +1,8 @@ package de.tum.in.www1.artemis.iris; -import static de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState.DONE; -import static de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState.IN_PROGRESS; -import static de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState.NOT_STARTED; +import static de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState.DONE; +import static de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState.IN_PROGRESS; +import static de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState.NOT_STARTED; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatNoException; import static org.awaitility.Awaitility.await; @@ -46,7 +46,7 @@ import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.iris.IrisMessageService; import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO; diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java index 88d2c1dd6c70..4271ea5e0375 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java @@ -49,9 +49,9 @@ import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.IngestionState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.user.UserUtilService; class PyrisLectureIngestionTest extends AbstractIrisIntegrationTest { @@ -231,8 +231,7 @@ void testAllStagesDoneIngestionStateDone() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); Optional optionalUnit = lectureUnitRepository.findById(unit.getId()); @@ -252,8 +251,7 @@ void testAllStagesDoneRemovesDeletionIngestionJob() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); @@ -270,8 +268,7 @@ void testStageNotDoneKeepsAdditionIngestionJob() throws Exception { String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); @@ -288,8 +285,7 @@ void testStageNotDoneKeepsDeletionIngetionJob() throws Exception { String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); @@ -305,8 +301,7 @@ void testErrorStageRemovesDeletionIngetionJob() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); @@ -326,8 +321,7 @@ void testErrorStageRemovesAdditionIngetionJob() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); @@ -347,8 +341,7 @@ void testRunIdIngestionJob() throws Exception { String newJobToken = pyrisJobService.addIngestionWebhookJob(); String chatJobToken = pyrisJobService.addCourseChatJob(123L, 123L); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + chatJobToken)))); MockHttpServletResponse response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + newJobToken + "/status", statusUpdate, HttpStatus.CONFLICT, headers); @@ -366,8 +359,7 @@ void testIngestionJobDone() throws Exception { String newJobToken = pyrisJobService.addIngestionWebhookJob(); String chatJobToken = pyrisJobService.addCourseChatJob(123L, 123L); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), - Optional.ofNullable(lecture1.getLectureUnits().getFirst().getId())); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + chatJobToken)))); MockHttpServletResponse response = request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + newJobToken + "/status", statusUpdate, HttpStatus.CONFLICT, headers); From f735406fc980b6c67576948ff71ff3ddb8ca3ab6 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Wed, 21 Aug 2024 12:55:16 +0200 Subject: [PATCH 14/95] Client Side feedback --- .../pyris/PyrisConnectorService.java | 2 +- .../pyris/PyrisPipelineService.java | 2 +- .../pyris/PyrisStatusUpdateService.java | 27 ++++++----- .../connectors/pyris/PyrisWebhookService.java | 2 +- .../PyrisLectureIngestionStatusUpdateDTO.java | 1 - .../pyris/dto/status/PyrisStageDTO.java | 1 + src/main/webapp/app/entities/lecture.model.ts | 34 +++++-------- .../lecture-unit-management.component.html | 4 +- .../lecture-unit-management.component.ts | 23 ++++----- .../webapp/app/lecture/lecture.component.html | 14 ++++-- .../webapp/app/lecture/lecture.component.ts | 4 +- src/main/webapp/i18n/de/lecture.json | 2 +- .../iris/IrisChatMessageIntegrationTest.java | 2 +- .../iris/PyrisLectureIngestionTest.java | 22 +++++---- .../lecture-unit-management.component.spec.ts | 10 ++-- .../lecture/lecture.component.spec.ts | 48 +++++++++---------- 16 files changed, 100 insertions(+), 98 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java index cf30e5ac35bf..d15ee61ff30e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisConnectorService.java @@ -21,10 +21,10 @@ import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit; import de.tum.in.www1.artemis.domain.lecture.LectureUnit; import de.tum.in.www1.artemis.repository.LectureUnitRepository; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureDeletionExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.iris.exception.IrisException; import de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java index c4ba7d4b50dd..cc6a873281f4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java @@ -25,6 +25,7 @@ import de.tum.in.www1.artemis.domain.participation.StudentParticipation; import de.tum.in.www1.artemis.repository.CourseRepository; import de.tum.in.www1.artemis.repository.StudentParticipationRepository; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatPipelineExecutionBaseDataDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO; @@ -33,7 +34,6 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.iris.exception.IrisException; import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; import de.tum.in.www1.artemis.service.metrics.LearningMetricsService; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java index d5c315f35860..f92e83ec7473 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java @@ -6,11 +6,11 @@ import org.springframework.stereotype.Service; import de.tum.in.www1.artemis.repository.AttachmentUnitRepository; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob; import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob; @@ -91,17 +91,18 @@ private boolean removeJobIfTerminated(List stages, String job) { */ public void handleStatusUpdate(IngestionWebhookJob job, PyrisLectureIngestionStatusUpdateDTO statusUpdate) { if (removeJobIfTerminated(statusUpdate.stages(), job.jobId())) { - attachmentUnitRepository.findById(statusUpdate.id()).ifPresent(unit -> { - PyrisStageState lastState = statusUpdate.stages().getLast().state(); - - if (lastState == PyrisStageState.DONE) { - unit.setPyrisIngestionState(IngestionState.DONE); - } else if (lastState == PyrisStageState.ERROR || lastState == PyrisStageState.SKIPPED) { - unit.setPyrisIngestionState(IngestionState.ERROR); - } - - attachmentUnitRepository.save(unit); - }); + attachmentUnitRepository.findById(statusUpdate.id()).ifPresent(unit -> { + PyrisStageState lastState = statusUpdate.stages().getLast().state(); + + if (lastState == PyrisStageState.DONE) { + unit.setPyrisIngestionState(IngestionState.DONE); + } + else if (lastState == PyrisStageState.ERROR || lastState == PyrisStageState.SKIPPED) { + unit.setPyrisIngestionState(IngestionState.ERROR); + } + + attachmentUnitRepository.save(unit); + }); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java index 16b9c22f1de4..cd500620788e 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisWebhookService.java @@ -21,11 +21,11 @@ import de.tum.in.www1.artemis.repository.LectureUnitRepository; import de.tum.in.www1.artemis.repository.iris.IrisSettingsRepository; import de.tum.in.www1.artemis.service.FilePathService; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureDeletionExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java index 3278ed7de921..5a8c16476196 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/lectureingestionwebhook/PyrisLectureIngestionStatusUpdateDTO.java @@ -1,7 +1,6 @@ package de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook; import java.util.List; -import java.util.Optional; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java index 0544b24eda13..8f04a0a2156b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java @@ -1,6 +1,7 @@ package de.tum.in.www1.artemis.service.connectors.pyris.dto.status; import com.fasterxml.jackson.annotation.JsonInclude; + import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/src/main/webapp/app/entities/lecture.model.ts b/src/main/webapp/app/entities/lecture.model.ts index dc62cff65ff3..3c0a4ac7651d 100644 --- a/src/main/webapp/app/entities/lecture.model.ts +++ b/src/main/webapp/app/entities/lecture.model.ts @@ -22,31 +22,23 @@ export class Lecture implements BaseEntity { channelName?: string; isAtLeastEditor?: boolean; isAtLeastInstructor?: boolean; - ingested?: IngestionState; + ingested: IngestionState; constructor() { - this.ingested = this.checkIngestionState ? this.checkIngestionState() : undefined; + this.updateIngestionState(); } - private checkIngestionState?(): IngestionState { - if (!this.lectureUnits) { - return IngestionState.NOT_STARTED; - } - - const attachmentUnits = this.lectureUnits.filter((unit) => unit.type === 'attachment') as AttachmentUnit[]; - const allDone = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.DONE); - const allNotStarted = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.NOT_STARTED); - const allFailed = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.ERROR); - - if (allDone) return IngestionState.DONE; - if (allFailed) return IngestionState.ERROR; - if (allNotStarted) return IngestionState.NOT_STARTED; - - return IngestionState.PARTIALLY_INGESTED; - } - public updateIngestionState?(): void { - if (this.checkIngestionState) { - this.ingested = this.checkIngestionState(); + public updateIngestionState(): void { + this.ingested = IngestionState.NOT_STARTED; + if (this.lectureUnits) { + const attachmentUnits = this.lectureUnits.filter((unit) => unit.type === 'attachment') as AttachmentUnit[]; + const allDone = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.DONE); + const allNotStarted = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.NOT_STARTED); + const allFailed = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.ERROR); + this.ingested = IngestionState.PARTIALLY_INGESTED; + if (allDone) this.ingested = IngestionState.DONE; + if (allFailed) this.ingested = IngestionState.ERROR; + if (allNotStarted) this.ingested = IngestionState.NOT_STARTED; } } } 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 50ff3700eb37..5d31480a08c1 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 @@ -82,8 +82,8 @@ type="button" class="btn btn-primary btn-sm flex-grow-1" [ngClass]="{ - error: getIcon(lectureUnit) === resendToIris, - 'btn-success': getIcon(lectureUnit) === done, + error: getIcon(lectureUnit) === faRepeat, + 'btn-success': getIcon(lectureUnit) === faCheckCircle, }" (click)="onIngestButtonClicked(lectureUnit.id!)" [ngbTooltip]="'entity.action.sendToIris' | artemisTranslate" diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts index d740a15e859d..1b33b788b053 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts @@ -56,12 +56,12 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { }; // Icons - faTrash = faTrash; - faPencilAlt = faPencilAlt; - sendToIris = faFileExport; - resendToIris = faRepeat; - done = faCheckCircle; - loading = faSpinner; + readonly faTrash = faTrash; + readonly faPencilAlt = faPencilAlt; + readonly faFileExport = faFileExport; + readonly faRepeat = faRepeat; + readonly faCheckCircle = faCheckCircle; + readonly faSpinner = faSpinner; constructor( private activatedRoute: ActivatedRoute, @@ -247,6 +247,7 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { return undefined; } } + onIngestButtonClicked(lectureUnitId: number) { this.lectureUnitService.ingestLectureUnitInPyris(lectureUnitId, this.lecture.id!).subscribe({ error: (error) => console.error('Failed to send Ingestion request', error), @@ -256,15 +257,15 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy { getIcon(attachmentUnit: AttachmentUnit): IconDefinition { switch (attachmentUnit.pyrisIngestionState) { case IngestionState.NOT_STARTED: - return this.sendToIris; + return this.faFileExport; case IngestionState.IN_PROGRESS: - return this.loading; + return this.faSpinner; case IngestionState.DONE: - return this.done; + return this.faCheckCircle; case IngestionState.ERROR: - return this.resendToIris; + return this.faRepeat; default: - return this.sendToIris; + return this.faFileExport; } } } diff --git a/src/main/webapp/app/lecture/lecture.component.html b/src/main/webapp/app/lecture/lecture.component.html index 6d69f5dbddab..14792de82dab 100644 --- a/src/main/webapp/app/lecture/lecture.component.html +++ b/src/main/webapp/app/lecture/lecture.component.html @@ -118,10 +118,12 @@

- - - - + @if (lectureIngestionEnabled) { + + + + + } @@ -138,7 +140,9 @@

{{ lecture.visibleDate | artemisDate }} {{ lecture.startDate | artemisDate }} {{ lecture.endDate | artemisDate }} - {{ lecture.ingested?.toString() }} + @if (lectureIngestionEnabled) { + {{ lecture.ingested }} + }
diff --git a/src/main/webapp/app/lecture/lecture.component.ts b/src/main/webapp/app/lecture/lecture.component.ts index c8255267e139..cd35af947686 100644 --- a/src/main/webapp/app/lecture/lecture.component.ts +++ b/src/main/webapp/app/lecture/lecture.component.ts @@ -160,9 +160,7 @@ export class LectureComponent implements OnInit, OnDestroy { this.lectures = res.map((lectureData) => { const lecture = new Lecture(); Object.assign(lecture, lectureData); - if (lecture.updateIngestionState) { - lecture.updateIngestionState(); - } + lecture.updateIngestionState(); return lecture; }); this.applyFilters(); diff --git a/src/main/webapp/i18n/de/lecture.json b/src/main/webapp/i18n/de/lecture.json index 9cf0c411de72..3b70ee0c8ab9 100644 --- a/src/main/webapp/i18n/de/lecture.json +++ b/src/main/webapp/i18n/de/lecture.json @@ -31,7 +31,7 @@ "endDate": "Ende", "visibleDate": "Sichtbar ab", "course": "Kurs", - "ingestionState": "Vorlesungsimport in Pyris", + "ingestionState": "Vorlesungsimport Zustand in Pyris", "detail": { "title": "Vorlesung", "sections": { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java index 5739dce75386..1b329e3d6b07 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java @@ -44,9 +44,9 @@ import de.tum.in.www1.artemis.participation.ParticipationUtilService; import de.tum.in.www1.artemis.repository.iris.IrisMessageRepository; import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; +import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; -import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; import de.tum.in.www1.artemis.service.iris.IrisMessageService; import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO; diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java index 4271ea5e0375..99e9eb15dfef 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/PyrisLectureIngestionTest.java @@ -48,10 +48,10 @@ import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisWebhookService; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.IngestionState; -import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.service.connectors.pyris.domain.status.PyrisStageState; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.user.UserUtilService; class PyrisLectureIngestionTest extends AbstractIrisIntegrationTest { @@ -231,7 +231,8 @@ void testAllStagesDoneIngestionStateDone() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), lecture1.getLectureUnits().getFirst().getId()); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), + lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); Optional optionalUnit = lectureUnitRepository.findById(unit.getId()); @@ -251,7 +252,8 @@ void testAllStagesDoneRemovesDeletionIngestionJob() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), lecture1.getLectureUnits().getFirst().getId()); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage), + lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); @@ -268,7 +270,8 @@ void testStageNotDoneKeepsAdditionIngestionJob() throws Exception { String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), lecture1.getLectureUnits().getFirst().getId()); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), + lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); @@ -285,7 +288,8 @@ void testStageNotDoneKeepsDeletionIngetionJob() throws Exception { String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO doneStage = new PyrisStageDTO("done", 1, PyrisStageState.DONE, "Stage completed successfully."); PyrisStageDTO inProgressStage = new PyrisStageDTO("inProgressStage", 1, PyrisStageState.IN_PROGRESS, "Stage completed successfully."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), lecture1.getLectureUnits().getFirst().getId()); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(doneStage, inProgressStage), + lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNotNull(); @@ -301,7 +305,8 @@ void testErrorStageRemovesDeletionIngetionJob() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.deleteLectureFromPyrisDB(List.of(unit)); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), lecture1.getLectureUnits().getFirst().getId()); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), + lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); @@ -321,7 +326,8 @@ void testErrorStageRemovesAdditionIngetionJob() throws Exception { if (lecture1.getLectureUnits().getFirst() instanceof AttachmentUnit unit) { String jobToken = pyrisWebhookService.addLectureUnitToPyrisDB(unit); PyrisStageDTO errorStage = new PyrisStageDTO("error", 1, PyrisStageState.ERROR, "Stage not broke due to error."); - PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), lecture1.getLectureUnits().getFirst().getId()); + PyrisLectureIngestionStatusUpdateDTO statusUpdate = new PyrisLectureIngestionStatusUpdateDTO("Success", List.of(errorStage), + lecture1.getLectureUnits().getFirst().getId()); var headers = new HttpHeaders(new LinkedMultiValueMap<>(Map.of("Authorization", List.of("Bearer " + jobToken)))); request.postWithoutResponseBody("/api/public/pyris/webhooks/ingestion/runs/" + jobToken + "/status", statusUpdate, HttpStatus.OK, headers); assertThat(pyrisJobService.getJob(jobToken)).isNull(); diff --git a/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts index f13c7a117f3f..7430ca838828 100644 --- a/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts +++ b/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts @@ -202,6 +202,7 @@ describe('LectureUnitManagementComponent', () => { expect(lectureUnitManagementComponent.getActionType(new VideoUnit())).toEqual(ActionType.Delete); expect(lectureUnitManagementComponent.getActionType(new OnlineUnit())).toEqual(ActionType.Delete); }); + it('should call onIngestButtonClicked when button is clicked', () => { const ingestLectureUnitInPyris = jest.spyOn(lectureUnitService, 'ingestLectureUnitInPyris'); const returnValue = of(new HttpResponse({ status: 200 })); @@ -229,17 +230,18 @@ describe('LectureUnitManagementComponent', () => { it('should update the icon based on ingestion state', () => { const attachmentUnit = { pyrisIngestionState: 'NOT_STARTED' } as any; - expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.sendToIris); + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.faFileExport); attachmentUnit.pyrisIngestionState = 'IN_PROGRESS'; - expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.loading); + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.faSpinner); attachmentUnit.pyrisIngestionState = 'DONE'; - expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.done); + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.faCheckCircle); attachmentUnit.pyrisIngestionState = 'ERROR'; - expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.resendToIris); + expect(lectureUnitManagementComponent.getIcon(attachmentUnit)).toEqual(lectureUnitManagementComponent.faRepeat); }); + it('should initialize profile info and check for Iris settings', () => { const mockCourse: Course = { id: 1, title: 'Test Course' }; lectureUnitManagementComponent.lecture = { id: 2, course: mockCourse } as Lecture; diff --git a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts index 740f47091aa2..eb2d780812be 100644 --- a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts @@ -316,30 +316,28 @@ describe('Lecture', () => { lecture.course = { id: 1, title: 'Sample Course' }; expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); - if (lecture.updateIngestionState) { - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.PARTIALLY_INGESTED); - - lecture.lectureUnits = [ - { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, - { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, - ]; - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.DONE); - - lecture.lectureUnits = [ - { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, - { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, - ]; - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); - - lecture.lectureUnits = [ - { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, - { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, - ]; - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.ERROR); - } + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.PARTIALLY_INGESTED); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.DONE); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.ERROR); }); }); From 7b8f6a745c30caa43814856495134b50c789106d Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Wed, 21 Aug 2024 13:38:51 +0200 Subject: [PATCH 15/95] Fix optional updateIngestionState --- src/main/webapp/app/entities/lecture.model.ts | 34 ++++++++----- .../webapp/app/lecture/lecture.component.ts | 4 +- .../lecture/lecture.component.spec.ts | 48 ++++++++++--------- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/src/main/webapp/app/entities/lecture.model.ts b/src/main/webapp/app/entities/lecture.model.ts index 3c0a4ac7651d..e3ea750bb591 100644 --- a/src/main/webapp/app/entities/lecture.model.ts +++ b/src/main/webapp/app/entities/lecture.model.ts @@ -22,23 +22,31 @@ export class Lecture implements BaseEntity { channelName?: string; isAtLeastEditor?: boolean; isAtLeastInstructor?: boolean; - ingested: IngestionState; + ingested?: IngestionState; constructor() { - this.updateIngestionState(); + this.ingested = this.checkIngestionState(); } - public updateIngestionState(): void { - this.ingested = IngestionState.NOT_STARTED; - if (this.lectureUnits) { - const attachmentUnits = this.lectureUnits.filter((unit) => unit.type === 'attachment') as AttachmentUnit[]; - const allDone = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.DONE); - const allNotStarted = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.NOT_STARTED); - const allFailed = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.ERROR); - this.ingested = IngestionState.PARTIALLY_INGESTED; - if (allDone) this.ingested = IngestionState.DONE; - if (allFailed) this.ingested = IngestionState.ERROR; - if (allNotStarted) this.ingested = IngestionState.NOT_STARTED; + private checkIngestionState(): IngestionState { + if (!this.lectureUnits) { + return IngestionState.NOT_STARTED; + } + + const attachmentUnits = this.lectureUnits.filter((unit) => unit.type === 'attachment') as AttachmentUnit[]; + const allDone = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.DONE); + const allNotStarted = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.NOT_STARTED); + const allFailed = attachmentUnits.every((unit) => unit.pyrisIngestionState === IngestionState.ERROR); + + if (allDone) return IngestionState.DONE; + if (allFailed) return IngestionState.ERROR; + if (allNotStarted) return IngestionState.NOT_STARTED; + + return IngestionState.PARTIALLY_INGESTED; + } + public updateIngestionState?(): void { + if (this.checkIngestionState) { + this.ingested = this.checkIngestionState(); } } } diff --git a/src/main/webapp/app/lecture/lecture.component.ts b/src/main/webapp/app/lecture/lecture.component.ts index cd35af947686..c8255267e139 100644 --- a/src/main/webapp/app/lecture/lecture.component.ts +++ b/src/main/webapp/app/lecture/lecture.component.ts @@ -160,7 +160,9 @@ export class LectureComponent implements OnInit, OnDestroy { this.lectures = res.map((lectureData) => { const lecture = new Lecture(); Object.assign(lecture, lectureData); - lecture.updateIngestionState(); + if (lecture.updateIngestionState) { + lecture.updateIngestionState(); + } return lecture; }); this.applyFilters(); diff --git a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts index eb2d780812be..740f47091aa2 100644 --- a/src/test/javascript/spec/component/lecture/lecture.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/lecture.component.spec.ts @@ -316,28 +316,30 @@ describe('Lecture', () => { lecture.course = { id: 1, title: 'Sample Course' }; expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.PARTIALLY_INGESTED); - - lecture.lectureUnits = [ - { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, - { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, - ]; - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.DONE); - - lecture.lectureUnits = [ - { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, - { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, - ]; - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); - - lecture.lectureUnits = [ - { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, - { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, - ]; - lecture.updateIngestionState(); - expect(lecture.ingested).toBe(IngestionState.ERROR); + if (lecture.updateIngestionState) { + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.PARTIALLY_INGESTED); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.DONE } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.DONE); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.NOT_STARTED } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.NOT_STARTED); + + lecture.lectureUnits = [ + { id: 1, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, + { id: 2, type: 'attachment', pyrisIngestionState: IngestionState.ERROR } as AttachmentUnit, + ]; + lecture.updateIngestionState(); + expect(lecture.ingested).toBe(IngestionState.ERROR); + } }); }); From c76a4bcd4bd1404f15c8d3f77ec34db0612ea094 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Wed, 21 Aug 2024 13:43:04 +0200 Subject: [PATCH 16/95] Fix optional updateIngestionState --- src/main/webapp/app/entities/lecture.model.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/entities/lecture.model.ts b/src/main/webapp/app/entities/lecture.model.ts index e3ea750bb591..7c2e2d40a17a 100644 --- a/src/main/webapp/app/entities/lecture.model.ts +++ b/src/main/webapp/app/entities/lecture.model.ts @@ -25,10 +25,10 @@ export class Lecture implements BaseEntity { ingested?: IngestionState; constructor() { - this.ingested = this.checkIngestionState(); + this.ingested = this.checkIngestionState?.(); } - private checkIngestionState(): IngestionState { + private checkIngestionState?(): IngestionState { if (!this.lectureUnits) { return IngestionState.NOT_STARTED; } @@ -46,7 +46,7 @@ export class Lecture implements BaseEntity { } public updateIngestionState?(): void { if (this.checkIngestionState) { - this.ingested = this.checkIngestionState(); + this.ingested = this.checkIngestionState?.(); } } } From 6d0bebadda3b826d94ee15d5f52dc92ee711897f Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Wed, 21 Aug 2024 14:31:35 +0200 Subject: [PATCH 17/95] Fix server test --- .../in/www1/artemis/iris/PyrisConnectorServiceTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java b/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java index 42ad834cf2a9..a6b4e0be62b8 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/PyrisConnectorServiceTest.java @@ -3,6 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.Test; @@ -13,6 +14,8 @@ import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorException; import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureUnitWebhookDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; import de.tum.in.www1.artemis.service.iris.exception.IrisForbiddenException; import de.tum.in.www1.artemis.service.iris.exception.IrisInternalPyrisErrorException; @@ -46,7 +49,10 @@ void testExceptionV2(int httpStatus, Class exceptionClass) { @MethodSource("irisExceptions") void testExceptionIngestionV2(int httpStatus, Class exceptionClass) { irisRequestMockProvider.mockIngestionWebhookRunError(httpStatus); - assertThatThrownBy(() -> pyrisConnectorService.executeLectureAddtionWebhook("fullIngestion", null)).isInstanceOf(exceptionClass); + PyrisLectureUnitWebhookDTO pyrisLectureUnitWebhookDTO = new PyrisLectureUnitWebhookDTO("example.pdf", 123L, "Lecture Unit Name", 456L, "Lecture Name", 789L, "Course Name", + "Course Description"); + PyrisWebhookLectureIngestionExecutionDTO executionDTO = new PyrisWebhookLectureIngestionExecutionDTO(pyrisLectureUnitWebhookDTO, null, List.of()); + assertThatThrownBy(() -> pyrisConnectorService.executeLectureAddtionWebhook("fullIngestion", executionDTO)).isInstanceOf(exceptionClass); } @ParameterizedTest From cf1e5c8b0c28bd2220a6f0da29b2e095f979c7f0 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:00:39 +0200 Subject: [PATCH 18/95] merge2 --- CONTRIBUTING.md | 41 +++- docs/dev/guidelines/database.rst | 8 +- .../artemis/repository/CourseRepository.java | 2 - .../ci/ContinuousIntegrationService.java | 8 +- .../pyris/job/CompetencyExtractionJob.java | 22 ++ .../competency/CourseCompetencyResource.java | 31 +-- .../templates/aeolus/rust/default.sh | 26 ++ .../templates/aeolus/rust/default.yaml | 14 ++ .../templates/rust/exercise/src/context.rs | 1 + .../templates/rust/solution/src/context.rs | 36 +++ .../complaints-student-view.component.html | 10 +- .../complaints-for-tutor.component.html | 44 +--- .../form/complaints-form.component.html | 26 +- .../request/complaint-request.component.html | 15 +- ...-export-confirmation-dialog.component.html | 2 +- .../data-export/data-export.component.html | 6 +- .../competency-relation-graph.component.html | 10 +- .../competencies/course-competency.service.ts | 11 +- ...tency-recommendation-detail.component.html | 10 +- .../course-description-form.component.html | 12 +- .../course-description-form.component.ts | 7 +- .../import/competency-search.component.html | 24 +- .../course-scores.component.html | 12 +- .../exam-assessment-buttons.component.html | 2 +- .../course-lti-configuration.component.html | 34 +-- ...it-course-lti-configuration.component.html | 2 +- ...management-exercises-search.component.html | 28 +-- ...course-management-exercises.component.html | 4 +- .../manage/course-management.component.html | 8 +- .../course/manage/course-management.module.ts | 2 + .../manage/course-update.component.html | 38 ++- .../course-detail-line-chart.component.html | 21 +- .../course-management-card.component.html | 40 ++-- ...rse-management-exercise-row.component.html | 12 +- ...agement-overview-statistics.component.html | 2 +- ...-tutorial-group-free-period.component.html | 2 +- ...-tutorial-group-free-period.component.html | 2 +- ...eate-tutorial-group-session.component.html | 2 +- ...edit-tutorial-group-session.component.html | 2 +- ...torial-groups-configuration.component.html | 6 +- ...torial-groups-configuration.component.html | 2 +- .../create-tutorial-group.component.html | 2 +- .../edit-tutorial-group.component.html | 2 +- ...scores-average-scores-graph.component.html | 2 +- .../exam-scores/exam-scores.component.html | 145 +++++------- .../manage/exam-management.component.html | 30 +-- .../exam/manage/exam-status.component.html | 46 ++-- ...e-announcement-create-modal.component.html | 7 +- ...ive-announcement-create-modal.component.ts | 23 +- .../exam-checklist.component.html | 172 +++++++------- .../exam-edit-working-time.component.html | 2 +- .../manage/exams/exam-detail.component.html | 22 +- .../exam-import/exam-import.component.html | 8 +- .../exam-mode-picker.component.html | 17 +- .../manage/exams/exam-update.component.html | 22 +- .../students/exam-students.component.html | 2 +- ...m-students-attendance-check.component.html | 18 +- .../exam-participation-cover.component.html | 4 +- .../exam-navigation-bar.component.html | 25 +- .../exam-participation.component.html | 8 +- .../exam-general-information.component.html | 8 +- .../exam-result-summary.component.html | 8 +- .../events/exam-live-event.component.html | 17 +- ...drag-and-drop-question-edit.component.html | 27 +-- .../drag-and-drop-question-edit.component.ts | 36 ++- .../drag-and-drop-question.component.html | 20 +- .../difficulty-picker.component.html | 24 +- .../detailed-grading-system.component.html | 24 +- .../create-exercise-unit.component.html | 27 ++- ...course-competencies-details.component.html | 6 +- .../course-competencies.component.html | 10 +- ...nversations-code-of-conduct.component.html | 2 +- .../course-conversations.component.html | 4 +- .../course-wide-search.component.html | 8 +- ...conversation-add-users-form.component.html | 24 +- ...nversation-add-users-dialog.component.html | 4 +- .../conversation-detail-dialog.component.html | 41 +++- .../conversation-info.component.html | 32 ++- .../conversation-member-row.component.html | 27 ++- .../conversation-members.component.html | 18 +- .../conversation-settings.component.html | 27 ++- .../conversation-header.component.html | 10 +- .../conversation-messages.component.html | 17 +- .../course-dashboard.component.html | 2 +- .../course-exercise-row.component.html | 2 +- .../course-exercises.component.html | 2 +- .../course-lecture-details.component.html | 30 ++- .../course-lecture-row.component.html | 2 +- .../overview/course-overview.component.html | 4 +- ...course-prerequisites-button.component.html | 4 +- .../course-registration-button.component.html | 4 +- .../course-registration-detail.component.html | 8 +- .../course-prerequisites-modal.component.html | 2 +- .../course-registration.component.html | 8 +- .../course-statistics.component.html | 222 +++++++++--------- .../course-tutorial-group-card.component.html | 11 +- .../course-unenrollment-modal.component.html | 20 +- .../app/overview/courses.component.html | 12 +- .../discussion-section.component.html | 28 +-- .../course-exercise-details.component.html | 10 +- .../connection-warning.component.html | 4 +- .../consistency-check.component.html | 2 +- .../course-users-selector.component.html | 12 +- .../date-time-picker.component.html | 2 +- .../date-time-picker.component.ts | 13 +- ...tom-exercise-category-badge.component.html | 10 + ...tom-exercise-category-badge.component.scss | 18 ++ ...ustom-exercise-category-badge.component.ts | 23 ++ .../domainCommands/correctOptionCommand.ts | 32 --- .../domainCommands/credits.command.ts | 36 --- .../domain-multi-option-list.command.ts | 103 -------- .../domainCommands/domainCommand.ts | 62 ----- .../domainMultiOptionCommand.ts | 15 -- .../domainCommands/domainTag.command.ts | 6 - .../DataExportCreationServiceTest.java | 19 +- .../edit-competency.component.spec.ts | 8 +- .../edit-prerequisite.component.spec.ts | 8 +- ...cy-recommendation-detail.component.spec.ts | 4 +- .../course-description-form.component.spec.ts | 10 + .../complaints-for-tutor.component.spec.ts | 11 +- .../course/course-exercises.component.spec.ts | 3 +- .../course/course-update.component.spec.ts | 2 +- ...g-and-drop-question-edit.component.spec.ts | 33 ++- .../drag-and-drop-question.component.spec.ts | 2 - ...res-average-scores-graph.component.spec.ts | 5 +- .../exam/exam-update.component.spec.ts | 6 +- ...nnouncement-create-modal.component.spec.ts | 9 +- .../exam-navigation-bar.component.spec.ts | 5 +- .../events/exam-live-event.component.spec.ts | 12 +- .../detailed-grading-system.component.spec.ts | 2 + ...versation-add-users-form.component.spec.ts | 5 +- .../course-exams.component.spec.ts | 7 +- .../course-statistics.component.spec.ts | 18 +- .../course-users-selector.component.spec.ts | 119 +++++----- .../conversation-options.component.spec.ts | 5 +- ...urse-tutorial-group-card.component.spec.ts | 17 +- .../course-tutorial-groups.component.spec.ts | 5 +- .../course/CourseCommunicationPage.ts | 4 +- .../endpointanalysis/EndpointAnalyzer.java | 39 +-- .../endpointanalysis/EndpointInformation.java | 8 +- .../cit/endpointanalysis/EndpointParser.java | 10 +- 141 files changed, 1265 insertions(+), 1385 deletions(-) create mode 100644 src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java create mode 100644 src/main/resources/templates/aeolus/rust/default.sh create mode 100644 src/main/resources/templates/aeolus/rust/default.yaml create mode 100644 src/main/resources/templates/rust/exercise/src/context.rs create mode 100644 src/main/resources/templates/rust/solution/src/context.rs create mode 100644 src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.html create mode 100644 src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.scss create mode 100644 src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/correctOptionCommand.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/credits.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/domain-multi-option-list.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/domainCommand.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/domainMultiOptionCommand.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/domainTag.command.ts diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea3d5c107479..482bdb00df6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,43 @@ -# Contributing Guide for Artemis +# Contribution Guidelines for Artemis Read the [setup guide](https://docs.artemis.cit.tum.de/dev/setup.html) on how to set up your local development environment. -Before creating a pull request, please read the [guidelines to the development process](https://docs.artemis.cit.tum.de/dev/development-process/development-process.html) as well as the [coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines.html). +## Identity and Transparency + +To ensure a transparent and trustworthy environment, we have established different guidelines for members of our organization and external contributors. + +### For Members of Our Organization + +1. **Real Names Required**: As a member of our organization, you must use your full real name in your GitHub profile. This is a prerequisite for joining our organization. Using a real name is crucial for building trust within the team and the broader community. It fosters accountability and transparency, which are essential for collaborative work. When members use their real identities, it encourages open communication and strengthens professional relationships. Furthermore, it aligns with best practices in open-source communities, where transparency is key to ensuring the integrity and reliability of contributions. + +2. **Profile Picture**: Members are required to upload an authentic profile picture. Use a clear, professional image and avoid comic-like pictures, memojis, or other non-authentic picture styles. Using a professional and authentic profile picture is essential for establishing credibility and fostering trust within the community. It helps others easily identify and connect with you, which is crucial for effective collaboration. By using a real photo, you present yourself as a serious and committed contributor, which in turn encourages others to take your work and interactions seriously. Avoiding non-authentic images ensures that the focus remains on the substance of your contributions rather than on distractions or misunderstandings that might arise from informal or unprofessional visuals. + +3. **Direct Branching and PR Creation**: As a member, you are encourages to create branches and pull requests (PRs) directly within the repository. Please follow the internal branching and code review processes outlined in [guidelines to the development process](https://docs.artemis.cit.tum.de/dev/development-process/development-process.html) and [coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines.html). + +### For External Contributors + +1. **Identity Verification**: External contributions will only be considered if the contributor uses their real name and an authentic profile picture (see above). This ensures accountability and trustworthiness in all external contributions. + +2. **Forking the Repository**: External contributors fork the repository and work on changes in their own branches. + +3. **Submit a Pull Request**: Once your work is complete, submit a pull request for review. Ensure that your branch is up to date with the main branch before submitting. + +4. **Compliance**: Contributions from external contributors that do not adhere to these guidelines may not be accepted. + +### References and Best Practices + +- We align our guidelines with the [GitHub Acceptable Use Policies](https://docs.github.com/en/site-policy/acceptable-use-policies) which stress the importance of authenticity and transparency in user profiles. +- For more insights on contributing to open-source projects, we recommend reviewing the [Open Source Guides by GitHub](https://opensource.guide/). + +By following these guidelines, we foster a collaborative environment built on mutual trust and respect, essential for the success of our project. + +## Contribution Process + +1. **External contributors only**: Fork the Repository and create a branch. +2. **Create a feature branch**: Work on your changes in a separate branch. +3. **Submit a pull request**: Once your work is complete, submit a pull request for review. + +Thank you for your contributions and for helping us maintain a high standard of quality and trust in this project. + + diff --git a/docs/dev/guidelines/database.rst b/docs/dev/guidelines/database.rst index 7898ab2caa33..0c7119159a9d 100644 --- a/docs/dev/guidelines/database.rst +++ b/docs/dev/guidelines/database.rst @@ -1,8 +1,6 @@ -********************** -Database Relationships -********************** - -WORK IN PROGRESS +******** +Database +******** 1. Retrieving and Building Objects ================================== diff --git a/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java index 470e789cdb27..1187d8c0e11d 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java @@ -222,8 +222,6 @@ SELECT COUNT(c) > 0 List findAllByShortName(String shortName); - Optional findById(long courseId); - /** * Returns the title of the course with the given id. * diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java index f22eebc954bf..2cb70653b3d4 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java @@ -219,8 +219,8 @@ enum RepositoryCheckoutPath implements CustomizableCheckoutPath { @Override public String forProgrammingLanguage(ProgrammingLanguage language) { return switch (language) { - case JAVA, PYTHON, C, HASKELL, KOTLIN, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY -> "assignment"; - case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVA, PYTHON, C, HASKELL, KOTLIN, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST -> "assignment"; + case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException("Unsupported programming language: " + language); }; } @@ -230,9 +230,9 @@ public String forProgrammingLanguage(ProgrammingLanguage language) { @Override public String forProgrammingLanguage(ProgrammingLanguage language) { return switch (language) { - case JAVA, PYTHON, HASKELL, KOTLIN, SWIFT, EMPTY -> ""; + case JAVA, PYTHON, HASKELL, KOTLIN, SWIFT, EMPTY, RUST -> ""; case C, VHDL, ASSEMBLER, OCAML -> "tests"; - case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException("Unsupported programming language: " + language); }; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java new file mode 100644 index 000000000000..2a76f5a3b072 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java @@ -0,0 +1,22 @@ +package de.tum.in.www1.artemis.service.connectors.pyris.job; + +import com.fasterxml.jackson.annotation.JsonInclude; + +import de.tum.in.www1.artemis.domain.Course; + +/** + * A pyris job that extracts competencies from a course description. + * + * @param jobId the job id + * @param courseId the course in which the competencies are being extracted + * @param userLogin the user login of the user who started the job + */ +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public record CompetencyExtractionJob(String jobId, long courseId, String userLogin) implements PyrisJob { + + @Override + public boolean canAccess(Course course) { + return course.getId().equals(courseId); + } + +} diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java index a3fdf0875c31..036b673d1674 100644 --- a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java +++ b/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java @@ -46,9 +46,10 @@ import de.tum.in.www1.artemis.service.competency.CompetencyProgressService; import de.tum.in.www1.artemis.service.competency.CompetencyRelationService; import de.tum.in.www1.artemis.service.competency.CourseCompetencyService; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; import de.tum.in.www1.artemis.service.feature.Feature; import de.tum.in.www1.artemis.service.feature.FeatureToggle; -import de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService; +import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService; import de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO; import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO; import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO; @@ -80,7 +81,7 @@ public class CourseCompetencyResource { private final CompetencyRelationService competencyRelationService; - private final Optional irisCompetencyGenerationSessionService; + private final Optional irisCompetencyGenerationService; private final CompetencyJolService competencyJolService; @@ -91,7 +92,7 @@ public class CourseCompetencyResource { public CourseCompetencyResource(UserRepository userRepository, CourseCompetencyService courseCompetencyService, CourseCompetencyRepository courseCompetencyRepository, CourseRepository courseRepository, CompetencyProgressService competencyProgressService, CompetencyProgressRepository competencyProgressRepository, CompetencyRelationRepository competencyRelationRepository, CompetencyRelationService competencyRelationService, - Optional irisCompetencyGenerationSessionService, CompetencyJolService competencyJolService, + Optional irisCompetencyGenerationService, CompetencyJolService competencyJolService, AuthorizationCheckService authorizationCheckService) { this.userRepository = userRepository; this.courseCompetencyService = courseCompetencyService; @@ -101,7 +102,7 @@ public CourseCompetencyResource(UserRepository userRepository, CourseCompetencyS this.competencyProgressRepository = competencyProgressRepository; this.competencyRelationRepository = competencyRelationRepository; this.competencyRelationService = competencyRelationService; - this.irisCompetencyGenerationSessionService = irisCompetencyGenerationSessionService; + this.irisCompetencyGenerationService = irisCompetencyGenerationService; this.competencyJolService = competencyJolService; this.authorizationCheckService = authorizationCheckService; } @@ -332,25 +333,25 @@ public ResponseEntity removeCompetencyRelation(@PathVariable long courseId } /** - * POST courses/:courseId/course-competencies/generate-from-description : Generates a list of course competencies from a given course description by using - * IRIS. + * POST courses/:courseId/course-competencies/:competencyId/competencies/generate-from-description + * Generates a list of competencies from a given course description with IRIS. * - * @param courseId the id of the current course - * @param courseDescription the text description of the course - * @return the ResponseEntity with status 200 (OK) and body the generated competencies + * @param courseId the id of the current course + * @param input the course description and current competencies + * @return the ResponseEntity with status 202 (Accepted) */ @PostMapping("courses/{courseId}/course-competencies/generate-from-description") @EnforceAtLeastEditorInCourse - public ResponseEntity> generateCompetenciesFromCourseDescription(@PathVariable Long courseId, @RequestBody String courseDescription) { - var irisService = irisCompetencyGenerationSessionService.orElseThrow(); + public ResponseEntity generateCompetenciesFromCourseDescription(@PathVariable Long courseId, @RequestBody PyrisCompetencyExtractionInputDTO input) { + var competencyGenerationService = irisCompetencyGenerationService.orElseThrow(); var user = userRepository.getUserWithGroupsAndAuthorities(); var course = courseRepository.findByIdElseThrow(courseId); - var session = irisService.getOrCreateSession(course, user); - irisService.addUserTextMessageToSession(session, courseDescription); - var competencies = irisService.executeRequest(session); + // Start the Iris competency generation pipeline for the given course. + // The generated competencies will be sent async over the websocket on the topic /topic/iris/competencies/{courseId} + competencyGenerationService.executeCompetencyExtractionPipeline(user, course, input.courseDescription(), input.currentCompetencies()); - return ResponseEntity.ok(competencies); + return ResponseEntity.accepted().build(); } /** diff --git a/src/main/resources/templates/aeolus/rust/default.sh b/src/main/resources/templates/aeolus/rust/default.sh new file mode 100644 index 000000000000..d1ba23293a58 --- /dev/null +++ b/src/main/resources/templates/aeolus/rust/default.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +set -e +export AEOLUS_INITIAL_DIRECTORY=${PWD} +build () { + echo '⚙️ executing build' + cargo build --verbose +} + +run_all_tests () { + echo '⚙️ executing run_all_tests' + cargo nextest run --profile ci +} + +main () { + if [[ "${1}" == "aeolus_sourcing" ]]; then + return 0 # just source to use the methods in the subshell, no execution + fi + local _script_name + _script_name=${BASH_SOURCE[0]:-$0} + cd "${AEOLUS_INITIAL_DIRECTORY}" + bash -c "source ${_script_name} aeolus_sourcing; build" + cd "${AEOLUS_INITIAL_DIRECTORY}" + bash -c "source ${_script_name} aeolus_sourcing; run_all_tests" +} + +main "${@}" diff --git a/src/main/resources/templates/aeolus/rust/default.yaml b/src/main/resources/templates/aeolus/rust/default.yaml new file mode 100644 index 000000000000..4cd44c110048 --- /dev/null +++ b/src/main/resources/templates/aeolus/rust/default.yaml @@ -0,0 +1,14 @@ +api: v0.0.1 +metadata: + name: Rust + id: rust + description: Test crate using cargo +actions: + - name: build + script: cargo build --verbose + - name: run_all_tests + script: cargo nextest run --profile ci + results: + - name: junit_target/nextest/ci/junit.xml + path: target/nextest/ci/junit.xml + type: junit diff --git a/src/main/resources/templates/rust/exercise/src/context.rs b/src/main/resources/templates/rust/exercise/src/context.rs new file mode 100644 index 000000000000..30940f4db7a7 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/context.rs @@ -0,0 +1 @@ +// TODO: Create and implement a Context struct according to the UML class diagram diff --git a/src/main/resources/templates/rust/solution/src/context.rs b/src/main/resources/templates/rust/solution/src/context.rs new file mode 100644 index 000000000000..71cd0d711753 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/context.rs @@ -0,0 +1,36 @@ +use crate::sort_strategy::SortStrategy; +use chrono::NaiveDate; +use std::ops::Deref; + +pub struct Context { + sort_algorithm: Option>>, +} + +impl Context { + pub fn new() -> Context { + Context { + sort_algorithm: None, + } + } + + /// Runs the configured sorting algorithm. + pub fn sort(&self, data: &mut [NaiveDate]) { + let sort_algorithm = self + .sort_algorithm + .as_ref() + .expect("sort_algorithm has to be set before sort() is called"); + + sort_algorithm.perform_sort(data); + } + + pub fn set_sort_algorithm(&mut self, sort_algorithm: Box>) { + self.sort_algorithm = Some(sort_algorithm); + } + + pub fn sort_algorithm(&self) -> &dyn SortStrategy { + self.sort_algorithm + .as_ref() + .expect("sort_algorithm has to be set") + .deref() + } +} diff --git a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html index efd1d1c458d1..c59190b2dad7 100644 --- a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html +++ b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html @@ -30,9 +30,8 @@ ? ('artemisApp.complaint.complaintNotAllowedTooltip' | artemisTranslate) : '' }}" - > - {{ 'artemisApp.complaint.moreInfo' | artemisTranslate }} - + jhiTranslate="artemisApp.complaint.moreInfo" + > } @if (!isExamMode && course?.requestMoreFeedbackEnabled) { + jhiTranslate="artemisApp.moreFeedback.button" + > }
} diff --git a/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html b/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html index 0997b352dbbd..97bd1ae26257 100644 --- a/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html +++ b/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html @@ -1,25 +1,20 @@ @if (isLoading) {
} @if (!isLoading && complaint) { -

- {{ complaint.complaintType === ComplaintType.MORE_FEEDBACK ? ('artemisApp.moreFeedback.review' | artemisTranslate) : ('artemisApp.complaint.review' | artemisTranslate) }} -

+

} @if (!isLoading && complaint) {
@if (handled) { -
- {{ - complaint.complaintType === ComplaintType.MORE_FEEDBACK - ? ('artemisApp.moreFeedback.alreadyHandled' | artemisTranslate) - : ('artemisApp.complaint.complaintAlreadyHandled' | artemisTranslate) - }} -
+
}
@if (showLockDuration) { @@ -35,21 +30,13 @@

} @if (lockedByCurrentUser) { - + }

- {{ - complaint.complaintType === ComplaintType.MORE_FEEDBACK - ? ('artemisApp.moreFeedback.title' | artemisTranslate) - : ('artemisApp.complaint.title' | artemisTranslate) - }} - + @if (handled) { @if (complaint?.accepted) { @@ -71,13 +58,9 @@

@if (handled || isAllowedToRespond) {
-

- {{ - complaint.complaintType === ComplaintType.MORE_FEEDBACK - ? ('artemisApp.moreFeedbackResponse.title' | artemisTranslate) - : ('artemisApp.complaintResponse.title' | artemisTranslate) - }} -

+

diff --git a/src/main/webapp/app/complaints/request/complaint-request.component.html b/src/main/webapp/app/complaints/request/complaint-request.component.html index 5c3b8f448f1c..2f86094c7345 100644 --- a/src/main/webapp/app/complaints/request/complaint-request.component.html +++ b/src/main/webapp/app/complaints/request/complaint-request.component.html @@ -7,18 +7,13 @@ }} {{ complaint.submittedTime | artemisTimeAgo }} @if (complaint.accepted === true) { - - {{ - complaint.complaintType === ComplaintType.COMPLAINT - ? ('artemisApp.complaint.acceptedLong' | artemisTranslate) - : ('artemisApp.moreFeedback.acceptedLong' | artemisTranslate) - }} - + } @if (complaint.accepted === false) { - - {{ 'artemisApp.complaint.rejectedLong' | artemisTranslate }} - + }

- +
- + {{ 'artemisApp.course.exercise.search.cardTitle' | artemisTrans
- + {{ 'artemisApp.course.exercise.search.cardTitle' | artemisTrans />
- + (focus)="tzFocus$.next($any($event).target.value)" (click)="tzClick$.next($any($event).target.value)" /> -
- {{ 'artemisApp.forms.configurationForm.timeZoneInput.explanation' | artemisTranslate }} -
+
}
diff --git a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html index b499fda9b56b..9d379b38622e 100644 --- a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html +++ b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html @@ -1,7 +1,7 @@
-
{{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}
+
@@ -16,25 +16,24 @@
{{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}
[disabled]="!showLifetimeOverview && displayedNumberOfWeeks === 4" (click)="displayPeriodOverview(4)" ngbTooltip="{{ 'artemisApp.courseStatistics.scopeButton.periodTooltip' | artemisTranslate: { amount: 4 } }}" - > - {{ 'artemisApp.courseStatistics.scopeButton.period' | artemisTranslate: { amount: 4 } }} - + jhiTranslate="artemisApp.courseStatistics.scopeButton.period" + [translateValues]="{ amount: 4 }" + > + jhiTranslate="artemisApp.courseStatistics.scopeButton.period" + [translateValues]="{ amount: 8 }" + > + jhiTranslate="artemisApp.courseStatistics.scopeButton.overview" + >
| } @@ -85,7 +84,7 @@

} @else { -

{{ 'artemisApp.course.notStartedYet' | artemisTranslate }}

+

{{ course.startDate | artemisDate }}

 } diff --git a/src/main/webapp/app/course/manage/overview/course-management-card.component.html b/src/main/webapp/app/course/manage/overview/course-management-card.component.html index 3619d90a93d8..adf01ba9af77 100644 --- a/src/main/webapp/app/course/manage/overview/course-management-card.component.html +++ b/src/main/webapp/app/course/manage/overview/course-management-card.component.html @@ -40,9 +40,7 @@

{{ course.title }} ({{ } @if (courseWithUsers.numberOfStudents === undefined) { - - {{ 'artemisApp.course.students' | artemisTranslate }} - + }

@@ -57,9 +55,7 @@

{{ course.title }} ({{ } @if (courseWithUsers.numberOfTeachingAssistants === undefined) { - - {{ 'artemisApp.course.tutors' | artemisTranslate }} - + }

@@ -76,9 +72,7 @@

{{ course.title }} ({{ } @if (courseWithUsers.numberOfEditors === undefined) { - - {{ 'artemisApp.course.editors' | artemisTranslate }} - + }

@@ -93,9 +87,7 @@

{{ course.title }} ({{ } @if (courseWithUsers.numberOfInstructors === undefined) { - - {{ 'artemisApp.course.instructors' | artemisTranslate }} - + }

@@ -116,7 +108,7 @@

{{ course.title }} ({{
- {{ 'artemisApp.course.releasedSoon' | artemisTranslate }} +
@if (showFutureExercises) {
@@ -139,7 +131,7 @@

{{ course.title }} ({{
- {{ 'artemisApp.course.currentWorking' | artemisTranslate }} +
@if (showCurrentExercises) {
@@ -162,7 +154,7 @@

{{ course.title }} ({{
- {{ 'artemisApp.course.inAssessment' | artemisTranslate }} +
@if (showExercisesInAssessment) {
@@ -185,7 +177,7 @@

{{ course.title }} ({{
- {{ 'artemisApp.course.pastExercises' | artemisTranslate: { amount: pastExercises.length, total: pastExerciseCount } }} +
@if (showPastExercises) {
@@ -206,7 +198,7 @@

{{ course.title }} ({{ } @if ((futureExercises?.length || 0) + (currentExercises?.length || 0) + (exercisesInAssessment?.length || 0) + (pastExercises?.length || 0) === 0) {
-

{{ 'artemisApp.course.noExercises' | artemisTranslate }}

+

}

@@ -240,7 +232,7 @@

{{ 'artemisApp.course.noExer id="course-card-open-exams" > - {{ 'entity.action.exams' | artemisTranslate }} + } @if (course.isAtLeastTutor) { @@ -252,7 +244,7 @@

{{ 'artemisApp.course.noExer id="course-card-open-exercises" > - {{ 'entity.action.exercise' | artemisTranslate }} + } @if (course.isAtLeastEditor) { @@ -263,7 +255,7 @@

{{ 'artemisApp.course.noExer id="course-card-open-lectures" > - {{ 'entity.action.lecture' | artemisTranslate }} + } @if (course.isAtLeastTutor) { @@ -274,7 +266,7 @@

{{ 'artemisApp.course.noExer id="course-card-open-open-statistics" > - {{ 'artemisApp.courseStatistics.statistics' | artemisTranslate }} + } @if (isCommunicationEnabled(course) && course.isAtLeastTutor) { @@ -284,7 +276,7 @@

{{ 'artemisApp.course.noExer [ngbTooltip]="'artemisApp.courseOverview.menu.communication' | artemisTranslate" > - {{ 'artemisApp.metis.communication.label' | artemisTranslate }} + } @if (course.timeZone || course.isAtLeastInstructor) { @@ -332,7 +324,7 @@

{{ 'artemisApp.course.noExer id="course-card-open-assessment-dashboard" > - {{ 'entity.action.assessmentDashboard' | artemisTranslate }} + } @if (course.isAtLeastInstructor) { @@ -343,7 +335,7 @@

{{ 'artemisApp.course.noExer id="course-card-open-scores" > - {{ 'entity.action.scores' | artemisTranslate }} + }

diff --git a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html index f4940c20c0c4..e5f8cdd9dee2 100644 --- a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html +++ b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html @@ -25,7 +25,7 @@
- {{ 'artemisApp.course.releaseDate' | artemisTranslate }} + @if (!details.releaseDate) {
@@ -51,7 +51,7 @@
- {{ 'artemisApp.course.dueDate' | artemisTranslate }} + @if (!details.dueDate) {
@@ -77,7 +77,7 @@
- {{ 'artemisApp.course.assessmentDueDate' | artemisTranslate }} + @if (!details.assessmentDueDate) {
@@ -105,7 +105,7 @@
@if (statistic && rowType === exerciseRowType.CURRENT) {
- {{ 'artemisApp.course.participations' | artemisTranslate }} + - {{ 'artemisApp.course.assessmentProgress' | artemisTranslate }} + - {{ 'artemisApp.course.averageScore' | artemisTranslate }} +
-

{{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}

+

diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html index f0f12f3eaf09..a810c1c0c46d 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html @@ -2,7 +2,7 @@ @if (isInitialized) {
-

{{ 'artemisApp.pages.createTutorialFreePeriod.title' | artemisTranslate }}

+

diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html index b7f69a950451..9df0a8393f78 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html @@ -2,7 +2,7 @@ @if (isInitialized) {
-

{{ 'artemisApp.pages.editTutorialFreePeriod.title' | artemisTranslate }}

+

diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html index b2c5a5875541..a4637425d034 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html @@ -2,7 +2,7 @@ @if (isInitialized) {
-

{{ 'artemisApp.pages.createTutorialSession.title' | artemisTranslate }}

+

diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html index 41e95ab0fb46..bbd1add0ab9b 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html @@ -2,7 +2,7 @@ @if (isInitialized) {
-

{{ 'artemisApp.pages.editTutorialSession.title' | artemisTranslate }}

+

diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html index 8ff2c70883d0..57d838855af1 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html @@ -1,7 +1,5 @@ -

{{ 'artemisApp.pages.createTutorialGroupsConfiguration.title' | artemisTranslate }}

- +

+ diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html index 9bd9a4cf4b68..383e1f597c22 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html @@ -1,4 +1,4 @@ -

{{ 'artemisApp.pages.editTutorialGroupsConfiguration.title' | artemisTranslate }}

+

diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html index 25250488c664..9dd9e8d60e8e 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html @@ -1,5 +1,5 @@ -

{{ 'artemisApp.pages.createTutorialGroup.title' | artemisTranslate }}

+

@if (course) { } diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html index a6e1ba53502d..47c46d6b6a74 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html @@ -1,5 +1,5 @@ -

{{ 'artemisApp.pages.editTutorialGroup.title' | artemisTranslate }}

+

@if (course) { } diff --git a/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html b/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html index 47e15fab1953..35ab48c1854a 100644 --- a/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html +++ b/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html @@ -1,6 +1,6 @@
-
{{ 'artemisApp.examScores.exerciseGroupTitle' | artemisTranslate: { groupTitle: this.averageScores.title } }}
+
- {{ 'artemisApp.examScores.noExerciseGroupAvailable' | artemisTranslate }} +
} @if (!studentResults) {
- {{ 'artemisApp.examScores.noStudentResultAvailable' | artemisTranslate }} +
}
@@ -58,7 +58,7 @@

[checked]="filterForSubmittedExams" (change)="toggleFilterForSubmittedExam()" /> - +

[checked]="filterForNonEmptySubmissions" (change)="toggleFilterForNonEmptySubmission()" /> - +
@@ -78,24 +78,16 @@

@if (gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.secondCorrectionColumn' | artemisTranslate }} - + } @if (gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.firstCorrectionColumn' | artemisTranslate }} - + } @if (!gradingScaleExists || isBonus) { - - {{ 'artemisApp.examScores.secondCorrectionColumn' | artemisTranslate }} - + } @if (!gradingScaleExists || isBonus) { - - {{ 'artemisApp.examScores.firstCorrectionColumn' | artemisTranslate }} - + } @@ -104,36 +96,24 @@

@if (gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }} - + } - - {{ 'artemisApp.examScores.submittedColumn' | artemisTranslate }} - - - {{ 'artemisApp.examScores.totalColumn' | artemisTranslate }} - + + @if (hasSecondCorrectionAndStarted && gradingScaleExists && !isBonus) { - - {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }} - + } @if (hasSecondCorrectionAndStarted) { - - {{ 'artemisApp.examScores.submittedColumn' | artemisTranslate }} - + } @if (hasSecondCorrectionAndStarted) { - - {{ 'artemisApp.examScores.totalColumn' | artemisTranslate }} - + } - {{ 'artemisApp.examScores.noOfExams' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.noOfExamsFilteredForPassed }} @@ -158,7 +138,7 @@

} - {{ 'artemisApp.examScores.averagePointsColumn' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.meanPointsPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.meanPointsPassed) : '-' }} @@ -200,9 +180,7 @@

@if (gradingScaleExists) { - - {{ isBonus ? ('artemisApp.examScores.averageBonusColumn' | artemisTranslate) : ('artemisApp.examScores.averageGradeColumn' | artemisTranslate) }} - + @if (!isBonus) { {{ aggregatedExamResults.meanGradePassed !== null ? aggregatedExamResults.meanGradePassed : '-' }} } @@ -226,7 +204,7 @@

} - {{ 'artemisApp.examScores.medianColumn' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.medianPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.medianPassed) : '-' }} @@ -272,9 +250,7 @@

@if (gradingScaleExists) { - - {{ isBonus ? ('artemisApp.examScores.medianBonusColumn' | artemisTranslate) : ('artemisApp.examScores.medianGradeColumn' | artemisTranslate) }} - + @if (!isBonus) { {{ aggregatedExamResults.medianGradePassed !== null ? aggregatedExamResults.medianGradePassed : '-' }} } @@ -298,7 +274,7 @@

} - {{ 'artemisApp.examScores.standardDeviationColumn' | artemisTranslate }} + @if (gradingScaleExists && !isBonus) { {{ aggregatedExamResults.standardDeviationPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.standardDeviationPassed) : '-' }} @@ -330,7 +306,7 @@

@if (gradingScaleExists && hasNumericGrades) { - {{ 'artemisApp.examScores.standardGradeDeviationColumn' | artemisTranslate }} + @if (!isBonus) { {{ @@ -373,30 +349,30 @@

@if (gradingScaleExists && this.aggregatedExamResults.medianRelativePassed !== null) {
- +
}
- +
@if (hasBonus) { -

- {{ 'artemisApp.examScores.gradesBeforeBonus' | artemisTranslate }} -

+

}
@if (hasBonus) { -

- {{ 'artemisApp.examScores.gradesAfterBonus' | artemisTranslate }} -

+

} @if (hasBonus) {
@@ -448,9 +422,7 @@

# - - {{ 'artemisApp.examScores.titleExerciseGroupColumn' | artemisTranslate }} - + {{ 'artemisApp.examScores.participantsColumn' | artemisTranslate }} @@ -460,17 +432,9 @@

@if (gradingScaleExists) { - - {{ - isBonus - ? ('artemisApp.examScores.averageBonusColumn' | artemisTranslate) - : ('artemisApp.examScores.averageGradeColumn' | artemisTranslate) - }} - + } - - {{ 'artemisApp.examScores.titleExerciseColumn' | artemisTranslate }} - + {{ 'artemisApp.examScores.participantsColumn' | artemisTranslate }} @@ -585,44 +549,43 @@

@if (gradingScaleExists) { - {{ - isBonus ? ('artemisApp.examScores.overallBonusColumn' | artemisTranslate) : ('artemisApp.examScores.overallGradeColumn' | artemisTranslate) - }} + } @if (hasBonus) { @if (presentationScoreThreshold !== undefined) { - {{ 'artemisApp.examScores.presentationScoreThresholdColumn' | artemisTranslate: { threshold: presentationScoreThreshold } }} + } - {{ - hasBonus === BonusStrategy.POINTS - ? ('artemisApp.examScores.bonusPointsColumn' | artemisTranslate) - : ('artemisApp.examScores.bonusGradeColumn' | artemisTranslate) - }} + - {{ 'artemisApp.examScores.finalGradeColumn' | artemisTranslate }} + } @if (gradingScaleExists && !isBonus) { - {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }} + } @if (hasPlagiarismVerdicts) { - {{ 'artemisApp.examScores.mostSeverePlagiarismVerdictColumn' | artemisTranslate }} + } @if (hasPlagiarismVerdictsInBonusSource) { - {{ 'artemisApp.examScores.mostSeverePlagiarismVerdictInBonusColumn' | artemisTranslate }} + } diff --git a/src/main/webapp/app/exam/manage/exam-management.component.html b/src/main/webapp/app/exam/manage/exam-management.component.html index f7689477c83e..d56b14cda7f6 100644 --- a/src/main/webapp/app/exam/manage/exam-management.component.html +++ b/src/main/webapp/app/exam/manage/exam-management.component.html @@ -7,11 +7,11 @@

- {{ 'artemisApp.examManagement.importExam' | artemisTranslate }} + - {{ 'artemisApp.examManagement.createExam' | artemisTranslate }} +

} @@ -24,15 +24,15 @@

- {{ 'global.field.id' | artemisTranslate }} + - {{ 'artemisApp.exam.title' | artemisTranslate }} + - {{ 'artemisApp.examStatus.columnTitle' | artemisTranslate }} + @@ -61,10 +61,10 @@

} @if (!exam.testExam) { -
{{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }}
+
} @if (exam.testExam) { -
{{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }}
+
} @@ -82,7 +82,7 @@

- {{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }} +
} @@ -94,7 +94,7 @@

- {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
} @@ -106,7 +106,7 @@

- {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} +
} @@ -114,7 +114,7 @@

- {{ 'entity.action.edit' | artemisTranslate }} +
} @@ -123,7 +123,7 @@

- {{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }} + } @if (!exam.testExam && course.isAtLeastInstructor) { @@ -133,19 +133,19 @@

- {{ 'artemisApp.examManagement.students' | artemisTranslate }} + } @if (course.isAtLeastInstructor) { - {{ 'entity.action.scores' | artemisTranslate }} + } @if (course.isAtLeastInstructor) { - {{ 'artemisApp.examManagement.examChecklist' | artemisTranslate }} + }
diff --git a/src/main/webapp/app/exam/manage/exam-status.component.html b/src/main/webapp/app/exam/manage/exam-status.component.html index 8e51dc8bc66b..a308dd071108 100644 --- a/src/main/webapp/app/exam/manage/exam-status.component.html +++ b/src/main/webapp/app/exam/manage/exam-status.component.html @@ -12,12 +12,13 @@ }
-
{{ 'artemisApp.examStatus.preparation.' + (isTestExam ? 'testExam.' : '') + 'examPreparation' | artemisTranslate }}
+
  1. - {{ - 'artemisApp.examStatus.preparation.configureExercises' | artemisTranslate: { amount: exam.exerciseGroups ? exam.exerciseGroups.length : 0 } - }} + @if (configuredExercises) { } @@ -32,14 +33,14 @@
    {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? } @if (maxPointExercises !== exam.examMaxPoints) { - {{ 'artemisApp.examStatus.preparation.testExam.maxPointsWrong' | artemisTranslate: { points: maxPointExercises } }} + }
    2. } @if (!isTestExam) {
  2. - {{ 'artemisApp.examStatus.preparation.registerStudents' | artemisTranslate: { registered: exam.numberOfExamUsers } }} + @if (registeredStudents) { } @@ -50,22 +51,19 @@
    {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? } @if (!isTestExam) {
  3. - {{ 'artemisApp.examStatus.preparation.generateStudentExams' | artemisTranslate }} + @if (!registeredStudents) { - {{ 'artemisApp.examStatus.preparation.notRegistered' | artemisTranslate }} + } @if (registeredStudents) { - - {{ - 'artemisApp.examStatus.preparation.registered' - | artemisTranslate - : { - generated: numberOfGeneratedStudentExams, - total: exam.numberOfExamUsers, - } - }} - + } @if (generatedStudentExams) { @@ -77,7 +75,7 @@
    {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? } @if (!isTestExam) {
  4. - {{ 'artemisApp.examStatus.preparation.prepareExerciseStart' | artemisTranslate }} + @if (preparedExerciseStart) { } @@ -115,13 +113,13 @@
    {{ 'artemisApp.examStatus.preparation.' + (isTestExam ?
-
{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'examConduction' | artemisTranslate }}
+
{{ exam.startDate | artemisDate }} - {{ exam.endDate | artemisDate }}
@if (examConductionState === examConductionStateEnum.ERROR) {
-
{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'conductionSuspended' | artemisTranslate }}
+
} @if (course?.isAtLeastInstructor && examChecklist && examConductionState !== examConductionStateEnum.ERROR) { @@ -179,7 +177,7 @@
{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + ' }
-
{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}
+
@if (examChecklist) {
    @if (examChecklist.numberOfTotalExamAssessmentsFinishedByCorrectionRound !== null && numberOfSubmitted !== 0) { @@ -215,9 +213,7 @@
    {{ 'artemisApp.examStatus.correction.examCorrection' | a } @if (!exam.publishResultsDate) { - - {{ 'artemisApp.examStatus.correction.notSet' | artemisTranslate }} - + }
    diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html index 0b05bacb6172..d6ec36ee35e0 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html @@ -9,15 +9,14 @@

    -
    diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts index d76862155c27..fb9414672e52 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts @@ -1,18 +1,17 @@ import { Component } from '@angular/core'; import { SafeHtml } from '@angular/platform-browser'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { BoldCommand } from 'app/shared/markdown-editor/commands/bold.command'; -import { ItalicCommand } from 'app/shared/markdown-editor/commands/italic.command'; -import { UnderlineCommand } from 'app/shared/markdown-editor/commands/underline.command'; -import { CodeCommand } from 'app/shared/markdown-editor/commands/code.command'; -import { CodeBlockCommand } from 'app/shared/markdown-editor/commands/codeblock.command'; -import { OrderedListCommand } from 'app/shared/markdown-editor/commands/orderedListCommand'; -import { UnorderedListCommand } from 'app/shared/markdown-editor/commands/unorderedListCommand'; import { ExamManagementService } from 'app/exam/manage/exam-management.service'; import { ExamLiveEventType, ExamWideAnnouncementEvent } from 'app/exam/participate/exam-participation-live-events.service'; import { faCheckCircle, faSpinner } from '@fortawesome/free-solid-svg-icons'; import { AccountService } from 'app/core/auth/account.service'; import dayjs from 'dayjs/esm'; +import { MonacoBoldAction } from 'app/shared/monaco-editor/model/actions/monaco-bold.action'; +import { MonacoItalicAction } from 'app/shared/monaco-editor/model/actions/monaco-italic.action'; +import { MonacoUnderlineAction } from 'app/shared/monaco-editor/model/actions/monaco-underline.action'; +import { MonacoCodeAction } from 'app/shared/monaco-editor/model/actions/monaco-code.action'; +import { MonacoCodeBlockAction } from 'app/shared/monaco-editor/model/actions/monaco-code-block.action'; +import { MonacoOrderedListAction } from 'app/shared/monaco-editor/model/actions/monaco-ordered-list.action'; @Component({ selector: 'jhi-exam-live-announcement-create-modal', @@ -20,7 +19,15 @@ import dayjs from 'dayjs/esm'; styleUrls: ['./exam-live-announcement-create-modal.component.scss'], }) export class ExamLiveAnnouncementCreateModalComponent { - COMMANDS = [new BoldCommand(), new ItalicCommand(), new UnderlineCommand(), new CodeCommand(), new CodeBlockCommand(), new OrderedListCommand(), new UnorderedListCommand()]; + actions = [ + new MonacoBoldAction(), + new MonacoItalicAction(), + new MonacoUnderlineAction(), + new MonacoCodeAction(), + new MonacoCodeBlockAction(), + new MonacoOrderedListAction(), + new MonacoOrderedListAction(), + ]; courseId: number; examId: number; diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html index 62378895923a..d0525ddc1928 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html @@ -1,13 +1,13 @@ @if (exam?.course?.isAtLeastInstructor) {

    - {{ 'artemisApp.examManagement.checklist.' + (isTestExam ? 'testExam.' : '') + 'title' | artemisTranslate }} +

    @if (!isTestExam) {

    {{ 'artemisApp.examManagement.checklist.introduction' | artemisTranslate }} - {{ 'artemisApp.examManagement.checklist.linkDescription' | artemisTranslate }} + {{ 'artemisApp.examManagement.checklist.introductionPart2' | artemisTranslate }}

    @@ -15,13 +15,11 @@

    @if (isTestExam) {

    - {{ 'artemisApp.examManagement.checklist.testExam.introduction' | artemisTranslate }} +

    }
    -

    - {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? 'testExam.' : '') + 'examPreparation' | artemisTranslate }} -

    +

    @@ -30,13 +28,13 @@

    #

    @@ -44,16 +42,16 @@

    @@ -132,20 +131,20 @@

    @@ -209,10 +208,10 @@

    - {{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }} +
    1 - {{ 'artemisApp.examManagement.checklist.tableItem.exerciseGroups' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.exerciseGroups' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.leastoneexercisegroup' | artemisTranslate }} +
    • @@ -66,30 +64,31 @@

      (exam.numberOfExercisesInExam ?? 0) <= exam.exerciseGroups.length " /> - {{ - (!hasOptionalExercises - ? 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsequal' - : 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsinbetween' - ) | artemisTranslate - }} +

    • - {{ 'artemisApp.examManagement.checklist.textitems.eachexercisegroup' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.pointsexercisegroupequal' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.totalpointspossible' | artemisTranslate }} +
    @@ -100,22 +99,22 @@

    		- {{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }} +
    2 - {{ 'artemisApp.examManagement.checklist.tableItem.testRun' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.testRun' | artemisTranslate }} +
      @if (examChecklist) {
    • - {{ 'artemisApp.examManagement.checklist.textitems.testruns' | artemisTranslate }} + {{ examChecklist.numberOfTestRuns }}
      • } @@ -124,7 +123,7 @@

    		- {{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }} +
    3 - {{ 'artemisApp.examManagement.checklist.tableItem.register' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.register' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.leastonestudent' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.studentsregistered' | artemisTranslate }} + {{ exam.numberOfExamUsers }}
    @@ -153,23 +152,23 @@

    		- {{ 'artemisApp.examManagement.students' | artemisTranslate }} +
    4 - {{ 'artemisApp.examManagement.checklist.tableItem.generateStudentExams' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.generateStudentExams' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.allexamsgenerated' | artemisTranslate }} +
    @@ -177,23 +176,23 @@

    		- {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
    5 - {{ 'artemisApp.examManagement.checklist.tableItem.prepareExerciseStart' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.prepareExerciseStart' | artemisTranslate }} +
      @if (examChecklist) {
    • - {{ 'artemisApp.examManagement.checklist.textitems.allExercisesPrepared' | artemisTranslate }} +
      • }
    @@ -201,7 +200,7 @@

    		- {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
    {{ isTestExam ? 3 : 6 }} - {{ 'artemisApp.examManagement.checklist.tableItem.examDetails' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.examDetails' | artemisTranslate }} + @if (isTestExam) {
    {{ 'artemisApp.examManagement.checklist.testExam.detailsHintForTestExams' | artemisTranslate }} : @@ -221,19 +220,19 @@

  1. - {{ 'artemisApp.examManagement.checklist.testExam.studentRegistration' | artemisTranslate }} +
  2. - {{ 'artemisApp.studentExams.studentExamStatusTestExam' | artemisTranslate }} +
  3. - {{ 'artemisApp.examManagement.checklist.testExam.instantResults' | artemisTranslate }} +
    4. @@ -249,15 +248,14 @@

    -

    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'examConduction' | artemisTranslate }}

    - {{ - 'artemisApp.examManagement.checklist.conductionPlannedFromTo' - | artemisTranslate - : { - from: exam.startDate! | artemisDate, - to: exam.endDate! | artemisDate, - } - }} +

    +
    @@ -266,13 +264,13 @@

    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + ' #

    @@ -280,10 +278,10 @@

    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '

    - + @@ -761,14 +725,10 @@

    - {{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }} +
    1 - {{ 'artemisApp.examManagement.checklist.tableItem.conductExam' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.conductExam' | artemisTranslate }} +
    @if (exam.numberOfExamUsers) { @@ -326,24 +324,24 @@

    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + ' } @if (examChecklist && numberOfSubmitted! === 0) {
    - {{ 'artemisApp.examManagement.checklist.textitems.noSubmissions' | artemisTranslate }} +
    }

    		- {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} +
    2 - {{ 'artemisApp.examManagement.checklist.tableItem.editWorkingTime' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.editWorkingTime' | artemisTranslate }} + @@ -368,7 +366,7 @@

    {{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '
    @if (!isTestExam) { -

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

    +

    @@ -377,13 +375,13 @@

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}#

    @@ -391,27 +389,27 @@

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

    diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html index 0145161f28b6..e0cd3e78705c 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html @@ -1,4 +1,4 @@ diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html index a2308edbf6aa..243126fc3758 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html @@ -4,10 +4,10 @@

    @if (!exam.testExam) { - {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }} + } @if (exam.testExam) { - {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }} + } {{ exam.title }}

    @@ -16,50 +16,50 @@

    - {{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }} + @if (false) { - {{ 'artemisApp.examManagement.quizPool' | artemisTranslate }} + } @if (!exam.testExam) { - {{ 'artemisApp.examManagement.students' | artemisTranslate }} + } - {{ 'artemisApp.examManagement.studentExams' | artemisTranslate }} + - {{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }} + @if (!exam.testExam) { - {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} + } @if (!exam.testExam) { - {{ 'artemisApp.examManagement.gradingSystem' | artemisTranslate }} + } @if (canHaveBonus) { - {{ 'artemisApp.examManagement.bonus' | artemisTranslate }} + } - {{ 'entity.action.scores' | artemisTranslate }} + diff --git a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html index cc6e19353695..04c0f2e4ae7c 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html @@ -1,10 +1,10 @@
    @if (!subsequentExerciseGroupSelection) { -

    {{ 'artemisApp.examManagement.importExam' | artemisTranslate }}

    +

    } @if (subsequentExerciseGroupSelection) { -

    {{ 'artemisApp.examManagement.exerciseGroup.import' | artemisTranslate }}

    +

    }
    @@ -54,10 +54,10 @@

    {{ 'artemisApp.examManagement.exerciseGroup.import' | ar

    @@ -91,10 +91,10 @@

    }

    } 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 a90146998779..9d56b746c3c9 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 @@ -193,9 +193,7 @@

    @if (handInEarly) {
    -
    - {{ 'artemisApp.examParticipation.continueAfterHandInEarlyDescription' | artemisTranslate }} -
    +
    }
    diff --git a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html index 7d86f3a1f68b..e8f14a4be1c1 100644 --- a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html +++ b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html @@ -1,19 +1,22 @@
    @if (exercises && exercises.length > 0 && !overviewPageOpen) { -
    - {{ 'artemisApp.examParticipation.progress' | artemisTranslate: { current: exerciseIndex + 1, all: exercises.length } }} -
    +
    } @if (exercises && exercises.length > 0 && !overviewPageOpen) { -
    - {{ 'artemisApp.examParticipation.progressSmall' | artemisTranslate: { current: exerciseIndex + 1, all: exercises.length } }} -
    +
    } @if (overviewPageOpen) { -
    - {{ 'artemisApp.examParticipation.examOverview' | artemisTranslate }} -
    +
    }
    @@ -83,9 +86,7 @@ {{ 'artemisApp.examParticipation.' + (exerciseIndex >= exercises.length - 1 ? 'submitLastExercise' : 'submitOtherExercise') | artemisTranslate }} } - +
    diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.html b/src/main/webapp/app/exam/participate/exam-participation.component.html index bfa6fe636568..391c435fee09 100644 --- a/src/main/webapp/app/exam/participate/exam-participation.component.html +++ b/src/main/webapp/app/exam/participate/exam-participation.component.html @@ -96,9 +96,11 @@ @if ((generateParticipationStatus | async) === 'failed') {

    - +
    } diff --git a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html index 17a9fe8d8752..d6b4a6cd2c74 100644 --- a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html +++ b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html @@ -1,8 +1,6 @@
    @if (!displayOnExamCover) { -

    - {{ 'artemisApp.exam.examSummary.generalInformation' | artemisTranslate }} -

    +

    }

    - {{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }} +
    1 - {{ 'artemisApp.examManagement.checklist.tableItem.suspiciousBehavior' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.suspiciousBehavior' | artemisTranslate }} +

    		- {{ 'artemisApp.examManagement.suspiciousBehavior.title' | artemisTranslate }} +
    2 - {{ 'artemisApp.examManagement.checklist.tableItem.assessAllSubmissions' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.assessAllSubmissions' | artemisTranslate }} +
    @if (examChecklist && examChecklist.numberOfTotalExamAssessmentsFinishedByCorrectionRound !== null && numberOfSubmitted !== 0) { @@ -439,7 +437,7 @@

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.checklist.textitems.noSubmissions' | artemisTranslate }} + }
    @@ -447,24 +445,24 @@

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} +

    3 - {{ 'artemisApp.examManagement.checklist.tableItem.publishResults' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.publishResults' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.pulishingdateset' | artemisTranslate }} +
      • @if (exam.publishResultsDate) {
      @@ -574,22 +572,22 @@

      {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

    		4 - {{ 'artemisApp.examManagement.checklist.tableItem.examReview' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.examReview' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.startdatereviewset' | artemisTranslate }} +
    • - {{ 'artemisApp.examManagement.checklist.textitems.enddatereviewset' | artemisTranslate }} +
    @@ -603,10 +601,10 @@

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}

    		5 - {{ 'artemisApp.examManagement.checklist.tableItem.resolveComplaints' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.resolveComplaints' | artemisTranslate }} +
    @if (examChecklist && examChecklist.numberOfAllComplaintsDone !== null && examChecklist.numberOfAllComplaints !== 0) {
    @@ -621,7 +619,7 @@

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.checklist.textitems.noComplaints' | artemisTranslate }} +

    }
    @@ -629,22 +627,22 @@

    {{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }} - {{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }} +

    6 - {{ 'artemisApp.examManagement.checklist.tableItem.exportResults' | artemisTranslate }} + - {{ 'artemisApp.examManagement.checklist.descriptionItem.exportResults' | artemisTranslate }} + - {{ 'entity.action.scores' | artemisTranslate }} +
    @if (!exam.testExam) { - {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }} + } @if (exam.testExam) { - {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }} + } diff --git a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html index 49ee3579c49e..fe55d21b62a8 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html @@ -1,8 +1,14 @@
    -
    - {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }} -
    +
    - {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }} -
    + jhiTranslate="artemisApp.examManagement.testExam.testExam" + >
    diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.html b/src/main/webapp/app/exam/manage/exams/exam-update.component.html index 3fdb6a1dfe4e..780e07a92c40 100644 --- a/src/main/webapp/app/exam/manage/exams/exam-update.component.html +++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.html @@ -4,15 +4,15 @@ @if (!exam.id) {
    @if (!isImport) { -

    {{ 'artemisApp.examManagement.createExam' | artemisTranslate }}

    +

    } @if (isImport) { -

    {{ 'artemisApp.examManagement.importExam' | artemisTranslate }}

    +

    }
    } @else { -

    {{ 'artemisApp.examManagement.editExam' | artemisTranslate }}

    +

    }
    @@ -102,7 +102,7 @@
    @if (isStartDateSet && isValidStartDateValue && !isValidStartDate) { - {{ 'entity.startDateError' | artemisTranslate }} + }
    @@ -118,7 +118,7 @@
    @if (isEndDateSet && isValidEndDateValue && !isValidEndDate) { - {{ 'entity.endDateError' | artemisTranslate }} + }
    @@ -232,7 +232,7 @@
    @if (!isValidExamStudentReviewEnd) { - {{ 'artemisApp.examManagement.reviewDatesInvalidWarning' | artemisTranslate }} + } @@ -257,19 +257,19 @@
    - +
    - +
    - +
    - +
    -
    {{ 'artemisApp.examManagement.reviewDatesInvalidExplanation' | artemisTranslate }}
    +
    @if (!isValidExamStudentReviewEnd) { diff --git a/src/main/webapp/app/exam/manage/students/exam-students.component.html b/src/main/webapp/app/exam/manage/students/exam-students.component.html index 471b3bcde32e..7a1aa199b56d 100644 --- a/src/main/webapp/app/exam/manage/students/exam-students.component.html +++ b/src/main/webapp/app/exam/manage/students/exam-students.component.html @@ -39,7 +39,7 @@

    title="{{ 'artemisApp.examManagement.examStudents.verifyAttendanceTooltip' | artemisTranslate }}" > - {{ 'artemisApp.examManagement.examStudents.verifyAttendanceBtn' | artemisTranslate }} + } @if (!isTestExam) { diff --git a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html index 2eee9c93ac88..85acc42e31d6 100644 --- a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html +++ b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html @@ -2,7 +2,7 @@ @if (isLoading) {
    } @else { @@ -35,26 +35,26 @@

    		- {{ 'global.field.id' | artemisTranslate }} + - {{ 'artemisApp.examManagement.examStudents.login' | artemisTranslate }} + - {{ 'artemisApp.examManagement.examStudents.registrationNumber' | artemisTranslate }} + - {{ 'artemisApp.examManagement.examStudents.attendanceChecks' | artemisTranslate }} + - {{ 'artemisApp.studentExams.started' | artemisTranslate }} + - {{ 'artemisApp.studentExams.submitted' | artemisTranslate }} +
    - {{ (examUser?.started ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }} + - {{ (examUser?.submitted ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }} +
    @@ -11,7 +9,7 @@

    } @@ -93,7 +91,7 @@

    {{ exam.examStudentReviewEnd | artemisDate }} } @if (reviewIsOpen) { -
    {{ 'artemisApp.exam.studentReviewEnabled' | artemisTranslate }}
    +
    } diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html index 06c7ae63bf6f..f1017919bfb7 100644 --- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html +++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html @@ -11,9 +11,7 @@

    @if (studentExam && !studentExam.submitted) {
    - - {{ 'artemisApp.exam.examSummary.youAreViewingAnUnsubmittedExam' | artemisTranslate }} - +
    } @if (studentExam?.exam) { @@ -42,9 +40,7 @@

    {{ 'artemisApp.exam.resultInformation' | artemisTranslate }} } -

    - {{ 'artemisApp.exam.exercises' | artemisTranslate }} -

    +

    @for (exercise of studentExam?.exercises; track exercise; let i = $index) {
    diff --git a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html index fa7d67675528..06bd840dcf5f 100644 --- a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html +++ b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html @@ -37,20 +37,20 @@
    {{ 'artemisApp.examManagement.testExam.examMode' | artemisTranslate }}: - {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }} +
    - + - + - + @if (event.user?.visibleRegistrationNumber) { - + } @@ -61,11 +61,12 @@ } @case (ExamLiveEventType.PROBLEM_STATEMENT_UPDATE) {
    -
    - {{ 'artemisApp.exam.events.messages.problemStatementUpdate.description' | artemisTranslate: { exerciseName: problemStatementUpdateEvent.exerciseName } }} -
    +
    @if (problemStatementUpdateEvent.text) { -
    {{ 'artemisApp.exam.events.messages.problemStatementUpdate.instructorMessage' | artemisTranslate }}
    +
    }
    diff --git a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html index 183061aefb94..a285e73eda79 100644 --- a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html +++ b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html @@ -110,9 +110,9 @@

    @@ -144,9 +144,9 @@

    @@ -200,29 +200,28 @@

    @if (!reEvaluationInProgress) {
    -
    - } - @if (reEvaluationInProgress) { + } @else {
    - diff --git a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts index fde9f929e280..49e6017a3f2f 100644 --- a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts +++ b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts @@ -16,14 +16,10 @@ import { DragAndDropQuestionUtil } from 'app/exercises/quiz/shared/drag-and-drop import { DragAndDropMouseEvent } from 'app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-mouse-event.class'; import { DragState } from 'app/entities/quiz/drag-state.enum'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { HintCommand } from 'app/shared/markdown-editor/domainCommands/hint.command'; -import { ExplanationCommand } from 'app/shared/markdown-editor/domainCommands/explanation.command'; import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model'; import { DragAndDropQuestion } from 'app/entities/quiz/drag-and-drop-question.model'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { DragItem } from 'app/entities/quiz/drag-item.model'; import { DropLocation } from 'app/entities/quiz/drop-location.model'; -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; import { QuizQuestionEdit } from 'app/exercises/quiz/manage/quiz-question-edit.interface'; import { cloneDeep } from 'lodash-es'; import { round } from 'app/shared/util/utils'; @@ -52,6 +48,9 @@ import { faFileImage } from '@fortawesome/free-regular-svg-icons'; import { CdkDragDrop } from '@angular/cdk/drag-drop'; import { MAX_QUIZ_QUESTION_POINTS } from 'app/shared/constants/input.constants'; import { FileService } from 'app/shared/http/file.service'; +import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action'; +import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action'; +import { MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; @Component({ selector: 'jhi-drag-and-drop-question-edit', @@ -63,7 +62,7 @@ import { FileService } from 'app/shared/http/file.service'; export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, AfterViewInit, QuizQuestionEdit { @ViewChild('clickLayer', { static: false }) private clickLayer: ElementRef; @ViewChild('backgroundImage ', { static: false }) private backgroundImage: SecuredImageComponent; - @ViewChild('markdownEditor', { static: false }) private markdownEditor: MarkdownEditorComponent; + @ViewChild('markdownEditor', { static: false }) private markdownEditor: MarkdownEditorMonacoComponent; @Input() question: DragAndDropQuestion; @Input() questionIndex: number; @@ -78,9 +77,7 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte @Output() addNewFile = new EventEmitter<{ fileName: string; path?: string; file: File }>(); @Output() removeFile = new EventEmitter(); - /** Ace Editor configuration constants **/ questionEditorText = ''; - backupQuestion: DragAndDropQuestion; filePreviewPaths: Map = new Map(); dropAllowed = false; @@ -107,11 +104,10 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte */ mouse: DragAndDropMouseEvent; - hintCommand = new HintCommand(); - explanationCommand = new ExplanationCommand(); + hintAction = new MonacoQuizHintAction(); + explanationAction = new MonacoQuizExplanationAction(); - /** {array} with domainCommands that are needed for a drag and drop question **/ - dragAndDropQuestionDomainCommands: DomainCommand[] = [this.explanationCommand, this.hintCommand]; + dragAndDropDomainActions = [this.explanationAction, this.hintAction]; // Icons faBan = faBan; @@ -838,20 +834,18 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte } /** - * 1. Gets the {array} containing the text with the domainCommandIdentifier and creates a new drag and drop problem statement - * by assigning the text according to the domainCommandIdentifiers to the drag and drop attributes. - * (question text, explanation, hint) - * @param domainCommands - containing markdownText with the corresponding domainCommand {DomainCommand} identifier + * Creates the drag and drop problem statement from the parsed markdown text, assigning the question text, explanation, and hint according to the domain actions found. + * @param textWithDomainActions The parsed markdown text with the corresponding domain actions. */ - domainCommandsFound(domainCommands: [string, DomainCommand | null][]): void { + domainActionsFound(textWithDomainActions: TextWithDomainAction[]): void { this.cleanupQuestion(); - for (const [text, command] of domainCommands) { - if (command === null && text.length > 0) { + for (const { text, action } of textWithDomainActions) { + if (action === undefined && text.length > 0) { this.question.text = text; } - if (command instanceof ExplanationCommand) { + if (action instanceof MonacoQuizExplanationAction) { this.question.explanation = text; - } else if (command instanceof HintCommand) { + } else if (action instanceof MonacoQuizHintAction) { this.question.hint = text; } } @@ -873,6 +867,6 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte */ prepareForSave(): void { this.cleanupQuestion(); - this.markdownEditor.parse(); + this.markdownEditor.parseMarkdown(); } } diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html index 45872ae42fa3..db2299ee644b 100644 --- a/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html +++ b/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html @@ -5,22 +5,16 @@
    @if (loadingState !== 'error') {

    -  {{ 'artemisApp.quizQuestion.loading' | artemisTranslate }} +  

    } @if (loadingState === 'error') {

    -  {{ 'artemisApp.quizQuestion.failed' | artemisTranslate }} +  

    - +

    } @@ -90,14 +84,10 @@

    @if (showResult && !forceSampleSolution) {
    @if (!showingSampleSolution) { -
    - {{ 'artemisApp.quizQuestion.showSampleSolution' | artemisTranslate }} -
    +
    } @if (showingSampleSolution) { -
    - {{ 'artemisApp.quizQuestion.hideSampleSolution' | artemisTranslate }} -
    +
    }
    } diff --git a/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html b/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html index ca7ed23187b1..5071bdc0cb5a 100644 --- a/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html +++ b/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html @@ -1,26 +1,26 @@
    -
    - {{ 'artemisApp.exercise.noLevel' | artemisTranslate }} -
    +
    - {{ 'artemisApp.exercise.easy' | artemisTranslate }} -
    + jhiTranslate="artemisApp.exercise.easy" + >
    - {{ 'artemisApp.exercise.medium' | artemisTranslate }} -
    + jhiTranslate="artemisApp.exercise.medium" + >

    - {{ 'artemisApp.exercise.hard' | artemisTranslate }} -
    + jhiTranslate="artemisApp.exercise.hard" + >
    diff --git a/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html b/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html index 88cc248eb61e..a1d61c9b289e 100644 --- a/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html +++ b/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html @@ -4,31 +4,21 @@

    diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html index 8fed64368500..f4d559178079 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html @@ -1,19 +1,19 @@ @if (isLoading) {
    } @else {
    -

    {{ 'artemisApp.exerciseUnit.createExerciseUnit.headline' | artemisTranslate }}

    +

    -

    {{ 'artemisApp.exerciseUnit.createExerciseUnit.description' | artemisTranslate }}

    +

    @if (hasCancelButton) { @@ -22,13 +22,22 @@

    {{ 'artemisApp.exerciseUnit.createExerciseUnit.headline' | artemisTranslate } @if (hasCreateExerciseButton) { - + } - +

    diff --git a/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html b/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html index bcb3067b9621..57a6aba8aafd 100644 --- a/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html +++ b/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html @@ -2,7 +2,7 @@ @if (isLoading) {
    } @@ -33,7 +33,7 @@

    @if (competency.softDueDate) {
    - {{ 'artemisApp.competency.competencyCard.softDueDate' | artemisTranslate }} + {{ competency.softDueDate | artemisTimeAgo }}
    } @@ -41,7 +41,7 @@

    @if (competency.course?.isAtLeastInstructor) { - {{ 'entity.action.edit' | artemisTranslate }} + }

    diff --git a/src/main/webapp/app/overview/course-competencies/course-competencies.component.html b/src/main/webapp/app/overview/course-competencies/course-competencies.component.html index 5525e504c070..2e478331ff8f 100644 --- a/src/main/webapp/app/overview/course-competencies/course-competencies.component.html +++ b/src/main/webapp/app/overview/course-competencies/course-competencies.component.html @@ -38,13 +38,13 @@ }
    -

    {{ 'artemisApp.competency.table.panelHeader' | artemisTranslate }}

    +

    {{ countMasteredCompetencies }} / {{ countCompetencies }} {{ 'artemisApp.competency.mastered' | artemisTranslate }}
    -
    {{ 'artemisApp.competency.progress' | artemisTranslate }}
    -
    {{ 'artemisApp.competency.progressDescription' | artemisTranslate }}
    -
    {{ 'artemisApp.competency.mastery' | artemisTranslate }}
    -
    {{ 'artemisApp.competency.masteryDescription' | artemisTranslate }}
    +
    +
    +
    +
    diff --git a/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html b/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html index fa89913e8392..7972f8cd36fe 100644 --- a/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html +++ b/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html @@ -1,4 +1,4 @@ -

    {{ 'artemisApp.codeOfConduct.title' | artemisTranslate }}

    +

      @for (user of responsibleContacts; track user) { diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html index a042cd0ee25d..52cf58d80242 100644 --- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html +++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html @@ -17,9 +17,7 @@ @if (course && isCodeOfConductAccepted === false) {
      - +
      } @if (isCodeOfConductAccepted && isServiceSetUp && course) { diff --git a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html index ce1e3506941d..f4a255b49422 100644 --- a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html +++ b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html @@ -29,11 +29,11 @@

      id="filterToUnresolved" (change)="onSelectContext()" /> - +
      - +
      id="filterToAnsweredOrReacted" (change)="onSelectContext()" /> - +
      -
      {{ 'artemisApp.metis.overview.sortedByDate' | artemisTranslate }}
      +
      @if (maxSelectable !== undefined) { -
      - {{ 'artemisApp.dialogs.addUsers.addUsersForm.maxUsersNote' | artemisTranslate: { max: maxSelectable } }} -
      +
      }
      @@ -19,9 +17,9 @@ [value]="'individual'" [ngModelOptions]="{ standalone: true }" /> - + - +
      @@ -36,14 +34,10 @@ @if (selectedUsersControl?.invalid && (selectedUsersControl?.dirty || selectedUsersControl?.touched)) {
      @if (selectedUsersControl?.errors?.required) { -
      - {{ 'artemisApp.dialogs.addUsers.addUsersForm.requiredError' | artemisTranslate }} -
      +
      } @if (selectedUsersControl?.errors?.maxlength) { -
      - {{ 'artemisApp.dialogs.addUsers.addUsersForm.maxError' | artemisTranslate: { max: maxSelectable } }} -
      +
      }
      } @@ -53,22 +47,22 @@
      - +
      - +
      - +
      diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html index 162723705463..32f3096ca9f0 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html @@ -10,9 +10,7 @@

      } @if (getAsGroupChat(activeConversation)) { - - {{ 'artemisApp.dialogs.addUsers.addUsersToGroupChat' | artemisTranslate }} - + }

      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 7545d6f726a1..bd18770a088c 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 @@ -13,9 +13,14 @@

      @if (getAsChannel(activeConversation); as channel) { @if (channel.tutorialGroupId && channel.tutorialGroupTitle) { - {{ - 'artemisApp.entities.tutorialGroup.channelReverse' | artemisTranslate: { title: channel.tutorialGroupTitle } - }} + } }

      @@ -24,20 +29,32 @@

      diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html index bc11bb78838f..78984e09adcb 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html @@ -14,14 +14,16 @@ value="{{ channelOrGroupChat.name ?? ('artemisApp.dialogs.conversationDetail.infoTab.noName' | artemisTranslate) }}" > - + @if ( (isChannel(channelOrGroupChat) && canChangeChannelProperties(channelOrGroupChat)) || (isGroupChat(channelOrGroupChat) && canChangeGroupChatProperties(channelOrGroupChat)) ) { - + }

      @@ -39,11 +41,13 @@ value="{{ channel.topic ?? ('artemisApp.dialogs.conversationDetail.infoTab.noTopic' | artemisTranslate) }}" > - + @if (canChangeChannelProperties(channel)) { - + } @@ -61,11 +65,13 @@ value="{{ channel.description ?? ('artemisApp.dialogs.conversationDetail.infoTab.noDescription' | artemisTranslate) }}" > - + @if (canChangeChannelProperties(channel)) { - + } @@ -73,7 +79,7 @@
      -
      {{ 'artemisApp.dialogs.conversationDetail.infoTab.moreInfo' | artemisTranslate }}
      +
        @if (activeConversation.creator) { diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html index 53d064bb2901..a481df162d51 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html @@ -15,19 +15,28 @@ }
        @if (canBeRemovedFromConversation) { - + } @if (canBeGrantedChannelModeratorRole) { - + } @if (canBeRevokedChannelModeratorRole) { - + }
      diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html index 91fd0d162bcf..c2184ede4a74 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html @@ -27,25 +27,21 @@
      - +
      @if (isSearching) {
      - {{ 'artemisApp.dialogs.conversationDetail.memberTab.searching' | artemisTranslate }} +
      } diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html index fb8898763af2..752c1e385261 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html @@ -4,24 +4,33 @@
      @if (canLeaveConversation) { - + }
      @if (conversationAsChannel; as channel) { @if (!channel.isArchived && canChangeChannelArchivalState) {
      - +
      } @if (channel.isArchived && canChangeChannelArchivalState) {
      - +
      } @if (canDeleteChannel) { 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 ad47e0362fb6..77c54a91e20f 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 @@ -19,9 +19,13 @@

      - {{ - 'artemisApp.entities.tutorialGroup.channelReverse' | artemisTranslate: { title: activeConversationAsChannel.tutorialGroupTitle } - }} +

      } } 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 37468268ca6e..373d7b8d9694 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 @@ -7,7 +7,7 @@
      - {{ 'artemisApp.conversationsLayout.conversationMessages.searchLabel' | artemisTranslate }} + - {{ 'artemisApp.conversationsLayout.conversationMessages.clearSearch' | artemisTranslate }} + } @switch (totalNumberOfPosts) { @case (0) { - {{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsNone' | artemisTranslate }} + } @case (1) { - {{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsSingle' | artemisTranslate }} + } @default { - {{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsMultiple' | artemisTranslate: { count: totalNumberOfPosts } }} + } } @@ -91,9 +94,7 @@
      @if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
      - +
      } @else { diff --git a/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html b/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html index edfb84460b84..1ae605ca2ad2 100644 --- a/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html +++ b/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html @@ -50,7 +50,7 @@
      {{ exercise.title }}
      {{ dueDate | artemisTimeAgo }}
      } @else { -
      {{ 'artemisApp.courseOverview.exerciseList.noDueDate' | artemisTranslate }}
      +
      }
      diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html index 2de6ec14a991..6be118bf7475 100644 --- a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html +++ b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html @@ -1,7 +1,7 @@
      @if (course) {
      - +
      @if (exerciseSelected) { diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html index 31e417b42160..3e27cd79cf9b 100644 --- a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html +++ b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html @@ -1,7 +1,7 @@ @if (isLoading) {
      } @@ -26,9 +26,12 @@

      @if (lecture?.course?.isAtLeastEditor) {
      - +
      } @@ -40,7 +43,7 @@

      @if (lecture.description) {
      -

      {{ 'artemisApp.courseOverview.lectureDetails.description' | artemisTranslate }}

      +

      @@ -51,12 +54,15 @@

      {{ 'artemisApp.courseOverview.lectureDetails.description' | artemisTranslate @if (lecture.lectureUnits) {
      -

      {{ 'artemisApp.courseOverview.lectureDetails.lectureUnits' | artemisTranslate }}

      +

      @if (hasPdfLectureUnit) { - + }
      } @@ -95,7 +101,7 @@

      {{ 'artemisApp.courseOverview.lectureDetails.lectureUnits' | artemisTranslat @if (lecture.attachments) {
      -

      {{ 'artemisApp.courseOverview.lectureDetails.attachments' | artemisTranslate }}

      +

      } @@ -120,9 +126,7 @@

      {{ attachmentExtension(attachment) | uppercase }} @if (attachmentNotReleased(attachment)) { - - {{ 'artemisApp.courseOverview.lectureDetails.notReleased' | artemisTranslate }} - + }
      diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html b/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html index e3f6841c9e09..d26daae4d1c5 100644 --- a/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html +++ b/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html @@ -23,7 +23,7 @@

      {{ lecture?.title }}

      ({{ lecture.startDate | artemisTimeAgo }})
      } @else { -
      {{ 'artemisApp.courseOverview.exerciseList.noDueDate' | artemisTranslate }}
      +
      } diff --git a/src/main/webapp/app/overview/course-overview.component.html b/src/main/webapp/app/overview/course-overview.component.html index 1cd9605ef9ef..ee6f77d51b5a 100644 --- a/src/main/webapp/app/overview/course-overview.component.html +++ b/src/main/webapp/app/overview/course-overview.component.html @@ -158,9 +158,7 @@
      @if (isNotManagementView && course.isAtLeastTutor) { } @if (showRefreshButton) { diff --git a/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html b/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html index f60094d04581..530576179db6 100644 --- a/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html +++ b/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html @@ -1,5 +1,3 @@ @if (course.prerequisites?.length) { - + } diff --git a/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html b/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html index 6b40d0b02e0d..960a67b4c207 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html @@ -11,7 +11,5 @@ /> } @if (!course.enrollmentConfirmationMessage!) { - + } diff --git a/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html b/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html index df46fef541bf..d03a7b1b8572 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html @@ -1,13 +1,11 @@ -

      {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}

      +

      @if (loading) {
      - {{ 'artemisApp.studentDashboard.enroll.courseLoading' | artemisTranslate }} +
      } @else {

      {{ course?.title }}

      -

      - {{ 'artemisApp.studentDashboard.enroll.notInCourseButCanEnroll' | artemisTranslate }} -

      +

      } diff --git a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html index 076549012a21..3e4ef9383be6 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html @@ -7,7 +7,7 @@

      @if (isLoading) {
      } @else { diff --git a/src/main/webapp/app/overview/course-registration/course-registration.component.html b/src/main/webapp/app/overview/course-registration/course-registration.component.html index 487181793162..36da4167694c 100644 --- a/src/main/webapp/app/overview/course-registration/course-registration.component.html +++ b/src/main/webapp/app/overview/course-registration/course-registration.component.html @@ -1,5 +1,5 @@
      -

      {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}

      +

      @@ -46,14 +46,12 @@

      {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}

      } @if (!loading && !coursesToSelect) { -
      - {{ 'artemisApp.studentDashboard.enroll.noCourse' | artemisTranslate }} -
      +
      } @if (loading && !coursesToSelect) {
      } diff --git a/src/main/webapp/app/overview/course-statistics/course-statistics.component.html b/src/main/webapp/app/overview/course-statistics/course-statistics.component.html index 2bf923aec355..73dd416ef9d2 100644 --- a/src/main/webapp/app/overview/course-statistics/course-statistics.component.html +++ b/src/main/webapp/app/overview/course-statistics/course-statistics.component.html @@ -3,23 +3,23 @@
      • - {{ 'artemisApp.courseOverview.statistics.includeStandardCategories' | artemisTranslate }} +
      • - {{ 'artemisApp.courseOverview.statistics.includeIndividualCategories' | artemisTranslate }} +
        • @if (categoryFilter.exercisesWithoutCategoriesPresent) { @@ -31,7 +31,7 @@ [checked]="categoryFilter.includeExercisesWithNoCategory" type="checkbox" /> - {{ 'artemisApp.courseOverview.statistics.exercisesWithNoCategories' | artemisTranslate }} + } @@ -53,7 +53,7 @@
        -

        {{ 'artemisApp.courseOverview.statistics.totalScore' | artemisTranslate }}

        +

        @@ -80,13 +80,17 @@
        {{ exerciseType.name | artemisTranslate }}
        }
        -
        - {{ 'artemisApp.courseOverview.statistics.yourPoints' | artemisTranslate: { number: overallPoints } }} -
        +
        - - {{ 'artemisApp.courseOverview.statistics.reachablePoints' | artemisTranslate: { number: reachablePoints, relative: currentRelativeScore } }} - + />
        - - {{ 'artemisApp.courseOverview.statistics.totalPoints' | artemisTranslate: { number: overallMaxPoints, relative: totalRelativeScore } }} - +
        - - {{ - isBonus - ? ('artemisApp.exam.examSummary.gradeKeyButtonBonus' | artemisTranslate) - : ('artemisApp.exam.examSummary.gradeKeyButton' | artemisTranslate) - }} - +
        } @if (course?.presentationScore) {
        -
        - {{ 'artemisApp.courseOverview.statistics.totalPresentationScore' | artemisTranslate: { number: overallPresentationScore } }} -
        -
        - {{ 'artemisApp.courseOverview.statistics.presentationScoreBonus' | artemisTranslate: { number: course?.presentationScore } }} -
        +
        +
        } @if (reachablePresentationPoints) {
        -
        - {{ 'artemisApp.courseOverview.statistics.totalPresentationPoints' | artemisTranslate: { number: overallPresentationScore } }} -
        -
        - {{ 'artemisApp.courseOverview.statistics.achievablePresentationPoints' | artemisTranslate: { number: reachablePresentationPoints } }} -
        +
        +
        {{ 'artemisApp.courseOverview.statistics.gradeInfo' | artemisTranslate }}
        -

        {{ 'artemisApp.courseOverview.statistics.pointsPerExercise' | artemisTranslate }}

        +

        @for (exerciseGroup of ngxExerciseGroups | keyvalue; let index = $index; track index) { @if (exerciseGroup.value[0]) {
        -

        - {{ - 'artemisApp.courseOverview.statistics.exerciseCount' | artemisTranslate: { number: exerciseGroup.value.length, type: exerciseGroup.key } - }} -

        +

        @if ([barChartTitle.INCLUDED, barChartTitle.BONUS, barChartTitle.NOT_INCLUDED, barChartTitle.NO_DUE_DATE].includes(model.name)) {
        @if (!model.isProgrammingExercise) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseAchievedScore' - | artemisTranslate - : { points: model.absoluteValue, percentage: roundScoreSpecifiedByCourseSettings(model.value, course) } - }} - + } @if (model.isProgrammingExercise) { - - {{ - 'artemisApp.courseOverview.statistics.programmingExercisePassedTests' - | artemisTranslate - : { tests: model.absoluteValue, percentage: roundScoreSpecifiedByCourseSettings(model.value, course) } - }} - + } @if (model.name === barChartTitle.BONUS) { @@ -237,54 +242,43 @@

        @case (barChartTitle.MISSED) {
        @if (!model.afterDueDate && !model.notParticipated && !model.isProgrammingExercise) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseMissedScore' - | artemisTranslate - : { - points: model.absoluteValue, - percentage: roundScoreSpecifiedByCourseSettings(model.value, course), - } - }} - + } @if (model.notParticipated) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseNotParticipated' - | artemisTranslate: { exercise: model.exerciseTitle } - }} - + } @if (model.afterDueDate) { - - {{ - 'artemisApp.courseOverview.statistics.exerciseParticipatedAfterDueDate' - | artemisTranslate: { exercise: model.exerciseTitle } - }} - + } @if (model.isProgrammingExercise && !model.notParticipated) { - - {{ - 'artemisApp.courseOverview.statistics.programmingExerciseFailedTests' - | artemisTranslate - : { - tests: model.absoluteValue, - percentage: roundScoreSpecifiedByCourseSettings(model.value, course), - } - }} - + }
        } @case (barChartTitle.NOT_GRADED) {
        - - {{ - 'artemisApp.courseOverview.statistics.exerciseNotGraded' | artemisTranslate: { exercise: model.exerciseTitle } - }} +
        } } @@ -294,17 +288,17 @@

        @if (exerciseGroup.value && exerciseGroup.value.length) {
        -
        - {{ 'artemisApp.courseOverview.statistics.yourPoints' | artemisTranslate: { number: exerciseGroup.value[0].absoluteScore } }} -
        +
        - - {{ - 'artemisApp.courseOverview.statistics.reachablePoints' - | artemisTranslate - : { number: exerciseGroup.value[0].reachablePoints, relative: exerciseGroup.value[0].currentRelativeScore } - }} - + />
        - - {{ - 'artemisApp.courseOverview.statistics.totalPoints' - | artemisTranslate: { number: exerciseGroup.value[0].overallMaxPoints, relative: exerciseGroup.value[0].relativeScore } - }} - + />
        @if (exerciseGroup.value[0].presentationScoreEnabled && course?.presentationScore) { -
        - {{ - 'artemisApp.courseOverview.statistics.presentationScore' - | artemisTranslate: { number: exerciseGroup.value[0].presentationScore } - }} -
        +
        }
        } @@ -343,9 +335,7 @@
        } @else {
        -
        - {{ 'artemisApp.courseOverview.statistics.noStatistics' | artemisTranslate }} -
        +
        }
        diff --git a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html index fcdc854c1e4a..4add37514666 100644 --- a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html +++ b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html @@ -17,9 +17,7 @@
        {{ tutorialGroup?.title ?? '' }}
        @if (tutorialGroup.teachingAssistantName) { -
        - {{ 'artemisApp.tutorialGroupCard.teachingAssistant' | artemisTranslate: { name: tutorialGroup.teachingAssistantName } }} -
        +
        } @if (showChannelLink && tutorialGroup.channel && isMessagingEnabled(course)) {
        @@ -29,10 +27,11 @@
        {{ tutorialGroup?.title ?? '' }}
        [routerLink]="['/courses', course.id!, 'communication']" [queryParams]="{ conversationId: tutorialGroup.channel.id }" class="btn btn-primary" - >{{ 'artemisApp.entities.tutorialGroup.channelWithName' | artemisTranslate: { channel: tutorialGroup.channel.name } }} + jhiTranslate="artemisApp.entities.tutorialGroup.channelWithName" + [translateValues]="{ channel: tutorialGroup.channel.name }" + > } @else { - {{ 'artemisApp.entities.tutorialGroup.channelWithName' | artemisTranslate: { channel: tutorialGroup.channel.name } }} + }
        } diff --git a/src/main/webapp/app/overview/course-unenrollment-modal.component.html b/src/main/webapp/app/overview/course-unenrollment-modal.component.html index 213dd615c852..31d17bde6bbc 100644 --- a/src/main/webapp/app/overview/course-unenrollment-modal.component.html +++ b/src/main/webapp/app/overview/course-unenrollment-modal.component.html @@ -1,7 +1,5 @@
        -

        - {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.title' | artemisTranslate }} -

        +

        @@ -10,9 +8,7 @@

        {{ course?.title }} ?

        @if (!canEnrollAgain) { -
        - {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.reenrollmentNotPossible' | artemisTranslate }} -
        +
        } @if (canEnrollAgain) {
        @@ -22,22 +18,16 @@

        }

        - +
        diff --git a/src/main/webapp/app/overview/courses.component.html b/src/main/webapp/app/overview/courses.component.html index ebfd4deb06f6..92381c38c62b 100644 --- a/src/main/webapp/app/overview/courses.component.html +++ b/src/main/webapp/app/overview/courses.component.html @@ -1,8 +1,6 @@ @if (nextRelevantExam && nextRelevantCourseForExam) {
        -

        - {{ 'artemisApp.studentDashboard.examTitle' | artemisTranslate: { course: nextRelevantCourseForExam.title } }} -

        +

        @@ -11,10 +9,10 @@

        {{ nextRelevantExam.title }}

        @if (nextRelevantExam.startDate) { -
        {{ 'artemisApp.exam.overview.start' | artemisTranslate: { start: nextRelevantExam.startDate | artemisDate } }}
        +
        } @if (nextRelevantExam.examMaxPoints) { -
        {{ 'artemisApp.exam.overview.maxPoints' | artemisTranslate: { points: nextRelevantExam.examMaxPoints } }}
        +
        }
        @@ -28,7 +26,7 @@

        @if (regularCourses.length) {
        - {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }} +
        }
        @@ -51,7 +49,7 @@

        - {{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }} +
        } @else { diff --git a/src/main/webapp/app/overview/discussion-section/discussion-section.component.html b/src/main/webapp/app/overview/discussion-section/discussion-section.component.html index c423a6c9ca5f..a1a4fc4d2944 100644 --- a/src/main/webapp/app/overview/discussion-section/discussion-section.component.html +++ b/src/main/webapp/app/overview/discussion-section/discussion-section.component.html @@ -20,15 +20,13 @@
        <
        @if (noChannelAvailable) { -
        - {{ 'artemisApp.metis.channel.noChannel' | artemisTranslate }} -
        +
        } @else {
        @if (currentPost !== undefined) {
        - {{ 'artemisApp.metis.post.showAllPosts' | artemisTranslate }} +
        } @else { @@ -65,7 +63,7 @@
        < id="filterToUnresolved" (change)="onSelectContext()" /> - +
        < id="filterToOwn" (change)="onSelectContext()" /> - +
        < id="filterToAnsweredOrReacted" (change)="onSelectContext()" /> - +
        @@ -98,7 +98,7 @@
        <
        - {{ 'artemisApp.metis.discussionSection.sortByDate' | artemisTranslate }} +
        @if (!currentSortDirection) {
        @@ -142,13 +142,13 @@
        < @if (isLoading) {
        -
        {{ 'artemisApp.metis.discussionSection.loadingMessages' | artemisTranslate }}
        +
        } @if (!isLoading && posts.length === 0) {
        -
        {{ 'artemisApp.metis.discussionSection.noMessages' | artemisTranslate }}
        +
        } @@ -163,10 +163,10 @@
        < } @if (!shouldSendMessage) { - {{ 'artemisApp.metis.newMessage' | artemisTranslate }} + } @if (shouldSendMessage) { - {{ 'artemisApp.metis.collapseNewMessage' | artemisTranslate }} + } @if (shouldSendMessage) { 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 07fbccb20ec1..0d8f889d1ed5 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 @@ -113,7 +113,7 @@
        -

        {{ 'artemisApp.courseOverview.exerciseDetails.recentResults' | artemisTranslate }}

        +

        @@ -130,7 +130,7 @@

        {{ 'artemisApp.courseOverview.exerciseDetails.recentResults' | artemisTransl @if (showMoreResults) {
        -

        {{ 'artemisApp.courseOverview.exerciseDetails.allResults' | artemisTranslate }}

        +

        @@ -153,9 +153,7 @@

        } @if (!sortedHistoryResults) { -
        - {{ 'artemisApp.courseOverview.exerciseDetails.noResults' | artemisTranslate }} -
        +
        }

        @@ -170,7 +168,7 @@

        @if (exampleSolutionInfo?.exampleSolutionPublished) {
        - {{ 'artemisApp.exercise.exampleSolution' | artemisTranslate }} +
        diff --git a/src/main/webapp/app/shared/connection-warning/connection-warning.component.html b/src/main/webapp/app/shared/connection-warning/connection-warning.component.html index ed662079efc4..bdb109ffdfc7 100644 --- a/src/main/webapp/app/shared/connection-warning/connection-warning.component.html +++ b/src/main/webapp/app/shared/connection-warning/connection-warning.component.html @@ -1,8 +1,6 @@ -
        - {{ 'artemisApp.disconnectedAlert' | artemisTranslate }} -
        +

        @if (isLoading) {
        } @else { 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 ed2531800f65..78e11295962c 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 @@ -20,28 +20,28 @@ #instance="ngbTypeahead" /> @if (isSearching) { - {{ 'artemisApp.userSelector.searchingText' | artemisTranslate }} +
        } @if (searchFailed) { - {{ 'artemisApp.userSelector.searchFailedText' | artemisTranslate }} +
        } @if (searchStudents) { - {{ 'artemisApp.userSelector.helpText' | artemisTranslate }} + }
        @if (rolesToAllowSearchingIn.includes('students')) {
        - +
        } @if (rolesToAllowSearchingIn.includes('tutors')) {
        - +
        } @if (rolesToAllowSearchingIn.includes('instructors')) { @@ -53,7 +53,7 @@ [checked]="searchInstructors" (change)="searchInstructors = !searchInstructors; onFilterChange()" /> - +
        }
        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 075a103d96c8..b1983a2ef7d2 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 @@ -41,7 +41,7 @@
        @if (dateInput.invalid || (requiredField && !dateInput.value)) { -
        {{ 'entity.dateMissingOrNotValid' | artemisTranslate: { labelName: labelName } }}
        +
        } @if (warning) {
        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 320817cfedc0..58196f94f02d 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 @@ -24,18 +24,17 @@ export class FormDateTimePickerComponent implements ControlValueAccessor { @Input() error: boolean; @Input() warning: boolean; @Input() requiredField: boolean = false; - @Input() startAt?: dayjs.Dayjs; // Default selected date. By default this sets it to the current time without seconds or milliseconds; + @Input() startAt?: dayjs.Dayjs; // Default selected date. By default, this sets it to the current time without seconds or milliseconds; @Input() min?: dayjs.Dayjs; // Dates before this date are not selectable. @Input() max?: dayjs.Dayjs; // Dates after this date are not selectable. @Input() shouldDisplayTimeZoneWarning = true; // Displays a warning that the current time zone might differ from the participants'. @Output() valueChange = new EventEmitter(); - // Icons - faCalendarAlt = faCalendarAlt; - faGlobe = faGlobe; - faClock = faClock; - faQuestionCircle = faQuestionCircle; - faCircleXmark = faCircleXmark; + readonly faCalendarAlt = faCalendarAlt; + readonly faGlobe = faGlobe; + readonly faClock = faClock; + readonly faQuestionCircle = faQuestionCircle; + readonly faCircleXmark = faCircleXmark; readonly faTriangleExclamation = faTriangleExclamation; private onChange?: (val?: dayjs.Dayjs) => void; diff --git a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.html b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.html new file mode 100644 index 000000000000..eec73d5844e4 --- /dev/null +++ b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.html @@ -0,0 +1,10 @@ +

        +
        + {{ category.category }} + @if (displayRemoveButton) { + + } +
        +

        diff --git a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.scss b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.scss new file mode 100644 index 000000000000..43a2d70cca34 --- /dev/null +++ b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.scss @@ -0,0 +1,18 @@ +.remove-button { + color: var(--white); + background: transparent !important; + border: none !important; + + &:hover { + opacity: 0.8; + } +} + +/** category options should be consistent with the type CategoryFontSize */ +.category-small { + font-size: 0.85rem; +} + +.category-default { + font-size: 1rem; +} diff --git a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts new file mode 100644 index 000000000000..8ba41f96ba8b --- /dev/null +++ b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts @@ -0,0 +1,23 @@ +import { Component, Input } from '@angular/core'; +import type { ExerciseCategory } from 'app/entities/exercise-category.model'; +import { CommonModule } from '@angular/common'; +import { faTimes } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; + +type CategoryFontSize = 'default' | 'small'; + +@Component({ + selector: 'jhi-custom-exercise-category-badge', + templateUrl: './custom-exercise-category-badge.component.html', + styleUrls: ['custom-exercise-category-badge.component.scss'], + standalone: true, + imports: [CommonModule, FontAwesomeModule], +}) +export class CustomExerciseCategoryBadgeComponent { + protected readonly faTimes = faTimes; + + @Input({ required: true }) category: ExerciseCategory; + @Input() displayRemoveButton: boolean = false; + @Input() onClick: () => void = () => {}; + @Input() fontSize: CategoryFontSize = 'default'; +} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/correctOptionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/correctOptionCommand.ts deleted file mode 100644 index 4a9764fc02a2..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/correctOptionCommand.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { addTextAtCursor } from 'app/shared/util/markdown.util'; -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; - -export class CorrectOptionCommand extends DomainTagCommand { - public static readonly IDENTIFIER = '[correct]'; - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addCorrectAnswerOption'; - - /** - * @function execute - * @desc Add a new correct answer option to the text editor at the location of the cursor - */ - execute(): void { - const text = '\n' + this.getOpeningIdentifier() + ' Enter a correct answer option here'; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the correct option - */ - getOpeningIdentifier(): string { - return CorrectOptionCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the correct option - */ - getClosingIdentifier(): string { - return '[/correct]'; - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/credits.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/credits.command.ts deleted file mode 100644 index b7070571e62d..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/credits.command.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; -import { addTextAtCursor } from 'app/shared/util/markdown.util'; - -export class CreditsCommand extends DomainTagCommand { - public static readonly IDENTIFIER = '[credits]'; - public static readonly TEXT = '0'; - // ' Add points students should get for this instruction here'; - displayCommandButton = false; - - buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addCredits'; - - /** - * @function execute - * @desc Add a credits for the corresponding instruction in the editor at the location of the cursor - */ - execute(): void { - const text = '\n' + this.getOpeningIdentifier() + CreditsCommand.TEXT; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the credits - */ - getOpeningIdentifier(): string { - return CreditsCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the credits - */ - getClosingIdentifier(): string { - return '[/credits]'; - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domain-multi-option-list.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domain-multi-option-list.command.ts deleted file mode 100644 index fb2ce14041c3..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domain-multi-option-list.command.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { DomainMultiOptionCommand } from 'app/shared/markdown-editor/domainCommands/domainMultiOptionCommand'; -import { getStringSegmentPositions } from 'app/shared/util/global.utils'; -import { removeTextRange } from 'app/shared/util/markdown.util'; - -/** - * Allows the insertion of values within a comma separated list. - * Will e.g. remove duplicates and append new items to the list. - */ -export abstract class DomainMultiOptionListCommand extends DomainMultiOptionCommand { - protected abstract getValueMeta(): string; - - setEditor(aceEditor: any) { - super.setEditor(aceEditor); - - const autoCompleter = { - getCompletions: (editor: any, session: any, pos: any, prefix: any, callback: any) => { - callback( - null, - this.getValues().map(({ value, id }) => { - return { - caption: value, - value: id, - meta: this.getValueMeta(), - }; - }), - ); - }, - }; - - this.addCompleter(autoCompleter); - } - - /** - * Update the list of values in the multi option list. Makes sure to not add duplicates into the brackets. - * - * @function execute - * @desc insert selected value into text - */ - execute(valueToAdd: string): void { - const cursorPosition = this.getCursorPosition(); - const matchInTag = this.isCursorWithinTag(); - - this.clearSelection(); - - const newValuesList = this.generateValueList(matchInTag, valueToAdd, cursorPosition); - const newValuesStringified = `${this.getOpeningIdentifier()}${newValuesList.join(',')}${this.getClosingIdentifier()}`; - if (matchInTag) { - removeTextRange( - { col: matchInTag.matchStart, row: cursorPosition.row }, - { - col: matchInTag.matchEnd, - row: cursorPosition.row, - }, - this.aceEditor, - ); - } - this.insertText(newValuesStringified); - this.focus(); - } - - /** - * Given a match, the new value to add and the cursor position, determine and return the updated value list. - * a) The cursor is within the brackets -> add/replace value in list. - * b) The cursor is NOT within the brackets -> just paste in a new value. - * - * @param match - * @param valueToAdd - * @param cursorPosition - */ - private generateValueList = ( - match: { matchStart: number; matchEnd: number; innerTagContent: string } | null, - valueToAdd: string, - cursorPosition: { row: number; column: number }, - ): string[] => { - const { column } = cursorPosition; - // Check if the cursor is within the tag - if so, add the value to the list. - // Also don't add a value again that is already included. - if (match && !match.innerTagContent.includes(valueToAdd)) { - const currentValues = match.innerTagContent.split(','); - const stringPositions = getStringSegmentPositions(match.innerTagContent, ','); - const wordUnderCursor = stringPositions.find(({ start, end }) => column - 1 - match.matchStart > start && column - 1 - match.matchStart < end); - if (wordUnderCursor) { - // Case 1: Replace value. - return currentValues.map((val) => (val === wordUnderCursor.word ? valueToAdd : val)); - } else if (column >= match.matchEnd - 1) { - // Case 2: Add value on left side. - return [...currentValues, valueToAdd]; - } else if (column <= match.matchStart + 1) { - // Case 3: Add value on right side. - return [valueToAdd, ...currentValues]; - } else { - // Case 4: Fallback - replace current. - return [valueToAdd]; - } - } else if (match && match.innerTagContent.includes(valueToAdd)) { - // Case 5: The value is already included, do nothing. - return match.innerTagContent.split(','); - } else { - // Case 6: There is no content yet, just paste the current value in. - return [valueToAdd]; - } - }; -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domainCommand.ts deleted file mode 100644 index b5922fb35e3c..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainCommand.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { Command } from 'app/shared/markdown-editor/commands/command'; -import { escapeStringForUseInRegex } from 'app/shared/util/global.utils'; - -/** abstract class for all domainCommands - customized commands for Artemis specific use cases - * e.g. multiple choice questions, drag and drop questions - * Each domain command has its own logic and a unique identifier**/ -export abstract class DomainCommand extends Command { - abstract getOpeningIdentifier(): string; // e.g. [exp] - abstract getClosingIdentifier(): string; // e.g. [/exp] - displayCommandButton = true; - - /** - * Generate a regex that can be used to get the content alone or including the tags. - * index 0: Get content with tags around it. - * index 1: Get content without the tags. - */ - getTagRegex(flags = ''): RegExp { - const escapedOpeningIdentifier = escapeStringForUseInRegex(this.getOpeningIdentifier()), - escapedClosingIdentifier = escapeStringForUseInRegex(this.getClosingIdentifier()); - return new RegExp(`${escapedOpeningIdentifier}(.*)${escapedClosingIdentifier}`, flags); - } - - /** - * Checks if the cursor is placed within the identifiers of a domain command. - * Returns the content between the identifiers if there is match, otherwise returns null. - */ - isCursorWithinTag(): { matchStart: number; matchEnd: number; innerTagContent: string } | null { - const { row, column } = this.aceEditor.getCursorPosition(), - line = this.aceEditor.getSession().getLine(row), - regex = this.getTagRegex('g'); - - const indexes: Array<{ matchStart: number; matchEnd: number; innerTagContent: string }> = []; - - // A line can have multiple tags in it, so we need to check for multiple matches. - let match = regex.exec(line); - while (match != undefined) { - indexes.push({ matchStart: match.index, matchEnd: match.index + match[0].length, innerTagContent: match[1] }); - match = regex.exec(line); - } - const matchOnCursor = indexes.find(({ matchStart, matchEnd }) => column > matchStart && column <= matchEnd); - return matchOnCursor || null; - } - - /** - * Checks if there is a tag in the line of the cursor. - * Returns the content between the identifiers if there is match, otherwise returns null. - */ - isTagInRow(row: number): { matchStart: number; matchEnd: number; innerTagContent: string } | null { - const line = this.aceEditor.getSession().getLine(row), - regex = this.getTagRegex(); - - if (!line) { - return null; - } - - const match = line.match(regex); - if (!match) { - return null; - } - return { matchStart: match.index, matchEnd: match.index + match[0].length, innerTagContent: match[1] }; - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainMultiOptionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domainMultiOptionCommand.ts deleted file mode 100644 index 6918dd1adf80..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainMultiOptionCommand.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; -import { ValueItem } from 'app/shared/markdown-editor/command-constants'; - -/** - * This domain command will be used as a dropdown in the markdown editor. - */ -export abstract class DomainMultiOptionCommand extends DomainCommand { - protected values: ValueItem[] = []; - setValues(values: ValueItem[]) { - this.values = values; - } - getValues() { - return this.values; - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainTag.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domainTag.command.ts deleted file mode 100644 index ff2c857c2558..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainTag.command.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; - -/** - * This domain command will be used as a button in the markdown editor. - */ -export abstract class DomainTagCommand extends DomainCommand {} diff --git a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java index e21e7563d52a..98f8b97e07e3 100644 --- a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java +++ b/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java @@ -167,7 +167,8 @@ void initTestCase() throws IOException { apollonRequestMockProvider.enableMockingOfRequests(); - // mock apollon conversion 8 times, because the last test includes 8 modeling exercises, because each test adds modeling exercises + // mock apollon conversion 8 times, because the last test includes 8 modeling + // exercises, because each test adds modeling exercises for (int i = 0; i < 8; i++) { mockApollonConversion(); } @@ -230,7 +231,6 @@ private void assertCommunicationDataCsvFile(Path courseDirPath) { /** * Asserts the content of the science events CSV file. * Allows for a 500ns difference between the timestamps due to the reimport from the csv export. - * Might cause the test to be flaky if multiple events are created overlapping and matched wrongly. * * @param extractedZipDirPath The path to the extracted zip directory * @param events The set of science events to compare with the content of the CSV file @@ -249,13 +249,13 @@ private void assertScienceEventsCSVFile(Path extractedZipDirPath, Set createScienceEvents(String userLogin) { - return Set.of(scienceUtilService.createScienceEvent(userLogin, ScienceEventType.EXERCISE__OPEN, 1L), - scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN, 2L), - scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN_UNIT, 3L)); + + ZonedDateTime timestamp = ZonedDateTime.now(); + // Rounding timestamp due to rounding during export + timestamp = timestamp.withNano(timestamp.getNano() - timestamp.getNano() % 10000); + return Set.of(scienceUtilService.createScienceEvent(userLogin, ScienceEventType.EXERCISE__OPEN, 1L, timestamp), + scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN, 2L, timestamp.plusMinutes(1)), + scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN_UNIT, 3L, timestamp.plusSeconds(30))); } @@ -635,7 +639,8 @@ void testDataExportContainsDataAboutCourseStudentUnenrolled() throws Exception { var course = prepareCourseDataForDataExportCreation(assessmentDueDateInTheFuture, courseShortName); conversationUtilService.addOneMessageForUserInCourse(TEST_PREFIX + "student1", course, "only one post"); var dataExport = initDataExport(); - // by setting the course groups to a different value we simulate unenrollment because the user is no longer part of the user group and hence, the course. + // by setting the course groups to a different value, we simulate unenrollment + // because the user is no longer part of the user group and hence, the course. courseUtilService.updateCourseGroups("abc", course, ""); dataExportCreationService.createDataExport(dataExport); var dataExportFromDb = dataExportRepository.findByIdElseThrow(dataExport.getId()); diff --git a/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts b/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts index 9581c68a404a..88b261712f1f 100644 --- a/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MockProvider } from 'ng-mocks'; +import { MockComponent, MockProvider } from 'ng-mocks'; import { AlertService } from 'app/core/util/alert.service'; import { ActivatedRoute, Router } from '@angular/router'; import { of } from 'rxjs'; @@ -15,6 +15,8 @@ import { MockRouter } from '../../helpers/mocks/mock-router'; import { CompetencyFormStubComponent } from './competency-form-stub.component'; import { ArtemisTestModule } from '../../test.module'; import { CompetencyFormComponent } from 'app/course/competencies/forms/competency/competency-form.component'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; +import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; describe('EditCompetencyComponent', () => { let editCompetencyComponentFixture: ComponentFixture; @@ -56,6 +58,10 @@ describe('EditCompetencyComponent', () => { ], schemas: [], }) + .overrideModule(ArtemisMarkdownEditorModule, { + remove: { exports: [MarkdownEditorMonacoComponent] }, + add: { exports: [MockComponent(MarkdownEditorMonacoComponent)], declarations: [MockComponent(MarkdownEditorMonacoComponent)] }, + }) .compileComponents() .then(() => { editCompetencyComponentFixture = TestBed.createComponent(EditCompetencyComponent); diff --git a/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts b/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts index 50e21caf9dfa..7e1009b2d1e8 100644 --- a/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MockProvider } from 'ng-mocks'; +import { MockComponent, MockProvider } from 'ng-mocks'; import { AlertService } from 'app/core/util/alert.service'; import { ActivatedRoute, Router } from '@angular/router'; import { of } from 'rxjs'; @@ -16,6 +16,8 @@ import { EditPrerequisiteComponent } from 'app/course/competencies/edit/edit-pre import { PrerequisiteService } from 'app/course/competencies/prerequisite.service'; import { PrerequisiteFormComponent } from 'app/course/competencies/forms/prerequisite/prerequisite-form.component'; import { PrerequisiteFormStubComponent } from './prerequisite-form-stub.component'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; +import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; describe('EditPrerequisiteComponent', () => { let editPrerequisiteComponentFixture: ComponentFixture; @@ -57,6 +59,10 @@ describe('EditPrerequisiteComponent', () => { ], schemas: [], }) + .overrideModule(ArtemisMarkdownEditorModule, { + remove: { exports: [MarkdownEditorMonacoComponent] }, + add: { exports: [MockComponent(MarkdownEditorMonacoComponent)], declarations: [MockComponent(MarkdownEditorMonacoComponent)] }, + }) .compileComponents() .then(() => { editPrerequisiteComponentFixture = TestBed.createComponent(EditPrerequisiteComponent); diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts index a2ee1c0c064b..b97f8099cd1d 100644 --- a/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts @@ -11,8 +11,8 @@ import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbColl import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { TaxonomySelectComponent } from 'app/course/competencies/taxonomy-select/taxonomy-select.component'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; describe('CompetencyRecommendationDetailComponent', () => { let competencyRecommendationDetailComponentFixture: ComponentFixture; @@ -28,7 +28,7 @@ describe('CompetencyRecommendationDetailComponent', () => { MockDirective(TranslateDirective), MockPipe(ArtemisTranslatePipe), MockPipe(HtmlForMarkdownPipe), - MockComponent(MarkdownEditorComponent), + MockComponent(MarkdownEditorMonacoComponent), MockComponent(TaxonomySelectComponent), ], providers: [], diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts index 20cfba29cac7..86f602263226 100644 --- a/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts @@ -70,4 +70,14 @@ describe('CourseDescriptionFormComponent', () => { courseDescriptionComponent.courseDescriptionControl.setValue(descriptionTooLong); expect(courseDescriptionComponent.isSubmitPossible).toBeFalse(); }); + + it('should update the description', () => { + courseDescriptionComponentFixture.detectChanges(); + + expect(courseDescriptionComponent.courseDescriptionControl.value).toEqual(courseDescriptionComponent.placeholder); + + const description = 'I'.repeat(courseDescriptionComponent['DESCRIPTION_MIN'] + 1); + courseDescriptionComponent.setCourseDescription(description); + expect(courseDescriptionComponent.courseDescriptionControl.value).toEqual(description); + }); }); diff --git a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts index 0a6055063b27..c8fdeedcc452 100644 --- a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts +++ b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts @@ -4,7 +4,7 @@ import { ComplaintResponseService } from 'app/complaints/complaint-response.serv import { ComplaintsForTutorComponent } from 'app/complaints/complaints-for-tutor/complaints-for-tutor.component'; import { ExerciseGroup } from 'app/entities/exercise-group.model'; import { TextareaCounterComponent } from 'app/shared/textarea/textarea-counter.component'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { RouterTestingModule } from '@angular/router/testing'; import { AlertService } from 'app/core/util/alert.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; @@ -17,6 +17,7 @@ import { HttpResponse } from '@angular/common/http'; import { of } from 'rxjs'; import { Course } from 'app/entities/course.model'; import { Exercise } from 'app/entities/exercise.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ComplaintsForTutorComponent', () => { let complaintsForTutorComponent: ComplaintsForTutorComponent; @@ -29,7 +30,13 @@ describe('ComplaintsForTutorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [RouterTestingModule.withRoutes([]), FormsModule], - declarations: [ComplaintsForTutorComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), MockComponent(TextareaCounterComponent)], + declarations: [ + ComplaintsForTutorComponent, + MockPipe(ArtemisTranslatePipe), + MockPipe(ArtemisDatePipe), + MockComponent(TextareaCounterComponent), + MockDirective(TranslateDirective), + ], providers: [MockProvider(ComplaintResponseService), MockProvider(ComplaintService), MockProvider(AlertService)], }) .compileComponents() diff --git a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts index 017814b34c5e..3a2e57aa1588 100644 --- a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts @@ -29,6 +29,7 @@ import { SidebarComponent } from 'app/shared/sidebar/sidebar.component'; import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; import { By } from '@angular/platform-browser'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('CourseExercisesComponent', () => { let fixture: ComponentFixture; @@ -44,7 +45,7 @@ describe('CourseExercisesComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule, FormsModule, RouterTestingModule.withRoutes([]), MockModule(ReactiveFormsModule)], + imports: [ArtemisTestModule, FormsModule, RouterTestingModule.withRoutes([]), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], declarations: [ CourseExercisesComponent, SidebarComponent, diff --git a/src/test/javascript/spec/component/course/course-update.component.spec.ts b/src/test/javascript/spec/component/course/course-update.component.spec.ts index 9566d806f9cf..2239ab6f91d1 100644 --- a/src/test/javascript/spec/component/course/course-update.component.spec.ts +++ b/src/test/javascript/spec/component/course/course-update.component.spec.ts @@ -43,7 +43,7 @@ import { ImageCropperModalComponent } from 'app/course/manage/image-cropper-moda import { FeatureToggle, FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service'; import { MockFeatureToggleService } from '../../helpers/mocks/service/mock-feature-toggle.service'; -@Component({ selector: 'jhi-markdown-editor', template: '' }) +@Component({ selector: 'jhi-markdown-editor-monaco', template: '' }) class MarkdownEditorStubComponent { @Input() markdown: string; @Input() enableResize = false; diff --git a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts index 2f5a5ee00a31..2a5d9fde2bb3 100644 --- a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts +++ b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { NgModel } from '@angular/forms'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { NgbCollapse, NgbModal, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model'; import { DragAndDropQuestion } from 'app/entities/quiz/drag-and-drop-question.model'; import { DragItem } from 'app/entities/quiz/drag-item.model'; @@ -13,10 +13,6 @@ import { QuizScoringInfoModalComponent } from 'app/exercises/quiz/manage/quiz-sc import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component'; import { FileUploaderService } from 'app/shared/http/file-uploader.service'; import { SecuredImageComponent } from 'app/shared/image/secured-image.component'; -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; -import { ExplanationCommand } from 'app/shared/markdown-editor/domainCommands/explanation.command'; -import { HintCommand } from 'app/shared/markdown-editor/domainCommands/hint.command'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; @@ -27,8 +23,9 @@ import { DragAndDropQuestionUtil } from 'app/exercises/quiz/shared/drag-and-drop import { ChangeDetectorRef } from '@angular/core'; import { clone } from 'lodash-es'; import { CdkDragDrop, DragDropModule } from '@angular/cdk/drag-drop'; -import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap'; -import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; +import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action'; +import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action'; +import { MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; describe('DragAndDropQuestionEditComponent', () => { let fixture: ComponentFixture; @@ -75,7 +72,7 @@ describe('DragAndDropQuestionEditComponent', () => { DragAndDropQuestionEditComponent, MockPipe(ArtemisTranslatePipe), MockComponent(QuizScoringInfoModalComponent), - MockComponent(MarkdownEditorComponent), + MockComponent(MarkdownEditorMonacoComponent), MockComponent(SecuredImageComponent), MockComponent(DragAndDropQuestionComponent), MockDirective(NgModel), @@ -603,36 +600,36 @@ describe('DragAndDropQuestionEditComponent', () => { expect(component.questionEditorText).toBe(newValue); }); - it('should detect domain commands', () => { + it('should detect domain actions', () => { component.question = new DragAndDropQuestion(); component.question.text = 'text'; component.question.explanation = 'explanation'; component.question.hint = 'hint'; - let domainCommand: [string, DomainCommand]; + let textWithDomainAction: TextWithDomainAction; // explanation - let command = new ExplanationCommand(); + let action = new MonacoQuizExplanationAction(); let text = 'take this as an explanationCommand'; - domainCommand = [text, command]; + textWithDomainAction = { text, action }; - component.domainCommandsFound([domainCommand]); + component.domainActionsFound([textWithDomainAction]); expect(component.question.explanation).toBe(text); // hint - command = new HintCommand(); + action = new MonacoQuizHintAction(); text = 'take this as a hintCommand'; - domainCommand = [text, command]; + textWithDomainAction = { text, action }; - component.domainCommandsFound([domainCommand]); + component.domainActionsFound([textWithDomainAction]); expect(component.question.hint).toBe(text); // text text = 'take this null as a command'; - domainCommand = [text, null as unknown as DomainCommand]; + textWithDomainAction = { text, action: undefined }; - component.domainCommandsFound([domainCommand]); + component.domainActionsFound([textWithDomainAction]); expect(component.question.text).toBe(text); }); diff --git a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts index 9d8afe5529f9..4b11c8785650 100644 --- a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts +++ b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts @@ -8,7 +8,6 @@ import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/question import { DragItemComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-item.component'; import { QuizScoringInfoStudentModalComponent } from 'app/exercises/quiz/shared/questions/quiz-scoring-infostudent-modal/quiz-scoring-info-student-modal.component'; import { SecuredImageComponent } from 'app/shared/image/secured-image.component'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; @@ -34,7 +33,6 @@ describe('DragAndDropQuestionComponent', () => { declarations: [ DragAndDropQuestionComponent, MockPipe(ArtemisTranslatePipe), - MockComponent(MarkdownEditorComponent), MockComponent(SecuredImageComponent), MockComponent(DragAndDropQuestionComponent), MockComponent(QuizScoringInfoStudentModalComponent), diff --git a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts index 80750ba8853b..5bf796d51879 100644 --- a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateService } from '@ngx-translate/core'; -import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { HttpResponse } from '@angular/common/http'; import { ExamScoresAverageScoresGraphComponent } from 'app/exam/exam-scores/exam-scores-average-scores-graph.component'; @@ -15,6 +15,7 @@ import { GraphColors } from 'app/entities/statistics.model'; import { NgxChartsSingleSeriesDataEntry } from 'app/shared/chart/ngx-charts-datatypes'; import { ExerciseType } from 'app/entities/exercise.model'; import { LocaleConversionService } from 'app/shared/service/locale-conversion.service'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ExamScoresAverageScoresGraphComponent', () => { let fixture: ComponentFixture; @@ -55,7 +56,7 @@ describe('ExamScoresAverageScoresGraphComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)], - declarations: [ExamScoresAverageScoresGraphComponent, MockPipe(ArtemisTranslatePipe)], + declarations: [ExamScoresAverageScoresGraphComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], providers: [ MockProvider(CourseManagementService, { find: () => { diff --git a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts index 3536693cbe09..6de1e1db5c13 100644 --- a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts @@ -19,7 +19,6 @@ import { Exam } from 'app/entities/exam.model'; import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { GradingSystemService } from 'app/grading-system/grading-system.service'; @@ -43,6 +42,7 @@ import { DocumentationButtonComponent } from 'app/shared/components/documentatio import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component'; import { UMLDiagramType } from '@ls1intum/apollon'; import { TextExercise } from 'app/entities/text-exercise.model'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; @Component({ template: '', @@ -77,7 +77,7 @@ describe('ExamUpdateComponent', () => { declarations: [ ExamUpdateComponent, MockComponent(FormDateTimePickerComponent), - MockComponent(MarkdownEditorComponent), + MockComponent(MarkdownEditorMonacoComponent), MockComponent(DataTableComponent), DummyComponent, MockPipe(ArtemisTranslatePipe), @@ -606,7 +606,7 @@ describe('ExamUpdateComponent', () => { ExamUpdateComponent, ExamExerciseImportComponent, MockComponent(FormDateTimePickerComponent), - MockComponent(MarkdownEditorComponent), + MockComponent(MarkdownEditorMonacoComponent), MockComponent(DataTableComponent), DummyComponent, MockPipe(ArtemisTranslatePipe), diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts index 6e248103b247..6ab12448b3fb 100644 --- a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts @@ -7,9 +7,9 @@ import { AccountService } from 'app/core/auth/account.service'; import { By } from '@angular/platform-browser'; import { MockComponent } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { ExamLiveEventComponent } from 'app/exam/shared/events/exam-live-event.component'; import { ExamWideAnnouncementEvent } from 'app/exam/participate/exam-participation-live-events.service'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; describe('ExamLiveAnnouncementCreateModalComponent', () => { let component: ExamLiveAnnouncementCreateModalComponent; @@ -19,7 +19,12 @@ describe('ExamLiveAnnouncementCreateModalComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ExamLiveAnnouncementCreateModalComponent, MockComponent(FaIconComponent), MockComponent(MarkdownEditorComponent), MockComponent(ExamLiveEventComponent)], + declarations: [ + ExamLiveAnnouncementCreateModalComponent, + MockComponent(FaIconComponent), + MockComponent(MarkdownEditorMonacoComponent), + MockComponent(ExamLiveEventComponent), + ], providers: [ { provide: NgbActiveModal, useValue: { dismiss: jest.fn() } }, { provide: ExamManagementService, useValue: { createAnnouncement: jest.fn() } }, diff --git a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts index 50389d445c46..fb8f91a5ba57 100644 --- a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts +++ b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import dayjs from 'dayjs/esm'; -import { MockComponent, MockModule } from 'ng-mocks'; +import { MockComponent, MockDirective, MockModule } from 'ng-mocks'; import { Exercise, ExerciseType } from 'app/entities/exercise.model'; import { ExamSession } from 'app/entities/exam-session.model'; import { of } from 'rxjs'; @@ -21,6 +21,7 @@ import { TranslateService } from '@ngx-translate/core'; import { faCheck, faEdit } from '@fortawesome/free-solid-svg-icons'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ExamLiveEventsButtonComponent } from 'app/exam/participate/events/exam-live-events-button.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('Exam Navigation Bar Component', () => { let fixture: ComponentFixture; @@ -35,7 +36,7 @@ describe('Exam Navigation Bar Component', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, TranslateTestingModule, MockModule(NgbTooltipModule)], - declarations: [ExamNavigationBarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent)], + declarations: [ExamNavigationBarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent), MockDirective(TranslateDirective)], providers: [ ExamParticipationService, { provide: ExamExerciseUpdateService, useValue: mockExamExerciseUpdateService }, diff --git a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts index f53027f7a24c..fe01da3df68d 100644 --- a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts +++ b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts @@ -16,6 +16,8 @@ import { TranslateService } from '@ngx-translate/core'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe'; import { WorkingTimeChangeComponent } from 'app/exam/shared/working-time-change/working-time-change.component'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { MockDirective } from 'ng-mocks'; describe('ExamLiveEventComponent', () => { let component: ExamLiveEventComponent; @@ -23,7 +25,15 @@ describe('ExamLiveEventComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ExamLiveEventComponent, WorkingTimeChangeComponent, ArtemisTranslatePipe, ArtemisDatePipe, HtmlForMarkdownPipe, ArtemisDurationFromSecondsPipe], + declarations: [ + ExamLiveEventComponent, + WorkingTimeChangeComponent, + ArtemisTranslatePipe, + ArtemisDatePipe, + HtmlForMarkdownPipe, + ArtemisDurationFromSecondsPipe, + MockDirective(TranslateDirective), + ], imports: [FontAwesomeModule], providers: [{ provide: TranslateService, useClass: MockTranslateService }], }).compileComponents(); diff --git a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts index c9fa23b97001..4e3b44045052 100644 --- a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts +++ b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts @@ -22,6 +22,7 @@ import { MockCourseManagementService } from '../../helpers/mocks/service/mock-co import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { PresentationType } from 'app/grading-system/grading-system-presentations/grading-system-presentations.component'; import { download, generateCsv, mkConfig } from 'export-to-csv'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; jest.mock('export-to-csv', () => { return { @@ -86,6 +87,7 @@ describe('Detailed Grading System Component', () => { MockComponent(HelpIconComponent), MockDirective(DeleteButtonDirective), MockPipe(ArtemisTranslatePipe), + MockDirective(TranslateDirective), ], providers: [ { provide: ActivatedRoute, useValue: route }, diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts index 61f94f5c2cfc..5dba62cd4934 100644 --- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts @@ -5,7 +5,7 @@ import { } from 'app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { CourseUsersSelectorComponent } from 'app/shared/course-users-selector/course-users-selector.component'; import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model'; import { generateExampleChannelDTO, generateExampleGroupChatDTO } from '../../../helpers/conversationExampleModels'; @@ -13,6 +13,7 @@ import { Course } from 'app/entities/course.model'; import { isChannelDTO } from 'app/entities/metis/conversation/channel.model'; import { By } from '@angular/platform-browser'; import { UserPublicInfoDTO } from 'app/core/user/user.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; const examples: ConversationDTO[] = [generateExampleGroupChatDTO({}), generateExampleChannelDTO({})]; examples.forEach((activeConversation) => { @@ -24,7 +25,7 @@ examples.forEach((activeConversation) => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ReactiveFormsModule, FormsModule], - declarations: [ConversationAddUsersFormComponent, MockComponent(CourseUsersSelectorComponent), MockPipe(ArtemisTranslatePipe)], + declarations: [ConversationAddUsersFormComponent, MockComponent(CourseUsersSelectorComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], }).compileComponents(); })); diff --git a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts index cabb62f2ae39..4b6ccb1ca3f1 100644 --- a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts @@ -5,20 +5,21 @@ import { CourseExamsComponent } from 'app/overview/course-exams/course-exams.com import { Exam } from 'app/entities/exam.model'; import { ArtemisTestModule } from '../../../test.module'; import dayjs from 'dayjs/esm'; -import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { Observable, of } from 'rxjs'; import { ArtemisServerDateService } from 'app/shared/server-date.service'; import { ExamParticipationService } from 'app/exam/participate/exam-participation.service'; import { StudentExam } from 'app/entities/student-exam.model'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { CourseStorageService } from 'app/course/manage/course-storage.service'; -import { SidebarComponent } from '../../../../../../main/webapp/app/shared/sidebar/sidebar.component'; +import { SidebarComponent } from 'app/shared/sidebar/sidebar.component'; import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component'; import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe'; import { RouterTestingModule } from '@angular/router/testing'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { CourseOverviewService } from 'app/overview/course-overview.service'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('CourseExamsComponent', () => { let component: CourseExamsComponent; @@ -100,7 +101,7 @@ describe('CourseExamsComponent', () => { router.navigate.mockImplementation(() => Promise.resolve(true)); TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)], + imports: [ArtemisTestModule, RouterTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], declarations: [CourseExamsComponent, SidebarComponent, SearchFilterComponent, MockPipe(ArtemisTranslatePipe), MockPipe(SearchFilterPipe)], providers: [ { provide: Router, useValue: router }, diff --git a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts index ea11d9ecd2a4..7631c4d81136 100644 --- a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts +++ b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts @@ -29,6 +29,7 @@ import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; import { of } from 'rxjs'; import { MockTranslateValuesDirective } from '../../../helpers/mocks/directive/mock-translate-values.directive'; import { ArtemisTestModule } from '../../../test.module'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('CourseStatisticsComponent', () => { let comp: CourseStatisticsComponent; @@ -336,6 +337,7 @@ describe('CourseStatisticsComponent', () => { MockComponent(DocumentationButtonComponent), MockTranslateValuesDirective, ArtemisTranslatePipe, + TranslateDirective, ], providers: [ MockProvider(ArtemisNavigationUtilService), @@ -376,11 +378,11 @@ describe('CourseStatisticsComponent', () => { fixture.detectChanges(); expect(comp.ngxExerciseGroups.size).toBe(4); const modelingWrapper = fixture.debugElement.query(By.css('#modeling-wrapper')); - expect(modelingWrapper.query(By.css('h4')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.exerciseCount '); - expect(modelingWrapper.query(By.css('#absolute-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.yourPoints '); - expect(modelingWrapper.query(By.css('#reachable-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.reachablePoints '); - expect(modelingWrapper.query(By.css('#max-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.totalPoints '); - expect(fixture.debugElement.query(By.css('#presentation-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.presentationScore '); + expect(modelingWrapper.query(By.css('h4')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.exerciseCount'); + expect(modelingWrapper.query(By.css('#absolute-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.yourPoints'); + expect(modelingWrapper.query(By.css('#reachable-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.reachablePoints'); + expect(modelingWrapper.query(By.css('#max-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.totalPoints'); + expect(fixture.debugElement.query(By.css('#presentation-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.presentationScore'); const programming: NgxExercise = comp.ngxExerciseGroups.get(ExerciseType.PROGRAMMING)![0]; expect(programming.series).toHaveLength(6); @@ -444,11 +446,11 @@ describe('CourseStatisticsComponent', () => { // check that html file displays the correct elements let debugElement = fixture.debugElement.query(By.css('#absolute-course-score')); - expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.yourPoints '); + expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.yourPoints'); debugElement = fixture.debugElement.query(By.css('#reachable-course-score')); - expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.reachablePoints '); + expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.reachablePoints'); debugElement = fixture.debugElement.query(By.css('#max-course-score')); - expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.totalPoints '); + expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.totalPoints'); }); it('should set the course after being notified about a course update', () => { 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 99a42141fbd2..ffb59f1825a3 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 @@ -1,18 +1,19 @@ import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; -import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component'; -import { ArtemisSharedModule } from 'app/shared/shared.module'; -import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { Component, DebugElement, ViewChild } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; -import { MockPipe, MockProvider } from 'ng-mocks'; 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 { CourseManagementService } from 'app/course/manage/course-management.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { Component, DebugElement, ViewChild } from '@angular/core'; +import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component'; import { UserPublicInfoDTO } from 'app/core/user/user.model'; -import { HttpResponse } from '@angular/common/http'; -import { of } from 'rxjs'; -import { By } from '@angular/platform-browser'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { ArtemisSharedModule } from 'app/shared/shared.module'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ template: ` @@ -32,11 +33,9 @@ class WrapperComponent { disabled = false; courseId = 1; - label = 'TestLabel'; rolesToAllowSearchingIn: SearchRoleGroup[] = ['tutors', 'students', 'instructors']; multiSelect = true; showUserList = true; - public selectedUsers: UserPublicInfoDTO[] | undefined | null = []; } @@ -48,7 +47,7 @@ describe('CourseUsersSelectorComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [CommonModule, FormsModule, ReactiveFormsModule, ArtemisSharedModule, ArtemisSharedComponentModule, NgbTypeaheadModule], + imports: [CommonModule, FormsModule, ReactiveFormsModule, NgbTypeaheadModule, ArtemisSharedModule, ArtemisSharedComponentModule, TranslateModule.forRoot()], declarations: [CourseUsersSelectorComponent, WrapperComponent, MockPipe(ArtemisTranslatePipe)], providers: [MockProvider(CourseManagementService)], }).compileComponents(); @@ -141,61 +140,63 @@ describe('CourseUsersSelectorComponent', () => { fixture.detectChanges(); tick(1000); expect(userSelectorComponent.selectedUsers).toEqual([exampleUserPublicInfoDTO]); - expect(fixture.debugElement.query(By.css('input')).nativeElement.disabled).toBeTrue(); - expect(fixture.debugElement.queryAll(By.css('.selected-user'))).toHaveLength(1); expect(fixture.debugElement.query(By.css('.delete-user'))).toBeFalsy(); })); }); -}); -function getNativeInput(element: HTMLElement): HTMLInputElement { - return element.querySelector('input'); -} + function getNativeInput(element: HTMLElement): HTMLInputElement { + return element.querySelector('input'); + } -function changeInput(element: any, value: string) { - const input = getNativeInput(element); - input.value = value; - const evt = new Event('input', { bubbles: true, cancelable: false }); - input.dispatchEvent(evt); -} + function changeInput(element: any, value: string) { + const input = getNativeInput(element); + input.value = value; + const evt = new Event('input', { bubbles: true, cancelable: false }); + input.dispatchEvent(evt); + } -function getDropdownButtons(element: DebugElement): DebugElement[] { - return Array.from(element.queryAll(By.css('button.dropdown-item'))); -} + function getDropdownButtons(element: DebugElement): DebugElement[] { + return Array.from(element.queryAll(By.css('button.dropdown-item'))); + } -function expectDropdownItems(nativeEl: HTMLElement, dropdownEntries: string[]): void { - const pages = nativeEl.querySelectorAll('button.dropdown-item'); - expect(pages).toHaveLength(dropdownEntries.length); - for (let i = 0; i < dropdownEntries.length; i++) { - const resultDef = dropdownEntries[i]; - expect(normalizeText(pages[i].textContent)).toEqual(resultDef); + function expectDropdownItems(nativeEl: HTMLElement, dropdownEntries: string[]): void { + const pages = nativeEl.querySelectorAll('button.dropdown-item'); + expect(pages).toHaveLength(dropdownEntries.length); + for (let i = 0; i < dropdownEntries.length; i++) { + const resultDef = dropdownEntries[i]; + expect(normalizeText(pages[i].textContent)).toEqual(resultDef); + } } -} -function normalizeText(txt: string | null): string { - return txt ? txt.trim().replace(/\s+/g, ' ') : ''; -} + function normalizeText(txt: string | null): string { + return txt ? txt.trim().replace(/\s+/g, ' ') : ''; + } -function generateExampleUserPublicInfoDTO({ - id = 3, - login = 'mort', - name = 'Mortimer of Sto Helit', - firstName = 'Mortimer', - lastName = 'of Sto Helit', - isInstructor = false, - isEditor = false, - isTeachingAssistant = false, - isStudent = true, -}: UserPublicInfoDTO) { - const exampleUserPublicInfoDTO = new UserPublicInfoDTO(); - exampleUserPublicInfoDTO.id = id; - exampleUserPublicInfoDTO.login = login; - exampleUserPublicInfoDTO.name = name; - exampleUserPublicInfoDTO.firstName = firstName; - exampleUserPublicInfoDTO.lastName = lastName; - exampleUserPublicInfoDTO.isInstructor = isInstructor; - exampleUserPublicInfoDTO.isEditor = isEditor; - exampleUserPublicInfoDTO.isTeachingAssistant = isTeachingAssistant; - exampleUserPublicInfoDTO.isStudent = isStudent; - return exampleUserPublicInfoDTO; -} + function generateExampleUserPublicInfoDTO({ + id = 3, + login = 'mort', + name = 'Mortimer of Sto Helit', + firstName = 'Mortimer', + lastName = 'of Sto Helit', + isInstructor = false, + isEditor = false, + isTeachingAssistant = false, + isStudent = true, + }: Partial = {}): UserPublicInfoDTO { + const exampleUserPublicInfoDTO = new UserPublicInfoDTO(); + exampleUserPublicInfoDTO.id = id; + exampleUserPublicInfoDTO.login = login; + exampleUserPublicInfoDTO.name = name; + exampleUserPublicInfoDTO.firstName = firstName; + exampleUserPublicInfoDTO.lastName = lastName; + exampleUserPublicInfoDTO.isInstructor = isInstructor; + exampleUserPublicInfoDTO.isEditor = isEditor; + exampleUserPublicInfoDTO.isTeachingAssistant = isTeachingAssistant; + exampleUserPublicInfoDTO.isStudent = isStudent; + return exampleUserPublicInfoDTO; + } + + afterEach(() => { + jest.clearAllMocks(); + }); +}); diff --git a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts index f9f5326d2e3c..a89b2264612a 100644 --- a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts +++ b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts @@ -1,5 +1,5 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { ConversationOptionsComponent } from 'app/shared/sidebar/conversation-options/conversation-options.component'; @@ -26,6 +26,7 @@ import { defaultFirstLayerDialogOptions } from 'app/overview/course-conversation import { ConversationDetailDialogComponent } from 'app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component'; import { MetisConversationService } from 'app/shared/metis/metis-conversation.service'; import { isOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; const examples: (() => ConversationDTO)[] = [ () => generateOneToOneChatDTO({}), @@ -59,7 +60,7 @@ examples.forEach((conversation) => { { path: 'courses/:courseId/exams/:examId', component: ExamDetailComponent }, ]), ], - declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe)], + declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)], providers: [ MockProvider(ConversationService), MockProvider(MetisConversationService), diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts index 1f8fa36ce3c9..de181aa7add3 100644 --- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts @@ -1,13 +1,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { CourseTutorialGroupCardComponent } from 'app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component'; -import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockComponent, MockPipe } from 'ng-mocks'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { TranslateService } from '@ngx-translate/core'; import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels'; import { User } from 'app/core/user/user.model'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { Course } from 'app/entities/course.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; +import { MockComponent, MockDirective } from 'ng-mocks'; +import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service'; describe('CourseTutorialGroupCardComponent', () => { let component: CourseTutorialGroupCardComponent; @@ -18,7 +20,16 @@ describe('CourseTutorialGroupCardComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [RouterTestingModule.withRoutes([])], - declarations: [CourseTutorialGroupCardComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe)], + declarations: [CourseTutorialGroupCardComponent, MockComponent(FaIconComponent), TranslatePipeMock, MockDirective(TranslateDirective)], + providers: [ + { + provide: TranslateService, + useValue: { + instant: (key: string) => key, + get: (key: string) => key, + }, + }, + ], }).compileComponents(); fixture = TestBed.createComponent(CourseTutorialGroupCardComponent); 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 7a722cf69505..cf60468091e9 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 @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'; import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service'; import { MockRouter } from '../../../helpers/mocks/mock-router'; -import { MockModule, MockPipe, MockProvider } from 'ng-mocks'; +import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { AlertService } from 'app/core/util/alert.service'; import { ActivatedRoute, Router, RouterModule, convertToParamMap } from '@angular/router'; @@ -18,6 +18,7 @@ import { SidebarComponent } from 'app/shared/sidebar/sidebar.component'; 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'; describe('CourseTutorialGroupsComponent', () => { let fixture: ComponentFixture; @@ -32,7 +33,7 @@ describe('CourseTutorialGroupsComponent', () => { router.navigate.mockImplementation(() => Promise.resolve(true)); TestBed.configureTestingModule({ - imports: [ArtemisTestModule, RouterModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)], + imports: [ArtemisTestModule, RouterModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)], declarations: [CourseTutorialGroupsComponent, MockPipe(ArtemisTranslatePipe), SidebarComponent, SearchFilterComponent, MockPipe(SearchFilterPipe)], providers: [ MockProvider(TutorialGroupsService), diff --git a/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts b/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts index 17d24b98c07a..6fd47e0a9a7f 100644 --- a/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts +++ b/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts @@ -156,7 +156,7 @@ export class CourseCommunicationPage { */ async reply(postID: number, content: string) { const postElement = this.getSinglePost(postID); - const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .ace_content'); + const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .monaco-editor'); await postReplyField.click(); await postReplyField.pressSequentially(content); const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/answer-posts`); @@ -172,7 +172,7 @@ export class CourseCommunicationPage { */ async replyWithMessage(postID: number, content: string): Promise { const postElement = this.getSinglePost(postID); - const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .ace_content'); + const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .monaco-editor'); await postReplyField.click(); await postReplyField.pressSequentially(content); const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/answer-messages`); diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalyzer.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalyzer.java index 250966bfd432..b096ba1201c6 100644 --- a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalyzer.java +++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalyzer.java @@ -15,9 +15,9 @@ public class EndpointAnalyzer { - private static String EndpointAnalysisResultPath = "endpointAnalysisResult.json"; + private static String ENDPOINT_ANALYSIS_RESULT_PATH = "endpointAnalysisResult.json"; - private static final Logger logger = LoggerFactory.getLogger(EndpointAnalyzer.class); + private static final Logger log = LoggerFactory.getLogger(EndpointAnalyzer.class); public static void main(String[] args) { analyzeEndpoints(); @@ -60,10 +60,13 @@ private static void analyzeEndpoints() { for (EndpointInformation endpoint : endpointClass.endpoints()) { String endpointURI = endpoint.buildComparableEndpointUri(); - List matchingRestCalls = restCallMap.getOrDefault(endpointURI, new ArrayList<>()); + List restCallsWithMatchingURI = restCallMap.getOrDefault(endpointURI, new ArrayList<>()); // Check for wildcard endpoints if no exact match is found - checkForWildcardEndpoints(endpoint, matchingRestCalls, endpointURI, restCallMap); + checkForWildcardEndpoints(endpoint, restCallsWithMatchingURI, endpointURI, restCallMap); + + List matchingRestCalls = restCallsWithMatchingURI.stream() + .filter(restCall -> restCall.method().toLowerCase().equals(endpoint.getHttpMethod().toLowerCase())).toList(); if (matchingRestCalls.isEmpty()) { unusedEndpoints.add(endpoint); @@ -75,10 +78,10 @@ private static void analyzeEndpoints() { } EndpointAnalysis endpointAnalysis = new EndpointAnalysis(endpointsAndMatchingRestCalls, unusedEndpoints); - mapper.writeValue(new File(EndpointAnalysisResultPath), endpointAnalysis); + mapper.writeValue(new File(ENDPOINT_ANALYSIS_RESULT_PATH), endpointAnalysis); } catch (IOException e) { - logger.error("Failed to analyze endpoints", e); + log.error("Failed to analyze endpoints", e); } } @@ -119,26 +122,26 @@ private static void printEndpointAnalysisResult() { ObjectMapper mapper = new ObjectMapper(); EndpointAnalysis endpointsAndMatchingRestCalls = null; try { - endpointsAndMatchingRestCalls = mapper.readValue(new File(EndpointAnalysisResultPath), new TypeReference() { + endpointsAndMatchingRestCalls = mapper.readValue(new File(ENDPOINT_ANALYSIS_RESULT_PATH), new TypeReference() { }); } catch (IOException e) { - logger.error("Failed to deserialize endpoint analysis result", e); + log.error("Failed to deserialize endpoint analysis result", e); return; } endpointsAndMatchingRestCalls.unusedEndpoints().stream().forEach(endpoint -> { - logger.info("============================================="); - logger.info("Endpoint URI: {}", endpoint.buildCompleteEndpointURI()); - logger.info("HTTP method: {}", endpoint.httpMethodAnnotation()); - logger.info("File path: {}", endpoint.className()); - logger.info("Line: {}", endpoint.line()); - logger.info("============================================="); - logger.info("No matching REST call found for endpoint: {}", endpoint.buildCompleteEndpointURI()); - logger.info("---------------------------------------------"); - logger.info(""); + log.info("============================================="); + log.info("Endpoint URI: {}", endpoint.buildCompleteEndpointURI()); + log.info("HTTP method: {}", endpoint.httpMethodAnnotation()); + log.info("File path: {}", endpoint.className()); + log.info("Line: {}", endpoint.line()); + log.info("============================================="); + log.info("No matching REST call found for endpoint: {}", endpoint.buildCompleteEndpointURI()); + log.info("---------------------------------------------"); + log.info(""); }); - logger.info("Number of endpoints without matching REST calls: {}", endpointsAndMatchingRestCalls.unusedEndpoints().size()); + log.info("Number of endpoints without matching REST calls: {}", endpointsAndMatchingRestCalls.unusedEndpoints().size()); } } diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointInformation.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointInformation.java index 19b32dc8881b..52f33cef81e2 100644 --- a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointInformation.java +++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointInformation.java @@ -4,16 +4,16 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -public record EndpointInformation(String requestMapping, String endpoint, String httpMethodAnnotation, String URI, String className, int line, List otherAnnotations) { +public record EndpointInformation(String requestMapping, String endpoint, String httpMethodAnnotation, String uri, String className, int line, List otherAnnotations) { - public String buildCompleteEndpointURI() { + String buildCompleteEndpointURI() { StringBuilder result = new StringBuilder(); if (this.requestMapping != null && !this.requestMapping.isEmpty()) { // Remove quotes from the requestMapping as they are used to define the String in the source code but are not part of the URI result.append(this.requestMapping.replace("\"", "")); } // Remove quotes from the URI as they are used to define the String in the source code but are not part of the URI - result.append(this.URI.replace("\"", "")); + result.append(this.uri.replace("\"", "")); return result.toString(); } @@ -23,7 +23,7 @@ String buildComparableEndpointUri() { } @JsonIgnore - public String getHttpMethod() { + String getHttpMethod() { return switch (this.httpMethodAnnotation) { case "GetMapping" -> "get"; case "PostMapping" -> "post"; diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointParser.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointParser.java index b0ab2cdb1f0b..9fb5a05b72da 100644 --- a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointParser.java +++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointParser.java @@ -36,7 +36,7 @@ public class EndpointParser { static final String REST_CALL_PARSING_RESULT_PATH = "restCalls.json"; - private static final Logger logger = LoggerFactory.getLogger(EndpointParser.class); + private static final Logger log = LoggerFactory.getLogger(EndpointParser.class); public static void main(String[] args) { final Path absoluteDirectoryPath = Path.of("../../src/main/java").toAbsolutePath().normalize(); @@ -48,7 +48,7 @@ public static void main(String[] args) { filesToParse = paths.filter(Files::isRegularFile).filter(path -> path.toString().endsWith(".java")).map(Path::toString).toArray(String[]::new); } catch (IOException e) { - logger.error("Error reading files from directory: {}", absoluteDirectoryPath, e); + log.error("Error reading files from directory: {}", absoluteDirectoryPath, e); } parseServerEndpoints(filesToParse); @@ -190,9 +190,9 @@ else if (annotation instanceof NormalAnnotationExpr normalAnnotationExpr) { */ private static void printFilesFailedToParse(List filesFailedToParse) { if (!filesFailedToParse.isEmpty()) { - logger.warn("Files failed to parse:", filesFailedToParse); + log.warn("Files failed to parse:", filesFailedToParse); for (String file : filesFailedToParse) { - logger.warn(file); + log.warn(file); } } } @@ -211,7 +211,7 @@ private static void writeEndpointsToFile(List endpoint new ObjectMapper().writeValue(new File(ENDPOINT_PARSING_RESULT_PATH), endpointClasses); } catch (IOException e) { - logger.error("Failed to write endpoint information to file", e); + log.error("Failed to write endpoint information to file", e); } } } From 3fd0fe6c3e42df3d071c6cc3770127194c015e11 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:25:49 +0200 Subject: [PATCH 19/95] merge3 --- .../artemis/repository/ExamRepository.java | 2 +- .../repository/ExamSessionRepository.java | 6 ++--- ...example-modeling-submission.component.html | 12 +++++----- .../example-solution.component.html | 4 ++-- .../example-submission-import.component.html | 4 ++-- .../example-submissions.component.html | 2 +- .../example-text-submission.component.html | 22 +++++++++++-------- .../pageobjects/exam/ExamCreationPage.ts | 7 +----- .../pageobjects/exam/ExamManagementPage.ts | 2 +- 9 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java index 127e51c9efab..afac757c9ccd 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java @@ -58,7 +58,7 @@ public interface ExamRepository extends ArtemisJpaRepository { /** * Find all exams for multiple courses that are already visible to the user (either registered, at least tutor or the exam is a test exam) * - * @param courseIds set of courseIds that the exams should be retreived + * @param courseIds set of courseIds that the exams should be retrieved * @param userId the id of the user requesting the exams * @param groupNames the groups of the user requesting the exams * @param now the current date, typically ZonedDateTime.now() diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java index b86b9ea3abc3..3924394b81ee 100644 --- a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java +++ b/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java @@ -39,9 +39,9 @@ Set findAllExamSessionsWithTheSameIpAddressAndBrowserFingerprintByE @Param("studentExamId") Long studentExamId, @Param("ipAddress") String ipAddress, @Param("browserFingerprintHash") String browserFingerprintHash); @Query(""" - SELECT es - FROM ExamSession es - WHERE es.studentExam.exam.id = :examId + SELECT es + FROM ExamSession es + WHERE es.studentExam.exam.id = :examId """) Set findAllExamSessionsByExamId(@Param("examId") long examId); } 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 20082632d010..8f414f19509e 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 @@ -5,7 +5,7 @@

        {{ 'artemisApp.exampleSubmission.home.assessmentTraining' | artemisTranslate }}

        +
        } @if (assessmentMode) {

        @@ -17,7 +17,7 @@
        {{ 'artemisApp.exampleSubmission.home.assessmentTraining' |
        - {{ 'artemisApp.exampleSubmission.assessmentTraining' | artemisTranslate }} +
        @@ -30,9 +30,7 @@
        {{ 'artemisApp.exampleSubmission.home.assessmentTraining' | [value]="ExampleSubmissionMode.READ_AND_CONFIRM" [(ngModel)]="selectedMode" /> - + {{ 'artemisApp.exampleSubmission.home.assessmentTraining' | [value]="ExampleSubmissionMode.ASSESS_CORRECTLY" [(ngModel)]="selectedMode" /> - +
        +
        } @if (readOnly) { diff --git a/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts index 53ac528bcdcc..e710822e6723 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts @@ -131,15 +131,10 @@ export class ExamCreationPage { private async enterText(selector: string, text: string) { const textField = this.page.locator(selector); - const textInput = textField.locator('.ace_text-input'); - // const currentText = textField.locator('.ace_text'); - - // if (await currentText.isVisible()) { - // const text = await currentText.textContent(); + const textInput = textField.locator('.monaco-editor'); if (text) { await clearTextField(textInput); } - // } await textInput.pressSequentially(text); } } diff --git a/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts b/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts index ad7dae5a7225..e2e5f76c24f0 100644 --- a/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts +++ b/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts @@ -114,7 +114,7 @@ export class ExamManagementPage { } async typeAnnouncementMessage(message: string) { - await this.page.locator('.ace_text-input').fill(message); + await this.page.locator('.monaco-editor textarea').fill(message); } async verifyAnnouncementContent(announcementTime: Dayjs, message: string, authorUsername: string) { From 7e598e04d5cca0eac03c088b1b0f0ee5e73b13db Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:26:26 +0200 Subject: [PATCH 20/95] merge4 --- ...ercise-assessment-dashboard.component.html | 146 ++++++------------ .../shared/exercise/exercise.service.ts | 9 +- .../exercise-categories.component.html | 6 +- .../exercise-categories.module.ts | 3 +- src/main/webapp/i18n/de/exercise-actions.json | 2 + src/main/webapp/i18n/de/exercise.json | 1 + src/main/webapp/i18n/en/exercise-actions.json | 2 + src/main/webapp/i18n/en/exercise.json | 1 + .../entities/exercise-category.model.spec.ts | 49 ++++++ 9 files changed, 116 insertions(+), 103 deletions(-) create mode 100644 src/test/javascript/spec/entities/exercise-category.model.spec.ts diff --git a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html index eae89aacb43b..bb0b532d5fe7 100644 --- a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html +++ b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html @@ -70,9 +70,7 @@ [panelDescriptionHeader]="'artemisApp.exerciseAssessmentDashboard.totalYours' | artemisTranslate" >
        -
        - {{ 'artemisApp.assessmentDashboard.submissions' | artemisTranslate }} -
        +
        {{ numberOfSubmissions.inTime }} @if (numberOfSubmissions.late > 0) { @@ -88,7 +86,7 @@ @if (complaintsEnabled) {
        -
        {{ 'artemisApp.assessmentDashboard.complaints' | artemisTranslate }}
        +
        @if (exercise.isAtLeastInstructor) {
        @@ -115,9 +113,7 @@ @if (feedbackRequestEnabled) {
        -
        - {{ 'artemisApp.assessmentDashboard.moreFeedbackRequests' | artemisTranslate }} -
        +
        @if (exercise.isAtLeastInstructor) {
        @@ -147,13 +143,13 @@ }
        -
        {{ 'artemisApp.exerciseAssessmentDashboard.ratings' | artemisTranslate }}
        +
        {{ ratingsDashboardInfo.total }} | {{ ratingsDashboardInfo.tutor }}
        - {{ 'artemisApp.exerciseAssessmentDashboard.exerciseDetails' | artemisTranslate }} +
        @@ -161,12 +157,12 @@
        - {{ 'artemisApp.exerciseAssessmentDashboard.stats.intime' | artemisTranslate }} +
        @if (numberOfSubmissions.late > 0) {
        - {{ 'artemisApp.exerciseAssessmentDashboard.stats.late' | artemisTranslate }} +
        }
        @@ -213,7 +209,7 @@ @if (exercise.type === ExerciseType.PROGRAMMING) {
        -

        {{ 'artemisApp.exerciseAssessmentDashboard.exampleSolution' | artemisTranslate }}

        +

        @if (!localVCEnabled) { @@ -236,7 +232,7 @@

        {{ 'artemisApp.exerciseAssessmentDashboard.exampleSolution' | artemisTransla @if (exercise.gradingCriteria && exercise.gradingCriteria.length > 0) {
        -

        {{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' | artemisTranslate }}

        +

        } @@ -245,19 +241,15 @@

        {{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' | @if (tutorParticipationStatus === NOT_PARTICIPATED && !isTestRun) {
        -

        {{ 'artemisApp.exerciseAssessmentDashboard.pleaseContactIfUnclear' | artemisTranslate }}

        +

        @@ -294,9 +286,7 @@

        {{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' | (click)="openExampleSubmission(nextExampleSubmissionId, true, false)" > @if (stats.toReview.done <= 0) { - - {{ 'artemisApp.exerciseAssessmentDashboard.start' | artemisTranslate }} - + } @else { {{ 'artemisApp.exerciseAssessmentDashboard.continue' | artemisTranslate }} } @@ -339,9 +329,7 @@

        {{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' | (click)="openExampleSubmission(nextExampleSubmissionId, false, true)" > @if (stats.toAssess.done <= 0) { - - {{ 'artemisApp.exerciseAssessmentDashboard.start' | artemisTranslate }} - + } @else { {{ 'artemisApp.exerciseAssessmentDashboard.continue' | artemisTranslate }} } @@ -373,22 +361,20 @@

        {{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' |

        } @if (submissionLockLimitReached && tutorParticipationStatus !== REVIEWED_INSTRUCTIONS) { -
        - {{ 'artemisApp.submission.lockedSubmissionsLimitReached' | artemisTranslate }} -
        +
        } @for (roundState of numberOfAssessmentsOfCorrectionRounds; track roundState; let correctionRound = $index) {
        @if ((tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED) && !isTestRun) { @if (!isExamMode) { -

        - {{ 'artemisApp.exerciseAssessmentDashboard.studentsSubmissions' | artemisTranslate }} -

        +

        } @if (isExamMode) { -

        - {{ 'artemisApp.exerciseAssessmentDashboard.studentsSubmissionsExam' | artemisTranslate: { round: correctionRound + 1 } }} -

        +

        } @if (correctionRound > 0) { } @if (numberOfCorrectionRoundsEnabled > correctionRound) { @if (isTestRun) { -

        - {{ 'artemisApp.exerciseAssessmentDashboard.testRunSubmissions' | artemisTranslate }} -

        +

        } @if (tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED || isTestRun) {
        @@ -417,20 +401,20 @@

        >

    @if (exercise.type === ExerciseType.TEXT) { } - + @@ -536,13 +520,9 @@

    } @else { @if (!exercise.teamMode) { -
    - {{ 'artemisApp.exerciseAssessmentDashboard.noSubmissions' | artemisTranslate }} -
    +
    } @else { -
    - {{ 'artemisApp.exerciseAssessmentDashboard.startAssessmentFromTeamPages' | artemisTranslate }} -
    +
    } } @if ( @@ -570,17 +550,13 @@

    } } @if (numberOfCorrectionRoundsEnabled <= correctionRound) { -
    - {{ 'artemisApp.exerciseAssessmentDashboard.correctionRoundNotYetEnabled' | artemisTranslate }} -
    +
    } } @if (tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED || isTestRun) { -

    - {{ 'artemisApp.exerciseAssessmentDashboard.complaints' | artemisTranslate }} -

    +

    @if (submissionsWithComplaints && submissionsWithComplaints!.length > 0) { @@ -589,22 +565,22 @@

    - + @@ -634,19 +610,13 @@

    {{ 'artemisApp.studentExamDetail.name' | artemisTranslate }} {{ event.user?.firstName }} {{ event.user?.lastName }}
    {{ 'artemisApp.studentExamDetail.login' | artemisTranslate }} {{ event.user?.login }}
    {{ 'artemisApp.studentExamDetail.email' | artemisTranslate }} {{ event.user?.email }}
    {{ 'artemisApp.studentExamDetail.matriculationNumber' | artemisTranslate }} {{ event.user?.visibleRegistrationNumber }}
    - - {{ 'artemisApp.gradingSystem.min' | artemisTranslate }} - + - - {{ 'artemisApp.gradingSystem.minPoints' | artemisTranslate }} - + - {{ 'artemisApp.gradingSystem.max' | artemisTranslate }} + - - {{ 'artemisApp.gradingSystem.maxPoints' | artemisTranslate }} - + - - {{ - this.gradingScale.gradeType === GradeType.GRADE - ? ('artemisApp.gradingSystem.gradeName' | artemisTranslate) - : ('artemisApp.gradingSystem.bonusPoints' | artemisTranslate) - }} - +
    # - {{ 'artemisApp.exerciseAssessmentDashboard.submissionDate' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.result' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.language' | artemisTranslate }} + {{ 'artemisApp.exerciseAssessmentDashboard.action' | artemisTranslate }}
    # - {{ 'artemisApp.exerciseAssessmentDashboard.submissionDate' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.result' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.responseTime' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.status' | artemisTranslate }} + {{ 'artemisApp.exerciseAssessmentDashboard.action' | artemisTranslate }}
    @if (submissionWithComplaint.complaint.accepted === undefined) { - - {{ 'artemisApp.complaint.listOfComplaints.noReply' | artemisTranslate }} - + } @if (submissionWithComplaint.complaint.accepted === true) { - - {{ 'artemisApp.complaint.listOfComplaints.accepted' | artemisTranslate }} - + } @if (submissionWithComplaint.complaint.accepted === false) { - - {{ 'artemisApp.complaint.listOfComplaints.rejected' | artemisTranslate }} - + } @@ -690,14 +660,10 @@

    } @else { @if (complaintsDashboardInfo.total === 0) { -
    - {{ 'artemisApp.exerciseAssessmentDashboard.noComplaints' | artemisTranslate }} -
    +
    } @if (complaintsDashboardInfo.total !== 0) { -
    - {{ 'artemisApp.exerciseAssessmentDashboard.noComplaintsDisplayed' | artemisTranslate }} -
    +
    } }
    @@ -705,9 +671,7 @@

    @if ((tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED) && !isExamMode) { -

    - {{ 'artemisApp.exerciseAssessmentDashboard.moreFeedback' | artemisTranslate }} -

    +

    # - {{ 'artemisApp.exerciseAssessmentDashboard.submissionDate' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.result' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.responseTime' | artemisTranslate }} + - {{ 'artemisApp.exerciseAssessmentDashboard.status' | artemisTranslate }} + {{ 'artemisApp.exerciseAssessmentDashboard.action' | artemisTranslate }}
    @if (moreFeedbackRequest.complaint.accepted === undefined) { - - {{ 'artemisApp.complaint.listOfComplaints.noReply' | artemisTranslate }} - + } @if (moreFeedbackRequest.complaint.accepted === true) { - - {{ 'artemisApp.moreFeedback.accepted' | artemisTranslate }} - + } @@ -813,14 +773,10 @@

    } @else { @if (moreFeedbackRequestsDashboardInfo.total === 0) { -
    - {{ 'artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequests' | artemisTranslate }} -
    +
    } @if (moreFeedbackRequestsDashboardInfo.total !== 0) { -
    - {{ 'artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequestsDisplayed' | artemisTranslate }} -
    +
    } }
    @@ -833,7 +789,7 @@

    @if (this.tutorParticipation.status! === TRAINED || exercise.isAtLeastInstructor) {
    @if (!isExamMode) { -

    {{ 'artemisApp.instructorExerciseDashboard.leaderboardTitle' | artemisTranslate }}

    +

    }
    diff --git a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts index dffb26604cc7..50c2227751e3 100644 --- a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts +++ b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts @@ -347,7 +347,7 @@ export class ExerciseService { * @param exercise the exercise */ static stringifyExerciseCategories(exercise: Exercise) { - return exercise.categories?.map((category) => JSON.stringify(category) as ExerciseCategory); + return exercise.categories?.map((category) => JSON.stringify(category) as unknown as ExerciseCategory); } /** @@ -362,12 +362,15 @@ export class ExerciseService { } /** - * Parses the exercise categories JSON string into ExerciseCategory objects. + * Parses the exercise categories JSON string into {@link ExerciseCategory} objects. * @param exercise - the exercise */ static parseExerciseCategories(exercise?: Exercise) { if (exercise?.categories) { - exercise.categories = exercise.categories.map((category) => JSON.parse(category as string) as ExerciseCategory); + exercise.categories = exercise.categories.map((category) => { + const categoryObj = JSON.parse(category as unknown as string); + return new ExerciseCategory(categoryObj.category, categoryObj.color); + }); } } 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 b78d7f984ae9..f811a3f4c4e7 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 @@ -7,13 +7,11 @@

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

    - {{ 'artemisApp.courseOverview.exerciseList.live' | artemisTranslate }} +

    } @for (category of exercise.categories; track category) { -

    - {{ category.category }} -

    + } @if (exercise.difficulty && showTags.difficulty) {

    diff --git a/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts b/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts index f56611d32021..f0f8877ffdec 100644 --- a/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts +++ b/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts @@ -3,9 +3,10 @@ import { RouterModule } from '@angular/router'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ExerciseCategoriesComponent } from 'app/shared/exercise-categories/exercise-categories.component'; +import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component'; @NgModule({ - imports: [ArtemisSharedModule, RouterModule, ArtemisSharedComponentModule], + imports: [ArtemisSharedModule, RouterModule, ArtemisSharedComponentModule, CustomExerciseCategoryBadgeComponent], declarations: [ExerciseCategoriesComponent], exports: [ExerciseCategoriesComponent], }) diff --git a/src/main/webapp/i18n/de/exercise-actions.json b/src/main/webapp/i18n/de/exercise-actions.json index f45e3097bf3e..928496b308b8 100644 --- a/src/main/webapp/i18n/de/exercise-actions.json +++ b/src/main/webapp/i18n/de/exercise-actions.json @@ -69,6 +69,8 @@ "uploadFile": "Datei hochladen", "viewTeam": "Team", "sshKeyTip": "Um SSH zu nutzen, musst du {link:hier} einen SSH Schlüssel zu deinem Konto hinzufügen.", + "vcsTokenTip": "Um mit einem VCS-Zugriffstoken auf das Repository zuzugreifen, musst du {link:hier} ein neues hinzufügen.", + "vcsTokenExpiredTip": "Dein VCS-Zugriffstoken ist abgelaufen. Erneuere es {link:hier}.", "startExerciseBeforeStartDate": "Du kannst vor dem Startdatum nicht an der Aufgabe teilnehmen.", "deleteMultipleExercisesQuestion": "Sollen die ausgewählten Aufgaben wirklich dauerhaft gelöscht werden?" } diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json index e198497deaa9..332f39024ff4 100644 --- a/src/main/webapp/i18n/de/exercise.json +++ b/src/main/webapp/i18n/de/exercise.json @@ -140,6 +140,7 @@ }, "categories": "Kategorien", "noCategory": "Keine Kategorie", + "selectCategories": "Kategorien auswählen", "participation": "Teilnahme", "participations": "Teilnahmen", "submissions": "Einreichungen", diff --git a/src/main/webapp/i18n/en/exercise-actions.json b/src/main/webapp/i18n/en/exercise-actions.json index b32d1e5be4d1..ba4ac935244d 100644 --- a/src/main/webapp/i18n/en/exercise-actions.json +++ b/src/main/webapp/i18n/en/exercise-actions.json @@ -70,6 +70,8 @@ "uploadFile": "Upload a file", "viewTeam": "Team", "sshKeyTip": "To use ssh, you need to add an ssh key to your account {link:here}.", + "vcsTokenTip": "To access the repository with a VCS access token, you need to add a new one to your account {link:here}.", + "vcsTokenExpiredTip": "Your VCS access token has expired. Renew it {link:here}.", "startExerciseBeforeStartDate": "You cannot participate before the start date of the exercise.", "deleteMultipleExercisesQuestion": "Are you sure you want to delete the selected exercises?" } diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json index fbc47e4093dc..ca2f0fdde23c 100644 --- a/src/main/webapp/i18n/en/exercise.json +++ b/src/main/webapp/i18n/en/exercise.json @@ -140,6 +140,7 @@ }, "categories": "Categories", "noCategory": "No Category", + "selectCategories": "Select categories", "participation": "Participation", "participations": "Participations", "submissions": "Submissions", diff --git a/src/test/javascript/spec/entities/exercise-category.model.spec.ts b/src/test/javascript/spec/entities/exercise-category.model.spec.ts new file mode 100644 index 000000000000..2beba4b62f40 --- /dev/null +++ b/src/test/javascript/spec/entities/exercise-category.model.spec.ts @@ -0,0 +1,49 @@ +import { ExerciseCategory } from 'app/entities/exercise-category.model'; + +describe('ExerciseCategory', () => { + describe('equals', () => { + it('should return true if the two exercise categories are equal', () => { + const exerciseCategory1 = new ExerciseCategory('Category 1', 'red'); + const exerciseCategory2 = new ExerciseCategory('Category 1', 'red'); + + expect(exerciseCategory1.equals(exerciseCategory2)).toBeTruthy(); + }); + + it('should return false if the two exercise categories are not equal', () => { + const exerciseCategory1 = new ExerciseCategory('Category 1', 'red'); + const exerciseCategory2 = new ExerciseCategory('Category 2', 'blue'); + + expect(exerciseCategory1.equals(exerciseCategory2)).toBeFalsy(); + }); + }); + + describe('compare', () => { + it("should return 0 if the two exercise categories' display text is the same", () => { + const exerciseCategory1 = new ExerciseCategory('Category 1', 'red'); + const exerciseCategory2 = new ExerciseCategory('Category 1', 'blue'); + + expect(exerciseCategory1.compare(exerciseCategory2)).toBe(0); + }); + + it("should return -1 if the first exercise category's display text is smaller than the second exercise category's display text", () => { + const exerciseCategory1 = new ExerciseCategory('Category 1', 'red'); + const exerciseCategory2 = new ExerciseCategory('Category 2', 'blue'); + + expect(exerciseCategory1.compare(exerciseCategory2)).toBe(-1); + }); + + it("should return 1 if the first exercise category's display text is larger than the second exercise category's display text", () => { + const exerciseCategory1 = new ExerciseCategory('Category 2', 'red'); + const exerciseCategory2 = new ExerciseCategory('Category 1', 'blue'); + + expect(exerciseCategory1.compare(exerciseCategory2)).toBe(1); + }); + + it('should return -1 if the first exercise category is undefined', () => { + const exerciseCategory1 = new ExerciseCategory(undefined, 'red'); + const exerciseCategory2 = new ExerciseCategory('Category 1', 'blue'); + + expect(exerciseCategory1.compare(exerciseCategory2)).toBe(-1); + }); + }); +}); From fc3280305bfc08b414927f60271fb7f7492dbf4b Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:32:33 +0200 Subject: [PATCH 21/95] merge5 --- .../app/entities/exercise-category.model.ts | 26 +- .../exercise-group-update.component.html | 4 +- ...ise-details-student-actions.component.html | 1 + .../exercise-filter-modal.component.html | 145 ++++++++ .../exercise-filter-modal.component.scss | 20 ++ .../exercise-filter-modal.component.ts | 231 ++++++++++++ .../exercise-filter-modal.helper.ts | 84 +++++ src/main/webapp/app/types/exercise-filter.ts | 43 +++ .../course/exercise-filter.model.spec.ts | 6 +- .../exercise-filter-modal.component.spec.ts | 259 ++++++++++++++ .../exercise-filter-modal.helper.spec.ts | 333 ++++++++++++++++++ 11 files changed, 1145 insertions(+), 7 deletions(-) create mode 100644 src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.html create mode 100644 src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.scss create mode 100644 src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.ts create mode 100644 src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.helper.ts create mode 100644 src/main/webapp/app/types/exercise-filter.ts create mode 100644 src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.component.spec.ts create mode 100644 src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.helper.spec.ts diff --git a/src/main/webapp/app/entities/exercise-category.model.ts b/src/main/webapp/app/entities/exercise-category.model.ts index bc134d0b7f29..68f09c914d2d 100644 --- a/src/main/webapp/app/entities/exercise-category.model.ts +++ b/src/main/webapp/app/entities/exercise-category.model.ts @@ -1,6 +1,30 @@ export class ExerciseCategory { public color?: string; + + // TODO should be renamed to "name" -> accessing variable via "category.name" instead of "category.category" - requires database migration (stored as json in database, see the table "exercise_categories") public category?: string; - constructor() {} + constructor(category: string | undefined, color: string | undefined) { + this.color = color; + this.category = category; + } + + equals(otherExerciseCategory: ExerciseCategory): boolean { + return this.color === otherExerciseCategory.color && this.category === otherExerciseCategory.category; + } + + /** + * @param otherExerciseCategory + * @returns the alphanumerical order of the two exercise categories based on their display text + */ + compare(otherExerciseCategory: ExerciseCategory): number { + if (this.category === otherExerciseCategory.category) { + return 0; + } + + const displayText = this.category?.toLowerCase() ?? ''; + const otherCategoryDisplayText = otherExerciseCategory.category?.toLowerCase() ?? ''; + + return displayText < otherCategoryDisplayText ? -1 : 1; + } } diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html index dedbac0c4960..fd9aab7bd355 100644 --- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html +++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html @@ -1,5 +1,5 @@
    -

    {{ (exerciseGroup.id ? 'artemisApp.examManagement.exerciseGroup.update' : 'artemisApp.examManagement.exerciseGroup.create') | artemisTranslate }}

    +

    @@ -10,7 +10,7 @@

    {{ (exerciseGroup.id ? 'artemisApp.examManagement.exerciseGroup.update' : 'a

    - {{ 'artemisApp.examManagement.exerciseGroup.titleInfo' | artemisTranslate }} +
    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 ea54cf40b8c2..b2d119d0cd2a 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 @@ -126,6 +126,7 @@ [participations]="exercise.studentParticipations!" [exercise]="exercise" [routerLinkForRepositoryView]="repositoryLink + '/repository/' + exercise.studentParticipations![0].id" + [useParticipationVcsAccessToken]="true" /> } @if (theiaEnabled) { diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.html b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.html new file mode 100644 index 000000000000..1a87237a4d46 --- /dev/null +++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.html @@ -0,0 +1,145 @@ + +
    +

    + + +

    + +
    +
    +
    + @if (noFiltersAvailable) { +
    + +
    + } + + @if (selectableCategoryOptions.length || selectedCategoryOptions.length) { + + + + +
    +
    + @for (categoryFilterOption of selectedCategoryOptions; track categoryFilterOption) { +
    + +
    + } +
    +
    + } +
    + + @if (typeFilter?.isDisplayed) { +
    + +
    + @for (typeFilter of typeFilter!.options; track typeFilter) { +
    + +
    + } +
    +
    + } + + + + + + + + @if (difficultyFilter?.isDisplayed && difficultyFilter) { +
    + +
    + @for (difficultyFilterOption of difficultyFilter.options; track difficultyFilterOption) { +
    + +
    + } +
    +
    + } + + + @if (achievedScore && achievedScore?.isDisplayed) { +
    + + +
    + } + + + @if (achievablePoints && achievablePoints.isDisplayed) { +
    + + +
    + } +
    +
    + + +
    + + +
    +
    + diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.scss b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.scss new file mode 100644 index 000000000000..c2db4383039b --- /dev/null +++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.scss @@ -0,0 +1,20 @@ +/* +ensures that the category dropdown selection does not overflow the screen to the bottom +(instead a scrollbar will be displayed) + */ +:host ::ng-deep ngb-typeahead-window.dropdown-menu { + max-height: 25rem; + overflow-y: auto; +} + +/* align the first checkbox to the left */ +.no-left-margin-padding:first-child { + margin-left: 0; + padding-left: 0; +} + +/* otherwise the dropdown changes the color on hover if no further options can be selected */ +.form-control:disabled, +.form-control[disabled] { + pointer-events: none; +} diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.ts b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.ts new file mode 100644 index 000000000000..8b1bf7c58488 --- /dev/null +++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.ts @@ -0,0 +1,231 @@ +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; +import { NgbActiveModal, NgbTypeahead } from '@ng-bootstrap/ng-bootstrap'; +import { faBackward, faFilter } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { SidebarCardElement, SidebarData } from 'app/types/sidebar'; +import { Observable, OperatorFunction, Subject, merge } from 'rxjs'; +import { debounceTime, distinctUntilChanged, filter, map } from 'rxjs/operators'; +import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component'; +import { RangeSliderComponent } from 'app/shared/range-slider/range-slider.component'; +import { + DifficultyFilterOption, + ExerciseCategoryFilterOption, + ExerciseFilterOptions, + ExerciseFilterResults, + ExerciseTypeFilterOption, + FilterDetails, + FilterOption, + RangeFilter, +} from 'app/types/exercise-filter'; +import { satisfiesFilters } from 'app/shared/exercise-filter/exercise-filter-modal.helper'; +import { DifficultyLevel, ExerciseType } from 'app/entities/exercise.model'; +import { ExerciseCategory } from 'app/entities/exercise-category.model'; +import { isRangeFilterApplied } from 'app/shared/sidebar/sidebar.helper'; + +@Component({ + selector: 'jhi-exercise-filter-modal', + templateUrl: './exercise-filter-modal.component.html', + styleUrls: ['./exercise-filter-modal.component.scss'], + standalone: true, + imports: [ + FormsModule, + ReactiveFormsModule, + FontAwesomeModule, + ArtemisSharedCommonModule, + ArtemisSharedComponentModule, + CustomExerciseCategoryBadgeComponent, + RangeSliderComponent, + ], +}) +export class ExerciseFilterModalComponent implements OnInit { + readonly faFilter = faFilter; + readonly faBackward = faBackward; + + @Output() filterApplied = new EventEmitter(); + + @ViewChild('categoriesFilterSelection', { static: false }) instance: NgbTypeahead; + + selectedCategoryOptions: ExerciseCategoryFilterOption[] = []; + selectableCategoryOptions: ExerciseCategoryFilterOption[] = []; + + noFiltersAvailable: boolean = false; + + focus$ = new Subject(); + click$ = new Subject(); + + form: FormGroup; + + model?: string; + + sidebarData?: SidebarData; + + categoryFilter?: FilterOption; + typeFilter?: FilterOption; + difficultyFilter?: FilterOption; + achievablePoints?: RangeFilter; + achievedScore?: RangeFilter; + + exerciseFilters?: ExerciseFilterOptions; + + constructor(private activeModal: NgbActiveModal) {} + + ngOnInit() { + this.categoryFilter = this.exerciseFilters?.categoryFilter; + this.typeFilter = this.exerciseFilters?.exerciseTypesFilter; + this.difficultyFilter = this.exerciseFilters?.difficultyFilter; + this.achievablePoints = this.exerciseFilters?.achievablePoints; + this.achievedScore = this.exerciseFilters?.achievedScore; + + this.noFiltersAvailable = !( + this.categoryFilter?.isDisplayed || + this.typeFilter?.isDisplayed || + this.difficultyFilter?.isDisplayed || + this.achievedScore?.isDisplayed || + this.achievablePoints?.isDisplayed + ); + + this.updateCategoryOptionsStates(); + } + + closeModal(): void { + this.activeModal.close(); + } + + search: OperatorFunction = (text$: Observable) => { + const debouncedText$ = text$.pipe(debounceTime(200), distinctUntilChanged()); + const clicksWithClosedPopup$ = this.click$.pipe(filter(() => !this.instance.isPopupOpen())); + const inputFocus$ = this.focus$; + + return merge(debouncedText$, inputFocus$, clicksWithClosedPopup$).pipe( + map((term) => + term === '' + ? this.selectableCategoryOptions + : this.selectableCategoryOptions.filter((categoryFilter: ExerciseCategoryFilterOption) => { + if (categoryFilter.category.category !== undefined) { + return categoryFilter.category.category?.toLowerCase().indexOf(term.toLowerCase()) > -1; + } + + return false; + }), + ), + ); + }; + resultFormatter = (exerciseCategory: ExerciseCategoryFilterOption) => exerciseCategory.category.category ?? ''; + + onSelectItem(event: any) { + const isEnterPressedForNotExistingItem = !event.item; + if (isEnterPressedForNotExistingItem) { + event.preventDefault(); + event.stopPropagation(); + return; + } + + event.preventDefault(); // otherwise clearing the input field will not work https://stackoverflow.com/questions/39783936/how-to-clear-the-typeahead-input-after-a-result-is-selected + const filterOption: ExerciseCategoryFilterOption = event.item; + filterOption.searched = true; + this.updateCategoryOptionsStates(); + this.model = undefined; // Clear the input field after selection + } + + removeItem(item: ExerciseCategoryFilterOption): () => void { + return () => { + item.searched = false; + this.updateCategoryOptionsStates(); + }; + } + + applyFilter(): void { + if (!this.sidebarData?.groupedData) { + return; + } + + const appliedFilterDetails = this.getAppliedFilterDetails(); + for (const groupedDataKey in this.sidebarData.groupedData) { + this.sidebarData.groupedData[groupedDataKey].entityData = this.sidebarData.groupedData[groupedDataKey].entityData.filter((sidebarElement) => + satisfiesFilters(sidebarElement, appliedFilterDetails), + ); + } + this.sidebarData.ungroupedData = this.sidebarData.ungroupedData?.filter((sidebarElement: SidebarCardElement) => satisfiesFilters(sidebarElement, appliedFilterDetails)); + + this.filterApplied.emit({ + filteredSidebarData: this.sidebarData, + appliedExerciseFilters: this.exerciseFilters, + isFilterActive: this.isFilterActive(appliedFilterDetails), + }); + + this.closeModal(); + } + + private getAppliedFilterDetails(): FilterDetails { + return { + searchedTypes: this.getSearchedTypes(), + selectedCategories: this.getSelectedCategories(), + searchedDifficulties: this.getSearchedDifficulties(), + isScoreFilterApplied: isRangeFilterApplied(this.achievedScore), + isPointsFilterApplied: isRangeFilterApplied(this.achievablePoints), + achievedScore: this.achievedScore, + achievablePoints: this.achievablePoints, + }; + } + + private getSearchedTypes(): ExerciseType[] | undefined { + return this.typeFilter?.options.filter((type) => type.checked).map((type) => type.value); + } + + private getSelectedCategories(): ExerciseCategory[] { + return this.selectedCategoryOptions + .filter((categoryOption: ExerciseCategoryFilterOption) => categoryOption.searched) + .map((categoryOption: ExerciseCategoryFilterOption) => categoryOption.category); + } + + private getSearchedDifficulties(): DifficultyLevel[] | undefined { + return this.difficultyFilter?.options.filter((difficulty) => difficulty.checked).map((difficulty) => difficulty.value); + } + + private isFilterActive(filterDetails: FilterDetails): boolean { + return ( + !!filterDetails.selectedCategories.length || + !!filterDetails.searchedTypes?.length || + !!filterDetails.searchedDifficulties?.length || + filterDetails.isScoreFilterApplied || + filterDetails.isPointsFilterApplied + ); + } + + clearFilter() { + this.categoryFilter?.options.forEach((categoryOption) => (categoryOption.searched = false)); + this.typeFilter?.options.forEach((typeOption) => (typeOption.checked = false)); + this.difficultyFilter?.options.forEach((difficultyOption) => (difficultyOption.checked = false)); + + this.resetRangeFilter(this.achievedScore); + this.resetRangeFilter(this.achievablePoints); + + this.applyFilter(); + } + + private resetRangeFilter(rangeFilter?: RangeFilter) { + if (!rangeFilter?.filter) { + return; + } + + const filter = rangeFilter.filter; + filter.selectedMin = filter.generalMin; + filter.selectedMax = filter.generalMax; + } + + private updateCategoryOptionsStates() { + this.selectedCategoryOptions = this.getUpdatedSelectedCategoryOptions(); + this.selectableCategoryOptions = this.getSelectableCategoryOptions(); + } + + private getUpdatedSelectedCategoryOptions(): ExerciseCategoryFilterOption[] { + return this.categoryFilter?.options.filter((categoryFilter) => categoryFilter.searched) ?? []; + } + + private getSelectableCategoryOptions(): ExerciseCategoryFilterOption[] { + return this.categoryFilter?.options.filter((categoryFilter) => !categoryFilter.searched) ?? []; + } +} diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.helper.ts b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.helper.ts new file mode 100644 index 000000000000..de922fce195d --- /dev/null +++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.helper.ts @@ -0,0 +1,84 @@ +import { SidebarCardElement } from 'app/types/sidebar'; +import { DifficultyLevel, ExerciseType } from 'app/entities/exercise.model'; +import { ExerciseCategory } from 'app/entities/exercise-category.model'; +import { FilterDetails, RangeFilter } from 'app/types/exercise-filter'; +import { getLatestResultOfStudentParticipation } from 'app/exercises/shared/participation/participation.utils'; + +export function satisfiesDifficultyFilter(sidebarElement: SidebarCardElement, searchedDifficulties?: DifficultyLevel[]): boolean { + if (!searchedDifficulties?.length) { + return true; + } + if (!sidebarElement.difficulty) { + return false; + } + + return searchedDifficulties.includes(sidebarElement.difficulty); +} + +export function satisfiesTypeFilter(sidebarElement: SidebarCardElement, searchedTypes?: ExerciseType[]): boolean { + if (!searchedTypes?.length) { + return true; + } + if (!sidebarElement.exercise?.type) { + return false; + } + + return searchedTypes.includes(sidebarElement.exercise.type); +} + +export function satisfiesCategoryFilter(sidebarElement: SidebarCardElement, selectedCategories: ExerciseCategory[]): boolean { + if (!selectedCategories.length) { + return true; + } + if (!sidebarElement?.exercise?.categories) { + return false; + } + + // noinspection UnnecessaryLocalVariableJS: not inlined because the variable name improves readability + const isAnyExerciseCategoryMatchingASelectedCategory = sidebarElement.exercise.categories.some((category) => + selectedCategories.some((selectedCategory) => selectedCategory.equals(category)), + ); + return isAnyExerciseCategoryMatchingASelectedCategory; +} + +export function satisfiesScoreFilter(sidebarElement: SidebarCardElement, isFilterApplied: boolean, achievedScoreFilter?: RangeFilter): boolean { + if (!isFilterApplied || !achievedScoreFilter) { + return true; + } + + const latestResult = getLatestResultOfStudentParticipation(sidebarElement.studentParticipation, true); + if (!latestResult?.score) { + return achievedScoreFilter.filter.selectedMin === 0; + } + + const isScoreInSelectedMinRange = latestResult.score >= achievedScoreFilter.filter.selectedMin; + const isScoreInSelectedMaxRange = latestResult.score <= achievedScoreFilter.filter.selectedMax; + + return isScoreInSelectedMinRange && isScoreInSelectedMaxRange; +} + +export function satisfiesPointsFilter(sidebarElement: SidebarCardElement, isPointsFilterApplied: boolean, achievablePointsFilter?: RangeFilter): boolean { + if (!isPointsFilterApplied || !achievablePointsFilter) { + return true; + } + + /** {@link Exercise.maxPoints} must be in the range 1 - 9999 */ + if (!sidebarElement.exercise?.maxPoints) { + return false; + } + + const isAchievablePointsInSelectedMinRange = sidebarElement.exercise.maxPoints >= achievablePointsFilter.filter.selectedMin; + const isAchievablePointsInSelectedMaxRange = sidebarElement.exercise.maxPoints <= achievablePointsFilter.filter.selectedMax; + + return isAchievablePointsInSelectedMinRange && isAchievablePointsInSelectedMaxRange; +} + +export function satisfiesFilters(sidebarElement: SidebarCardElement, filterDetails: FilterDetails) { + return ( + satisfiesCategoryFilter(sidebarElement, filterDetails.selectedCategories) && + satisfiesDifficultyFilter(sidebarElement, filterDetails.searchedDifficulties) && + satisfiesTypeFilter(sidebarElement, filterDetails.searchedTypes) && + satisfiesScoreFilter(sidebarElement, filterDetails.isScoreFilterApplied, filterDetails.achievedScore) && + satisfiesPointsFilter(sidebarElement, filterDetails.isPointsFilterApplied, filterDetails.achievablePoints) + ); +} diff --git a/src/main/webapp/app/types/exercise-filter.ts b/src/main/webapp/app/types/exercise-filter.ts new file mode 100644 index 000000000000..053dbb8d089c --- /dev/null +++ b/src/main/webapp/app/types/exercise-filter.ts @@ -0,0 +1,43 @@ +import { ExerciseCategory } from 'app/entities/exercise-category.model'; +import { DifficultyLevel, ExerciseType } from 'app/entities/exercise.model'; +import { SidebarData } from 'app/types/sidebar'; +import { IconProp } from '@fortawesome/fontawesome-svg-core'; + +/** + * isDisplayed - whether the filter is in the filter modal (e.g. for no sidebar element the difficulty is defined, so the difficulty filter is not displayed) + */ +export type FilterOption = { isDisplayed: boolean; options: T[] }; +export type ExerciseCategoryFilterOption = { category: ExerciseCategory; searched: boolean }; +export type ExerciseTypeFilterOption = { name: string; value: ExerciseType; checked: boolean; icon: IconProp }; +export type DifficultyFilterOption = { name: string; value: DifficultyLevel; checked: boolean }; + +export type RangeFilter = { + isDisplayed: boolean; + filter: { + generalMin: number; + generalMax: number; + selectedMin: number; + selectedMax: number; + step: number; + }; +}; + +export type ExerciseFilterOptions = { + categoryFilter?: FilterOption; + exerciseTypesFilter?: FilterOption; + difficultyFilter?: FilterOption; + achievedScore?: RangeFilter; + achievablePoints?: RangeFilter; +}; + +export type ExerciseFilterResults = { filteredSidebarData?: SidebarData; appliedExerciseFilters?: ExerciseFilterOptions; isFilterActive: boolean }; + +export type FilterDetails = { + searchedTypes?: ExerciseType[]; + selectedCategories: ExerciseCategory[]; + searchedDifficulties?: DifficultyLevel[]; + isScoreFilterApplied: boolean; + isPointsFilterApplied: boolean; + achievedScore?: RangeFilter; + achievablePoints?: RangeFilter; +}; diff --git a/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts b/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts index 8aadaa3d2189..232aab57fafa 100644 --- a/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts +++ b/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts @@ -6,10 +6,8 @@ import { ProgrammingExercise } from 'app/entities/programming-exercise.model'; import { Exercise } from 'app/entities/exercise.model'; describe('Exercise Filter Test', () => { - const category1 = new ExerciseCategory(); - category1.category = 'Easy'; - const category2 = new ExerciseCategory(); - category2.category = 'Hard'; + const category1 = new ExerciseCategory('Easy', undefined); + const category2 = new ExerciseCategory('Hard', undefined); const course: Course = { id: 123 } as Course; const exercise1 = new ProgrammingExercise(course, undefined); exercise1.id = 1; diff --git a/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.component.spec.ts b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.component.spec.ts new file mode 100644 index 000000000000..3432102e0a9d --- /dev/null +++ b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.component.spec.ts @@ -0,0 +1,259 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ExerciseFilterModalComponent } from 'app/shared/exercise-filter/exercise-filter-modal.component'; +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; +import { MockComponent, MockModule, MockProvider } from 'ng-mocks'; +import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; +import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component'; +import { RangeSliderComponent } from 'app/shared/range-slider/range-slider.component'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { By } from '@angular/platform-browser'; +import { RangeFilter } from 'app/types/exercise-filter'; +import { DifficultyLevel, Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model'; +import { ExerciseCategory } from 'app/entities/exercise-category.model'; +import { SidebarCardElement } from 'app/types/sidebar'; +import { Result } from 'app/entities/result.model'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; + +const EXERCISE_1 = { categories: [new ExerciseCategory('category1', undefined), new ExerciseCategory('category2', '#1b97ca')], maxPoints: 5, type: ExerciseType.TEXT } as Exercise; +const EXERCISE_2 = { + categories: [new ExerciseCategory('category3', '#0d3cc2'), new ExerciseCategory('category4', '#6ae8ac')], + maxPoints: 5, + type: ExerciseType.PROGRAMMING, +} as Exercise; +const EXERCISE_3 = { + categories: [new ExerciseCategory('category1', undefined), new ExerciseCategory('category4', '#6ae8ac')], + maxPoints: 8, + type: ExerciseType.PROGRAMMING, +} as Exercise; + +const SIDEBAR_CARD_ELEMENT_1 = { + exercise: EXERCISE_1, + type: ExerciseType.TEXT, + difficulty: DifficultyLevel.HARD, + studentParticipation: { results: [{ score: 7.7 } as Result] } as StudentParticipation, +} as SidebarCardElement; +const SIDEBAR_CARD_ELEMENT_2 = { + exercise: EXERCISE_2, + type: ExerciseType.PROGRAMMING, + difficulty: DifficultyLevel.EASY, + studentParticipation: { results: [{ score: 5.0 } as Result] } as StudentParticipation, +} as SidebarCardElement; +const SIDEBAR_CARD_ELEMENT_3 = { + exercise: EXERCISE_3, + type: ExerciseType.PROGRAMMING, + difficulty: DifficultyLevel.EASY, + studentParticipation: { results: [{ score: 82.3 } as Result] } as StudentParticipation, +} as SidebarCardElement; + +const SCORE_FILTER: RangeFilter = { + isDisplayed: true, + filter: { + generalMin: 0, + generalMax: 100, + selectedMin: 0, + selectedMax: 100, + step: 5, + }, +}; + +const POINTS_FILTER: RangeFilter = { + isDisplayed: true, + filter: { + generalMin: 0, + generalMax: 20, + selectedMin: 0, + selectedMax: 20, + step: 1, + }, +}; + +describe('ExerciseFilterModalComponent', () => { + let component: ExerciseFilterModalComponent; + let fixture: ComponentFixture; + let activeModal: NgbActiveModal; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + MockModule(FormsModule), + MockModule(ReactiveFormsModule), + MockModule(FontAwesomeModule), + MockModule(ArtemisSharedCommonModule), + MockModule(ArtemisSharedComponentModule), + ], + declarations: [ExerciseFilterModalComponent, MockComponent(CustomExerciseCategoryBadgeComponent), MockComponent(RangeSliderComponent)], + providers: [MockProvider(NgbActiveModal)], + }).compileComponents(); + + fixture = TestBed.createComponent(ExerciseFilterModalComponent); + component = fixture.componentInstance; + activeModal = TestBed.inject(NgbActiveModal); + + component.exerciseFilters = { + exerciseTypesFilter: { + isDisplayed: true, + options: [ + { name: 'artemisApp.courseStatistics.programming', value: ExerciseType.PROGRAMMING, checked: false, icon: getIcon(ExerciseType.PROGRAMMING) }, + { name: 'artemisApp.courseStatistics.quiz', value: ExerciseType.QUIZ, checked: false, icon: getIcon(ExerciseType.QUIZ) }, + { name: 'artemisApp.courseStatistics.modeling', value: ExerciseType.MODELING, checked: false, icon: getIcon(ExerciseType.MODELING) }, + { name: 'artemisApp.courseStatistics.text', value: ExerciseType.TEXT, checked: false, icon: getIcon(ExerciseType.TEXT) }, + { name: 'artemisApp.courseStatistics.file-upload', value: ExerciseType.FILE_UPLOAD, checked: false, icon: getIcon(ExerciseType.FILE_UPLOAD) }, + ], + }, + difficultyFilter: { + isDisplayed: true, + options: [ + { name: 'artemisApp.exercise.easy', value: DifficultyLevel.EASY, checked: false }, + { name: 'artemisApp.exercise.medium', value: DifficultyLevel.MEDIUM, checked: false }, + { name: 'artemisApp.exercise.hard', value: DifficultyLevel.HARD, checked: false }, + ], + }, + categoryFilter: { + isDisplayed: true, + options: [ + { category: new ExerciseCategory('category1', undefined), searched: false }, + { category: new ExerciseCategory('category2', undefined), searched: false }, + ], + }, + achievedScore: SCORE_FILTER, + achievablePoints: POINTS_FILTER, + }; + + fixture.detectChanges(); + }); + + it('should initialize filters properly', () => { + expect(component.categoryFilter).toEqual(component.exerciseFilters?.categoryFilter); + expect(component.typeFilter).toEqual(component.exerciseFilters?.exerciseTypesFilter); + expect(component.difficultyFilter).toEqual(component.exerciseFilters?.difficultyFilter); + expect(component.achievedScore).toEqual(component.exerciseFilters?.achievedScore); + expect(component.achievablePoints).toEqual(component.exerciseFilters?.achievablePoints); + }); + + describe('should close modal', () => { + it('with button in upper right corner on click', () => { + const closeSpy = jest.spyOn(activeModal, 'close'); + const closeModalSpy = jest.spyOn(component, 'closeModal'); + + const closeButton = fixture.debugElement.query(By.css('.btn-close')); + expect(closeButton).not.toBeNull(); + + closeButton.nativeElement.click(); + expect(closeSpy).toHaveBeenCalledOnce(); + expect(closeModalSpy).toHaveBeenCalledOnce(); + }); + + it('with button in lower right corner on click', () => { + const closeSpy = jest.spyOn(activeModal, 'close'); + const closeModalSpy = jest.spyOn(component, 'closeModal'); + + const cancelButton = fixture.debugElement.query(By.css('button[jhiTranslate="entity.action.cancel"]')); + expect(cancelButton).not.toBeNull(); + + cancelButton.nativeElement.click(); + expect(closeSpy).toHaveBeenCalledOnce(); + expect(closeModalSpy).toHaveBeenCalledOnce(); + }); + }); + + describe('select category', () => { + it('should mark a category as selected when category is found', () => { + expect(component.categoryFilter?.options[0].searched).toBeFalse(); // if it is not false in the beginning we do not test anything here + const onSelectItemSpy = jest.spyOn(component, 'onSelectItem'); + + component.model = 'category1'; + // Simulate selecting an item + const event = { + item: component.selectableCategoryOptions[0], + preventDefault: jest.fn(), + }; + component.onSelectItem(event); + fixture.detectChanges(); + + expect(onSelectItemSpy).toHaveBeenCalledOnce(); + expect(component.categoryFilter?.options[0].searched).toBeTrue(); + expect(component.model).toBeUndefined(); // Clear the input field after selection + }); + + it('should not change category filter when no item is provided', () => { + expect(component.categoryFilter?.options[0].searched).toBeFalse(); // if it is not false in the beginning we do not test anything here + const onSelectItemSpy = jest.spyOn(component, 'onSelectItem'); + + component.model = 'categoryThatIsNotDefinedAndSearchedViaEnter'; + const event = { + item: undefined, + preventDefault: jest.fn(), + stopPropagation: jest.fn(), + }; + component.onSelectItem(event); + fixture.detectChanges(); + + expect(onSelectItemSpy).toHaveBeenCalledOnce(); + expect(component.categoryFilter?.options[0].searched).toBeFalse(); + expect(component.model).toBe('categoryThatIsNotDefinedAndSearchedViaEnter'); + }); + }); + + it('should reset all filters when button is clicked', () => { + component.categoryFilter!.options[0].searched = true; + component.categoryFilter!.options[1].searched = true; + component.typeFilter!.options[0].checked = true; + component.typeFilter!.options[1].checked = true; + component.difficultyFilter!.options[0].checked = true; + component.difficultyFilter!.options[1].checked = false; + component.achievablePoints!.filter.selectedMax = 10; + component.achievedScore!.filter.selectedMin = 10; + const resetFilterSpy = jest.spyOn(component, 'clearFilter'); + + const resetButton = fixture.debugElement.query(By.css('span[jhiTranslate="artemisApp.courseOverview.exerciseFilter.clearFilter"]')); + expect(resetButton).not.toBeNull(); + resetButton.nativeElement.click(); + + expect(resetFilterSpy).toHaveBeenCalledOnce(); + expect(component.categoryFilter!.options[0].searched).toBeFalse(); + expect(component.categoryFilter!.options[1].searched).toBeFalse(); + expect(component.typeFilter!.options[0].checked).toBeFalse(); + expect(component.typeFilter!.options[1].checked).toBeFalse(); + expect(component.difficultyFilter!.options[0].checked).toBeFalse(); + expect(component.difficultyFilter!.options[1].checked).toBeFalse(); + expect(component.achievablePoints!.filter.selectedMax).toBe(component.achievablePoints?.filter.generalMax); + expect(component.achievedScore!.filter.selectedMin).toBe(component.achievedScore?.filter.generalMin); + }); + + it('should apply filters, emit the correct sidebar data and close the modal', () => { + component.sidebarData = { + groupByCategory: true, + sidebarType: 'exercise', + groupedData: { + past: { entityData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3] }, + }, + ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3], + }; + component.categoryFilter!.options[0].searched = true; // must have 'category1' + component.typeFilter!.options[0].checked = true; // must be a programming exercise + component.difficultyFilter!.options[0].checked = true; // must be easy + component.achievablePoints!.filter.selectedMax = 10; + component.achievedScore!.filter.selectedMin = 10; + + const filterAppliedEmitSpy = jest.spyOn(component.filterApplied, 'emit'); + const applyFilterSpy = jest.spyOn(component, 'applyFilter'); + const closeModalSpy = jest.spyOn(component, 'closeModal'); + const applyButton = fixture.debugElement.query(By.css('button[jhiTranslate="artemisApp.courseOverview.exerciseFilter.applyFilter"]')); + expect(applyButton).not.toBeNull(); + applyButton.nativeElement.click(); + + expect(applyFilterSpy).toHaveBeenCalledOnce(); + expect(filterAppliedEmitSpy).toHaveBeenCalledOnce(); + expect(filterAppliedEmitSpy).toHaveBeenCalledWith({ + filteredSidebarData: component.sidebarData, + appliedExerciseFilters: component.exerciseFilters, + isFilterActive: true, + }); + /** only {@link EXERCISE_3} fullfills the filter options and should be emitted in the event */ + expect(component.sidebarData.ungroupedData?.length).toBe(1); + + expect(closeModalSpy).toHaveBeenCalledOnce(); + }); +}); diff --git a/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.helper.spec.ts b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.helper.spec.ts new file mode 100644 index 000000000000..23ec9d99c4be --- /dev/null +++ b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.helper.spec.ts @@ -0,0 +1,333 @@ +import { ExerciseCategory } from 'app/entities/exercise-category.model'; +import { DifficultyLevel, Exercise, ExerciseType } from 'app/entities/exercise.model'; +import { Result } from 'app/entities/result.model'; +import { StudentParticipation } from 'app/entities/participation/student-participation.model'; +import { SidebarCardElement } from 'app/types/sidebar'; +import { + satisfiesCategoryFilter, + satisfiesDifficultyFilter, + satisfiesFilters, + satisfiesPointsFilter, + satisfiesScoreFilter, +} from 'app/shared/exercise-filter/exercise-filter-modal.helper'; +import { FilterDetails, RangeFilter } from 'app/types/exercise-filter'; + +const EXERCISE_1 = { categories: [new ExerciseCategory('category1', '#691b0b'), new ExerciseCategory('category2', '#1b97ca')], maxPoints: 10, type: ExerciseType.TEXT } as Exercise; +const EXERCISE_2 = { categories: [new ExerciseCategory('category3', '#0d3cc2'), new ExerciseCategory('category4', '#6ae8ac')], maxPoints: 5 } as Exercise; +const EXERCISE_4 = { categories: [new ExerciseCategory('category1', '#691b0b'), new ExerciseCategory('category8', '#1b97ca')], maxPoints: 10 } as Exercise; +const EXERCISE_5 = { maxPoints: 20 } as Exercise; + +const SIDEBAR_CARD_ELEMENT_1 = { + exercise: EXERCISE_1, + type: ExerciseType.TEXT, + difficulty: DifficultyLevel.HARD, + studentParticipation: { results: [{ score: 7.7 } as Result] } as StudentParticipation, +} as SidebarCardElement; +const SIDEBAR_CARD_ELEMENT_2 = { + exercise: EXERCISE_2, + type: ExerciseType.PROGRAMMING, + difficulty: DifficultyLevel.EASY, + studentParticipation: { results: [{ score: 82.3 } as Result] } as StudentParticipation, +} as SidebarCardElement; +const SIDEBAR_CARD_ELEMENT_4 = { exercise: EXERCISE_4 } as SidebarCardElement; + +/** contains duplicated type and difficulty with {@link SIDEBAR_CARD_ELEMENT_2}*/ +const SIDEBAR_CARD_ELEMENT_5 = { exercise: EXERCISE_5, type: ExerciseType.PROGRAMMING, difficulty: DifficultyLevel.EASY } as SidebarCardElement; + +describe('satisfiesDifficultyFilter', () => { + it('should return true if difficulty filter is undefined', () => { + const difficultyFilter = undefined; + + const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_1, difficultyFilter); + expect(resultItemWithDifficulty).toBeTrue(); + + const resultItemWithoutDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_4, difficultyFilter); + expect(resultItemWithoutDifficulty).toBeTrue(); + }); + + it('should return true if difficulty filter is []', () => { + const difficultyFilter: DifficultyLevel[] = []; + + const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_1, difficultyFilter); + expect(resultItemWithDifficulty).toBeTrue(); + + const resultItemWithoutDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_4, difficultyFilter); + expect(resultItemWithoutDifficulty).toBeTrue(); + }); + + it('should return true if difficulty is in difficulty filter', () => { + const difficultyFilter = [DifficultyLevel.HARD]; + + const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_1, difficultyFilter); + expect(resultItemWithDifficulty).toBeTrue(); + }); + + it('should return false if difficulty is NOT in difficulty filter', () => { + const difficultyFilter = [DifficultyLevel.HARD]; + + const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_2, difficultyFilter); + expect(resultItemWithDifficulty).toBeFalse(); + + const resultItemWithoutDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_4, difficultyFilter); + expect(resultItemWithoutDifficulty).toBeFalse(); + }); +}); + +describe('satisfiesCategoryFilter', () => { + it('should return true if difficulty filter is []', () => { + const categoryFilter: ExerciseCategory[] = []; + + const resultItemWithCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_1, categoryFilter); + expect(resultItemWithCategory).toBeTrue(); + + const resultItemWithoutCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_5, categoryFilter); + expect(resultItemWithoutCategory).toBeTrue(); + }); + + it('should return true category is included in difficulty filter', () => { + const categoryFilter = [new ExerciseCategory('category1', '#691b0b')]; + + const resultItemWithMatchingCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_1, categoryFilter); + expect(resultItemWithMatchingCategory).toBeTrue(); + }); + + it('should return false if difficulty is NOT in difficulty filter', () => { + const categoryFilter = [new ExerciseCategory('notExistingCategory', '#691b0b')]; + + const resultItemWithCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_1, categoryFilter); + expect(resultItemWithCategory).toBeFalse(); + + const resultItemWithoutCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_5, categoryFilter); + expect(resultItemWithoutCategory).toBeFalse(); + }); +}); + +describe('satisfiesScoreFilter', () => { + it('should return true if score filter is undefined', () => { + const scoreFilter = undefined; + + const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, true, scoreFilter); + expect(resultItemWithScore).toBeTrue(); + + const resultItemWithoutScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter); + expect(resultItemWithoutScore).toBeTrue(); + }); + + it('should return true if score filter is not applied', () => { + const scoreFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 0, + selectedMax: 1, + generalMin: 0, + generalMax: 1, + step: 1, + }, + }; + + const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, false, scoreFilter); + expect(resultItemWithScore).toBeTrue(); + + const resultItemWithoutScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, false, scoreFilter); + expect(resultItemWithoutScore).toBeTrue(); + }); + + it('should return true if score is in score filter', () => { + const scoreFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 5, + selectedMax: 10, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }; + + const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, true, scoreFilter); + expect(resultItemWithScore).toBeTrue(); + }); + + it('should return false if score is NOT in score filter', () => { + const scoreFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 20, + selectedMax: 30, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }; + + const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, true, scoreFilter); + expect(resultItemWithScore).toBeFalse(); + + const resultItemWithoutScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter); + expect(resultItemWithoutScore).toBeFalse(); + }); + + it('should return true if score of participation is not defined (not participated) and lower bound is 0', () => { + const scoreFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 0, + selectedMax: 10, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }; + const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter); + expect(resultItemWithScore).toBeTrue(); + }); + + it('should return false if score of participation is not defined (not participated) and lower bound is NOT 0', () => { + const scoreFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 1, + selectedMax: 10, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }; + const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter); + expect(resultItemWithScore).toBeFalse(); + }); +}); + +describe('satisfiesPointsFilter', () => { + it('should return true if points filter is undefined', () => { + const pointsFilter = undefined; + + const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, true, pointsFilter); + expect(resultItemWithPoints).toBeTrue(); + + const resultItemWithoutPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_4, true, pointsFilter); + expect(resultItemWithoutPoints).toBeTrue(); + }); + + it('should return true if points filter is not applied', () => { + const pointsFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 0, + selectedMax: 1, + generalMin: 0, + generalMax: 1, + step: 1, + }, + }; + + const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, false, pointsFilter); + expect(resultItemWithPoints).toBeTrue(); + + const resultItemWithoutPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_4, false, pointsFilter); + expect(resultItemWithoutPoints).toBeTrue(); + }); + + it('should return true if points is in points filter', () => { + const pointsFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 9, + selectedMax: 10, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }; + + const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, true, pointsFilter); + expect(resultItemWithPoints).toBeTrue(); + }); + + it('should return false if points is NOT in points filter', () => { + const pointsFilter: RangeFilter = { + isDisplayed: true, + filter: { + selectedMin: 11, + selectedMax: 12, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }; + + const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, true, pointsFilter); + expect(resultItemWithPoints).toBeFalse(); + + const resultItemWithoutPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_4, true, pointsFilter); + expect(resultItemWithoutPoints).toBeFalse(); + }); +}); + +describe('satisfiesFilters', () => { + it('should return true if item satisfies filters', () => { + const filter: FilterDetails = { + selectedCategories: [new ExerciseCategory('category1', '#691b0b')], + searchedTypes: [ExerciseType.TEXT], + searchedDifficulties: [DifficultyLevel.HARD], + isScoreFilterApplied: false, + isPointsFilterApplied: false, + achievedScore: { + isDisplayed: true, + filter: { + selectedMin: 5, + selectedMax: 10, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }, + achievablePoints: { + isDisplayed: true, + filter: { + selectedMin: 9, + selectedMax: 10, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }, + }; + const resultItem = satisfiesFilters(SIDEBAR_CARD_ELEMENT_1, filter); + + expect(resultItem).toBeTrue(); + }); + + it('should return false if item does not satisfy the score filter', () => { + const filter: FilterDetails = { + selectedCategories: [new ExerciseCategory('category1', '#691b0b')], + searchedTypes: [ExerciseType.TEXT], + searchedDifficulties: [DifficultyLevel.HARD], + isScoreFilterApplied: false, + isPointsFilterApplied: false, + achievedScore: { + isDisplayed: true, + filter: { + selectedMin: 69, + selectedMax: 70, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }, + achievablePoints: { + isDisplayed: true, + filter: { + selectedMin: 9, + selectedMax: 10, + generalMin: 0, + generalMax: 80, + step: 1, + }, + }, + }; + const resultItem = satisfiesFilters(SIDEBAR_CARD_ELEMENT_1, filter); + + expect(resultItem).toBeTrue(); + }); +}); From f5be8151d6aac24022750edd6c358dda307d443b Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:33:54 +0200 Subject: [PATCH 22/95] merge5 --- .../exercise-groups.component.html | 56 +++++++++---------- .../exercise-hint-update.component.html | 11 +--- .../manage/exercise-hint-update.component.ts | 8 +-- .../exercise-hint/manage/exercise-hint.scss | 5 -- .../exercise-hint-expandable.component.html | 4 +- ...xercise-hint-student-dialog.component.html | 9 +-- .../exercise-info.component.html | 2 +- .../exercise-scores.component.html | 37 ++++++------ .../exercise-scores-chart.component.html | 6 +- .../exercise-group-update.component.spec.ts | 5 +- .../exercise-hint-update.component.spec.ts | 4 +- 11 files changed, 65 insertions(+), 82 deletions(-) delete mode 100644 src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.scss diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html index 3ef9ff418472..8b72a9f8f417 100644 --- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html +++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html @@ -1,6 +1,6 @@
    -

    {{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }}

    +

    @if (course?.isAtLeastEditor) {
    @@ -51,12 +51,12 @@
    {{ exerciseGroup.title }}
    - {{ 'artemisApp.fileUploadExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.fileUploadExercise.home.importLabel' | artemisTranslate }} +
    @@ -65,12 +65,12 @@
    {{ exerciseGroup.title }}
    - {{ 'artemisApp.quizExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.quizExercise.home.importLabel' | artemisTranslate }} +
    @@ -79,12 +79,12 @@
    {{ exerciseGroup.title }}
    - {{ 'artemisApp.textExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.textExercise.home.importLabel' | artemisTranslate }} +
    @@ -93,12 +93,12 @@
    {{ exerciseGroup.title }}
    - {{ 'artemisApp.modelingExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.modelingExercise.home.importLabel' | artemisTranslate }} +
    @@ -107,12 +107,12 @@
    {{ exerciseGroup.title }}
    - {{ 'artemisApp.programmingExercise.home.createLabel' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.home.importLabel' | artemisTranslate }} +
    @@ -122,7 +122,7 @@
    {{ exerciseGroup.title }}
    - {{ 'entity.action.edit' | artemisTranslate }} + @if ( exerciseGroup.id && @@ -181,50 +181,50 @@
    {{ exerciseGroup.title }}
    - {{ 'global.field.id' | artemisTranslate }} + - {{ 'artemisApp.examManagement.exerciseGroup.type' | artemisTranslate }} + - {{ 'artemisApp.examManagement.exerciseGroup.title' | artemisTranslate }} + - {{ 'artemisApp.examManagement.exerciseGroup.points' | artemisTranslate }} + - {{ 'artemisApp.exercise.bonus' | artemisTranslate }} + - {{ 'artemisApp.exercise.includedCompletely' | artemisTranslate }} + @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id!)?.includes(exerciseType.PROGRAMMING)) { - {{ 'artemisApp.exercise.shortName' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.repositories' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.buildplans' | artemisTranslate }} + - {{ 'artemisApp.programmingExercise.participationMode' | artemisTranslate }} + } @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.QUIZ)) { - {{ 'artemisApp.quizExercise.questions' | artemisTranslate }} + } @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.MODELING)) { - {{ 'artemisApp.modelingExercise.diagramType' | artemisTranslate }} + } @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.FILE_UPLOAD)) { - {{ 'artemisApp.fileUploadExercise.filePattern' | artemisTranslate }} + } @if ( @@ -234,7 +234,7 @@
    {{ exerciseGroup.title }}
    exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.MODELING)) ) { - {{ 'artemisApp.assessmentMode' | artemisTranslate }} + } @@ -365,9 +365,7 @@
    {{ exerciseGroup.title }}
    } @if (!exerciseGroup.exercises) { -
    - {{ 'artemisApp.examManagement.exerciseGroup.noExercises' | artemisTranslate }} -
    +
    }
    diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html index 1235391ec365..5c80f6e0c868 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html @@ -60,15 +60,8 @@

    - +
    +
    @if (exerciseHint.type === HintType.CODE) {
    diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts index 3ea7292de040..b734c1c628df 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts +++ b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts @@ -4,8 +4,6 @@ import { ActivatedRoute } from '@angular/router'; import { Observable, Subscription, filter, switchMap } from 'rxjs'; import { AlertService } from 'app/core/util/alert.service'; import { ExerciseHintService } from '../shared/exercise-hint.service'; -import { EditorMode, MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component'; -import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command'; import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; import { faBan, faCircleNotch, faSave } from '@fortawesome/free-solid-svg-icons'; import { ExerciseHint, HintType } from 'app/entities/hestia/exercise-hint.model'; @@ -23,13 +21,14 @@ import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { ButtonType } from 'app/shared/components/button.component'; import { PROFILE_IRIS } from 'app/app.constants'; +import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action'; +import { MarkdownEditorHeight } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; const DEFAULT_DISPLAY_THRESHOLD = 3; @Component({ selector: 'jhi-exercise-hint-update', templateUrl: './exercise-hint-update.component.html', - styleUrls: ['./exercise-hint.scss'], }) export class ExerciseHintUpdateComponent implements OnInit, OnDestroy { MarkdownEditorHeight = MarkdownEditorHeight; @@ -47,8 +46,7 @@ export class ExerciseHintUpdateComponent implements OnInit, OnDestroy { isGeneratingDescription: boolean; paramSub: Subscription; - domainCommands = [new KatexCommand()]; - editorMode = EditorMode.LATEX; + domainActions = [new MonacoFormulaAction()]; // Icons faCircleNotch = faCircleNotch; diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.scss b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.scss deleted file mode 100644 index 536b30c1def3..000000000000 --- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.scss +++ /dev/null @@ -1,5 +0,0 @@ -.hint-form__editor-wrapper { - ::ng-deep .markdown-editor { - height: 300px; - } -} diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html index 8f5f0b1cce9f..7dc825d8aa95 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html @@ -21,12 +21,12 @@ - + @if (isLoading) {
    } @else { diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html index b7f412a0ef42..09c17845b507 100644 --- a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html @@ -6,10 +6,11 @@

    - {{ - 'artemisApp.exerciseHint.studentDialog.availableHintTaskDescription' - | artemisTranslate: { taskName: availableExerciseHints.first()!.programmingExerciseTask!.taskName } - }} + @for (hint of availableExerciseHints; track hint) {
    diff --git a/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html b/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html index 6730415e6a25..e223cb6f2b06 100644 --- a/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html @@ -1,5 +1,5 @@
    -
    {{ 'artemisApp.exercise.details' | artemisTranslate }}
    +
    @if (exercise.releaseDate) { diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html index bd6a45ee94dc..999ab5fe4108 100644 --- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html @@ -12,7 +12,7 @@

    {{ 'artemisApp.assessment.dashboard.activeFilter' | artemisTranslate }}: - {{ 'artemisApp.exercise.showingOnlyInRange' | artemisTranslate: { range: this.rangeFilter.toString() } }} +

    @@ -46,17 +46,14 @@

    @if (filteredParticipations.length && participationsPerFilter.get(resultCriteria.filterProp) !== filteredParticipations.length) { - - {{ - 'artemisApp.exercise.showingOfResults' - | artemisTranslate - : { - filtered: participationsPerFilter.get(resultCriteria.filterProp), - total: filteredParticipations.length, - percent: ((participationsPerFilter.get(resultCriteria.filterProp) ?? 0) * 100) / filteredParticipations.length | number: '1.0-1', - } - }} - + }
    @@ -158,7 +155,7 @@
    - {{ 'artemisApp.exercise.name' | artemisTranslate }} + @@ -181,12 +178,12 @@
    @if (exercise.teamMode) { - {{ 'artemisApp.exercise.teamShortName' | artemisTranslate }} + } @else { - {{ 'artemisApp.exercise.studentId' | artemisTranslate }} + } @@ -204,7 +201,7 @@
    - {{ 'artemisApp.exercise.completionDate' | artemisTranslate }} + @@ -215,7 +212,7 @@
    - {{ 'artemisApp.exercise.lastResult' | artemisTranslate }} + @@ -229,7 +226,7 @@
    - {{ 'artemisApp.exercise.type' | artemisTranslate }} + @@ -277,7 +274,7 @@
    - {{ 'artemisApp.exercise.submissionCount' | artemisTranslate }} + @@ -296,7 +293,7 @@
    - {{ 'artemisApp.exercise.duration' | artemisTranslate }} + diff --git a/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html b/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html index fa692113e2d2..c4918ffe1525 100644 --- a/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html +++ b/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html @@ -1,5 +1,5 @@
    -

    {{ 'artemisApp.exercise-scores-chart.title' | artemisTranslate }}

    +

    @if (exerciseTypeFilter.typeSet.size > 0) {
    • - {{ 'artemisApp.exercise-scores-chart.includeType' | artemisTranslate }} +
      • @for (type of exerciseTypeFilter.typeSet; track type) {
    • diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts index d20532d40dc7..8ca421927fb9 100644 --- a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts +++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts @@ -12,13 +12,14 @@ import { ExerciseGroupUpdateComponent } from 'app/exam/manage/exercise-groups/ex import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { AlertService } from 'app/core/util/alert.service'; -import { MockComponent, MockPipe } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe } from 'ng-mocks'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { of, throwError } from 'rxjs'; import { MockRouter } from '../../../../helpers/mocks/mock-router'; import { MockSyncStorage } from '../../../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service'; import { NgbAlertsMocksModule } from '../../../../helpers/mocks/directive/ngbAlertsMocks.module'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('ExerciseGroupUpdateComponent', () => { const course = { id: 456 } as Course; @@ -43,7 +44,7 @@ describe('ExerciseGroupUpdateComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientModule, FormsModule, NgbAlertsMocksModule], - declarations: [ExerciseGroupUpdateComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent)], + declarations: [ExerciseGroupUpdateComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockDirective(TranslateDirective)], providers: [ { provide: SessionStorageService, useClass: MockSyncStorage }, { provide: LocalStorageService, useClass: MockSyncStorage }, diff --git a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts index 038a9cc515ef..2af4e435afaf 100644 --- a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts +++ b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts @@ -11,7 +11,6 @@ import { HelpIconComponent } from 'app/shared/components/help-icon.component'; import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service'; import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model'; import { ActivatedRoute } from '@angular/router'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service'; import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model'; import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model'; @@ -25,6 +24,7 @@ import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model'; import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model'; import { PROFILE_IRIS } from 'app/app.constants'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; describe('ExerciseHint Management Update Component', () => { let comp: ExerciseHintUpdateComponent; @@ -52,7 +52,7 @@ describe('ExerciseHint Management Update Component', () => { beforeEach(fakeAsync(() => { TestBed.configureTestingModule({ imports: [ArtemisTestModule, FormsModule], - declarations: [ExerciseHintUpdateComponent, MockComponent(MarkdownEditorComponent), MockComponent(HelpIconComponent)], + declarations: [ExerciseHintUpdateComponent, MockComponent(MarkdownEditorMonacoComponent), MockComponent(HelpIconComponent)], providers: [ FormBuilder, MockProvider(ProgrammingExerciseService), From e9097601340fbaf806fc180d723afcb749aba3c2 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:34:35 +0200 Subject: [PATCH 23/95] merge5 --- ...file-upload-exam-submission.component.html | 17 +++++---- .../file-upload-assessment.component.html | 4 +-- ...file-upload-exercise-update.component.html | 36 ++++++++----------- .../exercise-update-warning.component.html | 4 +-- .../shared/feedback/feedback.component.html | 32 +++++++---------- .../exercise-update-plagiarism.component.html | 13 ++++--- .../feature-overview.component.html | 4 +-- .../exerciseReferenceCommand.ts | 36 ------------------- .../domainCommands/explanation.command.ts | 35 ------------------ .../domainCommands/feedback.command.ts | 35 ------------------ ...e-upload-exercise-update.component.spec.ts | 3 +- 11 files changed, 49 insertions(+), 170 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/explanation.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/feedback.command.ts 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 e1aae0b032ca..be5dce5a54a3 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 @@ -27,9 +27,12 @@

    - +

    @@ -46,9 +49,7 @@

    @if (submittedFileName && studentSubmission?.filePath) {
    -
    - {{ 'artemisApp.fileUploadSubmission.submittedFile' | artemisTranslate: { filename: submittedFileName } }} -
    +
    @if (submittedFileExtension) { @@ -59,9 +60,7 @@
    } @if (!submittedFileName && examTimeline) {
    -
    - {{ 'artemisApp.timeline.fileUploadNotSubmitted' | artemisTranslate }} -
    +
    }
    diff --git a/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html b/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html index a3a04e2f4b8d..002e35fe3ee3 100644 --- a/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html +++ b/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html @@ -30,7 +30,7 @@
    @if (submission?.filePath) {
    - {{ 'artemisApp.fileUploadAssessment.submissionFile' | artemisTranslate }} + {{ attachmentExtension(submission!.filePath!) | uppercase }}
    } @@ -77,7 +77,7 @@
    @if (submission?.filePath) {
    - {{ 'artemisApp.fileUploadAssessment.submissionFile' | artemisTranslate }} + {{ attachmentExtension(submission!.filePath!) | uppercase }}
    } diff --git a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html index 018239b68f98..244e6275b8b2 100644 --- a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html +++ b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html @@ -39,12 +39,11 @@

    -
    @if (!isExamMode) { @@ -63,12 +62,11 @@

    -

    @if (!isExamMode) { @@ -83,9 +81,7 @@

    @if (fileUploadExercise.exampleSolutionPublicationDateError) { - - {{ 'artemisApp.exercise.exampleSolutionPublicationDateError' | artemisTranslate }} - + }

    } @@ -119,7 +115,7 @@

    @if (fileUploadExercise.startDateError) { - {{ 'artemisApp.exercise.startDateError' | artemisTranslate }} + }

    @@ -140,7 +136,7 @@

    @if (fileUploadExercise.dueDateError) { - {{ 'artemisApp.exercise.dueDateError' | artemisTranslate }} + }

    @@ -157,15 +153,13 @@

    @if (fileUploadExercise.assessmentDueDateError) { - {{ 'artemisApp.exercise.assessmentDueDateError' | artemisTranslate }} + }

    }
    - +
    @if (points?.invalid && (points?.dirty || points?.touched) && points?.errors) { -
    - {{ 'artemisApp.exercise.pointsError' | artemisTranslate }} -
    +
    }
    @@ -211,9 +203,11 @@

    @if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) { -
    - {{ 'artemisApp.exercise.bonusPointsError' | artemisTranslate }} -
    +
    }

diff --git a/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html b/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html index 3f1295a4ee83..026ba95b9279 100644 --- a/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html @@ -18,9 +18,7 @@ @if (instructionDeleted) {
- +
} @if (creditChanged || usageCountChanged || instructionDeleted) { diff --git a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html index 02ec4680e56e..5d41e4bfe798 100644 --- a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html +++ b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html @@ -3,9 +3,7 @@ @if (taskName) {

} @else { -

- {{ 'artemisApp.result.detail.feedback' | artemisTranslate }} -

+

} @if (activeModal) { @@ -40,26 +38,22 @@

@if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA) { - - {{ 'artemisApp.result.resultString.automaticAIFeedbackSuccessfulTooltip' | artemisTranslate }} - + } @else { @if (!exercise?.maxPoints) { - - {{ 'artemisApp.result.score' | artemisTranslate: { score: roundValueSpecifiedByCourseSettings(result.score, course) } }} - + } @else { @if (exercise && exercise.maxPoints) { - - {{ - 'artemisApp.result.scoreWithPoints' - | artemisTranslate - : { - score: roundValueSpecifiedByCourseSettings(result.score ?? 0, course), - points: roundValueSpecifiedByCourseSettings(((result.score ?? 0) * exercise.maxPoints) / 100, course), - } - }} - + } } } diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html index c848e2b44c17..99c853afd07e 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html +++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html @@ -1,12 +1,11 @@
- + BETA
diff --git a/src/main/webapp/app/feature-overview/feature-overview.component.html b/src/main/webapp/app/feature-overview/feature-overview.component.html index 990dbda9f0cd..52eab3bfe420 100644 --- a/src/main/webapp/app/feature-overview/feature-overview.component.html +++ b/src/main/webapp/app/feature-overview/feature-overview.component.html @@ -1,6 +1,6 @@
-

{{ 'featureOverview.title' | artemisTranslate }}

+

@@ -17,7 +17,7 @@

{{ feature.title | artemisTranslate }}

}
-

{{ 'featureOverview.featureDetails' | artemisTranslate }}

+

@for (feature of features; track feature) {

{{ feature.title | artemisTranslate }}

diff --git a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand.ts deleted file mode 100644 index ba955b868eb9..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand'; -import { MetisService } from 'app/shared/metis/metis.service'; - -export class ExerciseReferenceCommand extends MultiOptionCommand { - metisService: MetisService; - - buttonTranslationString = 'artemisApp.metis.editor.exercise'; - - constructor(metisService: MetisService) { - super(); - this.metisService = metisService; - - this.setValues( - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - this.metisService.getCourse().exercises?.map((exercise) => ({ - id: exercise.id!.toString(), - value: exercise.title!, - type: exercise.type, - }))!, - ); - } - - /** - * @function execute - * @param {string} selectedExerciseId ID of the exercise to be referenced - * @desc Add an exercise reference link in markdown language - * 1. Add '[{exercise-title}](/courses/{courseId}/exercises/{exerciseId}})' at the cursor in the editor - * 2. Link in markdown language appears which when clicked navigates to the exercise page - */ - execute(selectedExerciseId: string): void { - const selectedExercise = this.getValues().find((value) => value.id.toString() === selectedExerciseId)!; - const referenceLink = `[${selectedExercise.type}]${selectedExercise.value}(${this.metisService.getLinkForExercise(selectedExercise.id)})[/${selectedExercise.type}]`; - this.insertText(referenceLink); - this.focus(); - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/explanation.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/explanation.command.ts deleted file mode 100644 index e8e0ccbb7efd..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/explanation.command.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { addTextAtCursor } from 'app/shared/util/markdown.util'; -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; - -export const explanationCommandIdentifier = '[exp]'; - -export class ExplanationCommand extends DomainTagCommand { - public static readonly TEXT = ' Add an explanation here (only visible in feedback after quiz has ended)'; - - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addExplanation'; - - /** - * @function execute - * @desc Add a new explanation to answer option or question title in the text editor at the location of the cursor - */ - execute(): void { - const text = '\n\t' + this.getOpeningIdentifier() + ExplanationCommand.TEXT; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the explanation - */ - getOpeningIdentifier(): string { - return explanationCommandIdentifier; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the explanation - */ - getClosingIdentifier(): string { - return '[/exp]'; - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/feedback.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/feedback.command.ts deleted file mode 100644 index 739b531dbff5..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/feedback.command.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; -import { addTextAtCursor } from 'app/shared/util/markdown.util'; - -export class FeedbackCommand extends DomainTagCommand { - public static readonly IDENTIFIER = '[feedback]'; - public static readonly TEXT = 'Add feedback for students here (visible for students)'; - - buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addFeedback'; - displayCommandButton = false; - - /** - * @function execute - * @desc Add a new feedback for the corresponding instruction in the editor at the location of the cursor - */ - execute(): void { - const text = '\n' + this.getOpeningIdentifier() + FeedbackCommand.TEXT; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the feedback - */ - getOpeningIdentifier(): string { - return FeedbackCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the feedback - */ - getClosingIdentifier(): string { - return '[/feedback]'; - } -} diff --git a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts index d104f657bdf3..caec2f8dbd54 100644 --- a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts @@ -23,6 +23,7 @@ import { fileUploadExercise } from '../../helpers/mocks/service/mock-file-upload import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; import { NgModel } from '@angular/forms'; +import { ExerciseCategory } from 'app/entities/exercise-category.model'; describe('FileUploadExerciseUpdateComponent', () => { let comp: FileUploadExerciseUpdateComponent; @@ -321,7 +322,7 @@ describe('FileUploadExerciseUpdateComponent', () => { it('should updateCategories properly by making category available for selection again when removing it', () => { comp.fileUploadExercise = fileUploadExercise; comp.exerciseCategories = []; - const newCategories = [{ category: 'Easy' }, { category: 'Hard' }]; + const newCategories = [new ExerciseCategory('Easy', undefined), new ExerciseCategory('Hard', undefined)]; comp.updateCategories(newCategories); From caa421eff67aee0b00430ffec20ae35c845c139f Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:35:11 +0200 Subject: [PATCH 24/95] merge5 --- .../generate-competencies.component.ts | 97 +++++++++++++++---- .../file-upload-exercise-update.component.ts | 11 +-- .../file-upload-submission.component.html | 4 +- .../git-diff-report-modal.component.html | 10 +- .../git-diff-report/git-diff-report.module.ts | 3 +- ...generic-confirmation-dialog.component.html | 2 +- ...update-text-property-dialog.component.html | 2 +- .../commands/fullscreen.command.ts | 24 ----- .../generate-competencies.component.spec.ts | 75 ++++++++++++-- .../fullscreen-command.spec.ts | 56 ----------- .../FileUploadExerciseCreationPage.ts | 2 +- 11 files changed, 158 insertions(+), 128 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/fullscreen.command.ts delete mode 100644 src/test/javascript/spec/component/markdown-editor/fullscreen-command.spec.ts diff --git a/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts b/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts index 74c6d6891d3f..9501484fe9b5 100644 --- a/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts +++ b/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts @@ -1,4 +1,4 @@ -import { Component, HostListener, OnInit } from '@angular/core'; +import { Component, HostListener, OnInit, ViewChild } from '@angular/core'; import { CompetencyService } from 'app/course/competencies/competency.service'; import { AlertService } from 'app/core/util/alert.service'; import { onError } from 'app/shared/util/global.utils'; @@ -8,17 +8,21 @@ import { ActivatedRoute, Router } from '@angular/router'; import { faBan, faSave, faTimes } from '@fortawesome/free-solid-svg-icons'; import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms'; import { ButtonType } from 'app/shared/components/button.component'; -import { finalize } from 'rxjs/operators'; import { ComponentCanDeactivate } from 'app/shared/guard/can-deactivate.model'; import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { Observable, firstValueFrom, map } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { TranslateService } from '@ngx-translate/core'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; +import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; +import { IrisStageDTO, IrisStageStateDTO } from 'app/entities/iris/iris-stage-dto.model'; import { CourseCompetencyService } from 'app/course/competencies/course-competency.service'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module'; +import { CourseManagementService } from 'app/course/manage/course-management.service'; +import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component'; export type CompetencyFormControlsWithViewed = { competency: FormGroup; @@ -31,6 +35,17 @@ export type CompetencyFormControls = { taxonomy: FormControl; }; +export type CompetencyRecommendation = { + title?: string; + description?: string; + taxonomy?: CompetencyTaxonomy; +}; + +type CompetencyGenerationStatusUpdate = { + stages: IrisStageDTO[]; + result?: CompetencyRecommendation[]; +}; + @Component({ selector: 'jhi-generate-competencies', templateUrl: './generate-competencies.component.html', @@ -38,6 +53,8 @@ export type CompetencyFormControls = { imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule, ArtemisCompetenciesModule], }) export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeactivate { + @ViewChild(CourseDescriptionFormComponent) courseDescriptionForm: CourseDescriptionFormComponent; + courseId: number; isLoading = false; submitted: boolean = false; @@ -53,6 +70,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti readonly documentationType: DocumentationType = 'GenerateCompetencies'; constructor( + private courseManagementService: CourseManagementService, private courseCompetencyService: CourseCompetencyService, private competencyService: CompetencyService, private alertService: AlertService, @@ -62,11 +80,15 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti private modalService: NgbModal, private artemisTranslatePipe: ArtemisTranslatePipe, private translateService: TranslateService, + private jhiWebsocketService: JhiWebsocketService, ) {} ngOnInit(): void { this.activatedRoute.params.subscribe((params) => { this.courseId = Number(params['courseId']); + firstValueFrom(this.courseManagementService.find(this.courseId)) + .then((course) => this.courseDescriptionForm.setCourseDescription(course.body?.description ?? '')) + .catch((res: HttpErrorResponse) => onError(this.alertService, res)); }); } @@ -76,24 +98,61 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti */ getCompetencyRecommendations(courseDescription: string) { this.isLoading = true; - this.courseCompetencyService - .generateCompetenciesFromCourseDescription(courseDescription, this.courseId) - .pipe( - finalize(() => { + this.getCurrentCompetencies().subscribe((currentCompetencies) => { + this.courseCompetencyService.generateCompetenciesFromCourseDescription(this.courseId, courseDescription, currentCompetencies).subscribe({ + next: () => { + const websocketTopic = `/user/topic/iris/competencies/${this.courseId}`; + this.jhiWebsocketService.subscribe(websocketTopic); + this.jhiWebsocketService.receive(websocketTopic).subscribe({ + next: (update: CompetencyGenerationStatusUpdate) => { + if (update.result) { + for (const competency of update.result) { + this.addCompetencyToForm(competency); + } + } + if (update.stages.every((stage) => stage.state === IrisStageStateDTO.DONE)) { + this.alertService.success('artemisApp.competency.generate.courseDescription.success', { noOfCompetencies: update.result?.length }); + } else if (update.stages.some((stage) => stage.state === IrisStageStateDTO.ERROR)) { + this.alertService.warning('artemisApp.competency.generate.courseDescription.warning'); + } + if (update.stages.every((stage) => stage.state !== IrisStageStateDTO.NOT_STARTED && stage.state !== IrisStageStateDTO.IN_PROGRESS)) { + this.jhiWebsocketService.unsubscribe(websocketTopic); + this.isLoading = false; + } + }, + error: (res: HttpErrorResponse) => { + onError(this.alertService, res); + this.jhiWebsocketService.unsubscribe(websocketTopic); + this.isLoading = false; + }, + }); + }, + error: (res: HttpErrorResponse) => { + onError(this.alertService, res); this.isLoading = false; - }), - ) - .subscribe({ - next: (res) => { - if (res.body?.length && res.body.length > 0) { - this.alertService.success('artemisApp.competency.generate.courseDescription.success', { noOfCompetencies: res.body.length }); - res.body?.forEach((competency) => this.addCompetencyToForm(competency)); - } else { - this.alertService.warning('artemisApp.competency.generate.courseDescription.warning'); - } }, - error: (res: HttpErrorResponse) => onError(this.alertService, res), }); + }); + } + + /** + * Returns the title, description, and taxonomy of all current competencies saved in this course, + * and the competency recommendations that are currently in the form. + * @private + */ + private getCurrentCompetencies(): Observable { + const currentCompetencySuggestions = this.competencies.getRawValue().map((c) => c.competency); + const courseCompetenciesObservable = this.courseCompetencyService.getAllForCourse(this.courseId); + if (courseCompetenciesObservable) { + return courseCompetenciesObservable.pipe( + map((competencies) => competencies.body?.map((c) => ({ title: c.title, description: c.description, taxonomy: c.taxonomy }))), + map((competencies) => currentCompetencySuggestions.concat(competencies ?? [])), + ); + } + return new Observable((subscriber) => { + subscriber.next(currentCompetencySuggestions); + subscriber.complete(); + }); } /** @@ -101,7 +160,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti * @param competency * @private */ - private addCompetencyToForm(competency: Competency) { + private addCompetencyToForm(competency: CompetencyRecommendation) { const formGroup: FormGroup = this.formBuilder.nonNullable.group({ competency: this.formBuilder.nonNullable.group({ title: [competency.title], @@ -150,7 +209,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti * Saves the competency recommendations as competencies and navigates back */ save() { - const competenciesToSave = this.competencies.getRawValue().map((c) => c.competency as Competency); + const competenciesToSave = this.competencies.getRawValue().map((c) => Object.assign(new Competency(), c.competency)); this.competencyService.createBulk(competenciesToSave, this.courseId).subscribe({ next: () => { this.submitted = true; diff --git a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts index 38e688e7c415..8cf0fe19dcb1 100644 --- a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts +++ b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Params } from '@angular/router'; import { HttpErrorResponse, HttpResponse } from '@angular/common/http'; import { AlertService, AlertType } from 'app/core/util/alert.service'; @@ -7,8 +7,6 @@ import { FileUploadExercise } from 'app/entities/file-upload-exercise.model'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { Exercise, ExerciseMode, IncludedInOverallScore, getCourseId, resetForImport } from 'app/entities/exercise.model'; -import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component'; -import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command'; import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; import { ExerciseCategory } from 'app/entities/exercise-category.model'; import { cloneDeep } from 'lodash-es'; @@ -27,10 +25,12 @@ import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-f import { NgModel } from '@angular/forms'; import { Subscription } from 'rxjs'; import { FormSectionStatus } from 'app/forms/form-status-bar/form-status-bar.component'; +import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action'; @Component({ selector: 'jhi-file-upload-exercise-update', templateUrl: './file-upload-exercise-update.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, }) export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestroy, OnInit { readonly IncludedInOverallScore = IncludedInOverallScore; @@ -53,10 +53,9 @@ export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestr goBackAfterSaving = false; exerciseCategories: ExerciseCategory[]; existingCategories: ExerciseCategory[]; - EditorMode = EditorMode; notificationText?: string; - domainCommandsProblemStatement = [new KatexCommand()]; - domainCommandsSampleSolution = [new KatexCommand()]; + domainActionsProblemStatement = [new MonacoFormulaAction()]; + domainActionsExampleSolution = [new MonacoFormulaAction()]; isImport: boolean; examCourseId?: number; diff --git a/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html b/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html index 6ef4808465d3..563047cf80cd 100644 --- a/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html +++ b/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html @@ -53,8 +53,8 @@
{{ submission!.submissionDate! | artemisTimeAgo }}
} @else { -
{{ 'artemisApp.exam.examSummary.yourSubmission' | artemisTranslate }}
- {{ 'artemisApp.fileUploadSubmission.submittedFile' | artemisTranslate: { filename: submittedFileName } }} +
+ }
diff --git a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html index eacc4d1f6f9e..198b27469831 100644 --- a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html +++ b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html @@ -1,11 +1,9 @@
-

- {{ - (diffForTemplateAndSolution ? 'artemisApp.programmingExercise.diffReport.title' : 'artemisApp.programmingExercise.diffReport.titleForSubmissions') - | artemisTranslate - }} -

+

diff --git a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts index b134a0c17ad2..d72ed6f72de0 100644 --- a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts +++ b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { ArtemisSharedModule } from 'app/shared/shared.module'; -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; import { GitDiffLineStatComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-line-stat.component'; import { GitDiffReportComponent } from './git-diff-report.component'; import { GitDiffFileComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-file.component'; @@ -12,7 +11,7 @@ import { GitDiffFilePanelTitleComponent } from 'app/exercises/programming/hestia import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; @NgModule({ - imports: [ArtemisSharedModule, AceEditorModule, NgbAccordionModule, MonacoEditorModule, ArtemisSharedComponentModule], + imports: [ArtemisSharedModule, NgbAccordionModule, MonacoEditorModule, ArtemisSharedComponentModule], declarations: [GitDiffFilePanelComponent, GitDiffFilePanelTitleComponent, GitDiffReportComponent, GitDiffFileComponent, GitDiffReportModalComponent, GitDiffLineStatComponent], exports: [GitDiffReportComponent, GitDiffReportModalComponent, GitDiffLineStatComponent], }) diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html index 6ff8585d7b43..b6e603c38de9 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html @@ -18,7 +18,7 @@

{{ translationKeys.titleKey | artemisTranslate: translat }

- + diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html index d32db2260889..1ad09b261236 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html @@ -38,7 +38,7 @@

diff --git a/src/main/webapp/app/shared/markdown-editor/commands/fullscreen.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/fullscreen.command.ts deleted file mode 100644 index a331a1c07479..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/fullscreen.command.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { faCompress } from '@fortawesome/free-solid-svg-icons'; -import { Command } from 'app/shared/markdown-editor/commands/command'; -import { enterFullscreen, exitFullscreen, isFullScreen } from 'app/shared/util/fullscreen.util'; - -/** - * Toggles fullscreen on button press. - * Uses the markdown editor wrapper including tabs as element for fullscreen. - * - * The command needs to check different browser implementations of the fullscreen mode so it is handled correctly. - */ -export class FullscreenCommand extends Command { - buttonIcon = faCompress as IconProp; - buttonTranslationString = 'artemisApp.markdownEditor.commands.fullscreen'; - - execute(): void { - if (isFullScreen()) { - exitFullscreen(); - } else { - const element = this.markdownWrapper.nativeElement; - enterFullscreen(element); - } - } -} diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts index f1dc252ada53..6888c6d994ea 100644 --- a/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts +++ b/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { ArtemisTestModule } from '../../../test.module'; @@ -12,7 +12,7 @@ import { CompetencyService } from 'app/course/competencies/competency.service'; import { AlertService } from 'app/core/util/alert.service'; import { MockNgbModalService } from '../../../helpers/mocks/service/mock-ngb-modal.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { of } from 'rxjs'; +import { Subject, of } from 'rxjs'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { CourseDescriptionFormStubComponent } from './course-description-form-stub.component'; import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route'; @@ -21,17 +21,23 @@ import { HttpResponse } from '@angular/common/http'; import { By } from '@angular/platform-browser'; import { CompetencyRecommendationDetailComponent } from 'app/course/competencies/generate-competencies/competency-recommendation-detail.component'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; +import { JhiWebsocketService } from 'app/core/websocket/websocket.service'; +import { IrisStageStateDTO } from 'app/entities/iris/iris-stage-dto.model'; import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component'; import { CourseCompetencyService } from 'app/course/competencies/course-competency.service'; import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module'; import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module'; +import { CourseManagementService } from 'app/course/manage/course-management.service'; describe('GenerateCompetenciesComponent', () => { let generateCompetenciesComponentFixture: ComponentFixture; let generateCompetenciesComponent: GenerateCompetenciesComponent; + let mockWebSocketSubject: Subject; beforeEach(() => { + mockWebSocketSubject = new Subject(); + TestBed.configureTestingModule({ imports: [ArtemisTestModule, GenerateCompetenciesComponent, ArtemisSharedCommonModule, ArtemisSharedComponentModule, ArtemisCompetenciesModule], declarations: [ @@ -50,6 +56,16 @@ describe('GenerateCompetenciesComponent', () => { useValue: new MockActivatedRoute({ courseId: 1 }), }, { provide: Router, useClass: MockRouter }, + { + provide: JhiWebsocketService, + useValue: { + subscribe: jest.fn(), + receive: jest.fn(() => mockWebSocketSubject.asObservable()), + unsubscribe: jest.fn(), + }, + }, + MockProvider(CourseDescriptionFormComponent), + MockProvider(CourseManagementService), MockProvider(CourseCompetencyService), MockProvider(CompetencyService), MockProvider(AlertService), @@ -85,11 +101,32 @@ describe('GenerateCompetenciesComponent', () => { expect(getCompetencyRecommendationsSpy).toHaveBeenCalledOnce(); }); + it('should initialize the form with the course description', fakeAsync(() => { + generateCompetenciesComponentFixture.detectChanges(); + const courseDescription = 'Course Description'; + + const courseDescriptionComponent: CourseDescriptionFormComponent = generateCompetenciesComponentFixture.debugElement.query( + By.directive(CourseDescriptionFormComponent), + ).componentInstance; + const setCourseDescriptionSpy = jest.spyOn(courseDescriptionComponent, 'setCourseDescription'); + + // mock the course returned by CourseManagementService + const course = { description: courseDescription }; + const courseManagementService = TestBed.inject(CourseManagementService); + const getCourseSpy = jest.spyOn(courseManagementService, 'find').mockReturnValue(of(new HttpResponse({ body: course }))); + + generateCompetenciesComponent.ngOnInit(); + tick(); + + expect(getCourseSpy).toHaveBeenCalledOnce(); + expect(setCourseDescriptionSpy).toHaveBeenCalledWith(courseDescription); + })); + it('should add competency recommendations', () => { generateCompetenciesComponentFixture.detectChanges(); const courseDescription = 'Course Description'; const response = new HttpResponse({ - body: [{}, {}], + body: null, status: 200, }); const courseCompetencyService = TestBed.inject(CourseCompetencyService); @@ -100,10 +137,15 @@ describe('GenerateCompetenciesComponent', () => { expect(generateCompetenciesComponent.competencies.value).toHaveLength(0); generateCompetenciesComponent.getCompetencyRecommendations(courseDescription); + const websocketMessage = { + stages: [{ state: IrisStageStateDTO.DONE }], + result: [{ title: 'Title', description: 'Description', taxonomy: CompetencyTaxonomy.ANALYZE }], + }; + mockWebSocketSubject.next(websocketMessage); generateCompetenciesComponentFixture.detectChanges(); - expect(generateCompetenciesComponentFixture.debugElement.queryAll(By.directive(CompetencyRecommendationDetailComponent))).toHaveLength(2); - expect(generateCompetenciesComponent.competencies.value).toHaveLength(2); + expect(generateCompetenciesComponentFixture.debugElement.queryAll(By.directive(CompetencyRecommendationDetailComponent))).toHaveLength(1); + expect(generateCompetenciesComponent.competencies.value).toHaveLength(1); expect(getSpy).toHaveBeenCalledOnce(); }); @@ -190,17 +232,30 @@ describe('GenerateCompetenciesComponent', () => { it('should display alerts after generating', () => { const alertService = TestBed.inject(AlertService); + const response = new HttpResponse({ + body: null, + status: 200, + }); const courseCompetencyService = TestBed.inject(CourseCompetencyService); - const generateCompetenciesMock = jest.spyOn(courseCompetencyService, 'generateCompetenciesFromCourseDescription'); + const generateCompetenciesMock = jest.spyOn(courseCompetencyService, 'generateCompetenciesFromCourseDescription').mockReturnValue(of(response)); - generateCompetenciesMock.mockReturnValue(of({ body: [{ id: 1 }] } as HttpResponse)); const successMock = jest.spyOn(alertService, 'success'); - generateCompetenciesComponent.getCompetencyRecommendations(''); + generateCompetenciesComponent.getCompetencyRecommendations('Cool course description'); + const websocketMessage = { + stages: [{ state: IrisStageStateDTO.DONE }], + result: [{ title: 'Title', description: 'Description', taxonomy: CompetencyTaxonomy.ANALYZE }], + }; + mockWebSocketSubject.next(websocketMessage); expect(successMock).toHaveBeenCalledOnce(); + expect(generateCompetenciesMock).toHaveBeenCalledOnce(); - generateCompetenciesMock.mockReturnValue(of({} as HttpResponse)); const warnMock = jest.spyOn(alertService, 'warning'); - generateCompetenciesComponent.getCompetencyRecommendations(''); + generateCompetenciesComponent.getCompetencyRecommendations('Cool course description'); + const errorMessage = { + stages: [{ state: IrisStageStateDTO.ERROR }], + result: [{ title: 'Title', description: 'Description', taxonomy: CompetencyTaxonomy.ANALYZE }], + }; + mockWebSocketSubject.next(errorMessage); expect(warnMock).toHaveBeenCalled(); }); diff --git a/src/test/javascript/spec/component/markdown-editor/fullscreen-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/fullscreen-command.spec.ts deleted file mode 100644 index a11404b80e20..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/fullscreen-command.spec.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; -import { FullscreenCommand } from 'app/shared/markdown-editor/commands/fullscreen.command'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { ArtemisTestModule } from '../../test.module'; -import * as FullscreenUtil from 'app/shared/util/fullscreen.util'; - -describe('FullscreenCommand', () => { - let comp: MarkdownEditorComponent; - let fixture: ComponentFixture; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(MarkdownEditorComponent); - comp = fixture.componentInstance; - }); - }); - - afterEach(() => { - jest.restoreAllMocks(); - }); - - it('should enable fullscreen on execute', () => { - jest.spyOn(FullscreenUtil, 'enterFullscreen'); - jest.spyOn(FullscreenUtil, 'isFullScreen').mockReturnValue(false); - - const command = new FullscreenCommand(); - comp.defaultCommands = [command]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - - command.execute(); - expect(FullscreenUtil.isFullScreen).toHaveBeenCalledOnce(); - expect(FullscreenUtil.enterFullscreen).toHaveBeenCalledOnce(); - }); - - it('should disable fullscreen on execute', () => { - jest.spyOn(FullscreenUtil, 'exitFullscreen'); - jest.spyOn(FullscreenUtil, 'isFullScreen').mockReturnValue(true); - - const command = new FullscreenCommand(); - comp.defaultCommands = [command]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - - command.execute(); - expect(FullscreenUtil.isFullScreen).toHaveBeenCalledOnce(); - expect(FullscreenUtil.exitFullscreen).toHaveBeenCalledOnce(); - }); -}); diff --git a/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts b/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts index 1520841bccf9..760eb91275dc 100644 --- a/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts +++ b/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts @@ -53,6 +53,6 @@ export class FileUploadExerciseCreationPage { } private async typeText(selector: string, text: string) { - await this.page.locator(selector).locator('.ace_content').pressSequentially(text); + await this.page.locator(selector).locator('.monaco-editor').pressSequentially(text); } } From e288e35fdeac2d98b3724e26babd3c0f2071d174 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:36:42 +0200 Subject: [PATCH 25/95] merge5 --- .../artemis/config/connector/GitLabApiConfiguration.java | 3 +++ .../de/tum/in/www1/artemis/exception/GitLabCIException.java | 3 +++ .../connectors/gitlab/GitLabAuthorizationInterceptor.java | 3 +++ .../gitlabci/GitLabCIAuthorizationInterceptor.java | 3 +++ .../connectors/gitlabci/GitLabCIBuildPlanService.java | 3 +++ .../service/connectors/gitlabci/GitLabCIInfoContributor.java | 3 +++ .../gitlabci/GitLabCIProgrammingLanguageFeatureService.java | 5 +++++ .../service/connectors/gitlabci/GitLabCIResultService.java | 3 +++ .../artemis/service/connectors/gitlabci/GitLabCIService.java | 3 +++ .../service/connectors/gitlabci/GitLabCITriggerService.java | 3 +++ .../connectors/gitlabci/GitLabCIUserManagementService.java | 3 +++ 11 files changed, 35 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java index 45bfdaf4a97b..f88d93656d1b 100644 --- a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java +++ b/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java @@ -8,6 +8,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Configuration @Profile("gitlab | gitlabci") public class GitLabApiConfiguration { diff --git a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java b/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java index 44f21ed0bf25..77279e2a6593 100644 --- a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java +++ b/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java @@ -1,5 +1,8 @@ package de.tum.in.www1.artemis.exception; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + public class GitLabCIException extends ContinuousIntegrationException { public GitLabCIException(String message) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java index 9a78a348d9d8..2e461a5e1106 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java @@ -3,6 +3,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlab") @Component public class GitLabAuthorizationInterceptor extends AbstractGitLabAuthorizationInterceptor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java index 79de2d27aa42..258aa2df4269 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java @@ -5,6 +5,9 @@ import de.tum.in.www1.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Component public class GitLabCIAuthorizationInterceptor extends AbstractGitLabAuthorizationInterceptor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java index 80e9dab30be0..23500df008f1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java @@ -19,6 +19,9 @@ import de.tum.in.www1.artemis.service.ResourceLoaderService; import de.tum.in.www1.artemis.service.connectors.ci.AbstractBuildPlanCreator; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlabci") public class GitLabCIBuildPlanService extends AbstractBuildPlanCreator { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java index 832d100a7585..ee088f9d901a 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java @@ -10,6 +10,9 @@ import de.tum.in.www1.artemis.config.Constants; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Component @Profile("gitlabci") public class GitLabCIInfoContributor implements InfoContributor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java index 55ecbb0e447c..661824ea06d8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java @@ -2,6 +2,7 @@ import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.EMPTY; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; +import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN; @@ -13,6 +14,9 @@ import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature; import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlabci") public class GitLabCIProgrammingLanguageFeatureService extends ProgrammingLanguageFeatureService { @@ -20,5 +24,6 @@ public class GitLabCIProgrammingLanguageFeatureService extends ProgrammingLangua public GitLabCIProgrammingLanguageFeatureService() { programmingLanguageFeatures.put(EMPTY, new ProgrammingLanguageFeature(EMPTY, false, false, false, false, false, List.of(), false, false)); programmingLanguageFeatures.put(JAVA, new ProgrammingLanguageFeature(JAVA, false, false, false, true, false, List.of(PLAIN_MAVEN, MAVEN_MAVEN), false, false)); + programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, false)); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java index 620e22e09a55..f71e0fe8253b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java @@ -25,6 +25,9 @@ import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService; import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Service public class GitLabCIResultService extends AbstractContinuousIntegrationResultService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java index 2c78eb608c4e..45d66cf19272 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java @@ -42,6 +42,9 @@ import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO; import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Service public class GitLabCIService extends AbstractContinuousIntegrationService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java index 72c4fcb6150b..d2fe1c62525f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java @@ -15,6 +15,9 @@ import de.tum.in.www1.artemis.service.UriService; import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlabci") @Service public class GitLabCITriggerService implements ContinuousIntegrationTriggerService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java index f70dd7a82ffa..e15e0dd7038f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java @@ -12,6 +12,9 @@ import de.tum.in.www1.artemis.exception.ContinuousIntegrationException; import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlabci") public class GitLabCIUserManagementService implements CIUserManagementService { From ebeff529027d22d23569ed8ace6062e63795c199 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:36:55 +0200 Subject: [PATCH 26/95] merge5 --- .../artemis/service/connectors/gitlab/GitLabException.java | 3 +++ .../gitlab/GitLabPersonalAccessTokenManagementService.java | 3 +++ .../www1/artemis/service/connectors/gitlab/GitLabService.java | 3 +++ .../service/connectors/gitlab/GitlabInfoContributor.java | 3 +++ .../artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java | 3 +++ .../gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java | 3 +++ .../gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java | 3 +++ .../gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java | 3 +++ .../service/connectors/gitlab/dto/GitLabProjectDTO.java | 3 +++ .../connectors/gitlab/dto/GitLabPushNotificationDTO.java | 3 +++ .../service/connectors/gitlab/dto/GitLabRepositoryDTO.java | 3 +++ 11 files changed, 33 insertions(+) diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java index b34cd9c61dba..f217ef874422 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java @@ -2,6 +2,9 @@ import de.tum.in.www1.artemis.exception.VersionControlException; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + public class GitLabException extends VersionControlException { public GitLabException() { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java index e5d5fb7b3c4e..e903ffe004f5 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java @@ -31,6 +31,9 @@ /** * Provides VCS access token services for GitLab via means of personal access tokens. */ +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlab") public class GitLabPersonalAccessTokenManagementService extends VcsTokenManagementService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java index 103a58652025..4cdddb4cf7a1 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java @@ -66,6 +66,9 @@ import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission; import de.tum.in.www1.artemis.service.util.UrlUtils; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Profile("gitlab") @Service public class GitLabService extends AbstractVersionControlService { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java index b24a6013dc93..951aafa36d8d 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java @@ -11,6 +11,9 @@ import de.tum.in.www1.artemis.config.Constants; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Component @Profile("gitlab") public class GitlabInfoContributor implements InfoContributor { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java index 6942e2da6343..d937d570bb45 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java @@ -7,6 +7,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabCommitDTO(@JsonProperty("id") String hash, String message, ZonedDateTime timestamp, @JsonProperty("url") String commitUrl, Author author, List added, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java index 2662aef4d7d7..0ceec1bc02dc 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java @@ -9,6 +9,9 @@ * * @param id The id of the personal access token. */ +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPersonalAccessTokenListResponseDTO(@JsonProperty Long id) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java index 263b15057000..154830c818b3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPersonalAccessTokenRequestDTO(String name, @JsonProperty("user_id") Long userId, String[] scopes, @JsonProperty("expires_at") Date expiresAt) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java index e8f4333975f7..6920d3db2bee 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPersonalAccessTokenResponseDTO(String name, @JsonProperty("user_id") Long userId, String[] scopes, @JsonProperty("expires_at") Date expiresAt, String token) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java index 605679d176bf..71353195ac21 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java @@ -6,6 +6,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabProjectDTO(int id, String name, String description, @JsonProperty("web_url") URL webUrl, @JsonProperty("git_ssh_url") String sshUrl, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java index 23858285deda..917628db09e8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java @@ -8,6 +8,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabPushNotificationDTO(@JsonProperty("object_kind") String triggerType, @JsonProperty("event_name") String eventName, @JsonProperty("before") String previousHash, diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java index f4e84034af8c..245eefed4498 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java @@ -5,6 +5,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @JsonIgnoreProperties(ignoreUnknown = true) @JsonInclude(JsonInclude.Include.NON_EMPTY) public record GitLabRepositoryDTO(String name, String url, String description, URL homepage) { From 5181aa09805c823dbba479a257c339fff4e1f28f Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:37:07 +0200 Subject: [PATCH 27/95] merge5 --- .../GitLabUserDoesNotExistException.java | 3 + .../gitlab/GitLabUserManagementService.java | 3 + ...rading-instructions-details.component.html | 49 +-- ...rading-instructions-details.component.scss | 4 - .../grading-instructions-details.component.ts | 290 ++++++++---------- .../grading-key-overview.component.html | 2 +- .../grading-key-table.component.html | 10 +- .../grading-system-info-modal.component.html | 26 +- .../grading-system.component.html | 12 +- .../domainCommands/gradingCriterionCommand.ts | 37 --- ...ing-instructions-details.component.spec.ts | 100 +++--- 11 files changed, 223 insertions(+), 313 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/gradingCriterionCommand.ts diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java index 298dee6f4e1b..36f65cc51902 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java @@ -1,5 +1,8 @@ package de.tum.in.www1.artemis.service.connectors.gitlab; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + public class GitLabUserDoesNotExistException extends GitLabException { public GitLabUserDoesNotExistException(String login) { diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java index 9733c7a131c0..0f8f67198b55 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java @@ -28,6 +28,9 @@ import de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenManagementService; import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService; +// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972 +@Deprecated(since = "7.5.0", forRemoval = true) + @Service @Profile("gitlab") public class GitLabUserManagementService implements VcsUserManagementService { diff --git a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html index be9cf1f0e6cd..a339415dfbd0 100644 --- a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html +++ b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html @@ -46,27 +46,27 @@ - {{ 'artemisApp.exercise.credits' | artemisTranslate }} + - {{ 'artemisApp.exercise.gradingScale' | artemisTranslate }} + - {{ 'artemisApp.exercise.instructionDescription' | artemisTranslate }} + - {{ 'artemisApp.exercise.feedback' | artemisTranslate }} + - {{ 'artemisApp.exercise.limit' | artemisTranslate }} + - {{ 'artemisApp.exercise.action' | artemisTranslate }} + @@ -151,15 +151,17 @@ @if (!showEditMode) {
-
} @@ -172,13 +174,13 @@
-
-
+
@if (criteria.structuredGradingInstructions!) {
- @for (instruction of criteria.structuredGradingInstructions; track instruction) { + @for (instruction of criteria.structuredGradingInstructions; track instruction; let index = $index) {
-
- +
diff --git a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss index 6ec55ecf1d9e..74e64144c104 100644 --- a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss +++ b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss @@ -37,10 +37,6 @@ width: auto; } - .input-group > input { - height: 100%; - } - .form-group { display: flex; align-items: center; diff --git a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts index 0215dcbfe5d5..7f6fa6f89ccd 100644 --- a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts +++ b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts @@ -1,18 +1,18 @@ import { AfterContentInit, ChangeDetectorRef, Component, Input, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core'; import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model'; -import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command'; -import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command'; -import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command'; -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model'; -import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand'; -import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command'; -import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command'; -import { GradingCriterionCommand } from 'app/shared/markdown-editor/domainCommands/gradingCriterionCommand'; import { Exercise } from 'app/entities/exercise.model'; import { cloneDeep } from 'lodash-es'; import { faPlus, faTrash, faUndo } from '@fortawesome/free-solid-svg-icons'; +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; +import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action'; +import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action'; +import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action'; +import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action'; +import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action'; +import { MarkdownEditorHeight, MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; +import { MonacoGradingCriterionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action'; +import { MonacoGradingInstructionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action'; @Component({ selector: 'jhi-grading-instructions-details', @@ -20,45 +20,43 @@ import { faPlus, faTrash, faUndo } from '@fortawesome/free-solid-svg-icons'; styleUrls: ['./grading-instructions-details.component.scss'], }) export class GradingInstructionsDetailsComponent implements OnInit, AfterContentInit { - /** Ace Editor configuration constants **/ - markdownEditorText = ''; @ViewChildren('markdownEditors') - private markdownEditors: QueryList; + private markdownEditors: QueryList; @ViewChild('markdownEditor', { static: false }) - private markdownEditor: MarkdownEditorComponent; + private markdownEditor: MarkdownEditorMonacoComponent; @Input() exercise: Exercise; private instructions: GradingInstruction[]; private criteria: GradingCriterion[]; backupExercise: Exercise; - - gradingCriterionCommand = new GradingCriterionCommand(); - gradingInstructionCommand = new GradingInstructionCommand(); - creditsCommand = new CreditsCommand(); - gradingScaleCommand = new GradingScaleCommand(); - instructionDescriptionCommand = new InstructionDescriptionCommand(); - feedbackCommand = new FeedbackCommand(); - usageCountCommand = new UsageCountCommand(); - + markdownEditorText = ''; showEditMode: boolean; - domainCommands: DomainCommand[] = [ - this.creditsCommand, - this.gradingScaleCommand, - this.instructionDescriptionCommand, - this.feedbackCommand, - this.usageCountCommand, - this.gradingCriterionCommand, - this.gradingInstructionCommand, + creditsAction = new MonacoGradingCreditsAction(); + gradingScaleAction = new MonacoGradingScaleAction(); + descriptionAction = new MonacoGradingDescriptionAction(); + feedbackAction = new MonacoGradingFeedbackAction(); + usageCountAction = new MonacoGradingUsageCountAction(); + gradingInstructionAction = new MonacoGradingInstructionAction(this.creditsAction, this.gradingScaleAction, this.descriptionAction, this.feedbackAction, this.usageCountAction); + gradingCriterionAction = new MonacoGradingCriterionAction(this.gradingInstructionAction); + + domainActionsForMainEditor = [ + this.creditsAction, + this.gradingScaleAction, + this.descriptionAction, + this.feedbackAction, + this.usageCountAction, + this.gradingInstructionAction, + this.gradingCriterionAction, ]; - domainCommandsGradingInstructions: DomainCommand[] = [ - this.creditsCommand, - this.gradingScaleCommand, - this.instructionDescriptionCommand, - this.feedbackCommand, - this.usageCountCommand, + domainActionsForGradingInstructionParsing: MonacoEditorDomainAction[] = [ + this.creditsAction, + this.gradingScaleAction, + this.descriptionAction, + this.feedbackAction, + this.usageCountAction, ]; // Icons @@ -66,6 +64,8 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent faTrash = faTrash; faUndo = faUndo; + protected readonly MarkdownEditorHeight = MarkdownEditorHeight; + constructor(private changeDetector: ChangeDetectorRef) {} ngOnInit() { @@ -87,7 +87,7 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent this.changeDetector.detectChanges(); this.criteria!.forEach((criterion) => { criterion.structuredGradingInstructions.forEach((instruction) => { - this.markdownEditors.get(index)!.markdownTextChange(this.generateInstructionText(instruction)); + this.markdownEditors.get(index)!.markdown = this.generateInstructionText(instruction); index += 1; }); }); @@ -99,10 +99,10 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent if (this.exercise.gradingCriteria) { for (const criterion of this.exercise.gradingCriteria) { if (criterion.title == undefined) { - // if it is a dummy criterion, leave out the command identifier + // if it is a dummy criterion, leave out the action identifier markdownText += this.generateInstructionsMarkdown(criterion); } else { - markdownText += GradingCriterionCommand.IDENTIFIER + criterion.title + '\n' + '\t' + this.generateInstructionsMarkdown(criterion); + markdownText += `${MonacoGradingCriterionAction.IDENTIFIER} ${criterion.title}\n\t${this.generateInstructionsMarkdown(criterion)}`; } } } @@ -130,7 +130,7 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent generateInstructionText(instruction: GradingInstruction): string { let markdownText = ''; markdownText = - GradingInstructionCommand.IDENTIFIER + + MonacoGradingInstructionAction.IDENTIFIER + '\n' + '\t' + this.generateCreditsText(instruction) + @@ -152,59 +152,52 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent } generateCreditsText(instruction: GradingInstruction): string { + const creditsText = MonacoGradingCreditsAction.TEXT; + const creditsIdentifier = MonacoGradingCreditsAction.IDENTIFIER; if (instruction.credits == undefined) { - instruction.credits = parseFloat(CreditsCommand.TEXT); - return CreditsCommand.IDENTIFIER + ' ' + CreditsCommand.TEXT; + instruction.credits = parseFloat(creditsText) || 0; } - return CreditsCommand.IDENTIFIER + ' ' + instruction.credits; + return `${creditsIdentifier} ${instruction.credits || creditsText}`; } generateGradingScaleText(instruction: GradingInstruction): string { if (instruction.gradingScale == undefined) { - instruction.gradingScale = GradingScaleCommand.TEXT; - return GradingScaleCommand.IDENTIFIER + ' ' + GradingScaleCommand.TEXT; + instruction.gradingScale = MonacoGradingScaleAction.TEXT; } - return GradingScaleCommand.IDENTIFIER + ' ' + instruction.gradingScale; + return `${MonacoGradingScaleAction.IDENTIFIER} ${instruction.gradingScale}`; } generateInstructionDescriptionText(instruction: GradingInstruction): string { if (instruction.instructionDescription == undefined) { - instruction.instructionDescription = InstructionDescriptionCommand.TEXT; - return InstructionDescriptionCommand.IDENTIFIER + ' ' + InstructionDescriptionCommand.TEXT; + instruction.instructionDescription = MonacoGradingDescriptionAction.TEXT; } - return InstructionDescriptionCommand.IDENTIFIER + ' ' + instruction.instructionDescription; + return `${MonacoGradingDescriptionAction.IDENTIFIER} ${instruction.instructionDescription}`; } generateInstructionFeedback(instruction: GradingInstruction): string { if (instruction.feedback == undefined) { - instruction.feedback = FeedbackCommand.TEXT; - return FeedbackCommand.IDENTIFIER + ' ' + FeedbackCommand.TEXT; + instruction.feedback = MonacoGradingFeedbackAction.TEXT; } - return FeedbackCommand.IDENTIFIER + ' ' + instruction.feedback; + return `${MonacoGradingFeedbackAction.IDENTIFIER} ${instruction.feedback}`; } generateUsageCount(instruction: GradingInstruction): string { if (instruction.usageCount == undefined) { - instruction.usageCount = parseInt(UsageCountCommand.TEXT, 10); - return UsageCountCommand.IDENTIFIER + ' ' + UsageCountCommand.TEXT; + instruction.usageCount = parseInt(MonacoGradingUsageCountAction.TEXT, 10) || 0; } - return UsageCountCommand.IDENTIFIER + ' ' + instruction.usageCount; + return `${MonacoGradingUsageCountAction.IDENTIFIER} ${instruction.usageCount}`; } initializeExerciseGradingInstructionText(): string { - if (this.exercise.gradingInstructions) { - return this.exercise.gradingInstructions + '\n\n'; - } else { - return 'Add Assessment Instruction text here' + '\n\n'; - } + return `${this.exercise.gradingInstructions || 'Add Assessment Instruction text here'}\n\n`; } prepareForSave(): void { this.cleanupExerciseGradingInstructions(); - this.markdownEditor.parse(); + this.markdownEditor.parseMarkdown(); if (this.exercise.gradingInstructionFeedbackUsed) { this.markdownEditors.forEach((component) => { - component.parse(); + component.parseMarkdown(this.domainActionsForGradingInstructionParsing); }); } } @@ -217,37 +210,33 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent this.exercise.gradingInstructions = undefined; } - hasCriterionCommand(domainCommands: [string, DomainCommand | null][]): boolean { - return domainCommands.some(([, command]) => command instanceof GradingCriterionCommand); + hasCriterionAction(textWithDomainActions: TextWithDomainAction[]): boolean { + return textWithDomainActions.some(({ action }) => action instanceof MonacoGradingCriterionAction); } /** - * @function createSubInstructionCommands - * @desc 1. divides the input: domainCommands in two subarrays: - * instructionCommands, which consists of all stand-alone instructions - * criteriaCommands, which consists of instructions that belong to a criterion - * 2. for each subarrray a method is called to create the criterion and instruction objects - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] + * Creates criterion and instruction objects based on the parsed markdown text. + * @param textWithDomainActions The parsed text segments with their corresponding domain actions. */ - createSubInstructionCommands(domainCommands: [string, DomainCommand | null][]): void { - let instructionCommands; - let criteriaCommands; - let endOfInstructionsCommand = 0; - if (!this.hasCriterionCommand(domainCommands)) { - this.setParentForInstructionsWithNoCriterion(domainCommands); + createSubInstructionActions(textWithDomainActions: TextWithDomainAction[]): void { + let instructionActions; + let criterionActions; + let endOfInstructionsAction = 0; + if (!this.hasCriterionAction(textWithDomainActions)) { + this.setParentForInstructionsWithNoCriterion(textWithDomainActions); } else { - for (const [, command] of domainCommands) { - endOfInstructionsCommand++; - this.setExerciseGradingInstructionText(domainCommands); - if (command instanceof GradingCriterionCommand) { - instructionCommands = domainCommands.slice(0, endOfInstructionsCommand - 1); - if (instructionCommands.length !== 0) { - this.setParentForInstructionsWithNoCriterion(instructionCommands); + for (const { action } of textWithDomainActions) { + endOfInstructionsAction++; + this.setExerciseGradingInstructionText(textWithDomainActions); + if (action instanceof MonacoGradingCriterionAction) { + instructionActions = textWithDomainActions.slice(0, endOfInstructionsAction - 1); + if (instructionActions.length !== 0) { + this.setParentForInstructionsWithNoCriterion(instructionActions); } - criteriaCommands = domainCommands.slice(endOfInstructionsCommand - 1); - if (criteriaCommands.length !== 0) { + criterionActions = textWithDomainActions.slice(endOfInstructionsAction - 1); + if (criterionActions.length !== 0) { this.instructions = []; // resets the instructions array to be filled with the instructions of the criteria - this.groupInstructionsToCriteria(criteriaCommands); // creates criterion object for each criterion and their corresponding instruction objects + this.groupInstructionsToCriteria(criterionActions); } break; } @@ -256,14 +245,13 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent } /** - * @function setParentForInstructionsWithNoCriterion - * @desc 1. creates a dummy criterion object for each stand-alone instruction - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] + * Creates a dummy grading criterion object for each instruction that does not belong to a criterion and assigns the instruction to it. + * @param textWithDomainActions The parsed text segments with their corresponding domain actions. */ - setParentForInstructionsWithNoCriterion(domainCommands: [string, DomainCommand | null][]): void { - for (const [, command] of domainCommands) { - this.setExerciseGradingInstructionText(domainCommands); - if (command instanceof GradingInstructionCommand) { + setParentForInstructionsWithNoCriterion(textWithDomainActions: TextWithDomainAction[]): void { + for (const { action } of textWithDomainActions) { + this.setExerciseGradingInstructionText(textWithDomainActions); + if (action instanceof MonacoGradingInstructionAction) { const dummyCriterion = new GradingCriterion(); const newInstruction = new GradingInstruction(); dummyCriterion.structuredGradingInstructions = []; @@ -273,68 +261,63 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent } } this.exercise.gradingCriteria = this.criteria; - this.setInstructionParameters(domainCommands); + this.setInstructionParameters(textWithDomainActions); } /** - * @function groupInstructionsToCriteria - * @desc 1. creates a criterion for each GradingCriterionCommandIdentifier - * and creates the instruction objects of this criterion then assigns them to their parent criterion - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] + * Creates a grading criterion object for each criterion action found in the parsed markdown text and assigns the corresponding grading instructions to it. + * @param textWithDomainActions The parsed text segments with their corresponding domain actions. */ - groupInstructionsToCriteria(domainCommands: [string, DomainCommand | null][]): void { - const initialCriteriaCommands = domainCommands; + groupInstructionsToCriteria(textWithDomainActions: TextWithDomainAction[]): void { + const initialCriterionActions = textWithDomainActions; if (this.exercise.gradingCriteria == undefined) { this.exercise.gradingCriteria = []; } - for (const [text, command] of domainCommands) { - if (command instanceof GradingCriterionCommand) { + for (const { text, action } of textWithDomainActions) { + if (action instanceof MonacoGradingCriterionAction) { const newCriterion = new GradingCriterion(); newCriterion.title = text; this.exercise.gradingCriteria.push(newCriterion); newCriterion.structuredGradingInstructions = []; - const modifiedArray = domainCommands.slice(1); // remove GradingCriterionCommandIdentifier after creating its criterion object + const arrayWithoutCriterion = textWithDomainActions.slice(1); // remove the identifier after creating its criterion object let endOfCriterion = 0; - for (const [, instrCommand] of modifiedArray) { + for (const remainingTextWithDomainAction of arrayWithoutCriterion) { + const instrAction = remainingTextWithDomainAction.action; endOfCriterion++; - if (instrCommand instanceof GradingInstructionCommand) { + if (instrAction instanceof MonacoGradingInstructionAction) { const newInstruction = new GradingInstruction(); // create instruction objects that belong to the above created criterion newCriterion.structuredGradingInstructions.push(newInstruction); this.instructions.push(newInstruction); } - if (instrCommand instanceof GradingCriterionCommand) { - domainCommands = domainCommands.slice(endOfCriterion, domainCommands.length); + if (instrAction instanceof MonacoGradingCriterionAction) { + textWithDomainActions = textWithDomainActions.slice(endOfCriterion, textWithDomainActions.length); break; } } } } - this.setInstructionParameters(initialCriteriaCommands.filter(([, command]) => !(command instanceof GradingCriterionCommand))); + this.setInstructionParameters(initialCriterionActions.filter(({ action }) => !(action instanceof MonacoGradingCriterionAction))); } /** - * @function setInstructionParameters - * @desc 1. Gets a tuple of text and domainCommandIdentifiers not including GradingCriterionCommandIdentifiers and assigns text values according to the domainCommandIdentifiers - * 2. The tuple order is the same as the order of the commands in the markdown text inserted by the user - * instruction objects must be created before the method gets triggered - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] + * Sets the parameters of the GradingInstruction objects based on the parsed markdown text. Note that the instruction objects must be created before this method is called. + * @param textWithDomainActions The parsed text segments with their corresponding domain actions. */ - - setInstructionParameters(domainCommands: [string, DomainCommand | null][]): void { + setInstructionParameters(textWithDomainActions: TextWithDomainAction[]): void { let index = 0; - for (const [text, command] of domainCommands) { + for (const { text, action } of textWithDomainActions) { if (!this.instructions[index]) { break; } - if (command instanceof CreditsCommand) { + if (action instanceof MonacoGradingCreditsAction) { this.instructions[index].credits = parseFloat(text); - } else if (command instanceof GradingScaleCommand) { + } else if (action instanceof MonacoGradingScaleAction) { this.instructions[index].gradingScale = text; - } else if (command instanceof InstructionDescriptionCommand) { + } else if (action instanceof MonacoGradingDescriptionAction) { this.instructions[index].instructionDescription = text; - } else if (command instanceof FeedbackCommand) { + } else if (action instanceof MonacoGradingFeedbackAction) { this.instructions[index].feedback = text; - } else if (command instanceof UsageCountCommand) { + } else if (action instanceof MonacoGradingUsageCountAction) { this.instructions[index].usageCount = parseInt(text, 10); index++; // index must be increased after the last parameter of the instruction to continue with the next instruction object } @@ -342,28 +325,19 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent } /** - * @function domainCommandsFound - * @desc 1. Gets a tuple of text and domainCommandIdentifiers and assigns text values according to the domainCommandIdentifiers - * 2. The tuple order is the same as the order of the commands in the markdown text inserted by the user - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] + * Updates the grading instructions of the exercise based on the parsed markdown text. + * @param textWithDomainActions The parsed text segments with their corresponding domain actions. */ - domainCommandsFound(domainCommands: [string, DomainCommand | null][]): void { + onDomainActionsFound(textWithDomainActions: TextWithDomainAction[]): void { this.instructions = []; this.criteria = []; this.exercise.gradingCriteria = []; - this.createSubInstructionCommands(domainCommands); + this.createSubInstructionActions(textWithDomainActions); } - /** - * @function onInstructionChange - * @desc 1. Gets a tuple of text and domainCommandIdentifiers and assigns text values according to the domainCommandIdentifiers - * 2. The tuple order is the same as the order of the commands in the markdown text inserted by the user - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] - * @param {GradingInstruction} instruction - */ - onInstructionChange(domainCommands: [string, DomainCommand | null][], instruction: GradingInstruction): void { + onInstructionChange(textWithDomainActions: TextWithDomainAction[], instruction: GradingInstruction): void { this.instructions = [instruction]; - this.setInstructionParameters(domainCommands); + this.setInstructionParameters(textWithDomainActions); } /** @@ -423,9 +397,8 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent } /** - * @function addNewInstruction - * @desc Adds new grading instruction for desired grading criteria - * @param criterion {GradingCriterion} the criteria, which includes the instruction that will be inserted + * Adds a new grading instruction for the specified grading criterion. + * @param criterion The grading criterion that contains the instruction to insert. */ addNewInstruction(criterion: GradingCriterion) { const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion); @@ -438,10 +411,6 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent this.initializeMarkdown(); } - /** - * @function addNewGradingCriteria - * @desc Adds new grading criteria for the exercise - */ addNewGradingCriterion() { const criterion = new GradingCriterion(); criterion.structuredGradingInstructions = []; @@ -453,21 +422,11 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent } } - /** - * @function onCriteriaTitleChange - * @desc Detects changes for grading criteria title - * @param {GradingCriterion} criterion the criteria, which includes title that will be changed - */ onCriterionTitleChange($event: any, criterion: GradingCriterion) { const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion); this.exercise.gradingCriteria![criterionIndex].title = $event.target.value; } - /** - * @function resetCriteriaTitle - * @desc Resets the whole grading criteria title - * @param criterion {GradingCriterion} the criteria, which includes title that will be reset - */ resetCriterionTitle(criterion: GradingCriterion) { const criterionIndex = this.findCriterionIndex(criterion, this.exercise); const backupCriterionIndex = this.findCriterionIndex(criterion, this.backupExercise); @@ -478,24 +437,21 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent } } - /** - * @function deleteGradingCriteria - * @desc Deletes the grading criteria with sub-grading instructions - * @param criterion {GradingCriterion} the criteria, which will be deleted - */ deleteGradingCriterion(criterion: GradingCriterion) { const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion); this.exercise.gradingCriteria!.splice(criterionIndex, 1); } /** - * @function setExerciseGradingInstructionText - * @desc Gets a tuple of text and domainCommandIdentifiers and assigns text values as grading instructions of exercise - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] + * Extracts the exercise grading instruction text from the start of the parsed markdown text. + * @param textWithDomainActions The parsed text segments with their corresponding domain actions. */ - setExerciseGradingInstructionText(domainCommands: [string, DomainCommand | null][]): void { - const [text, command] = domainCommands[0]; - if (command === null && text.length > 0) { + setExerciseGradingInstructionText(textWithDomainActions: TextWithDomainAction[]): void { + if (!textWithDomainActions.length) { + return; + } + const { text, action } = textWithDomainActions[0]; + if (action === undefined && text.length > 0) { this.exercise.gradingInstructions = text; } } @@ -509,12 +465,6 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent this.markdownEditorText = this.generateMarkdown(); } - /** - * Updates given grading instruction in exercise - * - * @param instruction needs to be updated - * @param criterion includes instruction needs to be updated - */ updateGradingInstruction(instruction: GradingInstruction, criterion: GradingCriterion) { const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion); const instructionIndex = this.exercise.gradingCriteria![criterionIndex].structuredGradingInstructions.indexOf(instruction); diff --git a/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html b/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html index e8d2049f27c0..9b959a75bbdb 100644 --- a/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html +++ b/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html @@ -5,7 +5,7 @@

{{ title }}

@if (!isExam) { -
{{ 'artemisApp.gradingSystem.overview.info' | artemisTranslate }}
+
} diff --git a/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html b/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html index 299ba8a449c5..96f12a89ac13 100644 --- a/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html +++ b/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html @@ -1,15 +1,15 @@
@if (!isExam) { -
{{ 'artemisApp.gradingSystem.overview.info' | artemisTranslate }}
+
}
- - + + @if (hasPointsSet) { - + } @@ -57,7 +57,7 @@
{{ 'artemisApp.gradingSystem.overview.info' | artemisTranslate }}
{{ isBonus ? ('artemisApp.exam.examSummary.bonus' | artemisTranslate) : ('artemisApp.exam.examSummary.grade' | artemisTranslate) }}{{ 'artemisApp.exam.examSummary.interval' | artemisTranslate }}{{ 'artemisApp.exam.examSummary.intervalPoints' | artemisTranslate }}
-
{{ 'artemisApp.gradingSystem.overview.intervals.title' | artemisTranslate }}
+
  • [a, b): {{ 'artemisApp.gradingSystem.overview.intervals.leftInclusiveRightExclusive' | artemisTranslate }}
  • (a, b]: {{ 'artemisApp.gradingSystem.overview.intervals.leftExclusiveRightInclusive' | artemisTranslate }}
    • diff --git a/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html b/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html index a16bf94026ba..d59b5dd01694 100644 --- a/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html +++ b/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html @@ -1,38 +1,38 @@
    -

    {{ 'artemisApp.gradingSystem.info.title' | artemisTranslate }}

    +

    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    - - + +
    {{ 'artemisApp.gradingSystem.info.general.title' | artemisTranslate }}{{ 'artemisApp.gradingSystem.info.general.explanation' | artemisTranslate }}
    {{ 'artemisApp.gradingSystem.info.maxPoints.title' | artemisTranslate }}{{ 'artemisApp.gradingSystem.info.maxPoints.explanation' | artemisTranslate }}
    {{ 'artemisApp.gradingSystem.info.gradeType.title' | artemisTranslate }}{{ 'artemisApp.gradingSystem.info.gradeType.explanation' | artemisTranslate }}
    {{ 'artemisApp.gradingSystem.info.inclusivity.title' | artemisTranslate }}{{ 'artemisApp.gradingSystem.info.inclusivity.explanation' | artemisTranslate }}
    {{ 'artemisApp.gradingSystem.info.firstPassingGrade.title' | artemisTranslate }}{{ 'artemisApp.gradingSystem.info.firstPassingGrade.explanation' | artemisTranslate }}
    {{ 'artemisApp.gradingSystem.info.importExport.title' | artemisTranslate }}{{ 'artemisApp.gradingSystem.info.importExport.explanation' | artemisTranslate }}
    diff --git a/src/main/webapp/app/grading-system/grading-system.component.html b/src/main/webapp/app/grading-system/grading-system.component.html index 65f83944d3ef..73eff43a322e 100644 --- a/src/main/webapp/app/grading-system/grading-system.component.html +++ b/src/main/webapp/app/grading-system/grading-system.component.html @@ -24,9 +24,7 @@

- {{ - isExam ? ('artemisApp.examManagement.maxPoints.title' | artemisTranslate) : ('artemisApp.course.maxPoints.title' | artemisTranslate) - }} + @if (!isExam) { } @@ -68,12 +66,8 @@

-
- {{ 'artemisApp.gradingSystem.intervalTab.title' | artemisTranslate }} -
-
- {{ 'artemisApp.gradingSystem.detailedTab.title' | artemisTranslate }} -
+
+
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingCriterionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingCriterionCommand.ts deleted file mode 100644 index 372842e7dbf7..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingCriterionCommand.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; -import { addTextAtCursor } from 'app/shared/util/markdown.util'; -import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command'; - -export class GradingCriterionCommand extends DomainTagCommand { - public static readonly IDENTIFIER = '[criterion]'; - public static readonly TEXT = ' Add criteria title (only visible for tutors)'; - - buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addCriterion'; - displayCommandButton = true; - gradingInstructionCommand = new GradingInstructionCommand(); - - /** - * @function execute - * @desc Add a new criterion for the corresponding exercise in the editor at the location of the cursor - */ - execute(): void { - const text = '\n' + this.getOpeningIdentifier() + GradingCriterionCommand.TEXT + '\n' + this.gradingInstructionCommand.instructionText(); - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the criterion - */ - getOpeningIdentifier(): string { - return GradingCriterionCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the criterion - */ - getClosingIdentifier(): string { - return '[/criterion]'; - } -} diff --git a/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts b/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts index c5f89566b009..ae00000ae4b6 100644 --- a/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts +++ b/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts @@ -4,20 +4,20 @@ import { Exercise } from 'app/entities/exercise.model'; import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model'; import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model'; import { GradingInstructionsDetailsComponent } from 'app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component'; -import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command'; -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; -import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command'; -import { GradingCriterionCommand } from 'app/shared/markdown-editor/domainCommands/gradingCriterionCommand'; -import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command'; -import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand'; -import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command'; -import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command'; import { LocalStorageService, SessionStorageService } from 'ngx-webstorage'; import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service'; import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service'; import { ArtemisTestModule } from '../../test.module'; - -describe('Grading Instructions Management Component', () => { +import { MonacoGradingInstructionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action'; +import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action'; +import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action'; +import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action'; +import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action'; +import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action'; +import { MonacoGradingCriterionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action'; +import { TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; + +describe('GradingInstructionsDetailsComponent', () => { let component: GradingInstructionsDetailsComponent; let fixture: ComponentFixture; let gradingInstruction: GradingInstruction; @@ -28,22 +28,13 @@ describe('Grading Instructions Management Component', () => { const backupExercise = { id: 1 } as Exercise; const criterionMarkdownText = - '[criterion]' + - 'testCriteria' + - '\n' + - '\t' + - '[instruction]\n' + - '\t' + - '[credits]' + - ' 1\n' + - '\t' + - '[gradingScale] scale\n' + - '\t' + - '[description] description\n' + - '\t' + - '[feedback] feedback\n' + - '\t' + - '[maxCountInScore] 0\n\n'; + '[criterion] testCriteria\n' + + '\t[instruction]\n' + + '\t[credits] 1\n' + + '\t[gradingScale] scale\n' + + '\t[description] description\n' + + '\t[feedback] feedback\n' + + '\t[maxCountInScore] 0\n\n'; beforeEach(() => { TestBed.configureTestingModule({ @@ -146,10 +137,10 @@ describe('Grading Instructions Management Component', () => { it('should change grading instruction', () => { const newDescription = 'new text'; - const domainCommands = [[newDescription, new InstructionDescriptionCommand()]] as [string, DomainCommand | null][]; + const domainActions = [{ text: newDescription, action: new MonacoGradingDescriptionAction() }] as TextWithDomainAction[]; component.exercise.gradingCriteria = [gradingCriterion]; - component.onInstructionChange(domainCommands, gradingInstruction); + component.onInstructionChange(domainActions, gradingInstruction); fixture.detectChanges(); expect(component.exercise.gradingCriteria[0].structuredGradingInstructions[0].instructionDescription).toEqual(newDescription); @@ -165,25 +156,38 @@ describe('Grading Instructions Management Component', () => { it('should set grading instruction text for exercise', () => { const markdownText = 'new text'; - const domainCommands = [[markdownText, null]] as [string, DomainCommand | null][]; + const domainActions = [{ text: markdownText, action: undefined }] as TextWithDomainAction[]; - component.setExerciseGradingInstructionText(domainCommands); + component.setExerciseGradingInstructionText(domainActions); fixture.detectChanges(); expect(component.exercise.gradingInstructions).toEqual(markdownText); }); - it('should set grading instruction without criterion command when markdown-change triggered', () => { - const domainCommands = [ - ['', new GradingInstructionCommand()], - ['1', new CreditsCommand()], - ['scale', new GradingScaleCommand()], - ['description', new InstructionDescriptionCommand()], - ['feedback', new FeedbackCommand()], - ['0', new UsageCountCommand()], - ] as [string, DomainCommand | null][]; + const getDomainActionArray = () => { + const creditsAction = new MonacoGradingCreditsAction(); + const scaleAction = new MonacoGradingScaleAction(); + const descriptionAction = new MonacoGradingDescriptionAction(); + const feedbackAction = new MonacoGradingFeedbackAction(); + const usageCountAction = new MonacoGradingUsageCountAction(); + const instructionAction = new MonacoGradingInstructionAction(creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction); + const criterionAction = new MonacoGradingCriterionAction(instructionAction); + + return [ + { text: 'testCriteria', action: criterionAction }, + { text: '', action: instructionAction }, + { text: '1', action: creditsAction }, + { text: 'scale', action: scaleAction }, + { text: 'description', action: descriptionAction }, + { text: 'feedback', action: feedbackAction }, + { text: '0', action: usageCountAction }, + ] as TextWithDomainAction[]; + }; - component.domainCommandsFound(domainCommands); + it('should set grading instruction without criterion action when markdown-change triggered', () => { + const domainActionsWithoutCriterion = getDomainActionArray().slice(1); + + component.onDomainActionsFound(domainActionsWithoutCriterion); fixture.detectChanges(); expect(component.exercise.gradingCriteria).toBeDefined(); @@ -191,18 +195,10 @@ describe('Grading Instructions Management Component', () => { expect(gradingCriteria.structuredGradingInstructions[0]).toEqual(gradingInstructionWithoutId); }); - it('should set grading instruction with criterion command when markdown-change triggered', () => { - const domainCommands = [ - ['testCriteria', new GradingCriterionCommand()], - ['', new GradingInstructionCommand()], - ['1', new CreditsCommand()], - ['scale', new GradingScaleCommand()], - ['description', new InstructionDescriptionCommand()], - ['feedback', new FeedbackCommand()], - ['0', new UsageCountCommand()], - ] as [string, DomainCommand | null][]; - - component.domainCommandsFound(domainCommands); + it('should set grading instruction with criterion action when markdown-change triggered', () => { + const domainActions = getDomainActionArray(); + + component.onDomainActionsFound(domainActions); fixture.detectChanges(); expect(component.exercise.gradingCriteria).toBeDefined(); From 59b9d6b342fe291f207aa9c4bcbf1267a53f31cc Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:38:32 +0200 Subject: [PATCH 28/95] merge5 --- gradle.properties | 15 ++-- .../guided-tour/guided-tour.component.html | 6 +- .../app/guided-tour/guided-tour.constants.ts | 2 +- .../app/guided-tour/guided-tour.service.ts | 6 +- .../group-chat-create-dialog.component.html | 12 +-- .../gradingInstruction.command.ts | 71 ----------------- .../domainCommands/gradingScaleCommand.ts | 35 --------- .../de/guidedTourProgrammingExercise.json | 2 +- .../en/guidedTourProgrammingExercise.json | 2 +- ...adingInstruction-command.component.spec.ts | 76 ------------------- .../spec/service/guided-tour.service.spec.ts | 4 +- 11 files changed, 22 insertions(+), 209 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/gradingInstruction.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/gradingScaleCommand.ts delete mode 100644 src/test/javascript/spec/component/markdown-editor/gradingInstruction-command.component.spec.ts diff --git a/gradle.properties b/gradle.properties index cfff6f39ed14..6a83d1c9b699 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,23 +6,22 @@ node_version=20.14.0 npm_version=10.7.0 # Dependency versions -jhipster_dependencies_version=8.6.0 -spring_boot_version=3.3.2 -spring_security_version=6.3.2 +jhipster_dependencies_version=8.7.0 +spring_boot_version=3.3.3 +spring_security_version=6.3.3 # TODO: before we upgrade to 6.5.x, we need to make sure that there are no performance issues with empty sets or lists -hibernate_version=6.4.9.Final +hibernate_version=6.6.0.Final # TODO: can we update to 5.x? opensaml_version=4.3.2 jwt_version=0.12.6 jaxb_runtime_version=4.0.5 -# TODO: we cannot update to 5.5.0 because we currently use the CP Subsystem for fenced locks, however CP Subsystem is only available to Enterprise customers -hazelcast_version=5.4.0 +hazelcast_version=5.5.0 junit_version=5.10.2 -mockito_version=5.12.0 +mockito_version=5.13.0 fasterxml_version=2.17.2 jgit_version=6.10.0.202406032230-r sshd_version=2.13.2 -checkstyle_version=10.17.0 +checkstyle_version=10.18.1 jplag_version=5.1.0 slf4j_version=2.0.16 sentry_version=7.14.0 diff --git a/src/main/webapp/app/guided-tour/guided-tour.component.html b/src/main/webapp/app/guided-tour/guided-tour.component.html index 2e3beed56c91..b970883717e9 100644 --- a/src/main/webapp/app/guided-tour/guided-tour.component.html +++ b/src/main/webapp/app/guided-tour/guided-tour.component.html @@ -40,7 +40,7 @@ @if (currentTourStep.headlineTranslateKey) {

@if (!guidedTourService.isOnResizeMessage && guidedTourService.currentTour && guidedTourService.currentTour.steps.length > 1) { - {{ 'tour.step' | artemisTranslate: { string: guidedTourService.getCurrentStepString() } }} + } {{ currentTourStep.headlineTranslateKey | artemisTranslate }}

@@ -92,7 +92,7 @@
} - @if (currentTourStep.userInteractionEvent === UserInteractionEvent.ACE_EDITOR) { + @if (currentTourStep.userInteractionEvent === UserInteractionEvent.MONACO_EDITOR) { } @if (currentTourStep.userInteractionEvent === UserInteractionEvent.WAIT_FOR_SELECTOR) { @@ -110,7 +110,7 @@
} - @if (currentTourStep.userInteractionEvent === UserInteractionEvent.ACE_EDITOR) { + @if (currentTourStep.userInteractionEvent === UserInteractionEvent.MONACO_EDITOR) { } @if (currentTourStep.userInteractionEvent === UserInteractionEvent.WAIT_FOR_SELECTOR) { diff --git a/src/main/webapp/app/guided-tour/guided-tour.constants.ts b/src/main/webapp/app/guided-tour/guided-tour.constants.ts index 58605d5f213c..5c2e08c5a322 100644 --- a/src/main/webapp/app/guided-tour/guided-tour.constants.ts +++ b/src/main/webapp/app/guided-tour/guided-tour.constants.ts @@ -34,7 +34,7 @@ export enum UserInteractionEvent { /** Listen for click events */ CLICK = 'click', /** Observe added or removed lines in the code editor */ - ACE_EDITOR = 'ace-editor', + MONACO_EDITOR = 'monaco-editor', /** Wait for the highlight element of the next tour step to be shown in the DOM */ WAIT_FOR_SELECTOR = 'wait-for-selector', /** Observe and assess the given modeling task in the Apollon editor */ diff --git a/src/main/webapp/app/guided-tour/guided-tour.service.ts b/src/main/webapp/app/guided-tour/guided-tour.service.ts index 71865327a9cc..dcf2872f1f98 100644 --- a/src/main/webapp/app/guided-tour/guided-tour.service.ts +++ b/src/main/webapp/app/guided-tour/guided-tour.service.ts @@ -641,9 +641,9 @@ export class GuidedTourService { }, false, ); - } else if (userInteraction === UserInteractionEvent.ACE_EDITOR) { - /** We observe any added or removed lines in the .ace_text-layer node and trigger enableNextStepClick() */ - targetNode = document.querySelector('.ace_text-layer') as HTMLElement; + } else if (userInteraction === UserInteractionEvent.MONACO_EDITOR) { + /** We observe any added or removed lines in the Monaco editor's .view-lines node and trigger enableNextStepClick() */ + targetNode = document.querySelector('.monaco-editor .view-lines') as HTMLElement; this.observeMutations(targetNode, options) .pipe( filter( diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html index 8625d0cc8d3a..d8e0e8a5aa1a 100644 --- a/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html +++ b/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html @@ -2,7 +2,7 @@

- {{ 'artemisApp.dialogs.createGroupChat.title' | artemisTranslate }} +

@@ -16,21 +16,17 @@

@if (selectedUsersControl?.invalid && (selectedUsersControl?.dirty || selectedUsersControl?.touched)) {
@if (selectedUsersControl?.errors?.required) { -
- {{ 'artemisApp.dialogs.createGroupChat.requiredError' | artemisTranslate }} -
+
} @if (selectedUsersControl?.errors?.maxlength) { -
- {{ 'artemisApp.dialogs.createGroupChat.maxError' | artemisTranslate: { max: 9 } }} -
+
}
}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingInstruction.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingInstruction.command.ts deleted file mode 100644 index 31d3179aacc3..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingInstruction.command.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; -import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command'; -import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command'; -import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command'; -import { addTextAtCursor } from 'app/shared/util/markdown.util'; -import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand'; -import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command'; - -export class GradingInstructionCommand extends DomainTagCommand { - creditsCommand = new CreditsCommand(); - gradingScaleCommand = new GradingScaleCommand(); - instructionCommand = new InstructionDescriptionCommand(); - feedbackCommand = new FeedbackCommand(); - usageCountCommand = new UsageCountCommand(); - - public static readonly IDENTIFIER = '[instruction]'; - - buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addInstruction'; - - instructionText(): string { - return ( - this.getOpeningIdentifier() + - '\n' + - '\t' + - (this.creditsCommand.getOpeningIdentifier() + - CreditsCommand.TEXT + - '\n' + - '\t' + - this.gradingScaleCommand.getOpeningIdentifier() + - GradingScaleCommand.TEXT + - '\n' + - '\t' + - this.instructionCommand.getOpeningIdentifier() + - InstructionDescriptionCommand.TEXT + - '\n' + - '\t' + - this.feedbackCommand.getOpeningIdentifier() + - FeedbackCommand.TEXT + - '\n' + - '\t' + - this.usageCountCommand.getOpeningIdentifier() + - UsageCountCommand.TEXT) + - '\n' - ); - } - /** - * @function execute - * @desc Add a new grading instruction in the editor at the location of the cursor - */ - execute(): void { - const text = this.instructionText(); - - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the grading instruction - */ - getOpeningIdentifier(): string { - return GradingInstructionCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the grading instruction - */ - getClosingIdentifier(): string { - return '[/instruction]'; - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingScaleCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingScaleCommand.ts deleted file mode 100644 index df7834baf6b3..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingScaleCommand.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; -import { addTextAtCursor } from 'app/shared/util/markdown.util'; - -export class GradingScaleCommand extends DomainTagCommand { - public static readonly IDENTIFIER = '[gradingScale]'; - public static readonly TEXT = 'Add instruction grading scale here (only visible for tutors)'; - displayCommandButton = false; - - buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addGradingScale'; - - /** - * @function execute - * @desc Add a new gradingScale to the instruction in the editor at the location of the cursor - */ - execute(): void { - const text = '\n' + this.getOpeningIdentifier() + GradingScaleCommand.TEXT; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the gradingScale - */ - getOpeningIdentifier(): string { - return GradingScaleCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the gradingScale - */ - getClosingIdentifier(): string { - return '[/gradingScale]'; - } -} diff --git a/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json b/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json index 8baa5f33ad99..8cfd6706e6b3 100644 --- a/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json +++ b/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json @@ -10,7 +10,7 @@ "headline": "Klassendatei", "content": "Klick hier auf die Klassendatei, damit sie sich im Programmiereditor öffnet." }, - "aceEditor": { + "monacoEditor": { "headline": "Programmiereditor", "content": "Nun wird dir der Quellcode im Programmiereditor angezeigt. Du kannst dir das TODO durchlesen und bereits versuchen, dieses zu lösen. Alternativ kannst du auch in dieser Demo schon beliebigen Code einfügen. Wenn du damit fertig bist, dann klicke auf weiter." }, diff --git a/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json b/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json index 645864117bf9..9e23b5f35836 100644 --- a/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json +++ b/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json @@ -10,7 +10,7 @@ "headline": "Class file", "content": "Click on the class file to display its source code in the editor." }, - "aceEditor": { + "monacoEditor": { "headline": "Code editor", "content": "The source code is now displayed in the code editor. You can read through the TODO and try to solve it. Alternatively, you can enter any code for this test round. If you are done with your implementation, just click on the Next button to proceed." }, diff --git a/src/test/javascript/spec/component/markdown-editor/gradingInstruction-command.component.spec.ts b/src/test/javascript/spec/component/markdown-editor/gradingInstruction-command.component.spec.ts deleted file mode 100644 index 5b99e057c7bf..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/gradingInstruction-command.component.spec.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { ArtemisTestModule } from '../../test.module'; -import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command'; -import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command'; -import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand'; -import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command'; -import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command'; -import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command'; -import { GradingCriterionCommand } from 'app/shared/markdown-editor/domainCommands/gradingCriterionCommand'; -import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { MockDirective, MockPipe } from 'ng-mocks'; -import { NgModel } from '@angular/forms'; - -describe('Grading Instruction Command', () => { - let comp: MarkdownEditorComponent; - let fixture: ComponentFixture; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule], - declarations: [MockPipe(ArtemisTranslatePipe), MockDirective(NgModel)], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(MarkdownEditorComponent); - comp = fixture.componentInstance; - }); - }); - - it('should add instruction identifiers and parameters on execute', () => { - const gradingInstructionCommand = new GradingInstructionCommand(); - comp.domainCommands = [gradingInstructionCommand]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - - gradingInstructionCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe( - '[instruction]' + - '\n' + - '\t' + - ('[credits]' + - CreditsCommand.TEXT + - '\n' + - '\t' + - '[gradingScale]' + - GradingScaleCommand.TEXT + - '\n' + - '\t' + - '[description]' + - InstructionDescriptionCommand.TEXT + - '\n' + - '\t' + - '[feedback]' + - FeedbackCommand.TEXT + - '\n' + - '\t' + - '[maxCountInScore]' + - UsageCountCommand.TEXT) + - '\n', - ); - }); - - it('should add CriteriaCommand identifier on execute', () => { - const criterionCommand = new GradingCriterionCommand(); - const gradingInstructionCommand = new GradingInstructionCommand(); - comp.domainCommands = [criterionCommand, gradingInstructionCommand]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - - criterionCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('\n' + '[criterion]' + GradingCriterionCommand.TEXT + '\n' + gradingInstructionCommand.instructionText()); - }); -}); diff --git a/src/test/javascript/spec/service/guided-tour.service.spec.ts b/src/test/javascript/spec/service/guided-tour.service.spec.ts index 04694f2919c5..fb7e9a1b9b0d 100644 --- a/src/test/javascript/spec/service/guided-tour.service.spec.ts +++ b/src/test/javascript/spec/service/guided-tour.service.spec.ts @@ -591,8 +591,8 @@ describe('GuidedTourService', () => { guidedTourService.enableUserInteraction(htmlTarget, userInteractionEvent); expect(querySelectorSpy).not.toHaveBeenCalled(); })); - it('should enableUserInteraction with UserInteractionEvent.ACE_EDITOR', fakeAsync(() => { - const userInteractionEvent = UserInteractionEvent.ACE_EDITOR; + it('should enableUserInteraction with UserInteractionEvent.MONACO_EDITOR', fakeAsync(() => { + const userInteractionEvent = UserInteractionEvent.MONACO_EDITOR; observeMutationsStub.mockReturnValue(of({ addedNodes: { length: 0 } as NodeList, removedNodes: { length: 0 } as NodeList } as MutationRecord)); guidedTourService.enableUserInteraction(htmlTarget, userInteractionEvent); expect(querySelectorSpy).toHaveBeenCalledOnce(); From e15070a5432bc8468ce9242870179698488e20be Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:39:01 +0200 Subject: [PATCH 29/95] merge5 --- docs/dev/guidelines.rst | 1 + .../import-all-competencies.component.html | 6 +- ...-exercise-page-with-details.component.html | 29 ++---- .../header-participation-page.component.html | 6 +- .../app/overview/header-course.component.html | 4 +- .../commands/headingOne.command.ts | 34 ------- .../commands/headingThree.command.ts | 34 ------- .../commands/headingTwo.command.ts | 34 ------- .../domainCommands/hint.command.ts | 35 ------- ...ercise-page-with-details.component.spec.ts | 3 +- .../markdown-editor/headingCommands.spec.ts | 94 ------------------- 11 files changed, 17 insertions(+), 263 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/headingOne.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/headingThree.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/headingTwo.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/hint.command.ts delete mode 100644 src/test/javascript/spec/component/markdown-editor/headingCommands.spec.ts diff --git a/docs/dev/guidelines.rst b/docs/dev/guidelines.rst index b53f26746d0d..8574b339f28d 100644 --- a/docs/dev/guidelines.rst +++ b/docs/dev/guidelines.rst @@ -7,6 +7,7 @@ Coding and design guidelines :includehidden: :maxdepth: 3 + guidelines/performance guidelines/server guidelines/server-tests guidelines/client diff --git a/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html b/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html index 3dcbbb03c4b2..ca189ca775c7 100644 --- a/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html +++ b/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html @@ -5,12 +5,12 @@

- {{ 'artemisApp.competency.importAll.search' | artemisTranslate }} + - {{ 'artemisApp.competency.import.importRelations' | artemisTranslate }} + @if (loading) { - {{ 'loading' | artemisTranslate }} + }
diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html index fc6a6fe86647..2ed3b9d18422 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html @@ -86,14 +86,10 @@ @if (course?.presentationScore) { {{ 'artemisApp.courseOverview.exerciseDetails.presented' | artemisTranslate }} @if ((studentParticipation?.presentationScore ?? 0) > 0) { - - {{ 'global.generic.yes' | artemisTranslate }} - + } @if ((studentParticipation?.presentationScore ?? 0) <= 0) { - - {{ 'global.generic.no' | artemisTranslate }} - + } } @else { {{ 'artemisApp.courseOverview.exerciseDetails.presentation' | artemisTranslate }} @@ -103,9 +99,7 @@ } @if (!studentParticipation?.presentationScore) { - - {{ 'global.generic.unset' | artemisTranslate }} - + } } @@ -144,14 +138,10 @@ @if (course?.presentationScore) { {{ 'artemisApp.courseOverview.exerciseDetails.presented' | artemisTranslate }} @if ((studentParticipation?.presentationScore ?? 0) > 0) { - - {{ 'global.generic.yes' | artemisTranslate }} - + } @if ((studentParticipation?.presentationScore ?? 0) <= 0) { - - {{ 'global.generic.no' | artemisTranslate }} - + } } @if (!course?.presentationScore) { @@ -162,9 +152,7 @@ } @if (!studentParticipation?.presentationScore) { - - {{ 'global.generic.unset' | artemisTranslate }} - + } } @@ -176,9 +164,8 @@ - {{ 'global.generic.yes' | artemisTranslate }} - + jhiTranslate="global.generic.yes" + > } diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html index 4dabbf9dea73..af31df28d183 100644 --- a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html +++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html @@ -4,7 +4,7 @@

-
{{ 'artemisApp.courseOverview.exerciseDetails.dueDate' | artemisTranslate }}
+
{{ (dueDate | artemisDate) || 'N/A' }} @if (dueDate) { {{ dueDate | artemisTimeAgo }} @@ -12,7 +12,7 @@
{{ 'artemisApp.courseOverview.exerciseDetails.du
@if (exercise.categories) {
-
{{ 'artemisApp.courseOverview.exerciseDetails.categories' | artemisTranslate }}
+
@for (category of exerciseCategories; track category) {
{{ category.category }} @@ -26,7 +26,7 @@
@if (exercise.maxPoints) {
diff --git a/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html b/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html index 0c3b9c5e57f0..9734b552d14d 100644 --- a/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html +++ b/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html @@ -179,7 +179,7 @@

this.hasActiveStage " /> - {{ 'artemisApp.exerciseChatbot.disclaimer' | artemisTranslate }} + } diff --git a/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html b/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html index e231aae3390b..4132e9fab587 100644 --- a/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html +++ b/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html @@ -9,12 +9,20 @@ } }
-
- {{ 'artemisApp.iris.settings.subSettings.enabled.on' | artemisTranslate }} -
-
- {{ 'artemisApp.iris.settings.subSettings.enabled.off' | artemisTranslate }} -
+
+

: diff --git a/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html b/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html index 17d26de15f89..baeaca3cdf6a 100644 --- a/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html +++ b/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html @@ -4,15 +4,13 @@ [ngClass]="{ 'btn-success selected': irisSubSettings?.enabled, 'btn-default': !irisSubSettings?.enabled }" [class.disabled]="disabled" (click)="setEnabled(true)" - > - {{ 'artemisApp.iris.settings.subSettings.enabled.on' | artemisTranslate }} - + jhiTranslate="artemisApp.iris.settings.subSettings.enabled.on" + >
- {{ 'artemisApp.iris.settings.subSettings.enabled.off' | artemisTranslate }} -
+ jhiTranslate="artemisApp.iris.settings.subSettings.enabled.off" + > diff --git a/src/main/webapp/app/shared/markdown-editor/commands/interactiveSearchCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/interactiveSearchCommand.ts deleted file mode 100644 index a6024ed958b1..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/interactiveSearchCommand.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { HttpResponse } from '@angular/common/http'; -import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand'; -import { Observable } from 'rxjs'; -import { SelectWithSearchComponent } from 'app/shared/markdown-editor/select-with-search/select-with-search.component'; - -export interface SelectableItem { - name?: string; -} - -export abstract class InteractiveSearchCommand extends MultiOptionCommand { - private selectWithSearchComponent: SelectWithSearchComponent; - execute(): void { - this.aceEditor.execCommand(this.getAssociatedInputCharacter()); - } - - private searchPositionStart: { row: number; column: number } | undefined; - - setEditor(aceEditor: any) { - super.setEditor(aceEditor); - - this.aceEditor.commands.addCommand({ - name: this.getAssociatedInputCharacter(), - bindKey: { win: this.getAssociatedInputCharacter(), mac: this.getAssociatedInputCharacter() }, - exec: (editor: any) => { - if (this.searchPositionStart) { - return; - } - - const cursorPosition = this.getCursorPosition(); - const lineContent = editor.session.getLine(cursorPosition.row).substring(0, cursorPosition.column); - - editor.insert(this.getAssociatedInputCharacter()); - if (cursorPosition.column === 0 || lineContent.slice(-1).match(/\s/)) { - this.searchPositionStart = cursorPosition; - this.selectWithSearchComponent?.open(); - this.aceEditor.focus(); - } - }, - } as any); - } - - setSelectWithSearchComponent(component: SelectWithSearchComponent) { - this.selectWithSearchComponent = component; - } - - insertSelection(selected: SelectableItem | undefined) { - if (selected !== undefined) { - const cursorPosition = this.aceEditor.getCursorPosition() as { row: number; column: number }; - - this.aceEditor.session - .getDocument() - .removeInLine(cursorPosition.row, this.searchPositionStart?.row === cursorPosition.row ? this.searchPositionStart.column : 0, cursorPosition.column); - - this.searchPositionStart = undefined; - - this.insertText(this.selectionToText(selected)); - } - - this.searchPositionStart = undefined; - this.aceEditor.focus(); - } - - abstract performSearch(searchTerm: string): Observable>; - - protected abstract selectionToText(selected: any): string; - - protected abstract getAssociatedInputCharacter(): string; - - getCursorScreenPosition(): any { - const cursorPosition = super.getCursorPosition(); - return this.aceEditor.renderer.textToScreenCoordinates(cursorPosition.row, cursorPosition.column); - } - - updateSearchTerm() { - if (!this.searchPositionStart) { - return; - } - - const cursorPosition = this.aceEditor.getCursorPosition(); - const lineContent = this.aceEditor.session.getLine(cursorPosition.row); - - const lastAtIndex = lineContent - .substring(cursorPosition.row === this.searchPositionStart.row ? this.searchPositionStart.column : 0, cursorPosition.column + 1) - .lastIndexOf(this.getAssociatedInputCharacter()); - - if (lastAtIndex >= 0) { - const searchTerm = lineContent - .substring(0, cursorPosition.column + 1) - .split(this.getAssociatedInputCharacter()) - .pop(); - - this.selectWithSearchComponent.updateSearchTerm(searchTerm); - } else { - this.selectWithSearchComponent.close(); - } - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/incorrectOptionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/incorrectOptionCommand.ts deleted file mode 100644 index 02891d0d345f..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/incorrectOptionCommand.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { addTextAtCursor } from 'app/shared/util/markdown.util'; -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; - -export class IncorrectOptionCommand extends DomainTagCommand { - public static readonly IDENTIFIER = '[wrong]'; - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addInCorrectAnswerOption'; - - /** - * @function execute - * @desc Add a new incorrect answer option to the text editor at the location of the cursor - */ - execute(): void { - const text = '\n' + this.getOpeningIdentifier() + ' Enter a wrong answer option here'; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the correct option - */ - getOpeningIdentifier(): string { - return IncorrectOptionCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the correct option - */ - getClosingIdentifier(): string { - return '[/wrong]'; - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/instructionDescription.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/instructionDescription.command.ts deleted file mode 100644 index 00e10e7d10b4..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/instructionDescription.command.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; -import { addTextAtCursor } from 'app/shared/util/markdown.util'; - -export class InstructionDescriptionCommand extends DomainTagCommand { - public static readonly IDENTIFIER = '[description]'; - public static readonly TEXT = 'Add grading instruction here (only visible for tutors)'; - displayCommandButton = false; - - buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addInstruction'; - - /** - * @function execute - * @desc Add a new description of the instruction in the editor at the location of the cursor - */ - execute(): void { - const text = '\n' + this.getOpeningIdentifier() + InstructionDescriptionCommand.TEXT; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the instruction description - */ - getOpeningIdentifier(): string { - return InstructionDescriptionCommand.IDENTIFIER; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the instruction description - */ - getClosingIdentifier(): string { - return '[/description]'; - } -} diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java index 1b329e3d6b07..caf7d3079520 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java @@ -48,8 +48,8 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.service.iris.IrisMessageService; +import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO; import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; -import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO; class IrisChatMessageIntegrationTest extends AbstractIrisIntegrationTest { @@ -139,8 +139,8 @@ void sendOneMessage() throws Exception { await().until(pipelineDone::get); - verifyWebsocketActivityWasExactly(irisSession, messageDTO(messageToSend.getContent()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), - messageDTO("Hello World")); + verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend.getContent()), + statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World")); } @Test @@ -164,8 +164,8 @@ void sendSuggestions() throws Exception { await().until(pipelineDone::get); - verifyWebsocketActivityWasExactly(irisSession, messageDTO(messageToSend.getContent()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), - suggestionsDTO("suggestion1", "suggestion2", "suggestion3")); + verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend.getContent()), + statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), suggestionsDTO("suggestion1", "suggestion2", "suggestion3")); } @Test @@ -306,7 +306,8 @@ void resendMessage() throws Exception { var irisMessage = irisMessageService.saveMessage(messageToSend, irisSession, IrisMessageSender.USER); request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, HttpStatus.OK); await().until(() -> irisSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()).getMessages().size() == 2); - verifyWebsocketActivityWasExactly(irisSession, statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World")); + verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), + messageDTO("Hello World")); } // User needs to be Admin to change settings @@ -337,8 +338,8 @@ void sendMessageRateLimitReached() throws Exception { var irisMessage = irisMessageService.saveMessage(messageToSend2, irisSession, IrisMessageSender.USER); request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, HttpStatus.TOO_MANY_REQUESTS); - verifyWebsocketActivityWasExactly(irisSession, messageDTO(messageToSend1.getContent()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), - messageDTO("Hello World")); + verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend1.getContent()), + statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World")); } finally { // Reset to not interfere with other tests @@ -375,10 +376,10 @@ private ArgumentMatcher messageDTO(List content) { @Override public boolean matches(Object argument) { - if (!(argument instanceof IrisWebsocketDTO websocketDTO)) { + if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) { return false; } - if (websocketDTO.type() != IrisWebsocketDTO.IrisWebsocketMessageType.MESSAGE) { + if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.MESSAGE) { return false; } return Objects.equals(websocketDTO.message().getContent().stream().map(IrisMessageContent::getContentAsString).toList(), @@ -397,10 +398,10 @@ private ArgumentMatcher statusDTO(PyrisStageState... stageStates) { @Override public boolean matches(Object argument) { - if (!(argument instanceof IrisWebsocketDTO websocketDTO)) { + if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) { return false; } - if (websocketDTO.type() != IrisWebsocketDTO.IrisWebsocketMessageType.STATUS) { + if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.STATUS) { return false; } if (websocketDTO.stages() == null) { @@ -424,10 +425,10 @@ private ArgumentMatcher suggestionsDTO(String... suggestions) { @Override public boolean matches(Object argument) { - if (!(argument instanceof IrisWebsocketDTO websocketDTO)) { + if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) { return false; } - if (websocketDTO.type() != IrisWebsocketDTO.IrisWebsocketMessageType.STATUS) { + if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.STATUS) { return false; } if (websocketDTO.suggestions() == null) { From 42215c4fa670b8ecf02aadd38376530a35cba4bd Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:39:34 +0200 Subject: [PATCH 31/95] merge5 --- .../IrisCompetencyGenerationSession.java | 51 ------ ...CompetencyGenerationSessionRepository.java | 20 --- .../iris/IrisCompetencyGenerationService.java | 71 ++++++++ .../dto/IrisCombinedChatSubSettingsDTO.java | 2 +- ...nedCompetencyGenerationSubSettingsDTO.java | 5 +- .../dto/IrisCombinedHestiaSubSettingsDTO.java | 3 +- .../dto/IrisCombinedSubSettingsInterface.java | 16 -- ...risCompetencyGenerationSessionService.java | 154 ------------------ .../websocket/IrisChatWebsocketService.java | 55 +++---- .../artemis/iris/IrisChatWebsocketTest.java | 6 +- ...isCompetencyGenerationIntegrationTest.java | 81 +++++---- 11 files changed, 153 insertions(+), 311 deletions(-) delete mode 100644 src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java create mode 100644 src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java delete mode 100644 src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java deleted file mode 100644 index 4353f30a63c1..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java +++ /dev/null @@ -1,51 +0,0 @@ -package de.tum.in.www1.artemis.domain.iris.session; - -import jakarta.persistence.DiscriminatorValue; -import jakarta.persistence.Entity; -import jakarta.persistence.ManyToOne; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; - -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; - -/** - * A IrisCompetencyGenerationSession is a session specific to a course and user. - * This is used for course editors to generate competency recommendations. - */ -@Entity -@DiscriminatorValue("COMPETENCY_GENERATION") -@JsonInclude(JsonInclude.Include.NON_EMPTY) -public class IrisCompetencyGenerationSession extends IrisSession { - - @ManyToOne - @JsonIgnore - private Course course; - - @ManyToOne - @JsonIgnore - private User user; - - public Course getCourse() { - return course; - } - - public void setCourse(Course course) { - this.course = course; - } - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - - @Override - public String toString() { - return "IrisCompetencyGenerationSession{" + "id=" + getId() + ", course=" + (course == null ? "null" : course.getId()) + ", user=" - + (user == null ? "null" : user.getName()) + '}'; - } -} diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java deleted file mode 100644 index 978749785907..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.tum.in.www1.artemis.repository.iris; - -import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession; -import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository; - -/** - * Repository interface for managing {@link IrisCompetencyGenerationSession} entities. - */ -public interface IrisCompetencyGenerationSessionRepository extends ArtemisJpaRepository { - - /** - * Finds the latest {@link IrisCompetencyGenerationSession} based on its course and user. - * - * @param courseId The ID of the course. - * @param userId The ID of the user. - * - * @return The latest competency generation session - */ - IrisCompetencyGenerationSession findFirstByCourseIdAndUserIdOrderByCreationDateDesc(long courseId, long userId); -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java new file mode 100644 index 000000000000..07be63259336 --- /dev/null +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java @@ -0,0 +1,71 @@ +package de.tum.in.www1.artemis.service.iris; + +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; + +import de.tum.in.www1.artemis.domain.Course; +import de.tum.in.www1.artemis.domain.User; +import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService; +import de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob; +import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketService; + +/** + * Service to handle the Competency generation subsytem of Iris. + */ +@Service +@Profile("iris") +public class IrisCompetencyGenerationService { + + private final PyrisPipelineService pyrisPipelineService; + + private final IrisWebsocketService websocketService; + + private final PyrisJobService pyrisJobService; + + public IrisCompetencyGenerationService(PyrisPipelineService pyrisPipelineService, IrisWebsocketService websocketService, PyrisJobService pyrisJobService) { + this.pyrisPipelineService = pyrisPipelineService; + this.websocketService = websocketService; + this.pyrisJobService = pyrisJobService; + } + + /** + * Executes the competency extraction pipeline on Pyris for a given course, user and course description + * + * @param user the user for which the pipeline should be executed + * @param course the course for which the pipeline should be executed + * @param courseDescription the description of the course + * @param currentCompetencies the current competencies of the course (to avoid re-extraction) + */ + public void executeCompetencyExtractionPipeline(User user, Course course, String courseDescription, PyrisCompetencyRecommendationDTO[] currentCompetencies) { + // @formatter:off + pyrisPipelineService.executePipeline( + "competency-extraction", + "default", + pyrisJobService.createTokenForJob(token -> new CompetencyExtractionJob(token, course.getId(), user.getLogin())), + executionDto -> new PyrisCompetencyExtractionPipelineExecutionDTO(executionDto, courseDescription, currentCompetencies, CompetencyTaxonomy.values(), 5), + stages -> websocketService.send(user.getLogin(), websocketTopic(course.getId()), new PyrisCompetencyStatusUpdateDTO(stages, null)) + ); + // @formatter:on + } + + /** + * Takes a status update from Pyris containing a new competency extraction result and sends it to the client via websocket + * + * @param userLogin the login of the user + * @param courseId the id of the course + * @param statusUpdate the status update containing the new competency recommendations + */ + public void handleStatusUpdate(String userLogin, long courseId, PyrisCompetencyStatusUpdateDTO statusUpdate) { + websocketService.send(userLogin, websocketTopic(courseId), statusUpdate); + } + + private static String websocketTopic(long courseId) { + return "competencies/" + courseId; + } + +} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java index 2bef37bda870..c98fdb1663a0 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java @@ -10,6 +10,6 @@ @JsonInclude(JsonInclude.Include.NON_EMPTY) public record IrisCombinedChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set allowedModels, - @Nullable String preferredModel, @Nullable IrisTemplate template) implements IrisCombinedSubSettingsInterface { + @Nullable String preferredModel, @Nullable IrisTemplate template) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java index 7e2e399e530e..e924be92e773 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java @@ -9,7 +9,6 @@ import de.tum.in.www1.artemis.domain.iris.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) - implements IrisCombinedSubSettingsInterface { - +public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, + @Nullable IrisTemplate template) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java index 47861b16ebbb..315fb572194c 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java @@ -9,6 +9,5 @@ import de.tum.in.www1.artemis.domain.iris.IrisTemplate; @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) - implements IrisCombinedSubSettingsInterface { +public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) { } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java deleted file mode 100644 index 79d23120b4fc..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.tum.in.www1.artemis.service.iris.dto; - -import java.util.Set; - -import jakarta.annotation.Nullable; - -public interface IrisCombinedSubSettingsInterface { - - boolean enabled(); - - @Nullable - Set allowedModels(); - - @Nullable - String preferredModel(); -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java deleted file mode 100644 index d8ec1f901123..000000000000 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java +++ /dev/null @@ -1,154 +0,0 @@ -package de.tum.in.www1.artemis.service.iris.session; - -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Service; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.JsonNode; - -import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.User; -import de.tum.in.www1.artemis.domain.competency.Competency; -import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; -import de.tum.in.www1.artemis.domain.competency.CourseCompetency; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender; -import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; -import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession; -import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType; -import de.tum.in.www1.artemis.repository.iris.IrisCompetencyGenerationSessionRepository; -import de.tum.in.www1.artemis.repository.iris.IrisMessageRepository; -import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository; -import de.tum.in.www1.artemis.security.Role; -import de.tum.in.www1.artemis.service.AuthorizationCheckService; -import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService; -import de.tum.in.www1.artemis.service.iris.IrisMessageService; -import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService; - -/** - * Service to handle the Competency generation subsytem of Iris. - */ -@Service -@Profile("iris") -public class IrisCompetencyGenerationSessionService implements IrisButtonBasedFeatureInterface> { - - private static final Logger log = LoggerFactory.getLogger(IrisCompetencyGenerationSessionService.class); - - private final PyrisConnectorService pyrisConnectorService; - - private final IrisSettingsService irisSettingsService; - - private final IrisSessionRepository irisSessionRepository; - - private final AuthorizationCheckService authCheckService; - - private final IrisCompetencyGenerationSessionRepository irisCompetencyGenerationSessionRepository; - - private final IrisMessageService irisMessageService; - - private final IrisMessageRepository irisMessageRepository; - - public IrisCompetencyGenerationSessionService(PyrisConnectorService pyrisConnectorService, IrisSettingsService irisSettingsService, IrisSessionRepository irisSessionRepository, - AuthorizationCheckService authCheckService, IrisCompetencyGenerationSessionRepository irisCompetencyGenerationSessionRepository, IrisMessageService irisMessageService, - IrisMessageRepository irisMessageRepository) { - this.pyrisConnectorService = pyrisConnectorService; - this.irisSettingsService = irisSettingsService; - this.irisSessionRepository = irisSessionRepository; - this.authCheckService = authCheckService; - this.irisCompetencyGenerationSessionRepository = irisCompetencyGenerationSessionRepository; - this.irisMessageService = irisMessageService; - this.irisMessageRepository = irisMessageRepository; - } - - /** - * Creates a new Iris session for the given course and user or gets an existing one from the last hour. - * - * @param course The course to create the session for - * @param user The user to create the session for - * @return The Iris session for the course - */ - public IrisCompetencyGenerationSession getOrCreateSession(Course course, User user) { - var existingSession = irisCompetencyGenerationSessionRepository.findFirstByCourseIdAndUserIdOrderByCreationDateDesc(course.getId(), user.getId()); - // Return the newest session if there is one and it is not older than 1 hour - if (existingSession != null && existingSession.getCreationDate().plusHours(1).isAfter(ZonedDateTime.now())) { - checkHasAccessTo(user, existingSession); - checkIsFeatureActivatedFor(existingSession); - return existingSession; - } - - var irisSession = new IrisCompetencyGenerationSession(); - irisSession.setCourse(course); - irisSession.setUser(user); - checkHasAccessTo(user, irisSession); - checkIsFeatureActivatedFor(irisSession); - irisSession = irisSessionRepository.save(irisSession); - return irisSession; - } - - /** - * Adds a user text message to a given IRIS session - * - * @param session the IRIS session - * @param message the message to add - */ - public void addUserTextMessageToSession(IrisCompetencyGenerationSession session, String message) { - var userMessage = new IrisMessage(); - userMessage.setSender(IrisMessageSender.USER); - userMessage.addContent(new IrisTextMessageContent(message)); - irisMessageService.saveMessage(userMessage, session, IrisMessageSender.USER); - } - - // @formatter:off - @JsonInclude(JsonInclude.Include.NON_EMPTY) - record CompetencyGenerationDTO( - String courseDescription, - CompetencyTaxonomy[] taxonomyOptions - ) {} - // @formatter:on - - @Override - public List executeRequest(IrisCompetencyGenerationSession session) { - // TODO: Re-add in a future PR. Remember to reenable the test cases! - return null; - } - - @Override - public void checkHasAccessTo(User user, IrisCompetencyGenerationSession irisSession) { - authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, irisSession.getCourse(), user); - } - - @Override - public void checkIsFeatureActivatedFor(IrisCompetencyGenerationSession irisSession) { - irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.COMPETENCY_GENERATION, irisSession.getCourse()); - } - - private List toCompetencies(JsonNode content) { - List competencies = new ArrayList<>(); - for (JsonNode node : content.get("competencies")) { - try { - Competency competency = new Competency(); - competency.setTitle(node.required("title").asText()); - - // skip competency if IRIS only replied with a title containing the special response "!done!" - if (node.get("description") == null && node.get("title").asText().equals("!done!")) { - log.info("Received special response \"!done!\", skipping parsing of competency."); - continue; - } - competency.setDescription(node.required("description").asText()); - competency.setTaxonomy(CompetencyTaxonomy.valueOf(node.required("taxonomy").asText())); - - competencies.add(competency); - } - catch (IllegalArgumentException e) { - log.error("Missing fields, could not parse Competency: " + node.toPrettyString(), e); - } - } - return competencies; - } -} diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java index 253ba0df1e45..21bfc4449228 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java @@ -5,52 +5,42 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession; -import de.tum.in.www1.artemis.domain.iris.session.IrisSession; -import de.tum.in.www1.artemis.service.WebsocketMessagingService; import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; +import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO; @Service @Profile("iris") -public class IrisChatWebsocketService extends IrisWebsocketService { +public class IrisChatWebsocketService { + + private final IrisWebsocketService websocketService; private final IrisRateLimitService rateLimitService; - public IrisChatWebsocketService(WebsocketMessagingService websocketMessagingService, IrisRateLimitService rateLimitService) { - super(websocketMessagingService); + public IrisChatWebsocketService(IrisWebsocketService websocketService, IrisRateLimitService rateLimitService) { + this.websocketService = websocketService; this.rateLimitService = rateLimitService; } - private User checkSessionTypeAndGetUser(IrisSession irisSession) { - if (!(irisSession instanceof IrisChatSession chatSession)) { - throw new UnsupportedOperationException("Only IrisChatSessions are supported"); - } - return chatSession.getUser(); - } - /** - * Sends a message over the websocket to a specific user + * Sends a message and/or a status update over the websocket to the user + * involved in the session. At least one of the message or the stages must be + * non-null, otherwise there is no need to send a message. + * This is currently used for both the exercise and course chat sessions, but + * this could be split up in the future. * + * @param session the session to send the message to * @param irisMessage that should be sent over the websocket * @param stages that should be sent over the websocket */ - public void sendMessage(IrisMessage irisMessage, List stages) { - var session = irisMessage.getSession(); - var user = checkSessionTypeAndGetUser(session); + public void sendMessage(IrisChatSession session, IrisMessage irisMessage, List stages) { + var user = session.getUser(); var rateLimitInfo = rateLimitService.getRateLimitInformation(user); - super.send(user, session.getId(), new IrisWebsocketDTO(irisMessage, rateLimitInfo, stages, null)); - } - - /** - * Sends a message over the websocket to a specific user without stages and suggestions - * - * @param message that should be sent over the websocket - */ - public void sendMessage(IrisMessage message) { - sendMessage(message, null); + var topic = "" + session.getId(); // Todo: add more specific topic + var payload = new IrisChatWebsocketDTO(irisMessage, rateLimitInfo, stages, null); + websocketService.send(user.getLogin(), topic, payload); } /** @@ -59,7 +49,7 @@ public void sendMessage(IrisMessage message) { * @param session the session to send the status update to * @param stages the stages to send */ - public void sendStatusUpdate(IrisSession session, List stages) { + public void sendStatusUpdate(IrisChatSession session, List stages) { this.sendStatusUpdate(session, stages, null); } @@ -70,8 +60,11 @@ public void sendStatusUpdate(IrisSession session, List stages) { * @param stages the stages to send * @param suggestions the suggestions to send */ - public void sendStatusUpdate(IrisSession session, List stages, List suggestions) { - var user = checkSessionTypeAndGetUser(session); - super.send(user, session.getId(), new IrisWebsocketDTO(null, rateLimitService.getRateLimitInformation(user), stages, suggestions)); + public void sendStatusUpdate(IrisChatSession session, List stages, List suggestions) { + var user = session.getUser(); + var rateLimitInfo = rateLimitService.getRateLimitInformation(user); + var topic = "" + session.getId(); // Todo: add more specific topic + var payload = new IrisChatWebsocketDTO(null, rateLimitInfo, stages, suggestions); + websocketService.send(user.getLogin(), topic, payload); } } diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java index 0a1bb785ab2d..4ce540f175c8 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java @@ -18,9 +18,9 @@ import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent; import de.tum.in.www1.artemis.service.WebsocketMessagingService; import de.tum.in.www1.artemis.service.iris.IrisRateLimitService; +import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO; import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService; -import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO; @ActiveProfiles("iris") class IrisChatWebsocketTest extends AbstractIrisIntegrationTest { @@ -53,9 +53,9 @@ void sendMessage() { var message = irisSession.newMessage(); message.addContent(createMockContent(), createMockContent()); message.setMessageDifferentiator(101010); - irisChatWebsocketService.sendMessage(message, List.of()); + irisChatWebsocketService.sendMessage(irisSession, message, List.of()); verify(websocketMessagingService, times(1)).sendMessageToUser(eq(TEST_PREFIX + "student1"), eq("/topic/iris/" + irisSession.getId()), - eq(new IrisWebsocketDTO(message, new IrisRateLimitService.IrisRateLimitInformation(0, -1, 0), List.of(), List.of()))); + eq(new IrisChatWebsocketDTO(message, new IrisRateLimitService.IrisRateLimitInformation(0, -1, 0), List.of(), List.of()))); } private IrisTextMessageContent createMockContent() { diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java index 613b35f5d08f..e67f52342bfc 100644 --- a/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java @@ -1,24 +1,35 @@ package de.tum.in.www1.artemis.iris; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; import java.util.List; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.test.context.support.WithMockUser; import de.tum.in.www1.artemis.domain.Course; -import de.tum.in.www1.artemis.domain.competency.Competency; import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState; +import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService; class IrisCompetencyGenerationIntegrationTest extends AbstractIrisIntegrationTest { private static final String TEST_PREFIX = "iriscompetencyintegration"; + @Autowired + IrisCompetencyGenerationService irisCompetencyGenerationService; + private Course course; @BeforeEach @@ -31,34 +42,43 @@ void initTestCase() { } @Test - @Disabled // TODO: Enable this test again! @WithMockUser(username = TEST_PREFIX + "editor1", roles = "EDITOR") void generateCompetencies_asEditor_shouldSucceed() throws Exception { - final String courseDescription = "Any description"; - Competency expected = new Competency(); - expected.setTitle("title"); - expected.setDescription("description"); - expected.setTaxonomy(CompetencyTaxonomy.ANALYZE); - // var competencyMap1 = Map.of("title", expected.getTitle(), "description", expected.getDescription(), "taxonomy", expected.getTaxonomy()); - // // empty or malformed competencies are ignored - // var competencyMap2 = Map.of("title", "!done"); - // var competencyMap3 = Map.of("malformed", "any content"); - // var responseMap = Map.of("competencies", List.of(competencyMap1, competencyMap2, competencyMap3)); - - /* - * irisRequestMockProvider.mockRunResponse(dto -> { - * assertThat(dto.settings().authenticationToken()).isNotNull(); - * pipelineDone.set(true); - * }); - */ - fail("This test is not yet implemented. Implement it and remove the fail call."); - - List competencies = request.postListWithResponseBody("/api/courses/" + course.getId() + "/course-competencies/generate-from-description", courseDescription, - Competency.class, HttpStatus.OK); - Competency actualCompetency = competencies.getFirst(); - - assertThat(competencies.size()).isEqualTo(1); - assertThat(actualCompetency).usingRecursiveComparison().comparingOnlyFields("title", "description", "taxonomy").isEqualTo(expected); + String courseDescription = "Cool course description"; + var currentCompetencies = new PyrisCompetencyRecommendationDTO[] { new PyrisCompetencyRecommendationDTO("test title", "test description", CompetencyTaxonomy.UNDERSTAND), }; + + // Expect that a request is sent to Pyris having the following characteristics + irisRequestMockProvider.mockRunCompetencyExtractionResponseAnd(dto -> { + var token = dto.execution().settings().authenticationToken(); + assertThat(token).isNotNull(); + assertThat(dto.courseDescription()).contains(courseDescription); + assertThat(dto.currentCompetencies()).containsExactly(currentCompetencies); + assertThat(dto.taxonomyOptions()).isNotEmpty(); + assertThat(dto.maxN()).isPositive(); + }); + + // Send a request to the Artemis server as if the user had clicked the button in the UI + request.postWithoutResponseBody("/api/courses/" + course.getId() + "/course-competencies/generate-from-description", + new PyrisCompetencyExtractionInputDTO(courseDescription, currentCompetencies), HttpStatus.ACCEPTED); + + PyrisCompetencyRecommendationDTO expected = new PyrisCompetencyRecommendationDTO("test title", "test description", CompetencyTaxonomy.UNDERSTAND); + List recommendations = List.of(expected, expected, expected); + List stages = List.of(new PyrisStageDTO("Generating Competencies", 10, PyrisStageState.DONE, null)); + + // In the real system, this would be triggered by Pyris via a REST call to the Artemis server + irisCompetencyGenerationService.handleStatusUpdate(TEST_PREFIX + "editor1", course.getId(), new PyrisCompetencyStatusUpdateDTO(stages, recommendations)); + + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(PyrisCompetencyStatusUpdateDTO.class); + verify(websocketMessagingService, timeout(200).times(3)).sendMessageToUser(eq(TEST_PREFIX + "editor1"), eq("/topic/iris/competencies/" + course.getId()), + argumentCaptor.capture()); + + List allValues = argumentCaptor.getAllValues(); + assertThat(allValues.get(0).stages()).hasSize(2); + assertThat(allValues.get(0).result()).isNull(); + assertThat(allValues.get(1).stages()).hasSize(2); + assertThat(allValues.get(1).result()).isNull(); + assertThat(allValues.get(2).stages()).hasSize(1); + assertThat(allValues.get(2).result()).isEqualTo(recommendations); } @Test @@ -74,6 +94,7 @@ void testAll_asTutor_shouldReturnForbidden() throws Exception { } void testAllPreAuthorize() throws Exception { - request.post("/api/courses/" + course.getId() + "/course-competencies/generate-from-description", "a", HttpStatus.FORBIDDEN); + request.post("/api/courses/" + course.getId() + "/course-competencies/generate-from-description", + new PyrisCompetencyExtractionInputDTO("a", new PyrisCompetencyRecommendationDTO[] {}), HttpStatus.FORBIDDEN); } } From 3ff48f3e27631cd2e48427e12a261b09553dc23f Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:39:45 +0200 Subject: [PATCH 32/95] merge5 --- ...kinsProgrammingLanguageFeatureService.java | 2 + .../build_plan/JenkinsBuildPlanService.java | 4 +- .../service/iris/IrisSessionService.java | 12 +----- .../session/IrisCourseChatSessionService.java | 6 +-- .../IrisExerciseChatSessionService.java | 6 +-- .../iris/websocket/IrisWebsocketService.java | 31 ++++++++++---- .../commands/italic.command.ts | 30 ------------- .../markdown-editor/commands/katex.command.ts | 25 ----------- .../connector/IrisRequestMockProvider.java | 15 +++++++ .../markdown-editor/italic-command.spec.ts | 42 ------------------- .../markdown-editor/katex-command.spec.ts | 33 --------------- 11 files changed, 51 insertions(+), 155 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/italic.command.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/katex.command.ts delete mode 100644 src/test/javascript/spec/component/markdown-editor/italic-command.spec.ts delete mode 100644 src/test/javascript/spec/component/markdown-editor/katex-command.spec.ts diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java index 533e4c709005..d8a4abd0fea3 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java @@ -6,6 +6,7 @@ import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; +import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.GCC; @@ -39,5 +40,6 @@ public JenkinsProgrammingLanguageFeatureService() { programmingLanguageFeatures.put(SWIFT, new ProgrammingLanguageFeature(SWIFT, false, true, true, true, false, List.of(PLAIN), false, false)); programmingLanguageFeatures.put(C, new ProgrammingLanguageFeature(C, false, false, true, false, false, List.of(FACT, GCC), false, false)); programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, false, false, false, false, true, List.of(), false, false)); + programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, false)); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java index a97f293e1b53..929a9e1e5750 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java @@ -184,8 +184,8 @@ private JenkinsXmlConfigBuilder builderFor(ProgrammingLanguage programmingLangua throw new UnsupportedOperationException("Xcode templates are not available for Jenkins."); } return switch (programmingLanguage) { - case JAVA, KOTLIN, PYTHON, C, HASKELL, SWIFT, EMPTY -> jenkinsBuildPlanCreator; - case VHDL, ASSEMBLER, OCAML, JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> + case JAVA, KOTLIN, PYTHON, C, HASKELL, SWIFT, EMPTY, RUST -> jenkinsBuildPlanCreator; + case VHDL, ASSEMBLER, OCAML, JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP -> throw new UnsupportedOperationException(programmingLanguage + " templates are not available for Jenkins."); }; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java index dded30f4e42e..f455b13979fe 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java @@ -8,14 +8,12 @@ import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.domain.iris.message.IrisMessage; -import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession; import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession; import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession; import de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession; import de.tum.in.www1.artemis.domain.iris.session.IrisSession; import de.tum.in.www1.artemis.repository.UserRepository; import de.tum.in.www1.artemis.service.iris.session.IrisChatBasedFeatureInterface; -import de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService; import de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService; @@ -38,16 +36,12 @@ public class IrisSessionService { private final IrisHestiaSessionService irisHestiaSessionService; - private final IrisCompetencyGenerationSessionService irisCompetencyGenerationSessionService; - public IrisSessionService(UserRepository userRepository, IrisExerciseChatSessionService irisExerciseChatSessionService, - IrisCourseChatSessionService irisCourseChatSessionService, IrisHestiaSessionService irisHestiaSessionService, - IrisCompetencyGenerationSessionService irisCompetencyGenerationSessionService) { + IrisCourseChatSessionService irisCourseChatSessionService, IrisHestiaSessionService irisHestiaSessionService) { this.userRepository = userRepository; this.irisExerciseChatSessionService = irisExerciseChatSessionService; this.irisCourseChatSessionService = irisCourseChatSessionService; this.irisHestiaSessionService = irisHestiaSessionService; - this.irisCompetencyGenerationSessionService = irisCompetencyGenerationSessionService; } /** @@ -107,7 +101,7 @@ public void requestMessageFromIris(S session) { public void sendOverWebsocket(IrisMessage message, S session) { var wrapper = getIrisSessionSubService(session); if (wrapper.irisSubFeatureInterface instanceof IrisChatBasedFeatureInterface chatWrapper) { - chatWrapper.sendOverWebsocket(message); + chatWrapper.sendOverWebsocket(session, message); } else { throw new BadRequestException("Invalid Iris session type " + message.getSession().getClass().getSimpleName()); @@ -143,8 +137,6 @@ private IrisSubFeatureWrapper getIrisSessionSubServic case IrisExerciseChatSession chatSession -> (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisExerciseChatSessionService, chatSession); case IrisCourseChatSession courseChatSession -> (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisCourseChatSessionService, courseChatSession); case IrisHestiaSession hestiaSession -> (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisHestiaSessionService, hestiaSession); - case IrisCompetencyGenerationSession irisCompetencyGenerationSession -> - (IrisSubFeatureWrapper) new IrisSubFeatureWrapper<>(irisCompetencyGenerationSessionService, irisCompetencyGenerationSession); case null, default -> throw new BadRequestException("Unknown Iris session type " + session.getClass().getSimpleName()); }; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java index 134e47b2abc4..bd5a4c25887b 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java @@ -97,8 +97,8 @@ public void checkIsFeatureActivatedFor(IrisCourseChatSession session) { } @Override - public void sendOverWebsocket(IrisMessage message) { - irisChatWebsocketService.sendMessage(message); + public void sendOverWebsocket(IrisCourseChatSession session, IrisMessage message) { + irisChatWebsocketService.sendMessage(session, message, null); } @Override @@ -135,7 +135,7 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu var message = new IrisMessage(); message.addContent(new IrisTextMessageContent(statusUpdate.result())); var savedMessage = irisMessageService.saveMessage(message, session, IrisMessageSender.LLM); - irisChatWebsocketService.sendMessage(savedMessage, statusUpdate.stages()); + irisChatWebsocketService.sendMessage(session, savedMessage, statusUpdate.stages()); } else { irisChatWebsocketService.sendStatusUpdate(session, statusUpdate.stages(), statusUpdate.suggestions()); diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java index 2916a34171ab..36508d8b0934 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java @@ -119,8 +119,8 @@ public void checkIsFeatureActivatedFor(IrisExerciseChatSession session) { } @Override - public void sendOverWebsocket(IrisMessage message) { - irisChatWebsocketService.sendMessage(message); + public void sendOverWebsocket(IrisExerciseChatSession session, IrisMessage message) { + irisChatWebsocketService.sendMessage(session, message, null); } @Override @@ -170,7 +170,7 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta var message = new IrisMessage(); message.addContent(new IrisTextMessageContent(statusUpdate.result())); var savedMessage = irisMessageService.saveMessage(message, session, IrisMessageSender.LLM); - irisChatWebsocketService.sendMessage(savedMessage, statusUpdate.stages()); + irisChatWebsocketService.sendMessage(session, savedMessage, statusUpdate.stages()); } else { irisChatWebsocketService.sendStatusUpdate(session, statusUpdate.stages(), statusUpdate.suggestions()); diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java index 537d9f31ec76..3fcd949be7b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java @@ -1,19 +1,24 @@ package de.tum.in.www1.artemis.service.iris.websocket; +import java.util.concurrent.ExecutionException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.stereotype.Service; -import de.tum.in.www1.artemis.domain.User; import de.tum.in.www1.artemis.service.WebsocketMessagingService; /** * A service to send a message over the websocket to a specific user */ -public abstract class IrisWebsocketService { +@Service +@Profile("iris") +public class IrisWebsocketService { private static final Logger log = LoggerFactory.getLogger(IrisWebsocketService.class); - private static final String IRIS_WEBSOCKET_TOPIC_PREFIX = "/topic/iris"; + private static final String TOPIC_PREFIX = "/topic/iris/"; private final WebsocketMessagingService websocketMessagingService; @@ -21,10 +26,22 @@ public IrisWebsocketService(WebsocketMessagingService websocketMessagingService) this.websocketMessagingService = websocketMessagingService; } - protected void send(User user, Long sessionId, Object payload) { - String irisWebsocketTopic = String.format("%s/%s", IRIS_WEBSOCKET_TOPIC_PREFIX, sessionId); - log.debug("Sending message to user {} on topic {}: {}", user.getLogin(), irisWebsocketTopic, payload); - websocketMessagingService.sendMessageToUser(user.getLogin(), irisWebsocketTopic, payload); + /** + * Sends a message over the websocket to a specific user + * + * @param userLogin the login of the user + * @param topicSuffix the suffix of the topic, which will be appended to "/topic/iris/" + * @param payload the DTO to send, which will be serialized to JSON + */ + public void send(String userLogin, String topicSuffix, Object payload) { + String topic = TOPIC_PREFIX + topicSuffix; + try { + websocketMessagingService.sendMessageToUser(userLogin, topic, payload).get(); + log.debug("Sent message to Iris user {} on topic {}: {}", userLogin, topic, payload); + } + catch (InterruptedException | ExecutionException e) { + log.error("Error while sending message to Iris user {} on topic {}: {}", userLogin, topic, payload, e); + } } } diff --git a/src/main/webapp/app/shared/markdown-editor/commands/italic.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/italic.command.ts deleted file mode 100644 index 48d2ac7f4248..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/italic.command.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { faItalic } from '@fortawesome/free-solid-svg-icons'; -import { Command } from './command'; - -export class ItalicCommand extends Command { - buttonIcon = faItalic as IconProp; - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.italic'; - - /** - * @function execute - * @desc Make/Remove italic text - * 1. Check if the selected text includes (*) - * 2. If included reduce the selected text by this elements and replace the selected text by textToAdd - * 3. If not included add (*) before and after the selected text and insert them into the editor - * 4. Italic in markdown language appears - */ - execute(): void { - const selectedText = this.getSelectedText(); - let textToAdd = ''; - - if (selectedText.charAt(0) === '*' && selectedText.charAt(selectedText.length - 1) === '*') { - textToAdd = selectedText.slice(1, -1); - this.insertText(textToAdd); - } else { - const trimmedText = this.deleteWhiteSpace(selectedText); - textToAdd = `*${trimmedText}*`; - this.addRefinedText(selectedText, textToAdd); - } - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/commands/katex.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/katex.command.ts deleted file mode 100644 index 893ca18141e7..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/katex.command.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { faEquals } from '@fortawesome/free-solid-svg-icons'; -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; -import { addTextAtCursor } from 'app/shared/util/markdown.util'; - -/** - * Insert a katex compatible formula. - * Uses an e-function as the example. - */ -export class KatexCommand extends DomainTagCommand { - buttonIcon = faEquals as IconProp; - buttonTranslationString = 'artemisApp.markdownEditor.commands.katex'; - execute(): void { - const text = `${this.getOpeningIdentifier()}e^{\\frac{1}{4} y^2}${this.getClosingIdentifier()}`; - addTextAtCursor(text, this.aceEditor); - } - - getOpeningIdentifier(): string { - return '$$ '; - } - - getClosingIdentifier(): string { - return ' $$'; - } -} diff --git a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java index 09ed5dee613d..21a17fc90380 100644 --- a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java +++ b/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java @@ -30,6 +30,7 @@ import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO; +import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO; import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO; @Component @@ -96,6 +97,20 @@ public void mockRunResponse(Consumer resp // @formatter:on } + public void mockRunCompetencyExtractionResponseAnd(Consumer executionDTOConsumer) { + // @formatter:off + mockServer + .expect(ExpectedCount.once(), requestTo(pipelinesApiURL + "/competency-extraction/default/run")) + .andExpect(method(HttpMethod.POST)) + .andRespond(request -> { + var mockRequest = (MockClientHttpRequest) request; + var dto = mapper.readValue(mockRequest.getBodyAsString(), PyrisCompetencyExtractionPipelineExecutionDTO.class); + executionDTOConsumer.accept(dto); + return MockRestResponseCreators.withRawStatus(HttpStatus.ACCEPTED.value()).createResponse(request); + }); + // @formatter:on + } + public void mockIngestionWebhookRunResponse(Consumer responseConsumer) { mockServer.expect(ExpectedCount.once(), requestTo(webhooksApiURL + "/lectures/fullIngestion")).andExpect(method(HttpMethod.POST)).andRespond(request -> { var mockRequest = (MockClientHttpRequest) request; diff --git a/src/test/javascript/spec/component/markdown-editor/italic-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/italic-command.spec.ts deleted file mode 100644 index a39dfd15ef90..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/italic-command.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; -import { ItalicCommand } from 'app/shared/markdown-editor/commands/italic.command'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { ArtemisTestModule } from '../../test.module'; -import { Command } from 'app/shared/markdown-editor/commands/command'; - -describe('ItalicCommand', () => { - let comp: MarkdownEditorComponent; - let fixture: ComponentFixture; - let command: Command; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(MarkdownEditorComponent); - comp = fixture.componentInstance; - - command = new ItalicCommand(); - comp.defaultCommands = [command]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - }); - }); - - it('should add ** on execute', () => { - comp.aceEditorContainer.getEditor().setValue('italic'); - command.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('*italic*'); - }); - - it('should remove ** on execute', () => { - comp.aceEditorContainer.getEditor().setValue('*italic*'); - command.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('italic'); - }); -}); diff --git a/src/test/javascript/spec/component/markdown-editor/katex-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/katex-command.spec.ts deleted file mode 100644 index 16d34e2a462e..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/katex-command.spec.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command'; -import { ArtemisTestModule } from '../../test.module'; - -describe('KatexCommand', () => { - let comp: MarkdownEditorComponent; - let fixture: ComponentFixture; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(MarkdownEditorComponent); - comp = fixture.componentInstance; - }); - }); - - it('should add insert the sample e-function into the editor on execute', () => { - const katexCommand = new KatexCommand(); - comp.domainCommands = [katexCommand]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - - katexCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('$$ e^{\\frac{1}{4} y^2} $$'); - }); -}); From 0ac814dc829a672c7deeb978373be95226c3c8bd Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:39:56 +0200 Subject: [PATCH 33/95] merge5 --- .../knowledge-area-edit.component.html | 2 +- .../learning-path-lecture-unit.component.html | 2 +- .../learning-path-lecture-unit.component.ts | 23 +++++++++++-------- ...nav-overview-learning-objects.component.ts | 17 +++++++++----- .../learning-path-nav-overview.component.ts | 21 ++++++++--------- .../learning-path-student-nav.component.ts | 12 +++++----- .../learning-path-legend.component.html | 20 ++++------------ .../learning-path.component.html | 2 +- .../learning-path-management.component.html | 2 +- ...arning-path-lecture-unit.component.spec.ts | 4 ++-- .../knowledge-area-edit.component.spec.ts | 4 ++-- 11 files changed, 53 insertions(+), 56 deletions(-) diff --git a/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html b/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html index 5121a3a30893..249e72addc6b 100644 --- a/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html +++ b/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html @@ -62,7 +62,7 @@

@if (isEditing) { - @if (attachmentToBeCreated?.id === attachment?.id) { -
- {{ 'artemisApp.lecture.attachments.isBeingEdited' | artemisTranslate }} -
+
} } @@ -140,7 +138,7 @@

jhiTranslate="artemisApp.lecture.attachments.file" >File - {{ 'artemisApp.lecture.attachments.fileLimitation' | artemisTranslate }} +
} @else { 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 5d31480a08c1..c6a911b698e9 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 @@ -1,7 +1,7 @@ @if (isLoading) {
} diff --git a/src/main/webapp/app/lecture/lecture-update.component.html b/src/main/webapp/app/lecture/lecture-update.component.html index 67f423adda06..9ba49083c37c 100644 --- a/src/main/webapp/app/lecture/lecture-update.component.html +++ b/src/main/webapp/app/lecture/lecture-update.component.html @@ -30,12 +30,7 @@

- +
@@ -77,22 +72,22 @@

- {{ 'artemisApp.attachmentUnit.createAttachmentUnits.processAutomatically' | artemisTranslate }} +

@if (processUnitMode) {
    -
  • {{ 'artemisApp.attachmentUnit.createAttachmentUnits.informativeText.firstLine' | artemisTranslate }}
    • -
  • {{ 'artemisApp.attachmentUnit.createAttachmentUnits.informativeText.secondLine' | artemisTranslate }}
    • -
  • {{ 'artemisApp.attachmentUnit.createAttachmentUnits.informativeText.note' | artemisTranslate }}
    • +
  • +
  • +
} @if (processUnitMode) {
- {{ 'artemisApp.attachmentUnit.createAttachmentUnit.fileLimitation' | artemisTranslate }} + - {{ 'artemisApp.attachmentUnit.createAttachmentUnit.fileRequiredValidationError' | artemisTranslate }} -
+
}
} diff --git a/src/main/webapp/app/lecture/lecture-update.component.ts b/src/main/webapp/app/lecture/lecture-update.component.ts index 592d937228cb..e0ac895d50ce 100644 --- a/src/main/webapp/app/lecture/lecture-update.component.ts +++ b/src/main/webapp/app/lecture/lecture-update.component.ts @@ -6,15 +6,14 @@ import { AlertService } from 'app/core/util/alert.service'; import { LectureService } from './lecture.service'; import { CourseManagementService } from '../course/manage/course-management.service'; import { Lecture } from 'app/entities/lecture.model'; -import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component'; import { Course } from 'app/entities/course.model'; -import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command'; import { onError } from 'app/shared/util/global.utils'; import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils'; import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component'; import { faBan, faHandshakeAngle, faPuzzlePiece, faQuestionCircle, faSave } from '@fortawesome/free-solid-svg-icons'; import { LectureUpdateWizardComponent } from 'app/lecture/wizard-mode/lecture-update-wizard.component'; import { FILE_EXTENSIONS } from 'app/shared/constants/file-extensions.constants'; +import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action'; @Component({ selector: 'jhi-lecture-update', @@ -26,7 +25,6 @@ export class LectureUpdateComponent implements OnInit { @ViewChild(LectureUpdateWizardComponent, { static: false }) wizardComponent: LectureUpdateWizardComponent; - EditorMode = EditorMode; lecture: Lecture; isSaving: boolean; isProcessing: boolean; @@ -35,7 +33,7 @@ export class LectureUpdateComponent implements OnInit { courses: Course[]; - domainCommandsDescription = [new KatexCommand()]; + domainActionsDescription = [new MonacoFormulaAction()]; file: File; fileName: string; fileInputTouched = false; diff --git a/src/main/webapp/app/lecture/lecture.component.html b/src/main/webapp/app/lecture/lecture.component.html index 14792de82dab..dd5018ca96eb 100644 --- a/src/main/webapp/app/lecture/lecture.component.html +++ b/src/main/webapp/app/lecture/lecture.component.html @@ -16,7 +16,7 @@

id="filter-dropdown-button" > - {{ 'artemisApp.courseOverview.exerciseList.filter' | artemisTranslate: { num: activeFilters.size } }} +
  • diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.html b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.html index adfb4aa9ede0..e7e90982591c 100644 --- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.html +++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.html @@ -12,10 +12,10 @@

@@ -26,9 +26,7 @@

- {{ 'artemisApp.lecture.attachments.isBeingEdited' | artemisTranslate }} - +
}

@@ -65,7 +63,7 @@

} @@ -79,7 +77,7 @@

} diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html index 9656e52daf04..9100d8436184 100644 --- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html +++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html @@ -6,6 +6,6 @@

- +
diff --git a/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts index c53c66a2034f..03be222b4cb4 100644 --- a/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts @@ -10,7 +10,6 @@ import { LectureUpdateComponent } from 'app/lecture/lecture-update.component'; import { LectureService } from 'app/lecture/lecture.service'; import { LectureUpdateWizardComponent } from 'app/lecture/wizard-mode/lecture-update-wizard.component'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; @@ -23,6 +22,7 @@ import { MockTranslateService } from '../../helpers/mocks/service/mock-translate import { ArtemisTestModule } from '../../test.module'; import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component'; import { LectureTitleChannelNameComponent } from 'app/lecture/lecture-title-channel-name.component'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; describe('LectureUpdateComponent', () => { let lectureUpdateWizardComponentFixture: ComponentFixture; @@ -51,7 +51,7 @@ describe('LectureUpdateComponent', () => { MockComponent(LectureTitleChannelNameComponent), MockComponent(LectureUpdateWizardComponent), MockComponent(FormDateTimePickerComponent), - MockComponent(MarkdownEditorComponent), + MockComponent(MarkdownEditorMonacoComponent), MockComponent(DocumentationButtonComponent), MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), diff --git a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts index 2d40c01a5b50..36701004edbb 100644 --- a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts +++ b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts @@ -1,10 +1,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { LectureUpdateWizardTitleComponent } from 'app/lecture/wizard-mode/lecture-wizard-title.component'; import { Lecture } from 'app/entities/lecture.model'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { MockComponent } from 'ng-mocks'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { LectureTitleChannelNameComponent } from 'app/lecture/lecture-title-channel-name.component'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; describe('LectureWizardTitleComponent', () => { let wizardTitleComponentFixture: ComponentFixture; @@ -13,7 +13,7 @@ describe('LectureWizardTitleComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ReactiveFormsModule, FormsModule], - declarations: [LectureUpdateWizardTitleComponent, MockComponent(MarkdownEditorComponent), MockComponent(LectureTitleChannelNameComponent)], + declarations: [LectureUpdateWizardTitleComponent, MockComponent(MarkdownEditorMonacoComponent), MockComponent(LectureTitleChannelNameComponent)], providers: [], schemas: [], }) From 88e5b266991120c6b5c5a3b2a304b761a70b6b2b Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:45:15 +0200 Subject: [PATCH 35/95] merge5 --- .../lecture-wizard-title.component.ts | 6 +- .../lectureAttachmentReferenceCommand.ts | 129 ------------------ .../lecture/LectureCreationPage.ts | 2 +- 3 files changed, 3 insertions(+), 134 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand.ts 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 8748b9232417..c8b89b284ffb 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 @@ -1,7 +1,6 @@ import { Component, Input } from '@angular/core'; -import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command'; -import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component'; import { Lecture } from 'app/entities/lecture.model'; +import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action'; @Component({ selector: 'jhi-lecture-update-wizard-title', @@ -11,8 +10,7 @@ export class LectureUpdateWizardTitleComponent { @Input() currentStep: number; @Input() lecture: Lecture; - domainCommandsDescription = [new KatexCommand()]; - EditorMode = EditorMode; + domainActionsDescription = [new MonacoFormulaAction()]; constructor() {} } diff --git a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand.ts deleted file mode 100644 index 8a1cce16bd2e..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand.ts +++ /dev/null @@ -1,129 +0,0 @@ -import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand'; -import { MetisService } from 'app/shared/metis/metis.service'; -import { ReferenceType } from 'app/shared/metis/metis.util'; -import { LectureService } from 'app/lecture/lecture.service'; -import { Lecture } from 'app/entities/lecture.model'; -import { map } from 'rxjs/operators'; -import { HttpResponse } from '@angular/common/http'; -import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model'; -import { Slide } from 'app/entities/lecture-unit/slide.model'; -import { Attachment } from 'app/entities/attachment.model'; -import { SlideItem, ValueItem } from 'app/shared/markdown-editor/command-constants'; -import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model'; - -export class LectureAttachmentReferenceCommand extends MultiOptionCommand { - metisService: MetisService; - - lectureService: LectureService; - - buttonTranslationString = 'artemisApp.metis.editor.lecture'; - - constructor(metisService: MetisService, lectureService: LectureService) { - super(); - this.metisService = metisService; - this.lectureService = lectureService; - - lectureService - .findAllByCourseIdWithSlides(this.metisService.getCourse().id!) - .pipe(map((response: HttpResponse) => response.body!)) - .subscribe((lectures: Lecture[]) => { - lectures.map((lecture) => { - this.setValues([ - ...this.values, - { - id: lecture.id!.toString(), - value: lecture.title!, - type: ReferenceType.LECTURE, - elements: this.lectureAttachments(lecture.attachments!), - attachmentUnits: this.attachmentUnitsWithSlides(lecture.lectureUnits!), - }, - ]); - }); - }); - } - - /** - * @function execute - * @param {string} selectedLectureId ID of the lecture to be referenced - * @param type - * @param selectedElementId - * @param selectedUnitId - * @param selectedSlideId - * @desc Add a lecture reference link in markdown language - * 1. Add '[{lecture-title}](/courses/{courseId}/lectures/{lectureId}})' at the cursor in the editor - * 2. Link in markdown language appears which when clicked navigates to the lecture page - */ - execute(selectedLectureId: string, type?: ReferenceType, selectedElementId?: string, selectedUnitId?: string, selectedSlideId?: string): void { - const selectedLecture = this.metisService.getCourse().lectures!.find((value) => value.id!.toString() === selectedLectureId)!; - this.lectureService - .findWithDetailsWithSlides(selectedLecture.id!) - .pipe(map((response: HttpResponse) => response.body!)) - .subscribe({ - next: (lecture: Lecture) => { - if (selectedUnitId) { - if (!selectedSlideId) { - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - const selectedUnit: AttachmentUnit = lecture.lectureUnits?.find((value: AttachmentUnit) => value.id!.toString() === selectedUnitId)!; - const shortLink = selectedUnit.attachment?.link!.split('attachments/')[1]; - const referenceLink = `[lecture-unit]${selectedUnit.name}(${shortLink})[/lecture-unit]`; - this.insertText(referenceLink); - this.focus(); - } else { - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - const selectedUnit: AttachmentUnit = lecture.lectureUnits?.find((value: AttachmentUnit) => value.id!.toString() === selectedUnitId)!; - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - const selectedSlide: Slide = selectedUnit.slides?.find((value: Slide) => value.id!.toString() === selectedSlideId)!; - const shortLink = selectedSlide.slideImagePath!.split('attachments/')[1]; - // Use a regular expression and the replace() method to remove the file name and last slash - const shortLinkWithoutFileName: string = shortLink.replace(new RegExp(`[^/]*${'.png'}`), '').replace(/\/$/, ''); - const referenceLink = `[slide]${selectedUnit.name} Slide ${selectedSlide.slideNumber}(${shortLinkWithoutFileName})[/slide]`; - this.insertText(referenceLink); - this.focus(); - } - } else { - // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain - const selectedAttachment = selectedLecture.attachments?.find((value) => value.id!.toString() === selectedElementId)!; - const shortLink = selectedAttachment ? selectedAttachment.link!.split('attachments/')[1] : ''; - const referenceLink = - ReferenceType.LECTURE === type - ? `[lecture]${selectedLecture.title}(${this.metisService.getLinkForLecture(selectedLecture.id!.toString())})[/lecture]` - : `[attachment]${selectedAttachment.name}(${shortLink})[/attachment]`; - this.insertText(referenceLink); - this.focus(); - } - }, - }); - } - - private lectureAttachments(attachments: Attachment[]): ValueItem[] { - return attachments?.map((attachment: any) => ({ - id: attachment.id!.toString(), - value: attachment.name!, - courseArtifactType: ReferenceType.ATTACHMENT, - })); - } - - private attachmentUnitsWithSlides(lectureUnits: LectureUnit[]): ValueItem[] { - return lectureUnits?.map((unit: any) => { - return { - id: unit.id!.toString(), - value: unit.name!, - slides: this.attachmentUnitSlides(unit.slides!), - courseArtifactType: ReferenceType.ATTACHMENT_UNITS, - }; - }); - } - - private attachmentUnitSlides(slides: Slide[]): SlideItem[] { - return slides - ?.map((slide: Slide) => { - return { - id: slide.id!.toString(), - slideNumber: slide.slideNumber!, - slideImagePath: slide.slideImagePath!, - courseArtifactType: ReferenceType.SLIDE, - }; - }) - .sort((a: SlideItem, b: SlideItem) => a.slideNumber - b.slideNumber); - } -} diff --git a/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts b/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts index 2d2e122969a6..8e4fa68e7f31 100644 --- a/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts +++ b/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts @@ -35,7 +35,7 @@ export class LectureCreationPage { * @param description - The description text for the lecture. */ async typeDescription(description: string) { - const descriptionField = this.page.locator('.ace_content'); + const descriptionField = this.page.locator('.monaco-editor'); await descriptionField.click(); await descriptionField.pressSequentially(description); } From 5f674c51666d278e3dc522ebb6f11c6e398a61be Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:45:42 +0200 Subject: [PATCH 36/95] merge5 --- .../templates/rust/exercise/src/lib.rs | 5 + .../templates/rust/solution/src/lib.rs | 5 + .../test/rust_template_test_macros/src/lib.rs | 346 ++++++++++++++++++ .../legal-document-update.component.html | 15 +- .../legal/legal-document-update.component.ts | 38 +- .../list-of-complaints.component.html | 63 ++-- ...loading-indicator-container.component.html | 2 +- .../markdown-editor/commands/link.command.ts | 30 -- .../legal-document-update.component.spec.ts | 15 +- .../markdown-editor/link-command.spec.ts | 42 --- .../lecture/LectureManagementPage.ts | 2 +- 11 files changed, 411 insertions(+), 152 deletions(-) create mode 100644 src/main/resources/templates/rust/exercise/src/lib.rs create mode 100644 src/main/resources/templates/rust/solution/src/lib.rs create mode 100644 src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/link.command.ts delete mode 100644 src/test/javascript/spec/component/markdown-editor/link-command.spec.ts diff --git a/src/main/resources/templates/rust/exercise/src/lib.rs b/src/main/resources/templates/rust/exercise/src/lib.rs new file mode 100644 index 000000000000..930d9899389d --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/lib.rs @@ -0,0 +1,5 @@ +pub mod bubble_sort; +pub mod context; +pub mod merge_sort; +pub mod policy; +pub mod sort_strategy; diff --git a/src/main/resources/templates/rust/solution/src/lib.rs b/src/main/resources/templates/rust/solution/src/lib.rs new file mode 100644 index 000000000000..930d9899389d --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/lib.rs @@ -0,0 +1,5 @@ +pub mod bubble_sort; +pub mod context; +pub mod merge_sort; +pub mod policy; +pub mod sort_strategy; diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs b/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs new file mode 100644 index 000000000000..498fa14d54a1 --- /dev/null +++ b/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs @@ -0,0 +1,346 @@ +//! Compile-time source code reflection +//! +//! Use this for conditional compilation. + +use proc_macro::TokenStream; + +use quote::{format_ident, quote}; +use syn::parse::Parse; +use syn::{parse_macro_input, Ident, Item, ItemFn, Path, Token}; + +trait ToStringLocal { + fn to_string(&self) -> String; +} + +impl ToStringLocal for Path { + fn to_string(&self) -> String { + let segments: Vec<_> = self.segments.iter().map(|s| s.ident.to_string()).collect(); + segments.join("::") + } +} + +#[proc_macro_attribute] +pub fn require_struct(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_struct) +} + +#[proc_macro_attribute] +pub fn require_struct_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_struct) +} + +#[proc_macro_attribute] +pub fn require_trait(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait) +} + +#[proc_macro_attribute] +pub fn require_trait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait) +} + +#[proc_macro_attribute] +pub fn require_enum(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_enum) +} + +#[proc_macro_attribute] +pub fn require_enum_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_enum) +} + +#[proc_macro_attribute] +pub fn require_function(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_function) +} + +#[proc_macro_attribute] +pub fn require_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_function) +} + +#[proc_macro_attribute] +pub fn require_impl_for_trait(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_for_trait) +} + +#[proc_macro_attribute] +pub fn require_impl_for_trait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_for_trait) +} + +#[proc_macro_attribute] +pub fn require_impl_function(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_function) +} + +#[proc_macro_attribute] +pub fn require_impl_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_function) +} + +#[proc_macro_attribute] +pub fn require_impl_method(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_method) +} + +#[proc_macro_attribute] +pub fn require_impl_method_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_method) +} + +#[proc_macro_attribute] +pub fn require_impl_const(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_const) +} + +#[proc_macro_attribute] +pub fn require_impl_const_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_const) +} + +#[proc_macro_attribute] +pub fn require_impl_type(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_impl_type) +} + +#[proc_macro_attribute] +pub fn require_impl_type_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_impl_type) +} + +#[proc_macro_attribute] +pub fn require_trait_function(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_function) +} + +#[proc_macro_attribute] +pub fn require_trait_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_function) +} + +#[proc_macro_attribute] +pub fn require_trait_method(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_method) +} + +#[proc_macro_attribute] +pub fn require_trait_method_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_method) +} + +#[proc_macro_attribute] +pub fn require_trait_const(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_const) +} + +#[proc_macro_attribute] +pub fn require_trait_const_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_const) +} + +#[proc_macro_attribute] +pub fn require_trait_type(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_type) +} + +#[proc_macro_attribute] +pub fn require_trait_type_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_type) +} + +#[proc_macro_attribute] +pub fn require_trait_supertrait(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_item(attr, item, make_cfg_trait_supertrait) +} + +#[proc_macro_attribute] +pub fn require_trait_supertrait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream { + require_for_function(attr, item, make_cfg_trait_supertrait) +} + +struct SuperTraitSpec { + module_path: String, + trait_name: String, + supertrait: String, +} + +impl Parse for SuperTraitSpec { + fn parse(input: syn::parse::ParseStream) -> syn::Result { + let path: Path = input.parse()?; + input.parse::()?; + let supertrait: Path = input.parse()?; + + let (module_path, trait_name) = split_path(path); + let supertrait = supertrait.segments.last().unwrap().ident.to_string(); + + Ok(SuperTraitSpec { + module_path, + trait_name, + supertrait, + }) + } +} + +impl ToStringLocal for SuperTraitSpec { + fn to_string(&self) -> String { + format!( + "supertrait {} of {}::{}", + self.supertrait, self.module_path, self.trait_name + ) + } +} + +fn require_for_item Ident>( + attr: TokenStream, + item: TokenStream, + make_cfg: F, +) -> TokenStream { + let attribute = parse_macro_input!(attr as A); + let original_item = parse_macro_input!(item as Item); + + let cfg = make_cfg(attribute); + + quote! ( + #[cfg(#cfg)] + #original_item + ) + .into() +} + +fn require_for_function Ident>( + attr: TokenStream, + item: TokenStream, + make_cfg: F, +) -> TokenStream { + let attribute = parse_macro_input!(attr as A); + let original_fn = parse_macro_input!(item as ItemFn); + + let failure_message = format!("missing {}", attribute.to_string()); + + let cfg = make_cfg(attribute); + + let ItemFn { + attrs, + vis, + sig, + block, + } = original_fn; + + quote!( + #(#attrs)* + #vis #sig { + #[cfg(not(#cfg))] + panic!(#failure_message); + #[cfg(#cfg)] + #block + } + ) + .into() +} + +fn make_cfg_struct(path: Path) -> Ident { + let (module_path, struct_name) = split_path(path); + format_ident!("structure_{module_path}_struct_{struct_name}") +} + +fn make_cfg_trait(path: Path) -> Ident { + let (module_path, trait_name) = split_path(path); + format_ident!("structure_{module_path}_trait_{trait_name}") +} + +fn make_cfg_enum(path: Path) -> Ident { + let (module_path, enum_name) = split_path(path); + format_ident!("structure_{module_path}_enum_{enum_name}") +} + +fn make_cfg_function(path: Path) -> Ident { + let (module_path, function_name) = split_path(path); + format_ident!("structure_{module_path}_fn_{function_name}") +} + +fn make_cfg_impl_for_trait(path: Path) -> Ident { + let (module_path, self_type, trait_name) = split_path2(path); + format_ident!("structure_{module_path}_impl_{trait_name}_for_{self_type}") +} + +fn make_cfg_impl_function(path: Path) -> Ident { + let (module_path, self_type, function) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_fn_{function}") +} + +fn make_cfg_impl_method(path: Path) -> Ident { + let (module_path, self_type, function) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_method_{function}") +} + +fn make_cfg_impl_const(path: Path) -> Ident { + let (module_path, self_type, const_name) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_const_{const_name}") +} + +fn make_cfg_impl_type(path: Path) -> Ident { + let (module_path, self_type, type_name) = split_path2(path); + format_ident!("structure_{module_path}_impl_{self_type}_type_{type_name}") +} + +fn make_cfg_trait_function(path: Path) -> Ident { + let (module_path, trait_type, function) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_fn_{function}") +} + +fn make_cfg_trait_method(path: Path) -> Ident { + let (module_path, trait_type, function) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_method_{function}") +} + +fn make_cfg_trait_const(path: Path) -> Ident { + let (module_path, trait_type, const_name) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_const_{const_name}") +} + +fn make_cfg_trait_type(path: Path) -> Ident { + let (module_path, trait_type, type_name) = split_path2(path); + format_ident!("structure_{module_path}_trait_{trait_type}_type_{type_name}") +} + +fn make_cfg_trait_supertrait(spec: SuperTraitSpec) -> Ident { + format_ident!( + "structure_{}_trait_{}_supertrait_{}", + spec.module_path, + spec.trait_name, + spec.supertrait + ) +} + +fn split_path(path: Path) -> (String, String) { + let path_segments: Vec<_> = path.segments.iter().map(|s| &s.ident).collect(); + let (item_name, path_segments) = path_segments.split_last().unwrap(); + + let item_name = item_name.to_string(); + let module_path = path_segments + .iter() + .copied() + .map(Ident::to_string) + .collect::>() + .join("_"); + + (module_path, item_name) +} + +fn split_path2(path: Path) -> (String, String, String) { + let path_segments: Vec<_> = path.segments.iter().map(|s| &s.ident).collect(); + let (item2_name, path_segments) = path_segments.split_last().unwrap(); + let (item1_name, path_segments) = path_segments.split_last().unwrap(); + + let item1_name = item1_name.to_string(); + let item2_name = item2_name.to_string(); + let module_path = path_segments + .iter() + .copied() + .map(Ident::to_string) + .collect::>() + .join("_"); + + (module_path, item1_name, item2_name) +} diff --git a/src/main/webapp/app/admin/legal/legal-document-update.component.html b/src/main/webapp/app/admin/legal/legal-document-update.component.html index d581d9dcf664..7ab8f31edb25 100644 --- a/src/main/webapp/app/admin/legal/legal-document-update.component.html +++ b/src/main/webapp/app/admin/legal/legal-document-update.component.html @@ -3,15 +3,14 @@

-
@if (!unsavedChanges && !isSaving) { @@ -34,13 +33,7 @@

}

- diff --git a/src/main/webapp/app/admin/legal/legal-document-update.component.ts b/src/main/webapp/app/admin/legal/legal-document-update.component.ts index 11151a4410c1..63541a0c97dc 100644 --- a/src/main/webapp/app/admin/legal/legal-document-update.component.ts +++ b/src/main/webapp/app/admin/legal/legal-document-update.component.ts @@ -1,14 +1,13 @@ import { AfterContentChecked, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { faBan, faCheckCircle, faCircleNotch, faExclamationTriangle, faSave } from '@fortawesome/free-solid-svg-icons'; import { LegalDocumentService } from 'app/shared/service/legal-document.service'; -import { MarkdownEditorComponent, MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { UnsavedChangesWarningComponent } from 'app/admin/legal/unsaved-changes-warning/unsaved-changes-warning.component'; import { LegalDocument, LegalDocumentLanguage, LegalDocumentType } from 'app/entities/legal-document.model'; import { ActivatedRoute } from '@angular/router'; import { Observable, tap } from 'rxjs'; import { JhiLanguageHelper } from 'app/core/language/language.helper'; -import { ArtemisMarkdownService } from 'app/shared/markdown.service'; +import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; @Component({ selector: 'jhi-privacy-statement-update-component', @@ -35,12 +34,12 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked legalDocumentType: LegalDocumentType = LegalDocumentType.PRIVACY_STATEMENT; unsavedChanges = false; isSaving = false; - @ViewChild(MarkdownEditorComponent, { static: false }) markdownEditor: MarkdownEditorComponent; + @ViewChild(MarkdownEditorMonacoComponent, { static: false }) markdownEditor: MarkdownEditorMonacoComponent; + currentContentTrimmed = ''; currentLanguage = this.DEFAULT_LANGUAGE; unsavedChangesWarning: NgbModalRef; titleKey: string; - private languageChangeInPreview: boolean; constructor( private legalDocumentService: LegalDocumentService, @@ -48,7 +47,6 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked private route: ActivatedRoute, private languageHelper: JhiLanguageHelper, private changeDetectorRef: ChangeDetectorRef, - private markdownService: ArtemisMarkdownService, ) {} ngOnInit() { @@ -84,7 +82,7 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked updateLegalDocument() { this.isSaving = true; - this.legalDocument.text = this.markdownEditor.markdown!; + this.legalDocument.text = this.currentContentTrimmed; if (this.legalDocumentType === LegalDocumentType.PRIVACY_STATEMENT) { this.legalDocumentService.updatePrivacyStatement(this.legalDocument).subscribe((statement) => { this.setUpdatedDocument(statement); @@ -102,29 +100,27 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked this.isSaving = false; } - checkUnsavedChanges(content: string) { + onContentChanged(content: string) { + this.currentContentTrimmed = content.trim(); this.unsavedChanges = content !== this.legalDocument.text; } - onLanguageChange(legalDocumentLanguage: any) { + onLanguageChange(legalDocumentLanguage: LegalDocumentLanguage) { if (this.unsavedChanges) { this.showWarning(legalDocumentLanguage); } else { - this.markdownEditor.markdown = ''; this.currentLanguage = legalDocumentLanguage; this.getLegalDocumentForUpdate(this.legalDocumentType, legalDocumentLanguage).subscribe((document) => { this.legalDocument = document; + this.markdownEditor.markdown = this.legalDocument.text; + // Ensure the new text is parsed and displayed in the preview + this.markdownEditor.parseMarkdown(); this.unsavedChanges = false; - // if we are currently in preview mode, we need to update the preview - if (this.markdownEditor.previewMode) { - this.markdownEditor.previewTextAsHtml = this.markdownService.safeHtmlForMarkdown(this.legalDocument.text); - this.languageChangeInPreview = true; - } }); } } - showWarning(legalDocumentLanguage: any) { + showWarning(legalDocumentLanguage: LegalDocumentLanguage) { this.unsavedChangesWarning = this.modalService.open(UnsavedChangesWarningComponent, { size: 'lg', backdrop: 'static' }); if (this.legalDocumentType === LegalDocumentType.PRIVACY_STATEMENT) { this.unsavedChangesWarning.componentInstance.textMessage = 'artemisApp.legal.privacyStatement.unsavedChangesWarning'; @@ -151,16 +147,4 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked ngAfterContentChecked() { this.changeDetectorRef.detectChanges(); } - - /** - * If the language is changed while we are in the preview mode, we must trigger a change event, so the ace editor updates its content. - * We must do this when the editor is visible because otherwise the editor will only be updated if you click on it once. - */ - updateTextIfLanguageChangedInPreview() { - if (this.languageChangeInPreview) { - // we have to trigger a change event, so the ace editor updates its content - this.markdownEditor.aceEditorContainer.getEditor().session._emit('change', { start: { row: 0, column: 0 }, end: { row: 0, column: 0 }, action: 'insert', lines: [] }); - this.languageChangeInPreview = false; - } - } } diff --git a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html index 0651cc2ad7e5..ff642a21befc 100644 --- a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html +++ b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html @@ -3,10 +3,10 @@

@if (complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.title' | artemisTranslate }} + } @if (complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.list.title' | artemisTranslate }} + }

@@ -15,16 +15,16 @@

@if (!allComplaintsForTutorLoaded && complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.loadAllComplaintsExplanation' | artemisTranslate }} + } @if (!allComplaintsForTutorLoaded && complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.list.loadAllRequestsExplanation' | artemisTranslate }} + } @if (allComplaintsForTutorLoaded && complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.allComplaintsLoaded' | artemisTranslate }} + } @if (allComplaintsForTutorLoaded && complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.list.allRequestsLoaded' | artemisTranslate }} + } @if (!allComplaintsForTutorLoaded) { } @@ -59,13 +59,12 @@

/>

@@ -80,48 +79,48 @@

@if (course?.isAtLeastInstructor) { } - + @@ -166,16 +165,16 @@

@@ -199,10 +198,10 @@

@if (complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.exerciseAssessmentDashboard.noComplaints' | artemisTranslate }} + } @if (complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequests' | artemisTranslate }} + }
diff --git a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html index 785e34640ba0..46f976b39ec6 100644 --- a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html +++ b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html @@ -1,7 +1,7 @@ @if (isLoading) { } @else { diff --git a/src/main/webapp/app/shared/markdown-editor/commands/link.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/link.command.ts deleted file mode 100644 index ef16cdfe80b7..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/link.command.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { faLink } from '@fortawesome/free-solid-svg-icons'; -import { Command } from './command'; - -export class LinkCommand extends Command { - buttonIcon = faLink as IconProp; - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.link'; - - /** - * @function execute - * @desc Add/Remove a link in markdown language - * 1. check if the selected text includes ('[](http://)') - * 2. If included reduce the selected text by this elements and replace the selected text by textToAdd - * 3. If not included add ('[](http://)') at the cursor in the editor - * 4. Link in markdown language appears - */ - execute(): void { - let selectedText = this.getSelectedText(); - - if (selectedText.includes('[](http://)')) { - const textToAdd = selectedText.slice(11); - this.insertText(textToAdd); - } else { - const range = this.getRange(); - selectedText = `[](http://)`; - this.replace(range, selectedText); - this.focus(); - } - } -} diff --git a/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts b/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts index c9f6b2ebd4ee..bbec5290351b 100644 --- a/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts +++ b/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts @@ -6,7 +6,6 @@ import { UnsavedChangesWarningComponent } from 'app/admin/legal/unsaved-changes- import { ButtonComponent } from 'app/shared/components/button.component'; import { TranslateDirective } from 'app/shared/language/translate.directive'; import { ArtemisTestModule } from '../../test.module'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { JhiLanguageHelper } from 'app/core/language/language.helper'; import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service'; import { MockLanguageHelper } from '../../helpers/mocks/service/mock-translate.service'; @@ -19,6 +18,7 @@ import { ActivatedRoute, UrlSegment } from '@angular/router'; import { of } from 'rxjs'; import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; import { PrivacyStatement } from 'app/entities/privacy-statement.model'; +import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; describe('LegalDocumentUpdateComponent', () => { let component: LegalDocumentUpdateComponent; @@ -35,7 +35,7 @@ describe('LegalDocumentUpdateComponent', () => { MockComponent(UnsavedChangesWarningComponent), MockComponent(ButtonComponent), MockDirective(TranslateDirective), - MockComponent(MarkdownEditorComponent), + MockComponent(MarkdownEditorMonacoComponent), MockComponent(ModePickerComponent), MockPipe(ArtemisTranslatePipe), ], @@ -117,7 +117,7 @@ describe('LegalDocumentUpdateComponent', () => { it('should correctly determine unsaved changes', () => { component.unsavedChanges = false; component.legalDocument.text = 'text'; - component.checkUnsavedChanges('changed text'); + component.onContentChanged('changed text'); expect(component.unsavedChanges).toBeTrue(); }); @@ -135,7 +135,7 @@ describe('LegalDocumentUpdateComponent', () => { updateFile = jest.spyOn(legalDocumentService, 'updateImprint').mockReturnValue(of(returnValue)); } component.markdownEditor.markdown = 'text'; - component.unsavedChanges = true; + component.onContentChanged('text'); const expected = new LegalDocument(documentType, LegalDocumentLanguage.GERMAN); expected.text = 'text'; fixture.detectChanges(); @@ -149,13 +149,12 @@ describe('LegalDocumentUpdateComponent', () => { expect(component.unsavedChanges).toBeFalse(); }), ); - it('should set the value of the markdown editor when switching to the edit mode if the language is changed while in preview mode', () => { + it('should set the value of the markdown editor when the language is changed while in preview mode', () => { setupRoutes(LegalDocumentType.PRIVACY_STATEMENT); const returnValue = new PrivacyStatement(LegalDocumentLanguage.GERMAN); returnValue.text = 'new content'; - const updateTextOnEditSelect = jest.spyOn(component, 'updateTextIfLanguageChangedInPreview').mockImplementation(); + const parseMarkdownStub = jest.spyOn(component.markdownEditor, 'parseMarkdown').mockImplementation(); component.markdownEditor.markdown = 'text'; - component.markdownEditor.previewMode = true; component.unsavedChanges = false; component.ngOnInit(); const loadFile = jest.spyOn(legalDocumentService, 'getPrivacyStatementForUpdate').mockReturnValue(of(returnValue)); @@ -164,7 +163,7 @@ describe('LegalDocumentUpdateComponent', () => { expect(loadFile).toHaveBeenCalledOnce(); expect(component.legalDocument.text).toBe('new content'); component.markdownEditor.onEditSelect.emit(); - expect(updateTextOnEditSelect).toHaveBeenCalledOnce(); + expect(parseMarkdownStub).toHaveBeenCalledOnce(); }); function setupRoutes(documentType: LegalDocumentType) { diff --git a/src/test/javascript/spec/component/markdown-editor/link-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/link-command.spec.ts deleted file mode 100644 index 442cfe7212d8..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/link-command.spec.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { ArtemisTestModule } from '../../test.module'; -import { LinkCommand } from 'app/shared/markdown-editor/commands/link.command'; -import { Command } from 'app/shared/markdown-editor/commands/command'; - -describe('LinkCommand', () => { - let comp: MarkdownEditorComponent; - let fixture: ComponentFixture; - let command: Command; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(MarkdownEditorComponent); - comp = fixture.componentInstance; - - command = new LinkCommand(); - comp.defaultCommands = [command]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - }); - }); - - it('should add [](http://) on execute', () => { - comp.aceEditorContainer.getEditor().setValue(''); - command.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('[](http://)'); - }); - - it('should remove [](http://) on execute', () => { - comp.aceEditorContainer.getEditor().setValue('[](http://)test'); - command.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('test'); - }); -}); diff --git a/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts b/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts index af5624689a7d..40b336fdb1de 100644 --- a/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts +++ b/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts @@ -95,7 +95,7 @@ export class LectureManagementPage { await this.openCreateUnit(UnitType.TEXT); await this.page.fill('#name', name); await this.page.fill('#pick-releaseDate #date-input-field', releaseDate.toString()); - const contentField = this.page.locator('.ace_content'); + const contentField = this.page.locator('.monaco-editor'); await contentField.click(); await contentField.pressSequentially(text); return this.submitUnit(); From dc96efa0c198fa7eda9bbdf883ba00e139e7cc93 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:47:32 +0200 Subject: [PATCH 37/95] merge5 --- .../domain/lti/Lti13ClientRegistration.java | 23 ++ ...alCIProgrammingLanguageFeatureService.java | 2 + .../LocalCIResultProcessingService.java | 6 - .../templates/rust/exercise/src/main.rs | 53 +++++ .../templates/rust/solution/src/main.rs | 59 +++++ .../lti-configuration.component.html | 14 +- .../markdown-editor.component.html | 220 ------------------ .../markdown-editor.component.scss | 132 ----------- src/main/webapp/app/shared/markdown.module.ts | 3 +- .../webapp/app/shared/util/markdown.util.ts | 56 ++--- ...VCLocalCIParticipationIntegrationTest.java | 2 +- 11 files changed, 160 insertions(+), 410 deletions(-) create mode 100644 src/main/resources/templates/rust/exercise/src/main.rs create mode 100644 src/main/resources/templates/rust/solution/src/main.rs delete mode 100644 src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html delete mode 100644 src/main/webapp/app/shared/markdown-editor/markdown-editor.component.scss diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java index 16800e0021c7..816d18157234 100644 --- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java +++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java @@ -37,6 +37,9 @@ public class Lti13ClientRegistration { @JsonProperty("jwks_uri") private String jwksUri; + @JsonProperty("logo_uri") + private String logoUri; + @JsonProperty("token_endpoint_auth_method") private String tokenEndpointAuthMethod; @@ -67,6 +70,7 @@ public Lti13ClientRegistration(String serverUrl, String clientRegistrationId) { this.setRedirectUris(List.of(serverUrl + "/" + CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH)); this.setInitiateLoginUri(serverUrl + "/" + CustomLti13Configurer.LTI13_LOGIN_INITIATION_PATH + "/" + clientRegistrationId); this.setJwksUri(serverUrl + "/.well-known/jwks.json"); + this.setLogoUri(serverUrl + "/public/images/logo.png"); Lti13ToolConfiguration toolConfiguration = getLti13ToolConfiguration(serverUrl); this.setLti13ToolConfiguration(toolConfiguration); @@ -83,6 +87,7 @@ private static Lti13ToolConfiguration getLti13ToolConfiguration(String serverUrl } toolConfiguration.setDomain(domain); toolConfiguration.setTargetLinkUri(serverUrl + "/courses"); + toolConfiguration.setDescription("Artemis: Interactive Learning with Individual Feedback"); toolConfiguration.setClaims(Arrays.asList("iss", "email", "sub", "name", "given_name", "family_name")); Message deepLinkingMessage = new Message(CustomLti13Configurer.LTI13_DEEPLINK_MESSAGE_REQUEST, serverUrl + "/" + CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH); toolConfiguration.setMessages(List.of(deepLinkingMessage)); @@ -145,6 +150,14 @@ public void setJwksUri(String jwksUri) { this.jwksUri = jwksUri; } + public String getLogoUri() { + return logoUri; + } + + public void setLogoUri(String logoUri) { + this.logoUri = logoUri; + } + public String getTokenEndpointAuthMethod() { return tokenEndpointAuthMethod; } @@ -179,6 +192,8 @@ public static class Lti13ToolConfiguration { @JsonProperty("target_link_uri") private String targetLinkUri; + private String description; + private List messages; private List claims; @@ -199,6 +214,14 @@ public void setTargetLinkUri(String targetLinkUri) { this.targetLinkUri = targetLinkUri; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public List getMessages() { return messages; } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java index 276ab23671fa..101e0540521f 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java @@ -8,6 +8,7 @@ import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.OCAML; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON; +import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT; import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.VHDL; import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT; @@ -46,5 +47,6 @@ public LocalCIProgrammingLanguageFeatureService() { programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, true, false, false, false, true, List.of(), false, true)); programmingLanguageFeatures.put(OCAML, new ProgrammingLanguageFeature(OCAML, false, false, false, false, true, List.of(), false, true)); programmingLanguageFeatures.put(SWIFT, new ProgrammingLanguageFeature(SWIFT, false, false, true, true, false, List.of(PLAIN), false, true)); + programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, true)); } } diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java index fd7e0cc0dc89..dfc7dcf776c2 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java +++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java @@ -20,7 +20,6 @@ import com.hazelcast.collection.ItemEvent; import com.hazelcast.collection.ItemListener; import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.cp.lock.FencedLock; import com.hazelcast.map.IMap; import de.tum.in.www1.artemis.domain.BuildJob; @@ -73,8 +72,6 @@ public class LocalCIResultProcessingService { private IMap buildAgentInformation; - private FencedLock resultQueueLock; - private UUID listenerId; public LocalCIResultProcessingService(@Qualifier("hazelcastInstance") HazelcastInstance hazelcastInstance, ProgrammingExerciseGradingService programmingExerciseGradingService, @@ -97,7 +94,6 @@ public LocalCIResultProcessingService(@Qualifier("hazelcastInstance") HazelcastI public void init() { this.resultQueue = this.hazelcastInstance.getQueue("buildResultQueue"); this.buildAgentInformation = this.hazelcastInstance.getMap("buildAgentInformation"); - this.resultQueueLock = this.hazelcastInstance.getCPSubsystem().getLock("resultQueueLock"); this.listenerId = resultQueue.addItemListener(new ResultQueueListener(), true); } @@ -112,9 +108,7 @@ public void removeListener() { public void processResult() { // set lock to prevent multiple nodes from processing the same build job - resultQueueLock.lock(); ResultQueueItem resultQueueItem = resultQueue.poll(); - resultQueueLock.unlock(); if (resultQueueItem == null) { return; diff --git a/src/main/resources/templates/rust/exercise/src/main.rs b/src/main/resources/templates/rust/exercise/src/main.rs new file mode 100644 index 000000000000..9263a66a267e --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/main.rs @@ -0,0 +1,53 @@ +use std::ops::RangeInclusive; +use std::time::Duration; + +use chrono::{NaiveDate, TimeDelta}; +use rand::{thread_rng, Rng}; + +const ITERATIONS: usize = 10; +const LENGTH_MIN: usize = 5; +const LENGTH_MAX: usize = 15; + +/// Main function. +/// Add code to demonstrate your implementation here. +fn main() { + todo!("Init Context and Policy"); + + // Run multiple times to simulate different sorting strategies + for _ in 0..ITERATIONS { + let mut dates = create_random_dates(); + todo!("Configure context"); + println!("Unsorted Array of course dates = {dates:#?}"); + + todo!("Sort dates"); + + println!("Sorted Array of course dates = {dates:#?}"); + } +} + +/// Generates a [Vec] of random [NaiveDate] objects with a random length +/// between [LENGTH_MIN] and [LENGTH_MAX]. +fn create_random_dates() -> Vec { + let length = thread_rng().gen_range(LENGTH_MIN..=LENGTH_MAX); + + let date_format = "%Y-%m-%d"; + let low_date = NaiveDate::parse_from_str("2024-09-15", date_format).unwrap(); + let high_date = NaiveDate::parse_from_str("2025-01-15", date_format).unwrap(); + + let mut dates = Vec::new(); + dates.resize_with(length, || random_date_within(low_date..=high_date)); + dates +} + +/// Creates a random Date within the given range. +fn random_date_within(range: RangeInclusive) -> NaiveDate { + let (start, end) = range.into_inner(); + + let max_delta = end - start; + let max_duration = max_delta.to_std().unwrap(); + + let random_duration = thread_rng().gen_range(Duration::ZERO..=max_duration); + let random_delta = TimeDelta::from_std(random_duration).unwrap(); + + start + random_delta +} diff --git a/src/main/resources/templates/rust/solution/src/main.rs b/src/main/resources/templates/rust/solution/src/main.rs new file mode 100644 index 000000000000..0d8d362fafc9 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/main.rs @@ -0,0 +1,59 @@ +use std::time::Duration; +use std::{cell::RefCell, ops::RangeInclusive}; + +use chrono::{NaiveDate, TimeDelta}; +use rand::{thread_rng, Rng}; + +use rust_template_exercise::{context::Context, policy::Policy}; + +const ITERATIONS: usize = 10; +const LENGTH_MIN: usize = 5; +const LENGTH_MAX: usize = 15; + +/// Main function. +/// Add code to demonstrate your implementation here. +fn main() { + // Init Context and Policy + let context = RefCell::new(Context::new()); + let mut policy = Policy::new(&context); + + // Run multiple times to simulate different sorting strategies + for _ in 0..ITERATIONS { + let mut dates = create_random_dates(); + // Configure context + policy.configure(&dates); + println!("Unsorted Array of course dates = {dates:#?}"); + + // Sort dates + context.borrow().sort(&mut dates); + + println!("Sorted Array of course dates = {dates:#?}"); + } +} + +/// Generates a [Vec] of random [NaiveDate] objects with a random length +/// between [LENGTH_MIN] and [LENGTH_MAX]. +fn create_random_dates() -> Vec { + let length = thread_rng().gen_range(LENGTH_MIN..=LENGTH_MAX); + + let date_format = "%Y-%m-%d"; + let low_date = NaiveDate::parse_from_str("2024-09-15", date_format).unwrap(); + let high_date = NaiveDate::parse_from_str("2025-01-15", date_format).unwrap(); + + let mut dates = Vec::new(); + dates.resize_with(length, || random_date_within(low_date..=high_date)); + dates +} + +/// Creates a random Date within the given range. +fn random_date_within(range: RangeInclusive) -> NaiveDate { + let (start, end) = range.into_inner(); + + let max_delta = end - start; + let max_duration = max_delta.to_std().unwrap(); + + let random_duration = thread_rng().gen_range(Duration::ZERO..=max_duration); + let random_delta = TimeDelta::from_std(random_duration).unwrap(); + + start + random_delta +} diff --git a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html index 6e026c952a34..32fb9e3112d8 100644 --- a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html +++ b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html @@ -8,7 +8,7 @@

-

{{ 'artemisApp.lti.dynamicRegistrationUrl' | artemisTranslate }}

+

@@ -17,7 +17,7 @@

{{ 'artemisApp.lti.dynamicRegistrationUrl' | artemisTran

-

{{ 'artemisApp.lti.configuredPlatforms' | artemisTranslate }}

+

@@ -130,35 +130,35 @@

{{ 'artemisApp.lti.configuredP
- {{ 'artemisApp.lti.deepLinkingUrl' | artemisTranslate }} +
{{ getDeepLinkingUrl() }}
- {{ 'artemisApp.lti.toolUrl' | artemisTranslate }} +
{{ getToolUrl() }}
- {{ 'artemisApp.lti.keysetUrl' | artemisTranslate }} +
{{ getKeysetUrl() }}
- {{ 'artemisApp.lti.initiateLoginUrl' | artemisTranslate }} +
{{ getInitiateLoginUrl() }}
- {{ 'artemisApp.lti.redirectUri' | artemisTranslate }} +
{{ getRedirectUri() }} diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html deleted file mode 100644 index 441a919c35f5..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html +++ /dev/null @@ -1,220 +0,0 @@ -
- -
-
diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.scss b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.scss deleted file mode 100644 index 008cc9349fe4..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.scss +++ /dev/null @@ -1,132 +0,0 @@ -.markdown-editor-wrapper { - display: flex; - flex-flow: column nowrap; - flex: 1 1 auto; - height: inherit; - color: var(--md-wrapper-color); - - // This is a fix for using the fullscreen mode on Safari. - &:-webkit-full-screen { - width: 100%; - height: 100%; - } - - .md-resize-icon { - color: var(--md-resize-icon-color); - } - - .tab-list { - background: var(--md-tab-list-bg); - } - .tab-content, - .tab-content > .active { - display: flex; - flex-flow: column nowrap; - flex: 1 1 auto; - height: 100%; - } - - .no-dropdown-indicator::after { - display: none; - } - - .markdown-editor { - display: flex; - flex-flow: column nowrap; - flex: 1 1 auto; - touch-action: none; - - // Fix for full screen mode, otherwise the color is black. - background-color: var(--md-editor-background); - - &__content { - height: 100% !important; - width: 100%; - flex: 1 1 auto; - overflow: auto; - } - - .file-input { - border-bottom: 1px dotted var(--md-file-input-border-color); - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } - - &__file-input { - // cannot be set to 'display: false' or similar - // input value would not be sent - width: 0.1px; - height: 0.1px; - opacity: 0; - overflow: hidden; - position: absolute; - z-index: -1; - } - - &__file-input:focus, - &__file-label:focus { - outline: 1px dotted #000; - outline: -webkit-focus-ring-color auto 5px; - } - - &__file-label { - cursor: pointer; - width: 100%; - border: 1px solid var(--border-color); - border-top: none; - border-radius: 0 0.15em 0.15em 0; - - .upload-subtitle { - font-size: 12px; - color: var(--bs-secondary); - } - } - - &__markdown { - height: inherit; - overflow: auto; - padding: 1rem; - } - - &__commands { - &-default, - &-domain { - display: flex; - flex-flow: row wrap; - align-items: center; - } - - .mat-mdc-button { - height: fit-content; - } - } - - .rg-bottom { - align-self: center; - } - } -} - -.background-editor-high { - overflow: scroll; -} - -.dropdown-menu { - max-height: 300px; - overflow-y: auto; - - li { - position: relative; - } -} - -.nested { - padding-left: 30px; -} -.nested-slide { - padding-left: 50px; -} - -.default-font-size { - font-size: var(--bs-body-font-size); -} diff --git a/src/main/webapp/app/shared/markdown.module.ts b/src/main/webapp/app/shared/markdown.module.ts index 00df892f1be2..1d10d89b3045 100644 --- a/src/main/webapp/app/shared/markdown.module.ts +++ b/src/main/webapp/app/shared/markdown.module.ts @@ -1,13 +1,12 @@ import { NgModule } from '@angular/core'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe'; @NgModule({ imports: [ArtemisMarkdownEditorModule], declarations: [HtmlForMarkdownPipe], providers: [ArtemisMarkdownService], - exports: [MarkdownEditorComponent, HtmlForMarkdownPipe], + exports: [HtmlForMarkdownPipe], }) export class ArtemisMarkdownModule {} diff --git a/src/main/webapp/app/shared/util/markdown.util.ts b/src/main/webapp/app/shared/util/markdown.util.ts index 973a0ad2c66e..69de712ce3f8 100644 --- a/src/main/webapp/app/shared/util/markdown.util.ts +++ b/src/main/webapp/app/shared/util/markdown.util.ts @@ -1,46 +1,18 @@ import { ExerciseHintExplanationInterface } from 'app/entities/quiz/quiz-question.model'; -import { hintCommentIdentifier } from 'app/shared/markdown-editor/domainCommands/hint.command'; -import { explanationCommandIdentifier } from 'app/shared/markdown-editor/domainCommands/explanation.command'; import { escapeStringForUseInRegex } from 'app/shared/util/global.utils'; +import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action'; +import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action'; -const hintOrExpRegex = new RegExp(escapeStringForUseInRegex(`${explanationCommandIdentifier}`) + '|' + escapeStringForUseInRegex(`${hintCommentIdentifier}`), 'g'); - -/** - * adds the passed text into the editor of the passed ace editor component at the current curser by focusing, clearing a selection, - * moving the cursor to the end of the line, and finally inserting the given text. - * After that the new test will be selected - * - * @param text the text that will be added into the editor of the passed ace editor component - * @param aceEditor the editor in which the text will be added at the current curser position - */ -export function addTextAtCursor(text: string, aceEditor: any) { - aceEditor.focus(); - aceEditor.clearSelection(); - aceEditor.moveCursorTo(aceEditor.getCursorPosition().row, Number.POSITIVE_INFINITY); - aceEditor.insert(text); - const range = aceEditor.selection.getRange(); - const commandIdentifier = text.split(']'); - const offsetRange = commandIdentifier[0].length + 1; - range.setStart(range.start.row, offsetRange); - aceEditor.selection.setRange(range); -} - -/** - * Remove the text at the specified range. - * @param from = col & row from which to start - * @param to = col & row at which to end - * @param aceEditor the editor in which text should be removed - */ -export function removeTextRange(from: { col: number; row: number }, to: { col: number; row: number }, aceEditor: any) { - aceEditor.focus(); - aceEditor.getSession().remove({ startRow: from.row, startColumn: from.col, endRow: to.row, endColumn: to.col }); -} +const hintOrExpRegex = new RegExp( + escapeStringForUseInRegex(`${MonacoQuizExplanationAction.IDENTIFIER}`) + '|' + escapeStringForUseInRegex(`${MonacoQuizHintAction.IDENTIFIER}`), + 'g', +); /** * Parse the markdown text and apply the result to the target object's data * - * The markdown text is split at hintCommentIdentifier and explanationCommandIdentifier tags. - * => First part is text. Everything after hintCommentIdentifier is Hint, anything after explanationCommandIdentifier is explanation + * The markdown text is split at MonacoQuizHintAction.IDENTIFIER and MonacoQuizExplanationAction.IDENTIFIER tags. + * => First part is text. Everything after MonacoQuizHintAction.IDENTIFIER is Hint, anything after MonacoQuizExplanationAction.IDENTIFIER is explanation * * @param markdownText {string} the markdown text to parse * @param targetObject {object} the object that the result will be saved in. Fields modified are 'text', 'hint' and 'explanation'. @@ -52,18 +24,18 @@ export function parseExerciseHintExplanation(markdownText: string, targetObject: // split markdownText into main text, hint and explanation const markdownTextParts = markdownText.split(hintOrExpRegex); targetObject.text = markdownTextParts[0].trim(); - if (markdownText.indexOf(hintCommentIdentifier) !== -1 && markdownText.indexOf(explanationCommandIdentifier) !== -1) { - if (markdownText.indexOf(hintCommentIdentifier) < markdownText.indexOf(explanationCommandIdentifier)) { + if (markdownText.indexOf(MonacoQuizHintAction.IDENTIFIER) !== -1 && markdownText.indexOf(MonacoQuizExplanationAction.IDENTIFIER) !== -1) { + if (markdownText.indexOf(MonacoQuizHintAction.IDENTIFIER) < markdownText.indexOf(MonacoQuizExplanationAction.IDENTIFIER)) { targetObject.hint = markdownTextParts[1].trim(); targetObject.explanation = markdownTextParts[2].trim(); } else { targetObject.hint = markdownTextParts[2].trim(); targetObject.explanation = markdownTextParts[1].trim(); } - } else if (markdownText.indexOf(hintCommentIdentifier) !== -1) { + } else if (markdownText.indexOf(MonacoQuizHintAction.IDENTIFIER) !== -1) { targetObject.hint = markdownTextParts[1].trim(); targetObject.explanation = undefined; - } else if (markdownText.indexOf(explanationCommandIdentifier) !== -1) { + } else if (markdownText.indexOf(MonacoQuizExplanationAction.IDENTIFIER) !== -1) { targetObject.hint = undefined; targetObject.explanation = markdownTextParts[1].trim(); } else { @@ -88,6 +60,6 @@ export function generateExerciseHintExplanation(sourceObject: ExerciseHintExplan return !sourceObject.text ? '' : sourceObject.text + - (sourceObject.hint ? '\n\t' + hintCommentIdentifier + ' ' + sourceObject.hint : '') + - (sourceObject.explanation ? '\n\t' + explanationCommandIdentifier + ' ' + sourceObject.explanation : ''); + (sourceObject.hint ? '\n\t' + MonacoQuizHintAction.IDENTIFIER + ' ' + sourceObject.hint : '') + + (sourceObject.explanation ? '\n\t' + MonacoQuizExplanationAction.IDENTIFIER + ' ' + sourceObject.explanation : ''); } diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java index 190d02485212..cbd957d51dd1 100644 --- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java +++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java @@ -57,7 +57,7 @@ void testStartParticipation() throws Exception { LocalVCRepositoryUri studentAssignmentRepositoryUri = new LocalVCRepositoryUri(projectKey, projectKey.toLowerCase() + "-" + TEST_PREFIX + "student1", localVCBaseUrl); assertThat(studentAssignmentRepositoryUri.getLocalRepositoryPath(localVCBasePath)).exists(); - var vcsAccessToken = request.get("/api/users/vcsToken?participationId=" + participation.getId(), HttpStatus.OK, String.class); + var vcsAccessToken = request.get("/api/account/participation-vcs-access-token?participationId=" + participation.getId(), HttpStatus.OK, String.class); assertThat(vcsAccessToken).isNotNull(); assertThat(vcsAccessToken).startsWith("vcpat"); From 8d23e4d3e60d778f6beaa738300c0a76e6b0792c Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:48:50 +0200 Subject: [PATCH 38/95] merge5 --- .../templates/rust/exercise/src/merge_sort.rs | 14 + ...match-percentage-info-modal.component.html | 10 +- .../markdown-editor.component.ts | 519 ------------------ .../markdown-editor/markdown-editor.module.ts | 9 +- .../markdown-editor-monaco.component.html | 35 +- .../markdown-editor-monaco.component.scss | 45 +- .../markdown-editor-monaco.component.ts | 134 ++++- .../monaco/markdown-editor-parsing.helper.ts | 61 ++ .../markdown-editor-monaco.component.spec.ts | 33 +- .../markdown-editor-parsing.helper.spec.ts | 51 ++ .../markdown-editor.component.spec.ts | 76 --- 11 files changed, 341 insertions(+), 646 deletions(-) create mode 100644 src/main/resources/templates/rust/exercise/src/merge_sort.rs delete mode 100644 src/main/webapp/app/shared/markdown-editor/markdown-editor.component.ts create mode 100644 src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-parsing.helper.ts create mode 100644 src/test/javascript/spec/component/markdown-editor/markdown-editor-parsing.helper.spec.ts delete mode 100644 src/test/javascript/spec/component/markdown-editor/markdown-editor.component.spec.ts diff --git a/src/main/resources/templates/rust/exercise/src/merge_sort.rs b/src/main/resources/templates/rust/exercise/src/merge_sort.rs new file mode 100644 index 000000000000..78fbb6b6dd33 --- /dev/null +++ b/src/main/resources/templates/rust/exercise/src/merge_sort.rs @@ -0,0 +1,14 @@ +use chrono::NaiveDate; + +pub struct MergeSort; + +impl MergeSort { + /// Sorts items with the Merge Sort algorithm. + /// + /// Arguments: + /// + /// * `input`: slice of items to be sorted + pub fn perform_sort(&self, input: &mut [NaiveDate]) { + todo!("implement"); + } +} diff --git a/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html b/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html index c653e3747365..e53cf5bda583 100644 --- a/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html +++ b/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html @@ -1,18 +1,18 @@
-

{{ 'artemisApp.quizExercise.matchingInfoModalTitle' | artemisTranslate }}

+

-
{{ 'artemisApp.courseOverview.exerciseDetails.points' | artemisTranslate }}
+
diff --git a/src/main/webapp/app/overview/header-course.component.html b/src/main/webapp/app/overview/header-course.component.html index df28e8ec031e..43a30615e2c8 100644 --- a/src/main/webapp/app/overview/header-course.component.html +++ b/src/main/webapp/app/overview/header-course.component.html @@ -17,9 +17,7 @@
{{ courseDescription }}
- - {{ 'artemisApp.courseOverview.studentView' | artemisTranslate }} - +
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/headingOne.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/headingOne.command.ts deleted file mode 100644 index b37e8dce1c20..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/headingOne.command.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { faHeading } from '@fortawesome/free-solid-svg-icons'; -import { Command } from 'app/shared/markdown-editor/commands/command'; - -export class HeadingOneCommand extends Command { - buttonIcon = faHeading as IconProp; - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.headingOne'; - - /** - * @function execute - * @desc Create/remove heading one in markdown language - * 1. Check if the selected text includes (#) and/or ('Heading 1') - * 2. If included reduce the selected text by this elements and add replace the selected text by textToAdd - * 3. If not included add (#) before the selected text and insert them into the editor - * 4. Heading one in markdown language appears - */ - execute(): void { - let selectedText = this.getSelectedText(); - - if (selectedText.includes('#') && !selectedText.includes('Heading 1')) { - const textToAdd = selectedText.slice(2); - this.insertText(textToAdd); - } else if (selectedText.includes('#') && selectedText.includes('Heading 1')) { - const textToAdd = selectedText.slice(2, -9); - this.insertText(textToAdd); - } else { - const initText = 'Heading 1'; - const range = this.getRange(); - selectedText = `# ${selectedText || initText}`; - this.replace(range, selectedText); - this.focus(); - } - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/commands/headingThree.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/headingThree.command.ts deleted file mode 100644 index 0d9e3ac9185d..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/headingThree.command.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { faHeading } from '@fortawesome/free-solid-svg-icons'; -import { Command } from 'app/shared/markdown-editor/commands/command'; - -export class HeadingThreeCommand extends Command { - buttonIcon = faHeading as IconProp; - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.headingThree'; - - /** - * @function execute - * @desc Create/Remove heading three language - * 1. check if the selected text includes (###) and/or ('Heading 3') - * 2. If included reduce the selected text by this elements and add replace the selected text by textToAdd - * 3. If not included add (###) before the selected text and insert them into the editor - * 4. Heading three in markdown language appears - */ - execute(): void { - let selectedText = this.getSelectedText(); - - if (selectedText.includes('###') && !selectedText.includes('Heading 3')) { - const textToAdd = selectedText.slice(4); - this.insertText(textToAdd); - } else if (selectedText.includes('###') && selectedText.includes('Heading 3')) { - const textToAdd = selectedText.slice(4, -9); - this.insertText(textToAdd); - } else { - const initText = 'Heading 3'; - const range = this.getRange(); - selectedText = `### ${selectedText || initText}`; - this.replace(range, selectedText); - this.focus(); - } - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/commands/headingTwo.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/headingTwo.command.ts deleted file mode 100644 index 4f14cafd8e0b..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/commands/headingTwo.command.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { IconProp } from '@fortawesome/fontawesome-svg-core'; -import { faHeading } from '@fortawesome/free-solid-svg-icons'; -import { Command } from 'app/shared/markdown-editor/commands/command'; - -export class HeadingTwoCommand extends Command { - buttonIcon = faHeading as IconProp; - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.headingTwo'; - - /** - * @function execute - * @desc Create/Remove heading two language - * 1. Check if the selected text includes (##) and/or ('Heading 2') - * 2. If included reduce the selected text by this elements and add replace the selected text by textToAdd - * 3. If not included add (##) before the selected text and insert them into the editor - * 4. Heading two in markdown language appears - */ - execute(): void { - let selectedText = this.getSelectedText(); - - if (selectedText.includes('##') && !selectedText.includes('Heading 2')) { - const textToAdd = selectedText.slice(3); - this.insertText(textToAdd); - } else if (selectedText.includes('##') && selectedText.includes('Heading 2')) { - const textToAdd = selectedText.slice(3, -9); - this.insertText(textToAdd); - } else { - const initText = 'Heading 2'; - const range = this.getRange(); - selectedText = `## ${selectedText || initText}`; - this.replace(range, selectedText); - this.focus(); - } - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/hint.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/hint.command.ts deleted file mode 100644 index 380bd4efa65e..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/domainCommands/hint.command.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { addTextAtCursor } from 'app/shared/util/markdown.util'; -import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command'; - -export const hintCommentIdentifier = '[hint]'; - -export class HintCommand extends DomainTagCommand { - public static readonly TEXT = ' Add a hint here (visible during the quiz via ?-Button)'; - - buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addHint'; - - /** - * @function execute - * @desc Add a new hint to the answer option or question title in the editor at the location of the cursor - */ - execute(): void { - const text = '\n\t' + this.getOpeningIdentifier() + HintCommand.TEXT; - addTextAtCursor(text, this.aceEditor); - } - - /** - * @function getOpeningIdentifier - * @desc identify the start of the hint - */ - getOpeningIdentifier(): string { - return hintCommentIdentifier; - } - - /** - * @function getClosingIdentifier - * @desc identify the end of the hint - */ - getClosingIdentifier(): string { - return '[/hint]'; - } -} diff --git a/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts index 6d38f089db69..6682b12aa12c 100644 --- a/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts +++ b/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts @@ -67,8 +67,7 @@ describe('HeaderExercisePageWithDetails', () => { expect(component.icon.iconName).toBe('keyboard'); // dueDate, categories, examMode should also be set if the necessary information is known - const category = new ExerciseCategory(); - category.category = 'testcategory'; + const category = new ExerciseCategory('testcategory', undefined); const categories = [category]; exercise.categories = categories; exam.endDate = dayjs().subtract(1, 'day'); diff --git a/src/test/javascript/spec/component/markdown-editor/headingCommands.spec.ts b/src/test/javascript/spec/component/markdown-editor/headingCommands.spec.ts deleted file mode 100644 index 1e842133b7fe..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/headingCommands.spec.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { ArtemisTestModule } from '../../test.module'; -import { HeadingOneCommand } from 'app/shared/markdown-editor/commands/headingOne.command'; -import { HeadingTwoCommand } from 'app/shared/markdown-editor/commands/headingTwo.command'; -import { HeadingThreeCommand } from 'app/shared/markdown-editor/commands/headingThree.command'; - -describe('HeadingOneCommand', () => { - let comp: MarkdownEditorComponent; - let fixture: ComponentFixture; - let headingOneCommand = new HeadingOneCommand(); - let headingTwoCommand = new HeadingTwoCommand(); - let headingThreeCommand = new HeadingThreeCommand(); - - afterEach(() => { - jest.restoreAllMocks(); - }); - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(MarkdownEditorComponent); - comp = fixture.componentInstance; - headingOneCommand = new HeadingOneCommand(); - headingTwoCommand = new HeadingTwoCommand(); - headingThreeCommand = new HeadingThreeCommand(); - comp.defaultCommands = [headingOneCommand, headingTwoCommand, headingThreeCommand]; - fixture.detectChanges(); - comp.ngAfterViewInit(); - }); - }); - - it('should add # Heading 1,2,3 on execute when no text is selected', () => { - headingOneCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('# Heading 1'); - comp.aceEditorContainer.getEditor().setValue(''); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(''); - headingTwoCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## Heading 2'); - comp.aceEditorContainer.getEditor().setValue(''); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(''); - headingThreeCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### Heading 3'); - }); - - it('should add #, ##, ### on execute when text is selected', () => { - jest.spyOn(comp.aceEditorContainer.getEditor(), 'getSelectedText').mockReturnValue('lorem'); - - headingOneCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('# lorem'); - comp.aceEditorContainer.getEditor().setValue('lorem'); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem'); - headingTwoCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## lorem'); - comp.aceEditorContainer.getEditor().setValue('lorem'); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem'); - headingThreeCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### lorem'); - }); - - it('should remove #, ##, ### on execute when text of header selected', () => { - comp.aceEditorContainer.getEditor().setValue('# lorem'); - headingOneCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem'); - comp.aceEditorContainer.getEditor().setValue('## lorem'); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## lorem'); - headingTwoCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem'); - comp.aceEditorContainer.getEditor().setValue('### lorem'); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### lorem'); - headingThreeCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem'); - }); - - it('should remove #, ##, ### with Heading text on execute when text of header selected', () => { - comp.aceEditorContainer.getEditor().setValue('# Heading 1'); - headingOneCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(''); - comp.aceEditorContainer.getEditor().setValue('## Heading 2'); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## Heading 2'); - headingTwoCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(''); - comp.aceEditorContainer.getEditor().setValue('### Heading 3'); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### Heading 3'); - headingThreeCommand.execute(); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(''); - }); -}); From 67421fd4f696b5ff24db1235f477d61ad5dd6948 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:39:18 +0200 Subject: [PATCH 30/95] merge5 --- .../IrisChatWebsocketDTO.java} | 8 +- .../IrisChatBasedFeatureInterface.java | 3 +- ...ded-in-overall-score-picker.component.html | 15 ++- .../interval-grading-system.component.html | 14 +-- .../iris-base-chatbot.component.html | 2 +- ...-common-sub-settings-update.component.html | 20 ++-- .../shared/iris-enabled.component.html | 10 +- .../commands/interactiveSearchCommand.ts | 97 ------------------- .../domainCommands/incorrectOptionCommand.ts | 32 ------ .../instructionDescription.command.ts | 35 ------- .../iris/IrisChatMessageIntegrationTest.java | 29 +++--- 11 files changed, 50 insertions(+), 215 deletions(-) rename src/main/java/de/tum/in/www1/artemis/service/iris/{websocket/IrisWebsocketDTO.java => dto/IrisChatWebsocketDTO.java} (84%) delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/interactiveSearchCommand.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/incorrectOptionCommand.ts delete mode 100644 src/main/webapp/app/shared/markdown-editor/domainCommands/instructionDescription.command.ts diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java similarity index 84% rename from src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java rename to src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java index 4c5067bde279..12fa282a3012 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java @@ -1,4 +1,4 @@ -package de.tum.in.www1.artemis.service.iris.websocket; +package de.tum.in.www1.artemis.service.iris.dto; import java.util.List; import java.util.Objects; @@ -20,7 +20,7 @@ * @param stages the stages of the Pyris pipeline */ @JsonInclude(JsonInclude.Include.NON_EMPTY) -public record IrisWebsocketDTO(IrisWebsocketMessageType type, IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, +public record IrisChatWebsocketDTO(IrisWebsocketMessageType type, IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, List suggestions) { /** @@ -31,7 +31,7 @@ public record IrisWebsocketDTO(IrisWebsocketMessageType type, IrisMessage messag * @param rateLimitInfo the rate limit information * @param stages the stages of the Pyris pipeline */ - public IrisWebsocketDTO(@Nullable IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, List suggestions) { + public IrisChatWebsocketDTO(@Nullable IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List stages, List suggestions) { this(determineType(message), message, rateLimitInfo, stages, suggestions); } @@ -62,7 +62,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - IrisWebsocketDTO that = (IrisWebsocketDTO) o; + IrisChatWebsocketDTO that = (IrisChatWebsocketDTO) o; return type == that.type && Objects.equals(message, that.message) && Objects.equals(rateLimitInfo, that.rateLimitInfo) && Objects.equals(stages, that.stages); } diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java index db345e973fdb..2001cb7077b8 100644 --- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java +++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java @@ -8,9 +8,10 @@ public interface IrisChatBasedFeatureInterface extends Ir /** * Sends a message over the websocket to a specific user * + * @param session that the message belongs to * @param message that should be sent over the websocket */ - void sendOverWebsocket(IrisMessage message); + void sendOverWebsocket(S session, IrisMessage message); /** * Sends a request to Iris to get a message for the given session. diff --git a/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html b/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html index ca7687b905ed..edaa0ae542cc 100644 --- a/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html +++ b/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html @@ -6,9 +6,8 @@ 'btn-default': includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY, }" (click)="change(IncludedInOverallScore.INCLUDED_COMPLETELY)" - > - {{ 'artemisApp.exercise.yes' | artemisTranslate }} - + jhiTranslate="artemisApp.exercise.yes" + >
- {{ 'artemisApp.exercise.bonus' | artemisTranslate }} -
+ jhiTranslate="artemisApp.exercise.bonus" + > @if (allowNotIncluded) {
- {{ 'artemisApp.exercise.no' | artemisTranslate }} -
+ jhiTranslate="artemisApp.exercise.no" + > } diff --git a/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html b/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html index 8b30dabedbd5..3b8a116ef2cc 100644 --- a/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html +++ b/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html @@ -12,9 +12,7 @@
- - {{ 'artemisApp.gradingSystem.intervalTab.title' | artemisTranslate }} - + @@ -29,13 +27,9 @@ - - {{ - this.gradingScale.gradeType === GradeType.GRADE - ? ('artemisApp.gradingSystem.gradeName' | artemisTranslate) - : ('artemisApp.gradingSystem.bonusPoints' | artemisTranslate) - }} - +
- {{ 'artemisApp.lecture.wizardMode.competencyConnectedUnits' | artemisTranslate }} +
{{ competency.title }} - {{ 'artemisApp.complaint.listOfComplaints.exercise' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.submissionId' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.assessorName' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.studentLogin' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.studentName' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.reviewerName' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.dateAndTime' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.responseTime' | artemisTranslate }} + - {{ 'artemisApp.complaint.listOfComplaints.status' | artemisTranslate }} + - {{ 'artemisApp.locks.lockStatus' | artemisTranslate }} + {{ 'artemisApp.complaint.listOfComplaints.actions' | artemisTranslate }}
@if (complaint.accepted === undefined) { - {{ 'artemisApp.complaint.listOfComplaints.noReply' | artemisTranslate }} + } @if (complaint.accepted === true && complaintType === ComplaintType.COMPLAINT) { - {{ 'artemisApp.complaint.listOfComplaints.accepted' | artemisTranslate }} + } @if (complaint.accepted === true && complaintType === ComplaintType.MORE_FEEDBACK) { - {{ 'artemisApp.moreFeedback.accepted' | artemisTranslate }} + } @if (complaint.accepted === false) { - {{ 'artemisApp.complaint.listOfComplaints.rejected' | artemisTranslate }} + } @@ -185,10 +184,10 @@

- - + + - - + +
{{ 'artemisApp.quizExercise.matchLetterCase.title' | artemisTranslate }}{{ 'artemisApp.quizExercise.matchLetterCase.explanation' | artemisTranslate }}
{{ 'artemisApp.quizExercise.matchPercentage.explanationTitle' | artemisTranslate }}{{ 'artemisApp.quizExercise.matchPercentage.explanation' | artemisTranslate }}

diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.ts b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.ts deleted file mode 100644 index 1795b4718b6e..000000000000 --- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.ts +++ /dev/null @@ -1,519 +0,0 @@ -import { AfterViewInit, Component, ContentChild, ElementRef, EventEmitter, Input, Output, ViewChild, ViewEncapsulation } from '@angular/core'; -import { SafeHtml } from '@angular/platform-browser'; -// Note: this import has to be before the 'brace' imports -import { AceEditorComponent } from 'app/shared/markdown-editor/ace-editor/ace-editor.component'; -import 'brace/theme/chrome'; -import 'brace/mode/markdown'; -import 'brace/mode/latex'; -import 'brace/ext/language_tools'; -import { Interactable } from '@interactjs/core/Interactable'; -import interact from 'interactjs'; -import { ArtemisMarkdownService } from 'app/shared/markdown.service'; -import { FileUploaderService } from 'app/shared/http/file-uploader.service'; -import { AlertService, AlertType } from 'app/core/util/alert.service'; -import { ColorSelectorComponent } from 'app/shared/color-selector/color-selector.component'; -import { DomainTagCommand } from './domainCommands/domainTag.command'; -import { escapeStringForUseInRegex } from 'app/shared/util/global.utils'; -import { UnderlineCommand } from 'app/shared/markdown-editor/commands/underline.command'; -import { ColorPickerCommand } from 'app/shared/markdown-editor/commands/colorPicker.command'; -import { BoldCommand } from 'app/shared/markdown-editor/commands/bold.command'; -import { AttachmentCommand } from 'app/shared/markdown-editor/commands/attachmentCommand'; -import { ReferenceCommand } from 'app/shared/markdown-editor/commands/reference.command'; -import { DomainMultiOptionCommand } from 'app/shared/markdown-editor/domainCommands/domainMultiOptionCommand'; -import { FullscreenCommand } from 'app/shared/markdown-editor/commands/fullscreen.command'; -import { HeadingOneCommand } from 'app/shared/markdown-editor/commands/headingOne.command'; -import { Command } from 'app/shared/markdown-editor/commands/command'; -import { ItalicCommand } from 'app/shared/markdown-editor/commands/italic.command'; -import { OrderedListCommand } from 'app/shared/markdown-editor/commands/orderedListCommand'; -import { HeadingTwoCommand } from 'app/shared/markdown-editor/commands/headingTwo.command'; -import { LinkCommand } from 'app/shared/markdown-editor/commands/link.command'; -import { CodeCommand } from 'app/shared/markdown-editor/commands/code.command'; -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; -import { UnorderedListCommand } from 'app/shared/markdown-editor/commands/unorderedListCommand'; -import { HeadingThreeCommand } from 'app/shared/markdown-editor/commands/headingThree.command'; -import { CodeBlockCommand } from 'app/shared/markdown-editor/commands/codeblock.command'; -import { faAngleDown, faAngleRight, faGripLines, faQuestionCircle } from '@fortawesome/free-solid-svg-icons'; -import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand'; -import { v4 as uuid } from 'uuid'; -import { MultipleChoiceVisualQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component'; -import { ExerciseReferenceCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand'; -import { InteractiveSearchCommand } from 'app/shared/markdown-editor/commands/interactiveSearchCommand'; - -export enum MarkdownEditorHeight { - INLINE = 100, - SMALL = 200, - MEDIUM = 500, - LARGE = 1000, - EXTRA_LARGE = 1500, -} - -export enum EditorMode { - NONE = 'none', - LATEX = 'latex', -} - -const getAceMode = (mode: EditorMode) => { - switch (mode) { - case EditorMode.LATEX: - return 'ace/mode/latex'; - case EditorMode.NONE: - return null; - default: - return null; - } -}; - -@Component({ - selector: 'jhi-markdown-editor', - templateUrl: './markdown-editor.component.html', - styleUrls: ['./markdown-editor.component.scss'], - encapsulation: ViewEncapsulation.None, -}) -export class MarkdownEditorComponent implements AfterViewInit { - public MultiOptionCommand = MultiOptionCommand; - public DomainMultiOptionCommand = DomainMultiOptionCommand; - public DomainTagCommand = DomainTagCommand; - public InteractiveSearchCommand = InteractiveSearchCommand; - // This ref is used for entering the fullscreen mode. - @ViewChild('wrapper', { read: ElementRef, static: false }) wrapper: ElementRef; - @ViewChild('aceEditor', { static: false }) - aceEditorContainer: AceEditorComponent; - aceEditorOptions = { - autoUpdateContent: true, - mode: 'markdown', - }; - @ViewChild(ColorSelectorComponent, { static: false }) colorSelector: ColorSelectorComponent; - - /** {string} which is initially displayed in the editor generated and passed on from the parent component*/ - @Input() markdown?: string; - @Input() editorMode = EditorMode.NONE; - @Input() showLineNumbers = false; - @Output() markdownChange = new EventEmitter(); - @Output() html = new EventEmitter(); - - /** default colors for the markdown editor*/ - markdownColors = ['#ca2024', '#3ea119', '#ffffff', '#000000', '#fffa5c', '#0d3cc2', '#b05db8', '#d86b1f']; - selectedColor = '#000000'; - /** {array} containing all colorPickerCommands - * IMPORTANT: If you want to use the colorpicker you have to implement
- * because the class definitions are saved within that method*/ - @Input() colorCommands: Command[] = [new ColorPickerCommand()]; - - /** - * Use this array for commands that are not related to the markdown but to the editor (e.g. fullscreen mode). - * These elements will be displayed on the right side of the command bar. - */ - @Input() metaCommands: Command[] = [new FullscreenCommand()]; - - /** {array} containing all default commands accessible for the editor per default */ - @Input() defaultCommands: Command[] = [ - new BoldCommand(), - new ItalicCommand(), - new UnderlineCommand(), - new ReferenceCommand(), - new CodeCommand(), - new CodeBlockCommand(), - new LinkCommand(), - new AttachmentCommand(), - new OrderedListCommand(), - new UnorderedListCommand(), - ]; - - /** {array} containing all header commands accessible for the markdown editor per default*/ - @Input() headerCommands: Command[] = [new HeadingOneCommand(), new HeadingTwoCommand(), new HeadingThreeCommand()]; - - /** {domainCommands} containing all domain commands which need to be set by the parent component which contains the markdown editor */ - @Input() domainCommands: Array; - - /** {textWithDomainCommandsFound} emits an {array} of text lines with the corresponding domain command to the parent component which contains the markdown editor */ - @Output() textWithDomainCommandsFound = new EventEmitter<[string, DomainCommand | null][]>(); - - @Output() onPreviewSelect = new EventEmitter(); - @Output() onEditSelect = new EventEmitter(); - - /** {showPreviewButton} - * 1. true -> the preview of the editor is used - * 2. false -> the preview of the parent component is used, parent has to set this value to false with an input */ - @Input() showPreviewButton = true; - - /** - * true -> the markdown content will be rendered and shown, used when there are no special additions (e.g. text exercises) - * false -> the parent component adds its own preview content with id=preview. Used e.g. for programming exercises - */ - @Input() showDefaultPreview = true; - - @Input() showEditButton = true; - - @Input() showVisualModeButton = false; - - /** {previewTextAsHtml} text that is emitted to the parent component if the parent does not use any domain commands */ - previewTextAsHtml: SafeHtml | null; - - /** {previewMode} when editor is created the preview is set to false, since the edit mode is set active */ - previewMode = false; - - /** {visualMode} when editor is created the visual mode is set to false, since the edit mode is set active */ - visualMode = false; - @Input() - minHeightEditor = MarkdownEditorHeight.SMALL.valueOf(); - - @ContentChild(MultipleChoiceVisualQuestionComponent, { static: false }) visualChild: MultipleChoiceVisualQuestionComponent; - - /** Resizable constants **/ - @Input() - enableResize = true; - @Input() - resizableMaxHeight = MarkdownEditorHeight.LARGE; - @Input() - resizableMinHeight = MarkdownEditorHeight.SMALL; - interactResizable: Interactable; - - /** {enableFileUpload} - * whether to show the file upload field and enable the drag and drop functionality - * enabled by default - */ - @Input() - enableFileUpload = true; - - // Icons - faQuestionCircle = faQuestionCircle; - faGripLines = faGripLines; - faAngleRight = faAngleRight; - faAngleDown = faAngleDown; - - uniqueMarkdownEditorId: string; - - editorContentString: string; - - constructor( - private artemisMarkdown: ArtemisMarkdownService, - private fileUploaderService: FileUploaderService, - private alertService: AlertService, - ) { - this.uniqueMarkdownEditorId = 'markdown-editor-' + uuid(); - } - - /** opens the button for selecting the color */ - openColorSelector(event: MouseEvent) { - const marginTop = 35; - const height = 110; - this.colorSelector.openColorSelector(event, marginTop, height); - } - - /** selected text is changed into the chosen color */ - onSelectedColor(selectedColor: string) { - this.selectedColor = selectedColor; - this.colorCommands[0].execute(selectedColor); - } - - /** - * @function addCommand - * @param command - * @desc customize the user interface of the markdown editor by adding a command - */ - addCommand(command: Command) { - this.defaultCommands.push(command); - } - - /** - * @function removeCommand - * @param classRef Command - * @desc customize the user interface of the markdown editor by removing a command - */ - removeCommand(classRef: typeof Command) { - setTimeout(() => (this.defaultCommands = this.defaultCommands.filter((element) => !(element instanceof classRef)))); - } - - isTypeOfExerciseReferenceCommand(commandToCheck: MultiOptionCommand) { - return commandToCheck instanceof ExerciseReferenceCommand; - } - - ngAfterViewInit(): void { - // Commands may want to add custom completers - remove standard completers of the ace editor. - this.aceEditorContainer.getEditor().setOptions({ - enableBasicAutocompletion: true, - enableLiveAutocompletion: true, - }); - this.aceEditorContainer.getEditor().completers = []; - - if (this.domainCommands == undefined || this.domainCommands.length === 0) { - [...this.defaultCommands, ...this.colorCommands, ...(this.headerCommands || []), ...this.metaCommands].forEach((command) => { - command.setEditor(this.aceEditorContainer.getEditor()); - command.setMarkdownWrapper(this.wrapper); - }); - } else { - [...this.defaultCommands, ...this.domainCommands, ...this.colorCommands, ...(this.headerCommands || []), ...this.metaCommands].forEach((command) => { - command.setEditor(this.aceEditorContainer.getEditor()); - command.setMarkdownWrapper(this.wrapper); - }); - } - this.setupMarkdownEditor(); - const selectedAceMode = getAceMode(this.editorMode); - if (selectedAceMode) { - this.aceEditorContainer.getEditor().getSession().setMode(selectedAceMode); - } - - if (this.enableResize) { - this.setupResizable(); - } - } - - /** - * @function setupQuestionEditor - * @desc Initializes the ace editor - */ - setupMarkdownEditor(): void { - this.aceEditorContainer.getEditor().renderer.setShowGutter(this.showLineNumbers); - this.aceEditorContainer.getEditor().renderer.setPadding(10); - this.aceEditorContainer.getEditor().renderer.setScrollMargin(8, 8); - this.aceEditorContainer.getEditor().setHighlightActiveLine(false); - this.aceEditorContainer.getEditor().setShowPrintMargin(false); - this.aceEditorContainer.getEditor().clearSelection(); - this.aceEditorContainer.getEditor().setAutoScrollEditorIntoView(true); - this.aceEditorContainer.getEditor().setOptions({ wrap: true }); - } - - /** - * @function setupResizable - * @desc Sets up resizable to enable resizing for the user - */ - setupResizable(): void { - // Use a unique, random ID to select the editor - // This is required to select the correct one in case multiple editors are used at the same time - const selector = '#' + this.uniqueMarkdownEditorId; - - // unregister previously set event listeners for class elements - interact(selector).unset(); - - this.interactResizable = interact(selector) - .resizable({ - // Enable resize from top edge; triggered by class rg-top - edges: { left: false, right: false, bottom: '.rg-bottom', top: false }, - // Set min and max height - modifiers: [ - interact.modifiers!.restrictSize({ - min: { width: 0, height: this.resizableMinHeight }, - max: { width: 2000, height: this.resizableMaxHeight }, - }), - ], - inertia: true, - }) - .on('resizestart', function (event: any) { - event.target.classList.add('card-resizable'); - }) - .on('resizeend', (event: any) => { - event.target.classList.remove('card-resizable'); - }) - .on('resizemove', (event: any) => { - const target = event.target; - // Update element height - target.style.height = event.rect.height + 'px'; - this.aceEditorContainer.getEditor().resize(); - }); - } - - /** - * Parses markdown to generate a preview if the standard preview is used and/or searches for domain command identifiers. - * Will emit events for both the generated preview and domain commands. - * - */ - parse(): void { - if (this.showDefaultPreview) { - this.previewTextAsHtml = this.artemisMarkdown.safeHtmlForMarkdown(this.markdown); - this.html.emit(this.previewTextAsHtml); - } - if (this.domainCommands && this.domainCommands.length && this.markdown) { - /** create array with domain command identifier */ - const domainCommandIdentifiersToParse = this.domainCommands.map((command) => command.getOpeningIdentifier()); - /** create empty array which - * will contain the splitted text with the corresponding domainCommandIdentifier which - * will be emitted to the parent component */ - const commandTextsMappedToCommandIdentifiers: [string, DomainCommand | null][] = []; - /** create a remainingMarkdownText of the markdown text to loop through it and find the domainCommandIdentifier */ - let remainingMarkdownText = this.markdown.slice(0); - - /** create string with the identifiers to use for RegEx by deleting the [] of the domainCommandIdentifiers */ - const commandIdentifiersString = domainCommandIdentifiersToParse - .map((tag) => tag.replace('[', '').replace(']', '')) - .map(escapeStringForUseInRegex) - .join('|'); - - /** create a new regex expression which searches for the domainCommands identifiers - * (?= If a command is found, add the command identifier to the result of the split - * \\[ look for the character '[' to determine the beginning of the command identifier - * (${commandIdentifiersString}) look if after the '[' one of the element of commandIdentifiersString is contained - * \\] look for the character ']' to determine the end of the command identifier - * ) close the bracket - * g: search in the whole string - * i: case insensitive, neglecting capital letters - * m: match the regex over multiple lines*/ - const regex = new RegExp(`(?=\\[(${commandIdentifiersString})\\])`, 'gmi'); - - /** iterating loop as long as the remainingMarkdownText of the markdown text exists and split the remainingMarkdownText when a domainCommand identifier is found */ - while (remainingMarkdownText.length) { - /** As soon as an identifier is with regEx the remainingMarkdownText of the markdown text is split and saved into {array} textWithCommandIdentifier - * split: saves its values into an {array} - * limit 1: indicated that as soon as an identifier is found remainingMarkdownText is split */ - const [textWithCommandIdentifier] = remainingMarkdownText.split(regex, 1); - /** substring: reduces the {string} by the length in the brackets - * Split the remainingMarkdownText by the length of {array} textWithCommandIdentifier to get the remaining array - * and save it into remainingMarkdownText to start the loop again and search for further domainCommandIdentifiers - * when remainingMarkdownText is empty the while loop will terminate*/ - remainingMarkdownText = remainingMarkdownText.substring(textWithCommandIdentifier.length); - /** call the parseLineForDomainCommand for each extracted textWithCommandIdentifier - * trim: reduced the whitespacing linebreaks */ - const commandTextWithCommandIdentifier = this.parseLineForDomainCommand(textWithCommandIdentifier.trim()); - /** push the commandTextWithCommandIdentifier into the commandTextsMappedToCommandIdentifiers*/ - commandTextsMappedToCommandIdentifiers.push(commandTextWithCommandIdentifier); - } - /** emit the {array} commandTextsMappedToCommandIdentifiers to the client*/ - this.textWithDomainCommandsFound.emit(commandTextsMappedToCommandIdentifiers); - } - } - - /** - * @function parseLineForDomainCommand - * @desc Couple each text with the domainCommandIdentifier to emit that to the parent component for the value assignment - * 1. Check which domainCommand identifier is contained within the text - * 2. Remove the domainCommand identifier from the text - * 3. Create an array with first element text and second element the domainCommand identifier - * @param text {string} from the parse function - * @return array of the text with the domainCommand identifier - */ - private parseLineForDomainCommand = (text: string): [string, DomainCommand | null] => { - for (const domainCommand of this.domainCommands) { - const possibleOpeningCommandIdentifier = [ - domainCommand.getOpeningIdentifier(), - domainCommand.getOpeningIdentifier().toLowerCase(), - domainCommand.getOpeningIdentifier().toUpperCase(), - ]; - if (possibleOpeningCommandIdentifier.some((identifier) => text.indexOf(identifier) !== -1)) { - // TODO when closingIdentifiers are used write a method to extract them from the text - const trimmedLineWithoutIdentifier = possibleOpeningCommandIdentifier.reduce((line, identifier) => line.replace(identifier, ''), text).trim(); - return [trimmedLineWithoutIdentifier, domainCommand]; - } - } - return [text.trim(), null]; - }; - - /** - * @function togglePreview - * @desc Toggle the preview in the template and parse the text - */ - changeNavigation(event: any): void { - this.previewMode = event.nextId === 'editor_preview'; - this.visualMode = event.nextId === 'editor_visual'; - - if (this.previewMode) { - this.onPreviewSelect.emit(); - } else { - this.onEditSelect.emit(); - } - - if (event.activeId === 'editor_visual' && this.visualChild) { - this.markdown = this.visualChild.parseQuestion(); - - if (this.previewMode) { - this.parse(); - } - } - - // The text must only be parsed when the active tab before event was edit, otherwise the text can't have changed. - if (event.activeId === 'editor_edit') { - this.parse(); - } - } - - /** - * @function onFileUpload - * @desc handle file upload for input - * @param event - */ - onFileUpload(event: any): void { - if (event.target.files.length >= 1) { - this.embedFiles(Array.from(event.target.files)); - } - } - - /** - * @function onFileDrop - * @desc handle drop of files - * @param {DragEvent} event - */ - onFileDrop(event: DragEvent): void { - event.preventDefault(); - if (event.dataTransfer?.items) { - // Use DataTransferItemList interface to access the file(s) - const files = new Array(); - for (let i = 0; i < event.dataTransfer.items.length; i++) { - // If dropped items aren't files, reject them - if (event.dataTransfer.items[i].kind === 'file') { - const file = event.dataTransfer.items[i].getAsFile(); - if (file) { - files.push(file); - } - } - } - this.embedFiles(files); - } else if (event.dataTransfer?.files) { - // Use DataTransfer interface to access the file(s) - this.embedFiles(Array.from(event.dataTransfer.files)); - } - } - - /** - * @function onFilePaste - * @desc handle paste of files - * @param {ClipboardEvent} event - */ - onFilePaste(event: ClipboardEvent): void { - if (event.clipboardData?.items) { - const images = new Array(); - for (let i = 0; i < event.clipboardData.items.length; i++) { - if (event.clipboardData.items[i].kind === 'file') { - const file = event.clipboardData.items[i].getAsFile(); - if (file) { - images.push(file); - } - } - } - this.embedFiles(images); - } - } - - /** - * @function embedFiles - * @desc generate and embed markdown code for files - * @param {FileList} files - */ - embedFiles(files: File[]): void { - const aceEditor = this.aceEditorContainer.getEditor(); - files.forEach((file: File) => { - this.fileUploaderService.uploadMarkdownFile(file).then( - (res) => { - const extension = file.name.split('.').pop()!.toLocaleLowerCase(); - - let textToAdd = `[${file.name}](${res.path})\n`; - if (extension !== 'pdf') { - // Show file as embedded image - textToAdd = '!' + textToAdd; - } - - aceEditor.insert(textToAdd); - }, - (error: Error) => { - this.alertService.addAlert({ - type: AlertType.DANGER, - message: error.message, - disableTranslation: true, - }); - }, - ); - }); - } - - markdownTextChange(value: any) { - this.markdown = value; - this.markdownChange.emit(value as string); - } -} diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts b/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts index cb04a2cbab90..198dad328789 100644 --- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts +++ b/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts @@ -1,19 +1,16 @@ -import { MarkdownEditorComponent } from './markdown-editor.component'; import { NgModule } from '@angular/core'; -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; import { FormsModule } from '@angular/forms'; import { ArtemisColorSelectorModule } from 'app/shared/color-selector/color-selector.module'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { MatMenuModule } from '@angular/material/menu'; import { MatButtonModule } from '@angular/material/button'; -import { SelectWithSearchComponent } from './select-with-search/select-with-search.component'; import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; import { DragDropModule } from '@angular/cdk/drag-drop'; @NgModule({ - imports: [ArtemisSharedModule, AceEditorModule, MonacoEditorModule, FormsModule, ArtemisColorSelectorModule, MatMenuModule, MatButtonModule, DragDropModule], - declarations: [MarkdownEditorComponent, MarkdownEditorMonacoComponent, SelectWithSearchComponent], - exports: [MarkdownEditorComponent, MarkdownEditorMonacoComponent], + imports: [ArtemisSharedModule, MonacoEditorModule, FormsModule, ArtemisColorSelectorModule, MatMenuModule, MatButtonModule, DragDropModule], + declarations: [MarkdownEditorMonacoComponent], + exports: [MarkdownEditorMonacoComponent], }) export class ArtemisMarkdownEditorModule {} diff --git a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html index 075014915cf8..52d80f585633 100644 --- a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html +++ b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html @@ -2,17 +2,18 @@
- @if (enableResize && !inPreviewMode) { + @if (enableResize && inEditMode) {
(); + @Output() + onBlurEditor = new EventEmitter(); + + @Output() + textWithDomainActionsFound = new EventEmitter(); + + @Output() + onDefaultPreviewHtmlChanged = new EventEmitter(); + + @Output() + onLeaveVisualTab = new EventEmitter(); + + defaultPreviewHtml: SafeHtml | undefined; inPreviewMode = false; + inVisualMode = false; + inEditMode = true; uniqueMarkdownEditorId: string; resizeObserver?: ResizeObserver; targetWrapperHeight?: number; + minWrapperHeight?: number; constrainDragPositionFn?: (pointerPosition: Point) => Point; isResizing = false; displayedActions: MarkdownActionsByGroup = { @@ -186,19 +229,27 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie colorSignal: Signal = computed(() => [...this.colorToClassMap.keys()]); + static readonly TAB_EDIT = 'editor_edit'; + static readonly TAB_PREVIEW = 'editor_preview'; + static readonly TAB_VISUAL = 'editor_visual'; readonly colorPickerMarginTop = 35; readonly colorPickerHeight = 110; // Icons protected readonly faQuestionCircle = faQuestionCircle; protected readonly faGripLines = faGripLines; protected readonly faAngleDown = faAngleDown; - // Types exposed to the template + // Types and values exposed to the template protected readonly LectureUnitType = LectureUnitType; protected readonly ReferenceType = ReferenceType; + // We cannot reference these static fields in the template, so we expose them here. + protected readonly TAB_EDIT = MarkdownEditorMonacoComponent.TAB_EDIT; + protected readonly TAB_PREVIEW = MarkdownEditorMonacoComponent.TAB_PREVIEW; + protected readonly TAB_VISUAL = MarkdownEditorMonacoComponent.TAB_VISUAL; constructor( private alertService: AlertService, private fileUploaderService: FileUploaderService, + private artemisMarkdown: ArtemisMarkdownService, ) { this.uniqueMarkdownEditorId = 'markdown-editor-' + uuid(); } @@ -206,24 +257,33 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie ngAfterContentInit(): void { // Affects the template - done in this method to avoid ExpressionChangedAfterItHasBeenCheckedErrors. this.targetWrapperHeight = this.initialEditorHeight !== EXTERNAL_HEIGHT ? this.initialEditorHeight.valueOf() : undefined; + this.minWrapperHeight = this.resizableMinHeight.valueOf(); this.constrainDragPositionFn = this.constrainDragPosition.bind(this); this.displayedActions = { - standard: this.defaultActions, - header: this.headerActions?.actions ?? [], - color: this.colorAction, + standard: this.filterDisplayedActions(this.defaultActions), + header: this.filterDisplayedActions(this.headerActions?.actions ?? []), + color: this.filterDisplayedAction(this.colorAction), domain: { - withoutOptions: this.domainActions.filter((action) => !(action instanceof MonacoEditorDomainActionWithOptions)), - withOptions: this.domainActions.filter((action) => action instanceof MonacoEditorDomainActionWithOptions), + withoutOptions: this.filterDisplayedActions(this.domainActions.filter((action) => !(action instanceof MonacoEditorDomainActionWithOptions))), + withOptions: this.filterDisplayedActions(this.domainActions.filter((action) => action instanceof MonacoEditorDomainActionWithOptions)), }, - lecture: this.lectureReferenceAction, - meta: this.metaActions, + lecture: this.filterDisplayedAction(this.lectureReferenceAction), + meta: this.filterDisplayedActions(this.metaActions), }; } + filterDisplayedActions(actions: T[]): T[] { + return actions.filter((action) => !action.hideInEditor); + } + + filterDisplayedAction(action?: T): T | undefined { + return action?.hideInEditor ? undefined : action; + } + ngAfterViewInit(): void { this.adjustEditorDimensions(); this.monacoEditor.setWordWrap(true); - this.monacoEditor.changeModel('markdown-content.custom-md', this._markdown, 'custom-md'); + this.monacoEditor.changeModel('markdown-content.custom-md', this._markdown ?? '', 'custom-md'); this.resizeObserver = new ResizeObserver(() => { this.adjustEditorDimensions(); }); @@ -232,6 +292,9 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie if (this.fileUploadFooter?.nativeElement) { this.resizeObserver.observe(this.fileUploadFooter.nativeElement); } + if (this.actionPalette?.nativeElement) { + this.resizeObserver.observe(this.actionPalette.nativeElement); + } [ this.defaultActions, this.headerActions?.actions ?? [], @@ -248,6 +311,10 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie } this.monacoEditor.registerAction(action); }); + + if (this.useDefaultMarkdownEditorOptions) { + this.monacoEditor.applyOptionPreset(DEFAULT_MARKDOWN_EDITOR_OPTIONS); + } } /** @@ -289,9 +356,9 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie * Adjusts the height of the element when the content height changes. * @param newContentHeight The new height of the content in the editor. */ - onContentHeightChanged(newContentHeight: number): void { + onContentHeightChanged(newContentHeight: number | undefined): void { if (this.linkEditorHeightToContentHeight) { - const totalHeight = newContentHeight + this.getElementClientHeight(this.fileUploadFooter) + this.getElementClientHeight(this.actionPalette); + const totalHeight = (newContentHeight ?? 0) + this.getElementClientHeight(this.fileUploadFooter) + this.getElementClientHeight(this.actionPalette); // Clamp the height so it is between the minimum and maximum height. this.targetWrapperHeight = Math.max(this.resizableMinHeight, Math.min(this.resizableMaxHeight, totalHeight)); } @@ -305,7 +372,7 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie const elementHeight = this.getElementClientHeight(this.isInitialHeightExternal() ? this.fullElement : this.wrapper); const fileUploadFooterHeight = this.getElementClientHeight(this.fileUploadFooter); const actionPaletteHeight = this.getElementClientHeight(this.actionPalette); - return elementHeight - fileUploadFooterHeight - actionPaletteHeight; + return elementHeight - fileUploadFooterHeight - actionPaletteHeight - BORDER_HEIGHT_OFFSET; } /** @@ -327,7 +394,9 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie * Adjust the dimensions of the editor to fit the available space. */ adjustEditorDimensions(): void { - this.monacoEditor.layoutWithFixedSize(this.getEditorWidth(), this.getEditorHeight()); + this.onContentHeightChanged(this.monacoEditor.getContentHeight()); + const editorHeight = this.getEditorHeight(); + this.monacoEditor.layoutWithFixedSize(this.getEditorWidth(), editorHeight); } /** @@ -335,13 +404,36 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie * @param event The event that contains the new active tab. */ onNavChanged(event: NgbNavChangeEvent) { - this.inPreviewMode = event.nextId === 'editor_preview'; - if (!this.inPreviewMode) { + this.inPreviewMode = event.nextId === this.TAB_PREVIEW; + this.inVisualMode = event.nextId === this.TAB_VISUAL; + this.inEditMode = event.nextId === this.TAB_EDIT; + if (this.inEditMode) { this.adjustEditorDimensions(); this.monacoEditor.focus(); - } else { + this.onEditSelect.emit(); + } else if (this.inPreviewMode) { this.onPreviewSelect.emit(); } + + // Some components need to know when the user leaves the visual tab, as it might make changes to the underlying data. + if (event.activeId === this.TAB_VISUAL) { + this.onLeaveVisualTab.emit(); + } + + // Parse the markdown when switching away from the edit tab or from visual to preview mode, as the visual mode may make changes to the markdown. + if (event.activeId === this.TAB_EDIT || (event.activeId === this.TAB_VISUAL && this.inPreviewMode)) { + this.parseMarkdown(); + } + } + + parseMarkdown(domainActionsToCheck: MonacoEditorDomainAction[] = this.domainActions): void { + if (this.showDefaultPreview) { + this.defaultPreviewHtml = this.artemisMarkdown.safeHtmlForMarkdown(this._markdown); + this.onDefaultPreviewHtmlChanged.emit(this.defaultPreviewHtml); + } + if (domainActionsToCheck.length && this._markdown) { + this.textWithDomainActionsFound.emit(parseMarkdownForDomainActions(this._markdown, domainActionsToCheck)); + } } /** @@ -434,7 +526,7 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie * Enable the text field mode of the editor. This makes the editor look and behave like a normal text field. */ enableTextFieldMode(): void { - this.monacoEditor.enableTextFieldMode(); + this.monacoEditor.applyOptionPreset(COMMUNICATION_MARKDOWN_EDITOR_OPTIONS); } /** diff --git a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-parsing.helper.ts b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-parsing.helper.ts new file mode 100644 index 000000000000..058cacf8c2ba --- /dev/null +++ b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-parsing.helper.ts @@ -0,0 +1,61 @@ +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; +import { escapeStringForUseInRegex } from 'app/shared/util/global.utils'; +import { TextWithDomainAction } from './markdown-editor-monaco.component'; + +/** + * Searches for the domain actions in the given markdown text and returns the text split into parts, each part associated with the domain action it belongs to. + * Note that the text will be trimmed before being returned. + * @param markdown The markdown text to parse + * @param domainActions The domain actions to search for in the markdown + */ +export function parseMarkdownForDomainActions(markdown: string, domainActions: MonacoEditorDomainAction[]): TextWithDomainAction[] { + let remainingText = markdown; + const actionIdentifiersString = domainActions + .map((action) => action.getOpeningIdentifier()) + .map((identifier) => identifier.replace('[', '').replace(']', '')) + .map(escapeStringForUseInRegex) + .join('|'); + const textMappedToActionIdentifiers: TextWithDomainAction[] = []; + + /* + * The following regex is used to split the text into parts, each part associated with the domain action it belongs to. It is structured as follows: + * 1. (?= If an action is found, add the action identifier to the result of the split + * 2. \\[ look for the character '[' to determine the beginning of the action identifier + * 3. (${actionIdentifiersString}) look if after the '[' one of the element of actionIdentifiersString is contained + * 4. ] look for the character ']' to determine the end of the action identifier + * 5. ) ends the group + * Flags: + * - g: search in the whole string + * - m: match the regex over multiple lines + * - i: case-insensitive matching + */ + const regex = new RegExp(`(?=\\[(${actionIdentifiersString})])`, 'gmi'); + while (remainingText.length) { + const [textWithActionIdentifier] = remainingText.split(regex, 1); + remainingText = remainingText.substring(textWithActionIdentifier.length); + const textWithDomainAction = parseLineForDomainAction(textWithActionIdentifier.trim(), domainActions); + textMappedToActionIdentifiers.push(textWithDomainAction); + } + + return textMappedToActionIdentifiers; +} + +/** + * Checks if the given line contains any of the domain action identifiers and returns the text without the identifier along with the domain action it belongs to. + * @param text The text to parse + * @param domainActions The domain actions to search for in the text + */ +function parseLineForDomainAction(text: string, domainActions: MonacoEditorDomainAction[]): TextWithDomainAction { + for (const domainAction of domainActions) { + const possibleOpeningIdentifiers = [ + domainAction.getOpeningIdentifier(), + domainAction.getOpeningIdentifier().toLowerCase(), + domainAction.getOpeningIdentifier().toUpperCase(), + ]; + if (possibleOpeningIdentifiers.some((identifier) => text.indexOf(identifier) !== -1)) { + const trimmedLineWithoutIdentifier = possibleOpeningIdentifiers.reduce((line, identifier) => line.replace(identifier, ''), text).trim(); + return { text: trimmedLineWithoutIdentifier, action: domainAction }; + } + } + return { text: text.trim() }; +} diff --git a/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts b/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts index 2e0ea029b664..3d1c671dab9a 100644 --- a/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts +++ b/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts @@ -7,7 +7,7 @@ import { ComponentFixture, TestBed, fakeAsync, flush } from '@angular/core/testi import { FormsModule } from '@angular/forms'; import { NgbNavModule, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; -import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; +import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; import { MonacoColorAction } from 'app/shared/monaco-editor/model/actions/monaco-color.action'; import { MockResizeObserver } from '../../helpers/mocks/service/mock-resize-observer'; @@ -15,12 +15,12 @@ import { CdkDragMove, DragDropModule } from '@angular/cdk/drag-drop'; import { ArtemisSharedModule } from 'app/shared/shared.module'; import { MonacoUrlAction } from 'app/shared/monaco-editor/model/actions/monaco-url.action'; import { MonacoAttachmentAction } from 'app/shared/monaco-editor/model/actions/monaco-attachment.action'; -import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component'; import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action'; import { MonacoTestCaseAction } from 'app/shared/monaco-editor/model/actions/monaco-test-case.action'; import { MonacoTaskAction } from 'app/shared/monaco-editor/model/actions/monaco-task.action'; import { MonacoFullscreenAction } from 'app/shared/monaco-editor/model/actions/monaco-fullscreen.action'; import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model'; +import { COMMUNICATION_MARKDOWN_EDITOR_OPTIONS } from 'app/shared/monaco-editor/monaco-editor-option.helper'; describe('MarkdownEditorMonacoComponent', () => { let fixture: ComponentFixture; @@ -86,11 +86,28 @@ describe('MarkdownEditorMonacoComponent', () => { fixture.detectChanges(); const adjustEditorDimensionsSpy = jest.spyOn(comp, 'adjustEditorDimensions'); const focusSpy = jest.spyOn(comp.monacoEditor, 'focus'); - comp.onNavChanged({ nextId: 'editor', activeId: 'editor_preview', preventDefault: jest.fn() }); + comp.onNavChanged({ nextId: MarkdownEditorMonacoComponent.TAB_EDIT, activeId: MarkdownEditorMonacoComponent.TAB_PREVIEW, preventDefault: jest.fn() }); expect(adjustEditorDimensionsSpy).toHaveBeenCalledOnce(); expect(focusSpy).toHaveBeenCalledOnce(); }); + it('should emit when leaving the visual tab', () => { + const emitSpy = jest.spyOn(comp.onLeaveVisualTab, 'emit'); + fixture.detectChanges(); + comp.onNavChanged({ nextId: MarkdownEditorMonacoComponent.TAB_EDIT, activeId: MarkdownEditorMonacoComponent.TAB_VISUAL, preventDefault: jest.fn() }); + expect(emitSpy).toHaveBeenCalledOnce(); + }); + + it.each([ + { tab: MarkdownEditorMonacoComponent.TAB_EDIT, flags: [true, false, false] }, + { tab: MarkdownEditorMonacoComponent.TAB_PREVIEW, flags: [false, true, false] }, + { tab: MarkdownEditorMonacoComponent.TAB_VISUAL, flags: [false, false, true] }, + ])(`should set the correct flags when navigating to $tab`, ({ tab, flags }) => { + fixture.detectChanges(); + comp.onNavChanged({ nextId: tab, activeId: MarkdownEditorMonacoComponent.TAB_EDIT, preventDefault: jest.fn() }); + expect([comp.inEditMode, comp.inPreviewMode, comp.inVisualMode]).toEqual(flags); + }); + it('should embed manually uploaded files', () => { const embedFilesStub = jest.spyOn(comp, 'embedFiles').mockImplementation(); fixture.detectChanges(); @@ -213,11 +230,9 @@ describe('MarkdownEditorMonacoComponent', () => { it('should react to content height changes if the height is linked to the editor', () => { comp.linkEditorHeightToContentHeight = true; - comp.initialEditorHeight = MarkdownEditorHeight.MEDIUM; - comp.resizableMinHeight = MarkdownEditorHeight.SMALL; comp.resizableMaxHeight = MarkdownEditorHeight.LARGE; fixture.detectChanges(); - expect(comp.targetWrapperHeight).toBe(MarkdownEditorHeight.MEDIUM); + expect(comp.targetWrapperHeight).toBe(MarkdownEditorHeight.SMALL); comp.onContentHeightChanged(1500); expect(comp.targetWrapperHeight).toBe(MarkdownEditorHeight.LARGE); comp.onContentHeightChanged(20); @@ -235,11 +250,11 @@ describe('MarkdownEditorMonacoComponent', () => { expect(comp.targetWrapperHeight).toBe(300 - wrapperTop - dragElemHeight / 2); }); - it('should forward enableTextFieldMode call', () => { + it('should use the correct options to enable text field mode', () => { fixture.detectChanges(); - const setTextFieldModeSpy = jest.spyOn(comp.monacoEditor, 'enableTextFieldMode'); + const applySpy = jest.spyOn(comp.monacoEditor, 'applyOptionPreset'); comp.enableTextFieldMode(); - expect(setTextFieldModeSpy).toHaveBeenCalledOnce(); + expect(applySpy).toHaveBeenCalledExactlyOnceWith(COMMUNICATION_MARKDOWN_EDITOR_OPTIONS); }); it('should apply option presets to the editor', () => { diff --git a/src/test/javascript/spec/component/markdown-editor/markdown-editor-parsing.helper.spec.ts b/src/test/javascript/spec/component/markdown-editor/markdown-editor-parsing.helper.spec.ts new file mode 100644 index 000000000000..99b9ec09559f --- /dev/null +++ b/src/test/javascript/spec/component/markdown-editor/markdown-editor-parsing.helper.spec.ts @@ -0,0 +1,51 @@ +import { parseMarkdownForDomainActions } from 'app/shared/markdown-editor/monaco/markdown-editor-parsing.helper'; +import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action'; +import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action'; + +describe('MarkdownEditorParsingHelper', () => { + it('should parse markdown without domain action identifiers', () => { + const markdown = 'This is some text that uses no domain action identifiers.'; + const result = parseMarkdownForDomainActions(markdown, []); + expect(result).toEqual([{ text: markdown, action: undefined }]); + }); + + it('should parse single-line text with one domain action identifier', () => { + const action = new MonacoGradingDescriptionAction(); + const markdown = 'This is some text. [description] This is a description.'; + const result = parseMarkdownForDomainActions(markdown, [action]); + expect(result).toEqual([ + { text: 'This is some text.', action: undefined }, + { text: 'This is a description.', action }, + ]); + }); + + it('should parse single-line text with multiple domain action identifiers', () => { + const descriptionAction = new MonacoGradingDescriptionAction(); + const feedbackAction = new MonacoGradingFeedbackAction(); + const markdown = 'This is some text. [description] This is a description. [feedback] This is some feedback.'; + const result = parseMarkdownForDomainActions(markdown, [descriptionAction, feedbackAction]); + expect(result).toEqual([ + { text: 'This is some text.', action: undefined }, + { text: 'This is a description.', action: descriptionAction }, + { text: 'This is some feedback.', action: feedbackAction }, + ]); + }); + + it('should parse multi-line text without domain action identifiers', () => { + const markdown = 'This is some text that uses no domain action identifiers.\nThis is a second line.'; + const result = parseMarkdownForDomainActions(markdown, []); + expect(result).toEqual([{ text: markdown, action: undefined }]); + }); + + it('should parse multi-line text with multiple domain action identifiers', () => { + const descriptionAction = new MonacoGradingDescriptionAction(); + const feedbackAction = new MonacoGradingFeedbackAction(); + const markdown = 'This is some text. [description] This is a description.\n [feedback] This is some feedback.'; + const result = parseMarkdownForDomainActions(markdown, [descriptionAction, feedbackAction]); + expect(result).toEqual([ + { text: 'This is some text.', action: undefined }, + { text: 'This is a description.', action: descriptionAction }, + { text: 'This is some feedback.', action: feedbackAction }, + ]); + }); +}); diff --git a/src/test/javascript/spec/component/markdown-editor/markdown-editor.component.spec.ts b/src/test/javascript/spec/component/markdown-editor/markdown-editor.component.spec.ts deleted file mode 100644 index b89259161e85..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/markdown-editor.component.spec.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormsModule } from '@angular/forms'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; -import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe'; -import { AceEditorComponent } from 'app/shared/markdown-editor/ace-editor/ace-editor.component'; -import { ColorSelectorComponent } from 'app/shared/color-selector/color-selector.component'; -import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; -import { FileUploaderService } from 'app/shared/http/file-uploader.service'; -import { AlertService } from 'app/core/util/alert.service'; -import { NgbNav } from '@ng-bootstrap/ng-bootstrap'; -import { ArtemisTestModule } from '../../test.module'; -import { NegatedTypeCheckPipe } from 'app/shared/pipes/negated-type-check.pipe'; -import { TypeCheckPipe } from 'app/shared/pipes/type-check.pipe'; - -describe('MarkdownEditorComponent', () => { - let fixture: ComponentFixture; - let component: MarkdownEditorComponent; - - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [MockProvider(FileUploaderService), MockProvider(AlertService)], - imports: [FormsModule, NgbNav, ArtemisTestModule, MockDirective(NgbTooltip)], - declarations: [ - MarkdownEditorComponent, - MockComponent(AceEditorComponent), - MockComponent(ColorSelectorComponent), - MockDirective(NgbTooltip), - MockPipe(ArtemisTranslatePipe), - MockPipe(NegatedTypeCheckPipe), - MockPipe(TypeCheckPipe), - ], - }).compileComponents(); - fixture = TestBed.createComponent(MarkdownEditorComponent); - component = fixture.componentInstance; - }); - - afterEach(() => { - jest.restoreAllMocks(); - }); - - it('should embed files when at least one file is uploaded', () => { - // Arrange - const files = [new File([], 'file1.png')]; - const event = { - target: { - files: files, - }, - }; - - const embedFilesSpy = jest.spyOn(component, 'embedFiles').mockImplementation(); - - // Act - component.onFileUpload(event as any); - - // Assert - expect(embedFilesSpy).toHaveBeenCalledWith(files); - }); - - it('should not embed files when no file is uploaded', () => { - // Arrange - const event = { - target: { - files: [], - }, - }; - - const embedFilesSpy = jest.spyOn(component, 'embedFiles'); - - // Act - component.onFileUpload(event as any); - - // Assert - expect(embedFilesSpy).not.toHaveBeenCalled(); - }); -}); From 75db9a22b51e6f8204456d105ff13dc51280f9f3 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:49:32 +0200 Subject: [PATCH 39/95] merge5 --- .../templates/rust/solution/src/merge_sort.rs | 59 +++++ .../rust/test/tests/structural_helpers/mod.rs | 207 +++++++++++++++ .../modeling-assessment-editor.component.ts | 3 +- .../modeling-exercise-update.component.html | 58 ++--- .../modeling-exercise-update.component.ts | 11 +- .../message-inline-input.component.html | 6 +- .../message-reply-inline-input.component.html | 6 +- .../metisReference-commands.spec.ts | 240 ------------------ ...modeling-exercise-update.component.spec.ts | 9 +- .../modeling-submission.component.spec.ts | 3 - .../service/modeling-exercise.service.spec.ts | 4 +- 11 files changed, 312 insertions(+), 294 deletions(-) create mode 100644 src/main/resources/templates/rust/solution/src/merge_sort.rs create mode 100644 src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs delete mode 100644 src/test/javascript/spec/component/markdown-editor/metisReference-commands.spec.ts diff --git a/src/main/resources/templates/rust/solution/src/merge_sort.rs b/src/main/resources/templates/rust/solution/src/merge_sort.rs new file mode 100644 index 000000000000..a1887c6d38f8 --- /dev/null +++ b/src/main/resources/templates/rust/solution/src/merge_sort.rs @@ -0,0 +1,59 @@ +use std::cmp::Ord; + +use crate::sort_strategy::SortStrategy; + +pub struct MergeSort; + +impl SortStrategy for MergeSort { + /// Sorts items with the Merge Sort algorithm. + /// + /// Arguments: + /// + /// * `input`: slice of items to be sorted + fn perform_sort(&self, input: &mut [T]) { + mergesort(input); + } +} + +fn mergesort(input: &mut [T]) { + if input.len() < 2 { + return; + } + + let middle = input.len() / 2; + let (left, right) = input.split_at_mut(middle); + mergesort(left); + mergesort(right); + merge(input, middle); +} + +fn merge(input: &mut [T], middle: usize) { + let mut result = Vec::with_capacity(input.len()); + + let mut left_index = 0; + let mut right_index = middle; + + while left_index < middle && right_index < input.len() { + if input[left_index] <= input[right_index] { + result.push(input[left_index]); + left_index += 1; + } else { + result.push(input[right_index]); + right_index += 1; + } + } + + if left_index < middle { + while left_index < middle { + result.push(input[left_index]); + left_index += 1; + } + } else { + while right_index < input.len() { + result.push(input[right_index]); + right_index += 1; + } + } + + input.copy_from_slice(&result); +} diff --git a/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs b/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs new file mode 100644 index 000000000000..493d043f6d5c --- /dev/null +++ b/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs @@ -0,0 +1,207 @@ +//! Run-time source code reflection +//! +//! Use this for flexible parsing and computed names. +#![allow(dead_code)] + +use std::io::Read; + +use syn::{ + Fields, ImplItem, ImplItemFn, + Item::{self, Impl, Struct, Trait}, + ItemImpl, ItemStruct, ItemTrait, TraitItem, TraitItemFn, TypeParamBound, +}; + +pub fn check_struct_names<'a, I: IntoIterator>( + items: &[Item], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_struct(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_struct<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemStruct> { + find_by_name( + items, + name, + |i| match i { + Struct(s) => Some(s), + _ => None, + }, + |s| &s.ident, + ) +} + +pub fn check_struct_field_names<'a, I: IntoIterator>( + fields: &Fields, + names: I, +) -> Result<(), &'a str> { + let p = match fields { + Fields::Named(f) => &f.named, + _ => panic!("The struct should have named fields"), + }; + + let field_names: Vec<_> = p.iter().map(|f| f.ident.as_ref().unwrap()).collect(); + + for name in names { + field_names + .iter() + .copied() + .find(|&n| n == name) + .ok_or(name)?; + } + Ok(()) +} + +pub fn find_impl<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemImpl> { + items.iter().find_map(|i| { + let im = match i { + Impl(im) => im, + _ => return None, + }; + let self_name = match im.self_ty.as_ref() { + syn::Type::Path(p) => &p.path.segments.last().unwrap().ident, + _ => return None, + }; + if im.trait_.is_some() { + return None; + } + + if self_name != name { + return None; + } + + Some(im) + }) +} + +pub fn find_impl_for<'a>(items: &'a [Item], name: &str, for_trait: &str) -> Option<&'a ItemImpl> { + items.iter().find_map(|i| { + let im = match i { + Impl(im) => im, + _ => return None, + }; + let self_name = match im.self_ty.as_ref() { + syn::Type::Path(p) => &p.path.segments.last().unwrap().ident, + _ => return None, + }; + let trait_name = match im.trait_.as_ref() { + Some((_, path, _)) => &path.segments.last().unwrap().ident, + _ => return None, + }; + + if self_name != name || trait_name != for_trait { + return None; + } + + Some(im) + }) +} + +pub fn check_impl_function_names<'a, I: IntoIterator>( + items: &[ImplItem], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_impl_function(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_impl_function<'a>(items: &'a [ImplItem], name: &str) -> Option<&'a ImplItemFn> { + find_by_name( + items, + name, + |i| match i { + ImplItem::Fn(f) => Some(f), + _ => None, + }, + |f| &f.sig.ident, + ) +} + +pub fn check_trait_names<'a, I: IntoIterator>( + items: &[Item], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_trait(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_trait<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemTrait> { + find_by_name( + items, + name, + |i| match i { + Trait(t) => Some(t), + _ => None, + }, + |t| &t.ident, + ) +} + +pub fn check_trait_function_names<'a, I: IntoIterator>( + items: &[TraitItem], + names: I, +) -> Result<(), &'a str> { + for name in names { + find_trait_function(items, name).ok_or(name)?; + } + Ok(()) +} + +pub fn find_trait_function<'a>(items: &'a [TraitItem], name: &str) -> Option<&'a TraitItemFn> { + find_by_name( + items, + name, + |i| match i { + TraitItem::Fn(f) => Some(f), + _ => None, + }, + |f| &f.sig.ident, + ) +} + +pub fn check_trait_supertrait(trait_: &ItemTrait, supertrait_name: &str) -> Result<(), ()> { + find_by_name( + &trait_.supertraits, + supertrait_name, + |s| match s { + TypeParamBound::Trait(t) => Some(t), + _ => None, + }, + |t| &t.path.segments.last().unwrap().ident, + ) + .ok_or(())?; + Ok(()) +} + +fn find_by_name< + 'a, + Item, + I: IntoIterator, + M: FnMut(Item) -> Option, + R, + N: FnMut(&R) -> C, + C: PartialEq<&'a str>, +>( + items: I, + name: &'a str, + item_matcher: M, + mut name_getter: N, +) -> Option { + items + .into_iter() + .filter_map(item_matcher) + .find(|i| name_getter(i) == name) +} + +pub fn parse_file>(path: P) -> syn::File { + let mut file = std::fs::File::open(path).unwrap(); + let mut content = String::new(); + file.read_to_string(&mut content).unwrap(); + syn::parse_file(&content).unwrap() +} diff --git a/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts b/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts index 53bac3581010..e6610b4edaf0 100644 --- a/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts +++ b/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts @@ -354,8 +354,7 @@ export class ModelingAssessmentEditorComponent implements OnInit { /** * Remove a feedback suggestion because it was accepted or discarded. - * The actual feedback creation when accepting happens in code-editor-ace-component/unreferenced-feedback because they have full control over the suggestion cards. - * @param feedback Feedback suggestion that is removed + * @param feedback Feedback suggestion to remove */ removeSuggestion(feedback: Feedback) { this.feedbackSuggestions = this.feedbackSuggestions.filter((feedbackSuggestion) => feedbackSuggestion !== feedback); diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html index 05e678ad84d4..5df3a96c4deb 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html @@ -33,12 +33,11 @@

-
@if (!isExamMode) { @@ -66,12 +65,11 @@

-

} @@ -87,9 +85,7 @@

@if (modelingExercise.exampleSolutionPublicationDateError) { - - {{ 'artemisApp.exercise.exampleSolutionPublicationDateError' | artemisTranslate }} - + }

} @@ -123,7 +119,7 @@

@if (modelingExercise.startDateError) { - {{ 'artemisApp.exercise.startDateError' | artemisTranslate }} + }

@@ -144,7 +140,7 @@

@if (modelingExercise.dueDateError) { - {{ 'artemisApp.exercise.dueDateError' | artemisTranslate }} + }

@@ -161,15 +157,13 @@

@if (modelingExercise.assessmentDueDateError) { - {{ 'artemisApp.exercise.assessmentDueDateError' | artemisTranslate }} + }

}
- +
@if (points?.invalid && (points?.dirty || points?.touched) && points?.errors) { -
- {{ 'artemisApp.exercise.pointsError' | artemisTranslate }} -
+
}
@@ -216,9 +208,11 @@

@if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) { -
- {{ 'artemisApp.exercise.bonusPointsError' | artemisTranslate }} -
+
}

@@ -233,17 +227,17 @@

- - - - - - - - - - - + + + + + + + + + + +

@if (semiAutomaticAssessmentAvailable) { diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts index 7e66dac4b5d8..4a4488812450 100644 --- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts +++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts @@ -1,4 +1,4 @@ -import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { HttpErrorResponse } from '@angular/common/http'; import { ModelingExercise } from 'app/entities/modeling-exercise.model'; @@ -6,8 +6,6 @@ import { ModelingExerciseService } from './modeling-exercise.service'; import { CourseManagementService } from 'app/course/manage/course-management.service'; import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { ExerciseMode, IncludedInOverallScore, resetForImport } from 'app/entities/exercise.model'; -import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component'; -import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { switchMap, tap } from 'rxjs/operators'; import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; @@ -32,10 +30,12 @@ import { NgModel } from '@angular/forms'; import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; +import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action'; @Component({ selector: 'jhi-modeling-exercise-update', templateUrl: './modeling-exercise-update.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, }) export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy, OnInit { @ViewChild(ExerciseTitleChannelNameComponent) exerciseTitleChannelNameComponent: ExerciseTitleChannelNameComponent; @@ -54,7 +54,6 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy readonly IncludedInOverallScore = IncludedInOverallScore; readonly documentationType: DocumentationType = 'Model'; - EditorMode = EditorMode; AssessmentType = AssessmentType; UMLDiagramType = UMLDiagramType; @@ -65,8 +64,8 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy exerciseCategories: ExerciseCategory[]; existingCategories: ExerciseCategory[]; notificationText?: string; - domainCommandsProblemStatement = [new KatexCommand()]; - domainCommandsSampleSolution = [new KatexCommand()]; + domainActionsProblemStatement = [new MonacoFormulaAction()]; + domainActionsExampleSolution = [new MonacoFormulaAction()]; examCourseId?: number; isImport: boolean; isExamMode: boolean; diff --git a/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html b/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html index 9233592719d3..2e2e9d8fa18f 100644 --- a/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html +++ b/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html @@ -11,10 +11,10 @@ @if (!warningDismissed) { } @if (editType === EditType.UPDATE) { diff --git a/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html b/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html index 79fa12a7be05..6ae8fa99fa7b 100644 --- a/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html +++ b/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html @@ -12,10 +12,10 @@ @if (!warningDismissed) { } @if (editType === EditType.UPDATE) { diff --git a/src/test/javascript/spec/component/markdown-editor/metisReference-commands.spec.ts b/src/test/javascript/spec/component/markdown-editor/metisReference-commands.spec.ts deleted file mode 100644 index 73f8446acc67..000000000000 --- a/src/test/javascript/spec/component/markdown-editor/metisReference-commands.spec.ts +++ /dev/null @@ -1,240 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; -import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module'; -import { ArtemisTestModule } from '../../test.module'; -import { MetisService } from 'app/shared/metis/metis.service'; -import { MockMetisService } from '../../helpers/mocks/service/mock-metis-service.service'; -import { ExerciseReferenceCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand'; -import { metisExercise, metisLecture, metisLecture2, metisLecture3 } from '../../helpers/sample/metis-sample-data'; -import { LectureAttachmentReferenceCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand'; -import { ReferenceType } from 'app/shared/metis/metis.util'; -import { LectureService } from 'app/lecture/lecture.service'; -import { MockProvider } from 'ng-mocks'; -import { HttpResponse } from '@angular/common/http'; -import { of } from 'rxjs'; -import { Slide } from 'app/entities/lecture-unit/slide.model'; -import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model'; - -describe('Exercise Lecture Attachment Reference Commands', () => { - let comp: MarkdownEditorComponent; - let fixture: ComponentFixture; - let exerciseReferenceCommand: ExerciseReferenceCommand; - let lectureReferenceCommand: LectureAttachmentReferenceCommand; - - let metisService: MetisService; - let lectureService: LectureService; - let findLectureWithDetailsSpy: jest.SpyInstance; - let findAllLecturesWithDetailsSpy: jest.SpyInstance; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule], - providers: [{ provide: MetisService, useClass: MockMetisService }, MockProvider(LectureService)], - }) - .compileComponents() - .then(() => { - fixture = TestBed.createComponent(MarkdownEditorComponent); - comp = fixture.componentInstance; - metisService = TestBed.inject(MetisService); - lectureService = TestBed.inject(LectureService); - findLectureWithDetailsSpy = jest.spyOn(lectureService, 'findWithDetailsWithSlides'); - findAllLecturesWithDetailsSpy = jest.spyOn(lectureService, 'findAllByCourseIdWithSlides'); - }); - }); - - afterEach(() => { - jest.restoreAllMocks(); - }); - - it('should initialize exercise reference command correctly', () => { - exerciseReferenceCommand = new ExerciseReferenceCommand(metisService); - expect(exerciseReferenceCommand.getValues()).toEqual( - metisService.getCourse().exercises!.map((exercise) => ({ id: exercise.id!.toString(), value: exercise.title!, type: exercise.type })), - ); - }); - - it('should initialize lecture attachment reference command correctly', () => { - const attachmentUnit = new AttachmentUnit(); - attachmentUnit.id = 3; - const slide = new Slide(); - slide.id = 3; - slide.slideNumber = 3; - slide.slideImagePath = 'directory/attachments/slides/Metis-Slide-3.png'; - attachmentUnit.slides?.push(slide); - metisLecture3.lectureUnits?.push(attachmentUnit); - const returnValue = of(new HttpResponse({ body: [metisLecture, metisLecture2, metisLecture3], status: 200 })); - - findAllLecturesWithDetailsSpy.mockReturnValue(returnValue); - lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService); - expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce(); - - expect(lectureReferenceCommand.getValues()).toEqual([ - { - id: metisLecture.id!.toString(), - value: metisLecture.title!, - type: ReferenceType.LECTURE, - elements: metisLecture.attachments?.map((attachment: any) => ({ - id: attachment.id!.toString(), - value: attachment.name!, - courseArtifactType: ReferenceType.ATTACHMENT, - })), - }, - { - id: metisLecture2.id!.toString(), - value: metisLecture2.title!, - type: ReferenceType.LECTURE, - elements: metisLecture2.attachments?.map((attachment: any) => ({ - id: attachment.id!.toString(), - value: attachment.name!, - courseArtifactType: ReferenceType.ATTACHMENT, - })), - attachmentUnits: metisLecture2.lectureUnits?.map((unit: any) => { - return { - id: unit.id!.toString(), - value: unit.name!, - slides: unit.slides - ?.map((slide: Slide) => { - return { - id: slide.id!.toString(), - slideNumber: slide.slideNumber!, - slideImagePath: slide.slideImagePath!, - courseArtifactType: ReferenceType.SLIDE, - }; - }) - .sort((a: Slide, b: Slide) => a.slideNumber! - b.slideNumber!), - courseArtifactType: ReferenceType.ATTACHMENT_UNITS, - }; - }), - }, - { - id: metisLecture3.id!.toString(), - value: metisLecture3.title!, - type: ReferenceType.LECTURE, - elements: metisLecture3.attachments?.map((attachment: any) => ({ - id: attachment.id!.toString(), - value: attachment.name!, - courseArtifactType: ReferenceType.ATTACHMENT, - })), - attachmentUnits: metisLecture3.lectureUnits?.map((unit: any) => { - return { - id: unit.id!.toString(), - value: unit.name!, - slides: unit.slides - ?.map((slide: Slide) => { - return { - id: slide.id!.toString(), - slideNumber: slide.slideNumber!, - slideImagePath: slide.slideImagePath!, - courseArtifactType: ReferenceType.SLIDE, - }; - }) - .sort((a: Slide, b: Slide) => a.slideNumber! - b.slideNumber!), - courseArtifactType: ReferenceType.ATTACHMENT_UNITS, - }; - }), - }, - ]); - }); - - it('should insert correct reference link for exercise to markdown editor on execute', () => { - exerciseReferenceCommand = new ExerciseReferenceCommand(metisService); - - comp.defaultCommands = [exerciseReferenceCommand]; - fixture.detectChanges(); - - comp.aceEditorContainer.getEditor().setValue(''); - - const referenceRouterLinkToExercise = `[${metisExercise.type}]${metisExercise.title}(${metisService.getLinkForExercise(metisExercise.id!.toString())})[/${ - metisExercise.type - }]`; - exerciseReferenceCommand.execute(metisExercise.id!.toString()); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToExercise); - }); - - it('should insert correct reference link for lecture to markdown editor on execute', () => { - const returnValue = of(new HttpResponse({ body: [metisLecture], status: 200 })); - findAllLecturesWithDetailsSpy.mockReturnValue(returnValue); - lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService); - expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce(); - - const returnValueDetail = of(new HttpResponse({ body: metisLecture, status: 200 })); - findLectureWithDetailsSpy.mockReturnValue(returnValueDetail); - - comp.defaultCommands = [lectureReferenceCommand]; - fixture.detectChanges(); - - comp.aceEditorContainer.getEditor().setValue(''); - - const referenceRouterLinkToLecture = `[lecture]${metisLecture.title}(${metisService.getLinkForLecture(metisLecture.id!.toString())})[/lecture]`; - lectureReferenceCommand.execute(metisLecture.id!.toString(), ReferenceType.LECTURE); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToLecture); - }); - - it('should insert correct reference link for attachment to markdown editor on execute', () => { - const returnValue = of(new HttpResponse({ body: [], status: 200 })); - findAllLecturesWithDetailsSpy.mockReturnValue(returnValue); - lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService); - expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce(); - - const returnValueDetail = of(new HttpResponse({ body: {}, status: 200 })); - findLectureWithDetailsSpy.mockReturnValue(returnValueDetail); - - comp.defaultCommands = [lectureReferenceCommand]; - fixture.detectChanges(); - - comp.aceEditorContainer.getEditor().setValue(''); - - const shortLink = metisLecture.attachments?.first() ? metisLecture.attachments?.first()?.link!.split('attachments/')[1] : ''; - const referenceRouterLinkToLecture = `[attachment]${metisLecture.attachments?.first()?.name}(${shortLink})[/attachment]`; - lectureReferenceCommand.execute(metisLecture.id!.toString(), ReferenceType.ATTACHMENT, metisLecture.attachments?.first()?.id!.toString()); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToLecture); - }); - - it('should insert correct reference link for attachment unit to markdown editor on execute', () => { - const returnValue = of(new HttpResponse({ body: [metisLecture3], status: 200 })); - findAllLecturesWithDetailsSpy.mockReturnValue(returnValue); - lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService); - expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce(); - - const returnValueDetail = of(new HttpResponse({ body: metisLecture3, status: 200 })); - findLectureWithDetailsSpy.mockReturnValue(returnValueDetail); - - comp.defaultCommands = [lectureReferenceCommand]; - fixture.detectChanges(); - - comp.aceEditorContainer.getEditor().setValue(''); - - const selectedUnit: AttachmentUnit = metisLecture3.lectureUnits?.first() as AttachmentUnit; - const shortLink = selectedUnit?.attachment ? selectedUnit?.attachment?.link!.split('attachments/')[1] : ''; - const referenceRouterLinkToLectureUnit = `[lecture-unit]${metisLecture3.lectureUnits?.first()?.name}(${shortLink})[/lecture-unit]`; - lectureReferenceCommand.execute(metisLecture3.id!.toString(), ReferenceType.ATTACHMENT_UNITS, undefined, selectedUnit?.id!.toString()); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToLectureUnit); - }); - - it('should insert correct reference link for attachment unit SLIDE to markdown editor on execute', () => { - const returnValue = of(new HttpResponse({ body: [metisLecture3], status: 200 })); - findAllLecturesWithDetailsSpy.mockReturnValue(returnValue); - lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService); - expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce(); - - const returnValueDetail = of(new HttpResponse({ body: metisLecture3, status: 200 })); - findLectureWithDetailsSpy.mockReturnValue(returnValueDetail); - lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService); - - comp.defaultCommands = [lectureReferenceCommand]; - fixture.detectChanges(); - - comp.aceEditorContainer.getEditor().setValue(''); - - const selectedUnit: AttachmentUnit = metisLecture3.lectureUnits?.first() as AttachmentUnit; - const selectedSlide: Slide = selectedUnit.slides?.first() as Slide; - const shortLink = selectedSlide.slideImagePath!.split('attachments/')[1]; - // Use a regular expression and the replace() method to remove the file name and last slash - const shortLinkWithoutFileName: string = shortLink.replace(new RegExp(`[^/]*${'.png'}`), '').replace(/\/$/, ''); - const referenceRouterLinkToSlide = `[slide]${metisLecture3.lectureUnits?.first()?.name} Slide ${selectedSlide.slideNumber}(${shortLinkWithoutFileName})[/slide]`; - lectureReferenceCommand.execute(metisLecture3.id!.toString(), ReferenceType.ATTACHMENT_UNITS, undefined, selectedUnit?.id!.toString(), selectedSlide?.id!.toString()); - expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToSlide); - }); -}); diff --git a/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts b/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts index b05efdeb91e5..f9963b3f1725 100644 --- a/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts @@ -27,6 +27,7 @@ import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiari import { NgModel } from '@angular/forms'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; import { UMLDiagramType } from '@ls1intum/apollon'; +import { ExerciseCategory } from 'app/entities/exercise-category.model'; describe('ModelingExerciseUpdateComponent', () => { let comp: ModelingExerciseUpdateComponent; @@ -34,7 +35,8 @@ describe('ModelingExerciseUpdateComponent', () => { let service: ModelingExerciseService; let courseService: CourseManagementService; let exerciseService: ExerciseService; - const categories = [{ category: 'testCat' }, { category: 'testCat2' }]; + const categories = [new ExerciseCategory('testCat', undefined), new ExerciseCategory('testCat2', undefined)]; + const categoriesStringified = categories.map((cat) => JSON.stringify(cat)); beforeEach(() => { @@ -262,7 +264,8 @@ describe('ModelingExerciseUpdateComponent', () => { const modelingExercise = new ModelingExercise(UMLDiagramType.ClassDiagram, undefined, undefined); modelingExercise.categories = categories; comp.modelingExercise = modelingExercise; - const newCategories = [{ category: 'newCat1' }, { category: 'newCat2' }]; + const newCategories = [new ExerciseCategory('newCat1', undefined), new ExerciseCategory('newCat2', undefined)]; + comp.updateCategories(newCategories); expect(comp.modelingExercise.categories).toEqual(newCategories); }); @@ -285,7 +288,7 @@ describe('ModelingExerciseUpdateComponent', () => { it('should updateCategories properly by making category available for selection again when removing it', () => { comp.modelingExercise = new ModelingExercise(UMLDiagramType.ClassDiagram, undefined, undefined); comp.exerciseCategories = []; - const newCategories = [{ category: 'Easy' }, { category: 'Hard' }]; + const newCategories = [new ExerciseCategory('Easy', undefined), new ExerciseCategory('Hard', undefined)]; comp.updateCategories(newCategories); diff --git a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts index 7ab3c3b3d2fa..439db7c5dcb9 100644 --- a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts @@ -1,4 +1,3 @@ -import * as ace from 'brace'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BehaviorSubject, of, throwError } from 'rxjs'; import { ArtemisTestModule } from '../../test.module'; @@ -45,8 +44,6 @@ import { GradingInstruction } from 'app/exercises/shared/structured-grading-crit import { AlertService } from 'app/core/util/alert.service'; describe('ModelingSubmissionComponent', () => { - // needed to make sure ace is defined - ace.acequire('ace/ext/modelist.js'); let comp: ModelingSubmissionComponent; let fixture: ComponentFixture; let debugElement: DebugElement; diff --git a/src/test/javascript/spec/service/modeling-exercise.service.spec.ts b/src/test/javascript/spec/service/modeling-exercise.service.spec.ts index e3227f1b718f..5fdfe0efe181 100644 --- a/src/test/javascript/spec/service/modeling-exercise.service.spec.ts +++ b/src/test/javascript/spec/service/modeling-exercise.service.spec.ts @@ -22,8 +22,8 @@ describe('ModelingExercise Service', () => { let httpMock: HttpTestingController; let elemDefault: ModelingExercise; let plagiarismResult: ModelingPlagiarismResult; - const category = { color: 'red', category: 'testCategory' } as ExerciseCategory; - const categories = [JSON.stringify(category) as ExerciseCategory]; + const category = new ExerciseCategory('testCategory', 'red'); + const categories = [JSON.stringify(category) as unknown as ExerciseCategory] as ExerciseCategory[]; beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule], From 48faf227149029aefec068e90bc15406d3b3f1b4 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:50:53 +0200 Subject: [PATCH 40/95] merge5 --- .../actions/monaco-editor-action.model.ts | 28 ++++++- ...editor-domain-action-with-options.model.ts | 2 +- .../monaco-editor-domain-action.model.ts | 33 ++++++++- ...o-correct-multiple-choice-answer.action.ts | 20 +++++ .../monaco-editor-option.helper.ts | 39 +++++++++- .../monaco-editor/monaco-editor.component.ts | 56 ++++---------- ...modeling-submission-team.component.spec.ts | 3 - ...aco-editor-action-quiz.integration.spec.ts | 40 ++++++++++ .../monaco-editor-action.integration.spec.ts | 2 +- ...r-grading-instructions.integration.spec.ts | 74 +++++++++++++++++++ .../monaco-editor.component.spec.ts | 6 ++ 11 files changed, 252 insertions(+), 51 deletions(-) create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action.ts create mode 100644 src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts index 8a022d32b7fc..07c6c89e4ac5 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts @@ -11,6 +11,7 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip keybindings?: number[]; icon?: IconDefinition; + readonly hideInEditor: boolean; /** * The disposable action that is returned by `editor.addAction`. This is required to unregister the action from the editor. @@ -28,12 +29,14 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip * @param translationKey The translation key of the action label. * @param icon The icon to display in the editor toolbar, if any. * @param keybindings The keybindings to trigger the action, if any. + * @param hideInEditor Whether to hide the action in the editor toolbar. Defaults to false. */ - constructor(id: string, translationKey: string, icon?: IconDefinition, keybindings?: number[]) { + constructor(id: string, translationKey: string, icon?: IconDefinition, keybindings?: number[], hideInEditor?: boolean) { this.id = id; this.translationKey = translationKey; this.icon = icon; this.keybindings = keybindings; + this.hideInEditor = hideInEditor ?? false; } /** @@ -61,6 +64,7 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip */ dispose(): void { this.disposableAction?.dispose(); + this.disposableAction = undefined; this._editor = undefined; } @@ -321,6 +325,10 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip } } + getPosition(editor: monaco.editor.ICodeEditor): monaco.IPosition { + return editor.getPosition() ?? { lineNumber: 1, column: 1 }; + } + /** * Sets the selection of the given editor to the given range and reveals it in the center of the editor. * @param editor The editor to set the selection in. @@ -331,6 +339,24 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip editor.revealRangeInCenter(selection); } + /** + * Clears the current selection in the given editor, but preserves the cursor position. + * @param editor The editor to clear the selection in. + */ + clearSelection(editor: monaco.editor.ICodeEditor): void { + const position = this.getPosition(editor); + this.setSelection(editor, new monaco.Range(position.lineNumber, position.column, position.lineNumber, position.column)); + } + + /** + * Adjusts the cursor position so it is at the end of the current line. + * @param editor The editor to adjust the cursor position in. + */ + moveCursorToEndOfLine(editor: monaco.editor.ICodeEditor): void { + const position: monaco.IPosition = { ...this.getPosition(editor), column: Number.POSITIVE_INFINITY }; + this.setPosition(editor, position); + } + /** * Toggles the fullscreen mode of the given element. If no element is provided, the editor's DOM node is used. * @param editor The editor to toggle the fullscreen mode for. diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts index f5723fef6394..83969d07626d 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts @@ -1,5 +1,5 @@ import { MonacoEditorDomainAction } from './monaco-editor-domain-action.model'; -import { ValueItem } from 'app/shared/markdown-editor/command-constants'; +import { ValueItem } from 'app/shared/markdown-editor/value-item.model'; export interface DomainActionWithOptionsArguments { selectedItem: ValueItem; diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts index c914241efa76..2a9999e96fd2 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts @@ -1,7 +1,36 @@ import { MonacoEditorAction } from './monaco-editor-action.model'; +import * as monaco from 'monaco-editor'; /** * Class representing domain actions for Artemis-specific use cases. - * TODO: In the future, each domain action should have its own logic and a unique identifier (e.g. multiple choice questions, drag and drop questions). */ -export abstract class MonacoEditorDomainAction extends MonacoEditorAction {} +export abstract class MonacoEditorDomainAction extends MonacoEditorAction { + abstract getOpeningIdentifier(): string; + + /** + * Inserts, below the current line, a new line with the domain action identifier and the given text. + * Afterward, if specified, sets the selection to cover exactly the provided text part. + * @param editor The editor in which to insert the text + * @param text The text to insert. Can be empty. + * @param indent Whether to indent the inserted text with a tab. + * @param updateSelection Whether to update the selection after inserting the text + */ + addTextWithDomainActionIdentifier(editor: monaco.editor.ICodeEditor, text: string, indent = false, updateSelection = true): void { + this.clearSelection(editor); + this.moveCursorToEndOfLine(editor); + const identifierWithText = text ? `${this.getOpeningIdentifier()} ${text}` : this.getOpeningIdentifier(); + const insertText = indent ? `\n\t${identifierWithText}` : `\n${identifierWithText}`; + this.insertTextAtPosition(editor, this.getPosition(editor), insertText); + if (updateSelection) { + const newPosition = this.getPosition(editor); + // Set the selection to cover exactly the text part + this.setSelection(editor, { + startLineNumber: newPosition.lineNumber, + endLineNumber: newPosition.lineNumber, + startColumn: newPosition.column - text.length, + endColumn: newPosition.column, + }); + } + editor.focus(); + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action.ts new file mode 100644 index 000000000000..e8307539ec41 --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action.ts @@ -0,0 +1,20 @@ +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; +import * as monaco from 'monaco-editor'; + +export class MonacoCorrectMultipleChoiceAnswerAction extends MonacoEditorDomainAction { + static readonly ID = 'artemisApp.multipleChoiceQuestion.editor.addCorrectAnswerOption'; + static readonly IDENTIFIER = '[correct]'; + static readonly TEXT = 'Enter a correct answer option here'; + + constructor() { + super(MonacoCorrectMultipleChoiceAnswerAction.ID, 'artemisApp.multipleChoiceQuestion.editor.addCorrectAnswerOption'); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, MonacoCorrectMultipleChoiceAnswerAction.TEXT); + } + + getOpeningIdentifier(): string { + return MonacoCorrectMultipleChoiceAnswerAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts index d9c13af84836..ea36346ec1d3 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts @@ -1,4 +1,4 @@ -import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model'; +import { MonacoEditorOptionPreset, MonacoEditorOptions } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model'; export const SHORT_ANSWER_QUIZ_QUESTION_EDITOR_OPTIONS = new MonacoEditorOptionPreset({ // Hide the gutter @@ -14,3 +14,40 @@ export const SHORT_ANSWER_QUIZ_QUESTION_EDITOR_OPTIONS = new MonacoEditorOptionP // Disable line highlighting renderLineHighlight: 'none', }); + +const defaultMarkdownOptions: MonacoEditorOptions = { + // Sets up the layout to make the editor look more like a text field (no line numbers, margin, or highlights). + lineNumbers: 'off', + glyphMargin: false, + folding: false, + lineDecorationsWidth: '1ch', + lineNumbersMinChars: 0, + padding: { + top: 5, + }, + renderLineHighlight: 'none', + // Only show scrollbars if required. + scrollbar: { + vertical: 'auto', + horizontal: 'auto', + }, + overviewRulerLanes: 0, + hideCursorInOverviewRuler: true, + // The suggestions from showWords are shared between editors of the same language, so we disable them. + suggest: { + showWords: false, + }, + // We use the 'simple' strategy for word wraps to prevent performance issues. This prevents us from switching to a different font as the lines would no longer break correctly. + wordWrap: 'on', + wrappingStrategy: 'simple', + selectionHighlight: false, + occurrencesHighlight: 'off', +}; + +export const DEFAULT_MARKDOWN_EDITOR_OPTIONS = new MonacoEditorOptionPreset(defaultMarkdownOptions); + +export const COMMUNICATION_MARKDOWN_EDITOR_OPTIONS = new MonacoEditorOptionPreset({ + ...defaultMarkdownOptions, + // Separates the editor suggest widget from the editor's layout. It will stick to the page, but it won't interfere with other elements. + fixedOverflowWidgets: true, +}); diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts index e7c5908d1a9a..0e63c2081074 100644 --- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts +++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts @@ -11,7 +11,9 @@ import { MonacoEditorAction } from 'app/shared/monaco-editor/model/actions/monac import { TranslateService } from '@ngx-translate/core'; import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model'; -type EditorPosition = { row: number; column: number }; +export const MAX_TAB_SIZE = 8; +export type EditorPosition = { lineNumber: number; column: number }; + @Component({ selector: 'jhi-monaco-editor', template: '', @@ -100,8 +102,12 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { @Output() contentHeightChanged = new EventEmitter(); + @Output() + onBlurEditor = new EventEmitter(); + private contentHeightListener?: monaco.IDisposable; private textChangedListener?: monaco.IDisposable; + private blurEditorWidgetListener?: monaco.IDisposable; private textChangedEmitTimeout?: NodeJS.Timeout; ngOnInit(): void { @@ -120,6 +126,10 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { } }); + this.blurEditorWidgetListener = this._editor.onDidBlurEditorWidget(() => { + this.onBlurEditor.emit(); + }); + this.themeSubscription = this.themeService.getCurrentThemeObservable().subscribe((theme) => this.changeTheme(theme)); } @@ -129,6 +139,7 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { this.themeSubscription?.unsubscribe(); this.textChangedListener?.dispose(); this.contentHeightListener?.dispose(); + this.blurEditorWidgetListener?.dispose(); } private emitTextChangeEvent() { @@ -146,14 +157,12 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { } } - // Workaround: The rest of the code expects { row, column } - we have { lineNumber, column }. Can be removed when Ace is removed. getPosition(): EditorPosition { - const position = this._editor.getPosition() ?? new monaco.Position(0, 0); - return { row: position.lineNumber, column: position.column }; + return this._editor.getPosition() ?? { column: 0, lineNumber: 0 }; } setPosition(position: EditorPosition) { - this._editor.setPosition({ lineNumber: position.row, column: position.column }); + this._editor.setPosition(position); } setSelection(range: monaco.IRange): void { @@ -393,43 +402,6 @@ export class MonacoEditorComponent implements OnInit, OnDestroy { }); } - /** - * Enables a text field mode for the editor. This will make the editor look more like a text field and less like a code editor. - * In particular, line numbers, margins, and highlights will be disabled. - */ - enableTextFieldMode(): void { - this._editor.updateOptions({ - // Sets up the layout to make the editor look more like a text field (no line numbers, margin, or highlights). - lineNumbers: 'off', - glyphMargin: false, - folding: false, - lineDecorationsWidth: '1ch', - lineNumbersMinChars: 0, - padding: { - top: 5, - }, - renderLineHighlight: 'none', - selectionHighlight: false, - occurrencesHighlight: 'off', - // Only show scrollbars if required. - scrollbar: { - vertical: 'auto', - horizontal: 'auto', - }, - overviewRulerLanes: 0, - hideCursorInOverviewRuler: true, - // The suggestions from showWords are shared between editors of the same language. - suggest: { - showWords: false, - }, - // Separates the editor suggest widget from the editor's layout. It will stick to the page, but it won't interfere with other elements. - fixedOverflowWidgets: true, - // We use the 'simple' strategy for word wraps to prevent performance issues. This prevents us from switching to a different font as the lines would no longer break correctly. - wrappingStrategy: 'simple', - }); - this.setWordWrap(true); - } - /** * Applies the given options to the editor. * @param options The options to apply. diff --git a/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts b/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts index c6019160c79c..0f44f1b0e6fd 100644 --- a/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts +++ b/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts @@ -1,4 +1,3 @@ -import * as ace from 'brace'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BehaviorSubject, of, throwError } from 'rxjs'; import { ArtemisTestModule } from '../../test.module'; @@ -47,8 +46,6 @@ import { ExerciseMode } from 'app/entities/exercise.model'; import { SubmissionPatch } from 'app/entities/submission-patch.model'; describe('ModelingSubmissionComponent', () => { - // needed to make sure ace is defined - ace.acequire('ace/ext/modelist.js'); let comp: ModelingSubmissionComponent; let fixture: ComponentFixture; let debugElement: DebugElement; diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts index 4ef09a0bed8c..482467968cdb 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts @@ -5,6 +5,10 @@ import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.modul import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; import { MonacoInsertShortAnswerOptionAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-insert-short-answer-option.action'; import { MonacoInsertShortAnswerSpotAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-insert-short-answer-spot.action'; +import { MonacoWrongMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action'; +import { MonacoCorrectMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action'; +import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action'; +import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action'; describe('MonacoEditorActionQuizIntegration', () => { let fixture: ComponentFixture; @@ -135,4 +139,40 @@ describe('MonacoEditorActionQuizIntegration', () => { expect(comp.getText()).toBe(questionText + '[-spot 1]' + `\n\n\n[-option 1] ${MonacoInsertShortAnswerOptionAction.DEFAULT_TEXT}`); }); }); + + describe('Multiple Choice answer options', () => { + it('should insert a wrong MC option', () => { + comp.triggerKeySequence('This is a question that needs some options.'); + const action = new MonacoWrongMultipleChoiceAnswerAction(); + comp.registerAction(action); + action.executeInCurrentEditor(); + expect(comp.getText()).toBe('This is a question that needs some options.\n[wrong] Enter a wrong answer option here'); + }); + + it('should insert a correct MC option', () => { + comp.triggerKeySequence('This is a question that needs some options.'); + const action = new MonacoCorrectMultipleChoiceAnswerAction(); + comp.registerAction(action); + action.executeInCurrentEditor(); + expect(comp.getText()).toBe('This is a question that needs some options.\n[correct] Enter a correct answer option here'); + }); + + it('should add an explanation to an answer option', () => { + comp.triggerKeySequence('This is a question that has an option.\n[correct] Option 1'); + const action = new MonacoQuizExplanationAction(); + comp.registerAction(action); + action.executeInCurrentEditor(); + expect(comp.getText()).toBe( + 'This is a question that has an option.\n[correct] Option 1\n\t[exp] Add an explanation here (only visible in feedback after quiz has ended)', + ); + }); + + it('should add a hint to an answer option', () => { + comp.triggerKeySequence('This is a question that has an option.\n[correct] Option 1'); + const action = new MonacoQuizHintAction(); + comp.registerAction(action); + action.executeInCurrentEditor(); + expect(comp.getText()).toBe('This is a question that has an option.\n[correct] Option 1\n\t[hint] Add a hint here (visible during the quiz via ?-Button)'); + }); + }); }); diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts index c1204d455f57..3ccaa08b5f79 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts @@ -180,7 +180,7 @@ describe('MonacoEditorActionIntegration', () => { const action = new MonacoTaskAction(); comp.registerAction(action); action.executeInCurrentEditor(); - expect(comp.getText()).toBe(MonacoTaskAction.INSERT_TASK_TEXT); + expect(comp.getText()).toBe(`[task]${MonacoTaskAction.TEXT}`); }); it('should enter fullscreen', () => { diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts new file mode 100644 index 000000000000..a5df872438f0 --- /dev/null +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts @@ -0,0 +1,74 @@ +import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component'; +import { ArtemisTestModule } from '../../../test.module'; +import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; +import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MonacoGradingInstructionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action'; +import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action'; +import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action'; +import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action'; +import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action'; +import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action'; +import { MonacoGradingCriterionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action'; + +describe('MonacoEditorActionGradingInstructionsIntegration', () => { + let fixture: ComponentFixture; + let comp: MonacoEditorComponent; + + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ArtemisTestModule, MonacoEditorModule], + declarations: [MonacoEditorComponent], + providers: [], + }) + .compileComponents() + .then(() => { + fixture = TestBed.createComponent(MonacoEditorComponent); + comp = fixture.componentInstance; + global.ResizeObserver = jest.fn().mockImplementation((callback: ResizeObserverCallback) => { + return new MockResizeObserver(callback); + }); + fixture.detectChanges(); + }); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + const setupActions = () => { + const creditsAction = new MonacoGradingCreditsAction(); + const scaleAction = new MonacoGradingScaleAction(); + const descriptionAction = new MonacoGradingDescriptionAction(); + const feedbackAction = new MonacoGradingFeedbackAction(); + const usageCountAction = new MonacoGradingUsageCountAction(); + const instructionAction = new MonacoGradingInstructionAction(creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction); + const criterionAction = new MonacoGradingCriterionAction(instructionAction); + [creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction, instructionAction, criterionAction].forEach((action) => comp.registerAction(action)); + return { creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction, instructionAction, criterionAction }; + }; + + const expectedInstructionTextWithoutCriterion = + '\n[instruction]' + + '\n\t[credits] 0' + + '\n\t[gradingScale] Add instruction grading scale here (only visible for tutors)' + + '\n\t[description] Add grading instruction here (only visible for tutors)' + + '\n\t[feedback] Add feedback for students here (visible for students)' + + '\n\t[maxCountInScore] 0'; + + const generalInstructionText = 'These are some general instructions for the tutors.'; + + it('should insert grading instructions', () => { + comp.triggerKeySequence(generalInstructionText); + const actions = setupActions(); + actions.instructionAction.executeInCurrentEditor(); + expect(comp.getText()).toBe(generalInstructionText + expectedInstructionTextWithoutCriterion); + }); + + it('should insert grading criterion', () => { + comp.triggerKeySequence(generalInstructionText); + const actions = setupActions(); + actions.criterionAction.executeInCurrentEditor(); + expect(comp.getText()).toBe(`${generalInstructionText}\n[criterion] Add criterion title (only visible to tutors)${expectedInstructionTextWithoutCriterion}`); + }); +}); diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts index dc9f7fb8b33c..ae34f743a3a7 100644 --- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts +++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts @@ -170,6 +170,12 @@ describe('MonacoEditorComponent', () => { expect(documentHighlightedMargins).toHaveLength(3); }); + it('should get the number of lines in the editor', () => { + fixture.detectChanges(); + comp.setText(multiLineText); + expect(comp.getNumberOfLines()).toBe(5); + }); + it('should pass the current line number to the line decorations hover button when clicked', () => { const clickCallbackStub = jest.fn(); const className = 'testClass'; From 6853968cbe9fa87894723dc2201ee8c790f99b45 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:52:11 +0200 Subject: [PATCH 41/95] merge5 --- .../monaco-exercise-reference.action.ts | 6 +++- .../monaco-grading-credits.action.ts | 20 +++++++++++ .../monaco-grading-criterion.action.ts | 22 ++++++++++++ .../monaco-grading-description.action.ts | 20 +++++++++++ .../monaco-grading-feedback.action.ts | 20 +++++++++++ .../monaco-grading-instruction.action.ts | 35 +++++++++++++++++++ .../monaco-grading-scale.action.ts | 20 +++++++++++ .../monaco-grading-usage-count.action.ts | 20 +++++++++++ .../model/actions/monaco-formula.action.ts | 6 +++- .../monaco-editor-option-preset.model.ts | 6 ++-- .../monaco-editor-overlay-widget.model.ts | 2 +- 11 files changed, 172 insertions(+), 5 deletions(-) create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action.ts diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts index d9e2024b7513..846241c6dd94 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts @@ -2,7 +2,7 @@ import { TranslateService } from '@ngx-translate/core'; import * as monaco from 'monaco-editor'; import { MetisService } from 'app/shared/metis/metis.service'; import { MonacoEditorDomainActionWithOptions } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model'; -import { ValueItem } from 'app/shared/markdown-editor/command-constants'; +import { ValueItem } from 'app/shared/markdown-editor/value-item.model'; /** * Action to insert a reference to an exercise into the editor. Users that type a / will see a list of available exercises to reference. @@ -59,4 +59,8 @@ export class MonacoExerciseReferenceAction extends MonacoEditorDomainActionWithO super.dispose(); this.disposableCompletionProvider?.dispose(); } + + getOpeningIdentifier(): string { + return '[exercise]'; + } } diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action.ts new file mode 100644 index 000000000000..200a239de9ee --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action.ts @@ -0,0 +1,20 @@ +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; +import * as monaco from 'monaco-editor'; + +export class MonacoGradingCreditsAction extends MonacoEditorDomainAction { + static readonly ID = 'monaco-grading-credits.action'; + static readonly IDENTIFIER = '[credits]'; + static readonly TEXT = '0'; + + constructor() { + super(MonacoGradingCreditsAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addCredits', undefined, undefined, true); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, MonacoGradingCreditsAction.TEXT, true, false); + } + + getOpeningIdentifier(): string { + return MonacoGradingCreditsAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action.ts new file mode 100644 index 000000000000..02302850bca5 --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action.ts @@ -0,0 +1,22 @@ +import * as monaco from 'monaco-editor'; +import { MonacoEditorDomainAction } from '../monaco-editor-domain-action.model'; +import { MonacoGradingInstructionAction } from './monaco-grading-instruction.action'; + +export class MonacoGradingCriterionAction extends MonacoEditorDomainAction { + static readonly ID = 'monaco-grading-criterion.action'; + static readonly IDENTIFIER = '[criterion]'; + static readonly TEXT = 'Add criterion title (only visible to tutors)'; + + constructor(private readonly gradingInstructionAction: MonacoGradingInstructionAction) { + super(MonacoGradingCriterionAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addCriterion'); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, MonacoGradingCriterionAction.TEXT, false, false); + this.gradingInstructionAction.executeInCurrentEditor(); + } + + getOpeningIdentifier(): string { + return MonacoGradingCriterionAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action.ts new file mode 100644 index 000000000000..f04d861cb4d7 --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action.ts @@ -0,0 +1,20 @@ +import * as monaco from 'monaco-editor'; +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; + +export class MonacoGradingDescriptionAction extends MonacoEditorDomainAction { + static readonly ID = 'monaco-grading-description.action'; + static readonly IDENTIFIER = '[description]'; + static readonly TEXT = 'Add grading instruction here (only visible for tutors)'; + + constructor() { + super(MonacoGradingDescriptionAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addDescription', undefined, undefined, true); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, MonacoGradingDescriptionAction.TEXT, true, false); + } + + getOpeningIdentifier(): string { + return MonacoGradingDescriptionAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action.ts new file mode 100644 index 000000000000..2dc1306eeffd --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action.ts @@ -0,0 +1,20 @@ +import * as monaco from 'monaco-editor'; +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; + +export class MonacoGradingFeedbackAction extends MonacoEditorDomainAction { + static readonly ID = 'monaco-grading-feedback.action'; + static readonly IDENTIFIER = '[feedback]'; + static readonly TEXT = 'Add feedback for students here (visible for students)'; + + constructor() { + super(MonacoGradingFeedbackAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addFeedback', undefined, undefined, true); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, MonacoGradingFeedbackAction.TEXT, true, false); + } + + getOpeningIdentifier(): string { + return MonacoGradingFeedbackAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action.ts new file mode 100644 index 000000000000..fa14b18da454 --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action.ts @@ -0,0 +1,35 @@ +import * as monaco from 'monaco-editor'; +import { MonacoEditorDomainAction } from '../monaco-editor-domain-action.model'; +import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action'; +import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action'; +import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action'; +import { MonacoGradingFeedbackAction } from './monaco-grading-feedback.action'; +import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action'; + +export class MonacoGradingInstructionAction extends MonacoEditorDomainAction { + static readonly ID = 'monaco-grading-instruction.action'; + static readonly IDENTIFIER = '[instruction]'; + + constructor( + private readonly creditsAction: MonacoGradingCreditsAction, + private readonly scaleAction: MonacoGradingScaleAction, + private readonly descriptionAction: MonacoGradingDescriptionAction, + private readonly feedbackAction: MonacoGradingFeedbackAction, + private readonly usageCountAction: MonacoGradingUsageCountAction, + ) { + super(MonacoGradingInstructionAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addInstruction'); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, '', false, false); + this.creditsAction.executeInCurrentEditor(); + this.scaleAction.executeInCurrentEditor(); + this.descriptionAction.executeInCurrentEditor(); + this.feedbackAction.executeInCurrentEditor(); + this.usageCountAction.executeInCurrentEditor(); + } + + getOpeningIdentifier(): string { + return MonacoGradingInstructionAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action.ts new file mode 100644 index 000000000000..53e1bd2b9485 --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action.ts @@ -0,0 +1,20 @@ +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; +import * as monaco from 'monaco-editor'; + +export class MonacoGradingScaleAction extends MonacoEditorDomainAction { + static readonly ID = 'monaco-grading-scale.action'; + static readonly IDENTIFIER = '[gradingScale]'; + static readonly TEXT = 'Add instruction grading scale here (only visible for tutors)'; + + constructor() { + super(MonacoGradingScaleAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addScale', undefined, undefined, true); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, MonacoGradingScaleAction.TEXT, true, false); + } + + getOpeningIdentifier(): string { + return MonacoGradingScaleAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action.ts new file mode 100644 index 000000000000..b68700d3e094 --- /dev/null +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action.ts @@ -0,0 +1,20 @@ +import * as monaco from 'monaco-editor'; +import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model'; + +export class MonacoGradingUsageCountAction extends MonacoEditorDomainAction { + static readonly ID = 'monaco-grading-usage-count.action'; + static readonly IDENTIFIER = '[maxCountInScore]'; + static readonly TEXT = '0'; + + constructor() { + super(MonacoGradingUsageCountAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addUsageCount', undefined, undefined, true); + } + + run(editor: monaco.editor.ICodeEditor): void { + this.addTextWithDomainActionIdentifier(editor, MonacoGradingUsageCountAction.TEXT, true, false); + } + + getOpeningIdentifier(): string { + return MonacoGradingUsageCountAction.IDENTIFIER; + } +} diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts index 4a605b733520..e7d5de9d0324 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts @@ -20,7 +20,11 @@ export class MonacoFormulaAction extends MonacoEditorDomainAction { * @param editor The editor in which to toggle formula text. */ run(editor: monaco.editor.ICodeEditor) { - this.toggleDelimiterAroundSelection(editor, FORMULA_OPEN_DELIMITER, FORMULA_CLOSE_DELIMITER, MonacoFormulaAction.DEFAULT_FORMULA); + this.toggleDelimiterAroundSelection(editor, this.getOpeningIdentifier(), FORMULA_CLOSE_DELIMITER, MonacoFormulaAction.DEFAULT_FORMULA); editor.focus(); } + + getOpeningIdentifier(): string { + return FORMULA_OPEN_DELIMITER; + } } diff --git a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts index b4ddcdc5a58d..e3470bdb6837 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts @@ -1,17 +1,19 @@ import * as monaco from 'monaco-editor'; +export type MonacoEditorOptions = monaco.editor.IEditorOptions; + /** * A preset of Monaco Editor options that can be applied to an editor for specific use cases, e.g. short answer quiz questions. * Presets are defined in the file monaco-editor-option.helper.ts. */ export class MonacoEditorOptionPreset { - constructor(private options: monaco.editor.IEditorOptions) {} + constructor(private options: MonacoEditorOptions) {} /** * Update the editor options with the preset options. * @param editor The editor to which the options should be applied. */ - apply(editor: monaco.editor.IStandaloneCodeEditor): void { + apply(editor: monaco.editor.ICodeEditor): void { editor.updateOptions(this.options); } } diff --git a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts index d138ae87df1c..8ea50ee8898d 100644 --- a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts +++ b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts @@ -20,7 +20,7 @@ export class MonacoEditorOverlayWidget extends MonacoCodeEditorElement implement constructor(editor: monaco.editor.ICodeEditor, id: string, domNode: HTMLElement, position: OverlayWidgetPosition) { super(editor, id); this.domNode = domNode; - // At the moment, the inline feedback nodes will only reach their maximum width with the following line. This workaround can be removed as soon as the Ace editor has been replaced. + // Ensure that the widget reaches its maximum width. this.domNode.style.width = '100%'; this.position = position; } From 69c13f01a1ccedb816f72813c3ef10ef99d356c5 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 20:52:22 +0200 Subject: [PATCH 42/95] merge5 --- ...ltiple-choice-question-edit.component.html | 23 ++++--- ...multiple-choice-question-edit.component.ts | 67 ++++++++++--------- .../multiple-choice-question.component.html | 14 ++-- ...iple-choice-visual-question.component.html | 4 +- .../commands/multiOptionCommand.ts | 14 ---- .../model/actions/monaco-task.action.ts | 12 +++- .../model/actions/monaco-test-case.action.ts | 4 ++ .../quiz/monaco-quiz-explanation.action.ts | 20 ++++++ .../actions/quiz/monaco-quiz-hint.action.ts | 20 ++++++ ...aco-wrong-multiple-choice-answer.action.ts | 20 ++++++ ...ple-choice-question-edit.component.spec.ts | 44 ++++++------ 11 files changed, 151 insertions(+), 91 deletions(-) delete mode 100644 src/main/webapp/app/shared/markdown-editor/commands/multiOptionCommand.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action.ts create mode 100644 src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action.ts diff --git a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html index de7ab74f204c..84d72e6ee23b 100644 --- a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html +++ b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html @@ -47,9 +47,9 @@

MC

[disabled]="question.singleChoice ?? false" title="scoring type" > - - - + + +
@@ -94,19 +94,20 @@

MC

- - + @if (showMultipleChoiceQuestionPreview) { } @@ -114,13 +115,13 @@

MC

 - + @if (showMultipleChoiceQuestionVisual) { - + } - +
diff --git a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts index 48fdeb5a2c09..be36aaedd0e7 100644 --- a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts +++ b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts @@ -1,29 +1,33 @@ -import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; import { ArtemisMarkdownService } from 'app/shared/markdown.service'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { HintCommand } from 'app/shared/markdown-editor/domainCommands/hint.command'; -import { ExplanationCommand } from 'app/shared/markdown-editor/domainCommands/explanation.command'; -import { IncorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/incorrectOptionCommand'; import { AnswerOption } from 'app/entities/quiz/answer-option.model'; -import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component'; import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model'; -import { CorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/correctOptionCommand'; -import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand'; import { QuizQuestionEdit } from 'app/exercises/quiz/manage/quiz-question-edit.interface'; import { generateExerciseHintExplanation } from 'app/shared/util/markdown.util'; import { faAngleDown, faAngleRight, faQuestionCircle, faTrash } from '@fortawesome/free-solid-svg-icons'; import { ScoringType } from 'app/entities/quiz/quiz-question.model'; import { MAX_QUIZ_QUESTION_POINTS } from 'app/shared/constants/input.constants'; +import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action'; +import { MonacoWrongMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action'; +import { MonacoCorrectMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action'; +import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action'; +import { MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component'; +import { MultipleChoiceVisualQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component'; @Component({ selector: 'jhi-multiple-choice-question-edit', templateUrl: './multiple-choice-question-edit.component.html', styleUrls: ['../quiz-exercise.scss', '../../shared/quiz.scss'], encapsulation: ViewEncapsulation.None, + changeDetection: ChangeDetectionStrategy.OnPush, }) export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestionEdit { @ViewChild('markdownEditor', { static: false }) - private markdownEditor: MarkdownEditorComponent; + private markdownEditor: MarkdownEditorMonacoComponent; + + @ViewChild('visual', { static: false }) + visualChild: MultipleChoiceVisualQuestionComponent; @Input() question: MultipleChoiceQuestion; @@ -35,26 +39,22 @@ export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestion @Output() questionDeleted = new EventEmitter(); - /** Ace Editor configuration constants **/ questionEditorText = ''; - - /** Status boolean for collapse status **/ isQuestionCollapsed: boolean; /** Set default preview of the markdown editor as preview for the multiple choice question **/ get showPreview(): boolean { - return this.markdownEditor && this.markdownEditor.previewMode; + return this.markdownEditor && this.markdownEditor.inPreviewMode; } showMultipleChoiceQuestionPreview = true; showMultipleChoiceQuestionVisual = true; - hintCommand = new HintCommand(); - correctCommand = new CorrectOptionCommand(); - incorrectCommand = new IncorrectOptionCommand(); - explanationCommand = new ExplanationCommand(); + correctAction = new MonacoCorrectMultipleChoiceAnswerAction(); + wrongAction = new MonacoWrongMultipleChoiceAnswerAction(); + explanationAction = new MonacoQuizExplanationAction(); + hintAction = new MonacoQuizHintAction(); - /** DomainCommands for the multiple choice question **/ - commandMultipleChoiceQuestions: DomainCommand[] = [this.correctCommand, this.incorrectCommand, this.explanationCommand, this.hintCommand]; + multipleChoiceActions = [this.correctAction, this.wrongAction, this.explanationAction, this.hintAction]; // Icons faTrash = faTrash; @@ -131,12 +131,13 @@ export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestion * to get the newest values in the editor to update the question attributes */ prepareForSave(): void { - if (this.markdownEditor.visualMode) { - this.markdownEditor.markdown = this.markdownEditor.visualChild.parseQuestion(); - } - this.cleanupQuestion(); - this.markdownEditor.parse(); + this.markdownEditor.parseMarkdown(); + } + + onLeaveVisualTab(): void { + this.markdownEditor.markdown = this.visualChild.parseQuestion(); + this.prepareForSave(); } /** @@ -153,34 +154,34 @@ export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestion } /** - * 1. Gets a tuple of text and domainCommandIdentifiers and assigns text values according to the domainCommandIdentifiers a + * 1. Gets a tuple of text and domain action identifiers and assigns text values according to the domain actions a * multiple choice question the to the multiple choice question attributes. * (question text, explanation, hint, answerOption (correct/wrong) - * 2. The tuple order is the same as the order of the commands in the markdown text inserted by the user + * 2. The tuple order is the same as the order of the actions in the markdown text inserted by the user * 3. resetMultipleChoicePreview() is triggered to notify the parent component * about the changes within the question and to cacheValidation() since the assigned values have changed - * @param domainCommands containing tuples of [text, domainCommandIdentifiers] + * @param textWithDomainActions The parsed text segments with their corresponding domain actions. */ - domainCommandsFound(domainCommands: [string, DomainCommand | null][]): void { + domainActionsFound(textWithDomainActions: TextWithDomainAction[]): void { this.cleanupQuestion(); let currentAnswerOption; - for (const [text, command] of domainCommands) { - if (command === null && text.length > 0) { + for (const { text, action } of textWithDomainActions) { + if (action === undefined && text.length > 0) { this.question.text = text; } - if (command instanceof CorrectOptionCommand || command instanceof IncorrectOptionCommand) { + if (action instanceof MonacoCorrectMultipleChoiceAnswerAction || action instanceof MonacoWrongMultipleChoiceAnswerAction) { currentAnswerOption = new AnswerOption(); - currentAnswerOption.isCorrect = command instanceof CorrectOptionCommand; + currentAnswerOption.isCorrect = action instanceof MonacoCorrectMultipleChoiceAnswerAction; currentAnswerOption.text = text; this.question.answerOptions!.push(currentAnswerOption); - } else if (command instanceof ExplanationCommand) { + } else if (action instanceof MonacoQuizExplanationAction) { if (currentAnswerOption) { currentAnswerOption.explanation = text; } else { this.question.explanation = text; } - } else if (command instanceof HintCommand) { + } else if (action instanceof MonacoQuizHintAction) { if (currentAnswerOption) { currentAnswerOption.hint = text; } else { diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html index 4e8613b42c15..63e6da43a628 100644 --- a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html +++ b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html @@ -10,10 +10,10 @@

} @if (!isSingleChoice) { -

{{ 'artemisApp.quizQuestion.allOptions' | artemisTranslate }}
+
} @if (isSingleChoice) { -
{{ 'artemisApp.quizQuestion.singleOption' | artemisTranslate }}
+
} @if (question.hint || (question.explanation && showResult)) {
@@ -98,13 +98,13 @@
{{ 'artemisApp.quizQuestion.singleOption' | artemisTranslate }}
@if (showResult) { - - + + @if (!forceSampleSolution) { } @if (!forceSampleSolution) { - + } @for (answerOption of question.answerOptions; track answerOption; let i = $index) { @@ -134,10 +134,10 @@
{{ 'artemisApp.quizQuestion.singleOption' | artemisTranslate }}
@if (!isExamMode) { } @if (!isExamMode) { } 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 0dfc849da228..32f0d6889eec 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 @@ -12,7 +12,7 @@ import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; import { MockRouter } from '../../../helpers/mocks/mock-router'; import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component'; -@Component({ selector: 'jhi-markdown-editor', template: '' }) +@Component({ selector: 'jhi-markdown-editor-monaco', template: '' }) class MarkdownEditorStubComponent { @Input() markdown: string; @Input() enableResize = false; diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts index 4cdcd197c837..e1027d236097 100644 --- a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts +++ b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts @@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { AssessmentLayoutComponent } from 'app/assessment/assessment-layout/assessment-layout.component'; import { TextAssessmentAreaComponent } from 'app/exercises/text/assess/text-assessment-area/text-assessment-area.component'; -import { MockComponent, MockPipe, MockProvider } from 'ng-mocks'; +import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks'; import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component'; import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component'; import { ExerciseType } from 'app/entities/exercise.model'; @@ -46,6 +46,7 @@ import { TextAssessmentBaseComponent } from 'app/exercises/text/assess/text-asse import { AthenaService } from 'app/assessment/athena.service'; import { MockAthenaService } from '../../helpers/mocks/service/mock-athena-service'; import { TextBlockRef } from 'app/entities/text-block-ref.model'; +import { TranslateDirective } from 'app/shared/language/translate.directive'; describe('TextSubmissionAssessmentComponent', () => { let component: TextSubmissionAssessmentComponent; @@ -160,6 +161,7 @@ describe('TextSubmissionAssessmentComponent', () => { MockComponent(ResizeableContainerComponent), MockComponent(UnreferencedFeedbackComponent), MockPipe(ArtemisTranslatePipe), + MockDirective(TranslateDirective), ], providers: [ { provide: ActivatedRoute, useValue: mockActivatedRoute }, diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts index 04d2c353f042..06e2de934c41 100644 --- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts +++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts @@ -26,7 +26,7 @@ import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredPr import { ArtemisDateRangePipe } from 'app/shared/pipes/artemis-date-range.pipe'; import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper'; -@Component({ selector: 'jhi-markdown-editor', template: '' }) +@Component({ selector: 'jhi-markdown-editor-monaco', template: '' }) class MarkdownEditorStubComponent { @Input() markdown: string; @Input() enableResize = false; diff --git a/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts b/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts index a18217aac3d1..7d13e7ee1101 100644 --- a/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts +++ b/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts @@ -57,7 +57,7 @@ export class TextExerciseCreationPage { } private async typeText(selector: string, text: string) { - const textField = this.page.locator(selector).locator('.ace_content'); + const textField = this.page.locator(selector).locator('.monaco-editor'); await textField.click(); await textField.pressSequentially(text); } From 0fd5292f13f46814b5067031bcae8bae3588eaa5 Mon Sep 17 00:00:00 2001 From: Yassine Souissi Date: Sun, 1 Sep 2024 21:10:38 +0200 Subject: [PATCH 60/95] merge5 --- ...al-group-free-days-overview.component.html | 5 +- .../tutorial-group-row.component.html | 4 +- ...rial-group-free-period-form.component.html | 60 ++++++++----------- ...oup-free-period-row-buttons.component.html | 2 +- ...oup-free-periods-management.component.html | 12 ++-- ...al-group-free-periods-table.component.html | 12 ++-- ...tutorial-group-session-form.component.html | 42 ++++--------- .../tutorial-group-row-buttons.component.html | 6 +- ...l-group-free-period-form.component.spec.ts | 11 +++- ...-free-periods-management.component.spec.ts | 4 +- ...orial-group-session-form.component.spec.ts | 11 +++- 11 files changed, 80 insertions(+), 89 deletions(-) diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html index 70edd4b36df5..b3a9ec03eac7 100644 --- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html +++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html @@ -15,9 +15,8 @@ placement="top" [ngbPopover]="freeDay.reason.trim()" [popoverTitle]="'artemisApp.entities.tutorialFreePeriod.reason' | artemisTranslate" - > - {{ 'artemisApp.entities.tutorialFreePeriod.reason' | artemisTranslate }} - + jhiTranslate="artemisApp.entities.tutorialFreePeriod.reason" + > } } diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html index 00440e00746f..69291296cf47 100644 --- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html +++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html @@ -23,9 +23,7 @@ } @else {} @if (mixOfOfflineAndOfflineTutorialGroups) { - + } @if (mifOfDifferentLanguages) {
{{ 'artemisApp.multipleChoiceQuestion.answer' | artemisTranslate }}{{ 'artemisApp.multipleChoiceQuestion.solution' | artemisTranslate }}{{ 'artemisApp.multipleChoiceQuestion.you' | artemisTranslate }}
@if (!answerOption.invalid && !question.invalid && answerOption.isCorrect) { - {{ 'artemisApp.multipleChoiceQuestion.correct' | artemisTranslate }} + } @if (!answerOption.invalid && !question.invalid && !answerOption.isCorrect) { - {{ 'artemisApp.multipleChoiceQuestion.wrong' | artemisTranslate }} + } @if (answerOption.invalid || question.invalid) { diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html index 941b371f74e0..d22aaa202246 100644 --- a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html +++ b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html @@ -1,5 +1,5 @@
-

{{ 'artemisApp.multipleChoiceQuestion.visualEditor.questionTitle' | artemisTranslate }}

+

- {{ - 'artemisApp.forms.tutorialGroupForm.notificationInput.help' | artemisTranslate - }} + @if (notificationControl?.invalid && (notificationControl?.dirty || notificationControl?.touched)) {
@if (notificationControl?.errors?.maxlength) { -
- {{ 'artemisApp.forms.tutorialGroupForm.notificationInput.maxLengthValidationError' | artemisTranslate: { max: '1000' } }} -
+
}
} diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html index 4690d672a4e1..96315f6b7d57 100644 --- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html +++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html @@ -8,9 +8,12 @@
} @if (!loading && !binaryFile!! && !cannotLoadFiles) { -
- {{ 'artemisApp.plagiarism.noFileSelected' | artemisTranslate }} -
+
} @if (loading && !cannotLoadFiles) {
@@ -21,7 +24,7 @@ } @if (binaryFile && !cannotLoadFiles) {
- {{ 'artemisApp.plagiarism.binaryFileNotRendered' | artemisTranslate }} - {{ 'entity.action.download' | artemisTranslate }} + +
} 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 21011cacb571..e55e5fb28db2 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, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { HttpErrorResponse } from '@angular/common/http'; import { TextExercise } from 'app/entities/text-exercise.model'; @@ -7,8 +7,6 @@ import { CourseManagementService } from 'app/course/manage/course-management.ser import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'; import { AssessmentType } from 'app/entities/assessment-type.model'; import { ExerciseMode, IncludedInOverallScore, resetForImport } from 'app/entities/exercise.model'; -import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component'; -import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command'; import { switchMap, tap } from 'rxjs/operators'; import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service'; import { NgForm, NgModel } from '@angular/forms'; @@ -31,10 +29,12 @@ import { FormSectionStatus } from 'app/forms/form-status-bar/form-status-bar.com import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component'; import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component'; import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component'; +import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action'; @Component({ selector: 'jhi-text-exercise-update', templateUrl: './text-exercise-update.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, }) export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterViewInit { readonly IncludedInOverallScore = IncludedInOverallScore; @@ -56,7 +56,6 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView isExamMode: boolean; isImport = false; goBackAfterSaving = false; - EditorMode = EditorMode; AssessmentType = AssessmentType; isAthenaEnabled$: Observable | undefined; @@ -67,8 +66,8 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView existingCategories: ExerciseCategory[]; notificationText?: string; - domainCommandsProblemStatement = [new KatexCommand()]; - domainCommandsSampleSolution = [new KatexCommand()]; + domainActionsProblemStatement = [new MonacoFormulaAction()]; + domainActionsExampleSolution = [new MonacoFormulaAction()]; formSectionStatus: FormSectionStatus[]; diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html index 0bf5784ea593..8f0eccda8242 100644 --- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html +++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html @@ -14,14 +14,10 @@ @if (nameControl?.invalid && (nameControl?.dirty || nameControl?.touched)) {
@if (nameControl?.errors?.required) { -
- {{ 'artemisApp.textUnit.createTextUnit.nameRequiredValidationError' | artemisTranslate }} -
+
} @if (nameControl?.errors?.maxlength) { -
- {{ 'artemisApp.textUnit.createTextUnit.nameMaxLengthValidationError' | artemisTranslate }} -
+
}
} @@ -38,18 +34,24 @@ />
- + {{ 'artemisApp.textUnit.markdownHelp' | artemisTranslate }} GitHub Markdown Guide - +
@if (hasCancelButton) {
# - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.name' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.points' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAssessments' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAcceptedComplaints' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfNotAnsweredMoreFeedbackRequests' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfComplaintResponses' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAnsweredMoreFeedbackRequests' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.averageScore' | artemisTranslate }} + - {{ 'artemisApp.assessmentDashboard.tutorLeaderboard.averageRating' | artemisTranslate }} +
- {{ (tutorialGroup.isOnline ? 'artemisApp.generic.online' : 'artemisApp.generic.offline') | artemisTranslate }} - diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html index fe8fb59ae02b..59a45f3f20da 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html @@ -1,8 +1,6 @@
-
- {{ 'artemisApp.generic.timeZone' | artemisTranslate: { timeZone } }} -
+
@if (form) { @@ -17,7 +15,7 @@ [checked]="timeFrame === TimeFrame.Period" (click)="setTimeFrame(TimeFrame.Period)" /> - + - + - +
-
@if (timeFrame === TimeFrame.Period) { - +
@if (form.controls.endDate?.invalid && (form.controls.endDate?.dirty || form.controls.endDate?.touched) && form.controls.endDate?.errors?.required) { -
- {{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.requiredEndDateError' | artemisTranslate }} -
+
} @else if ( form.controls.endDate?.touched && form.controls.startDate?.touched && (form.controls.endDate?.value | artemisDate: 'short-date' : false : timeZone) <= (form.controls.startDate?.value | artemisDate: 'short-date' : false : timeZone) ) { -
- {{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.invalidEndDateError' | artemisTranslate }} -
+
} } @else if (timeFrame === TimeFrame.PeriodWithinDay) { - +
- +
- {{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.invalidEndDateError' | artemisTranslate }} -
+
} }
- + @if (form.controls.reason?.invalid && (form.controls.reason?.dirty || (form.controls.reason?.touched && form.controls.reason?.errors?.maxlength))) { -
- {{ 'artemisApp.forms.tutorialFreePeriodForm.reasonInput.maxLengthValidationError' | artemisTranslate: { max: '256' } }} -
+
}
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html index 5b80e8513372..fca57919527d 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html @@ -3,7 +3,7 @@
-
- {{ 'artemisApp.pages.tutorialFreePeriodsManagement.timeZoneExplanation' | artemisTranslate: { timeZone: course.timeZone } }} -
+
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html index 70611f9df79b..7c274032f21b 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html @@ -3,12 +3,12 @@ - - - - - - + + + + + + diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html index 818bd2dafafe..539ff442d0fe 100644 --- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html +++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html @@ -1,15 +1,13 @@
-
- {{ 'artemisApp.generic.timeZone' | artemisTranslate: { timeZone } }} -
+
@if (form) {
- +
@if (dateControl?.errors?.required) { -
- {{ 'artemisApp.forms.sessionForm.dateInput.requiredDateError' | artemisTranslate }} -
+
} @if (dateControl?.errors?.owlDateTimeParse) { -
- {{ 'artemisApp.forms.sessionForm.dateInput.parseError' | artemisTranslate }} -
+
}
} @@ -45,13 +39,13 @@
- {{ 'artemisApp.forms.sessionForm.timeInput.from' | artemisTranslate }} +
- {{ 'artemisApp.forms.sessionForm.timeInput.to' | artemisTranslate }} +
@@ -60,34 +54,28 @@ @if (startTimeControl?.invalid && (startTimeControl?.dirty || startTimeControl?.touched)) {
@if (startTimeControl?.errors?.required) { -
- {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }} -
+
}
} @if (endTimeControl?.invalid && (endTimeControl?.dirty || endTimeControl?.touched)) {
@if (endTimeControl?.errors?.required) { -
- {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }} -
+
}
} @if (form?.invalid && (form?.dirty || form?.touched)) {
@if (form?.errors?.invalidTimeRange) { -
- {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }} -
+
}
}
- +
{{ 'global.field.id' | artemisTranslate }}{{ 'artemisApp.entities.tutorialFreePeriod.startDate' | artemisTranslate }}{{ 'artemisApp.entities.tutorialFreePeriod.endDate' | artemisTranslate }}{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStartTime' | artemisTranslate }}{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEndTime' | artemisTranslate }}{{ 'artemisApp.entities.tutorialFreePeriod.reason' | artemisTranslate }}