diff --git a/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts b/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts index 3c0e259e7707..b77b05f098dd 100644 --- a/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts +++ b/src/main/webapp/app/exercises/modeling/participate/modeling-submission.component.ts @@ -15,7 +15,7 @@ import { ModelingAssessmentService } from 'app/exercises/modeling/assess/modelin import { ModelingSubmissionService } from 'app/exercises/modeling/participate/modeling-submission.service'; import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component'; import { getExerciseDueDate, hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils'; -import { addParticipationToResult, getAutomaticUnreferencedFeedback } from 'app/exercises/shared/result/result.utils'; +import { addParticipationToResult, getUnreferencedFeedback } from 'app/exercises/shared/result/result.utils'; import { AccountService } from 'app/core/auth/account.service'; import { GuidedTourService } from 'app/guided-tour/guided-tour.service'; import { modelingTour } from 'app/guided-tour/tours/modeling-tour'; @@ -664,7 +664,7 @@ export class ModelingSubmissionComponent implements OnInit, OnDestroy, Component get unreferencedFeedback(): Feedback[] | undefined { if (this.assessmentResult?.feedbacks) { checkSubsequentFeedbackInAssessment(this.assessmentResult.feedbacks); - return getAutomaticUnreferencedFeedback(this.assessmentResult.feedbacks); + return getUnreferencedFeedback(this.assessmentResult.feedbacks); } return undefined; } diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts index 85b30f694334..4ea2f86dfae7 100644 --- a/src/main/webapp/app/exercises/shared/result/result.utils.ts +++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts @@ -125,12 +125,16 @@ export const getManualUnreferencedFeedback = (feedbacks: Feedback[] | undefined) }; /** - * searches for all automatic unreferenced feedback in an array of feedbacks of a result + * searches for all unreferenced feedback in an array of feedbacks of a result * @param feedbacks the feedback of a result * @returns an array with the unreferenced feedback of the result */ -export const getAutomaticUnreferencedFeedback = (feedbacks: Feedback[] | undefined): Feedback[] | undefined => { - return feedbacks ? feedbacks.filter((feedbackElement) => !feedbackElement.reference && feedbackElement.type === FeedbackType.AUTOMATIC) : undefined; +export const getUnreferencedFeedback = (feedbacks: Feedback[] | undefined): Feedback[] | undefined => { + return feedbacks + ? feedbacks.filter( + (feedbackElement) => !feedbackElement.reference && (feedbackElement.type === FeedbackType.MANUAL_UNREFERENCED || feedbackElement.type === FeedbackType.AUTOMATIC), + ) + : undefined; }; export function isAIResultAndFailed(result: Result | undefined): boolean { diff --git a/src/test/javascript/spec/component/utils/result.utils.spec.ts b/src/test/javascript/spec/component/utils/result.utils.spec.ts index 9b4463b3c353..b7160cefa41c 100644 --- a/src/test/javascript/spec/component/utils/result.utils.spec.ts +++ b/src/test/javascript/spec/component/utils/result.utils.spec.ts @@ -1,10 +1,10 @@ import { ResultTemplateStatus, breakCircularResultBackReferences, - getAutomaticUnreferencedFeedback, getManualUnreferencedFeedback, getResultIconClass, getTextColorClass, + getUnreferencedFeedback, isOnlyCompilationTested, } from 'app/exercises/shared/result/result.utils'; import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model'; @@ -31,7 +31,7 @@ describe('ResultUtils', () => { expect(unreferencedFeedbacks).toEqual([{ type: FeedbackType.MANUAL_UNREFERENCED }]); }); - it('should filter out all non unreferenced feedbacks that do not have type AUTOMATIC', () => { + it('should filter out all non unreferenced feedbacks', () => { const feedbacks = [ { reference: 'foo' }, { reference: 'foo', type: FeedbackType.AUTOMATIC }, @@ -39,8 +39,8 @@ describe('ResultUtils', () => { { type: FeedbackType.MANUAL_UNREFERENCED }, {}, ]; - const unreferencedFeedbacks = getAutomaticUnreferencedFeedback(feedbacks); - expect(unreferencedFeedbacks).toEqual([{ type: FeedbackType.AUTOMATIC }]); + const unreferencedFeedbacks = getUnreferencedFeedback(feedbacks); + expect(unreferencedFeedbacks).toEqual([{ type: FeedbackType.AUTOMATIC }, { type: FeedbackType.MANUAL_UNREFERENCED }]); }); it.each([