General:Make Request Feedback a standalone component
#9323
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| @if (!!participation()?.exercise) { | ||
| <jhi-request-feedback-button class="me-3" [exercise]="participation()?.exercise!"></jhi-request-feedback-button> | ||
| } | ||
| @if (commitState === CommitState.CONFLICT) { | ||
| <div> | ||
| <button | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, input } from '@angular/core'; | ||
| import { HttpErrorResponse } from '@angular/common/http'; | ||
| import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; | ||
| import { catchError, switchMap, tap } from 'rxjs/operators'; | ||
|
|
@@ -14,6 +14,7 @@ import { CodeEditorConfirmRefreshModalComponent } from './code-editor-confirm-re | |
| import { AUTOSAVE_CHECK_INTERVAL, AUTOSAVE_EXERCISE_INTERVAL } from 'app/shared/constants/exercise-exam-constants'; | ||
| import { faCircleNotch, faSync, faTimes } from '@fortawesome/free-solid-svg-icons'; | ||
| import { faPlayCircle } from '@fortawesome/free-regular-svg-icons'; | ||
| import { Participation } from 'app/entities/participation/participation.model'; | ||
|
|
||
| @Component({ | ||
| selector: 'jhi-code-editor-actions', | ||
|
|
@@ -34,6 +35,7 @@ export class CodeEditorActionsComponent implements OnInit, OnDestroy, OnChanges | |
| @Input() get commitState() { | ||
| return this.commitStateValue; | ||
| } | ||
| participation = input<Participation>(); | ||
|
|
||
undernagruzez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| @Output() commitStateChange = new EventEmitter<CommitState>(); | ||
| @Output() editorStateChange = new EventEmitter<EditorState>(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,6 +24,7 @@ import { CodeEditorFileBrowserBadgeComponent } from 'app/exercises/programming/s | |
| import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module'; | ||
| import { CodeEditorMonacoComponent } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component'; | ||
| import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; | ||
| import { RequestFeedbackButtonComponent } from 'app/overview/exercise-details/request-feedback-button/request-feedback-button.component'; | ||
|
|
||
| @NgModule({ | ||
| imports: [ | ||
|
|
@@ -35,6 +36,7 @@ import { ArtemisSharedComponentModule } from 'app/shared/components/shared-compo | |
| ArtemisProgrammingManualAssessmentModule, | ||
| MonacoEditorModule, | ||
| ArtemisSharedComponentModule, | ||
| RequestFeedbackButtonComponent, | ||
| ], | ||
| declarations: [ | ||
| CodeEditorGridComponent, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ <h4 class="editor-title"><ng-content select="[editorTitle]" /></h4> | |
| (onRefreshFiles)="onRefreshFiles()" | ||
| (commitStateChange)="onCommitStateChange.emit($event)" | ||
| (onError)="onError($event)" | ||
| [participation]="participation" | ||
undernagruzez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /> | ||
| } | ||
| </div> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,9 +6,10 @@ import { OrionExerciseDetailsStudentActionsComponent } from 'app/orion/participa | |
| import { ExerciseDetailsStudentActionsComponent } from 'app/overview/exercise-details/exercise-details-student-actions.component'; | ||
| import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; | ||
| import { ArtemisSharedPipesModule } from 'app/shared/pipes/shared-pipes.module'; | ||
| import { RequestFeedbackButtonComponent } from 'app/overview/exercise-details/request-feedback-button/request-feedback-button.component'; | ||
|
|
||
| @NgModule({ | ||
| imports: [ArtemisSharedModule, ArtemisSharedComponentModule, ArtemisSharedPipesModule, OrionModule, FeatureToggleModule, RequestFeedbackButtonComponent], | ||
| declarations: [ExerciseDetailsStudentActionsComponent, OrionExerciseDetailsStudentActionsComponent], | ||
| exports: [ExerciseDetailsStudentActionsComponent, OrionExerciseDetailsStudentActionsComponent], | ||
| }) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -135,30 +135,8 @@ | |
| <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.openOnlineIDE"></span> | ||
| </a> | ||
| } | ||
| @if (exercise.allowFeedbackRequests && gradedParticipation && exercise.type === ExerciseType.PROGRAMMING) { | ||
| <jhi-request-feedback-button [exercise]="exercise" [smallButtons]="smallButtons"></jhi-request-feedback-button> | ||
| } | ||
undernagruzez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </ng-container> | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -110,6 +110,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges | |||||||||||||||||||
| this.profileService.getProfileInfo().subscribe((profileInfo) => { | ||||||||||||||||||||
| this.localVCEnabled = profileInfo.activeProfiles?.includes(PROFILE_LOCALVC); | ||||||||||||||||||||
| this.athenaEnabled = profileInfo.activeProfiles?.includes(PROFILE_ATHENA); | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // The online IDE is only available with correct SpringProfile and if it's enabled for this exercise | ||||||||||||||||||||
| if (profileInfo.activeProfiles?.includes(PROFILE_THEIA) && this.programmingExercise) { | ||||||||||||||||||||
| this.theiaEnabled = true; | ||||||||||||||||||||
|
|
@@ -135,9 +136,6 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges | |||||||||||||||||||
| }); | ||||||||||||||||||||
| } else if (this.exercise.type === ExerciseType.MODELING) { | ||||||||||||||||||||
| this.editorLabel = 'openModelingEditor'; | ||||||||||||||||||||
| } else if (this.exercise.type === ExerciseType.TEXT) { | ||||||||||||||||||||
| this.editorLabel = 'openTextEditor'; | ||||||||||||||||||||
| this.profileService.getProfileInfo().subscribe((profileInfo) => { | ||||||||||||||||||||
|
|
@@ -257,6 +255,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges | |||||||||||||||||||
| }); | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // this method will be removed once text and modeling support new component | ||||||||||||||||||||
| requestFeedback() { | ||||||||||||||||||||
| if (!this.assureConditionsSatisfied()) return; | ||||||||||||||||||||
| if (this.exercise.type === ExerciseType.PROGRAMMING) { | ||||||||||||||||||||
|
|
@@ -341,6 +340,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges | |||||||||||||||||||
| * 3. There is no already pending feedback request. | ||||||||||||||||||||
| * @returns {boolean} `true` if all conditions are satisfied, otherwise `false`. | ||||||||||||||||||||
| */ | ||||||||||||||||||||
| // this method will be removed once text and modeling support new component | ||||||||||||||||||||
| assureConditionsSatisfied(): boolean { | ||||||||||||||||||||
| this.updateParticipations(); | ||||||||||||||||||||
| if (this.exercise.type === ExerciseType.PROGRAMMING) { | ||||||||||||||||||||
|
|
@@ -388,27 +388,12 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges | |||||||||||||||||||
|
|
||||||||||||||||||||
| hasAthenaResultForlatestSubmission(): boolean { | ||||||||||||||||||||
| if (this.gradedParticipation?.submissions && this.gradedParticipation?.results) { | ||||||||||||||||||||
| // submissions.results is always undefined so this is neccessary | ||||||||||||||||||||
| return ( | ||||||||||||||||||||
| this.gradedParticipation.submissions.last()?.id === | ||||||||||||||||||||
| this.gradedParticipation?.results.filter((result) => result.assessmentType == AssessmentType.AUTOMATIC_ATHENA).first()?.submission?.id | ||||||||||||||||||||
| ); | ||||||||||||||||||||
|
Comment on lines
+391
to
+395
There was a problem hiding this comment. Potential runtime errors due to non-standard JavaScript arrays do not have Apply this diff to fix the issue: -return (
- this.gradedParticipation.submissions.last()?.id ===
- this.gradedParticipation?.results.filter((result) => result.assessmentType == AssessmentType.AUTOMATIC_ATHENA).first()?.submission?.id
-);
+const latestSubmissionId = this.gradedParticipation.submissions?.[this.gradedParticipation.submissions.length - 1]?.id;
+const firstAthenaResultSubmissionId = this.gradedParticipation?.results.filter((result) => result.assessmentType === AssessmentType.AUTOMATIC_ATHENA)?.[0]?.submission?.id;
+return latestSubmissionId === firstAthenaResultSubmissionId;📝 Committable suggestion
Suggested change
|
||||||||||||||||||||
| } | ||||||||||||||||||||
| return false; | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| @if (!isExamExercise) { | ||
| @if (athenaEnabled) { | ||
| @if (exercise().type === ExerciseType.TEXT) { | ||
| <button | ||
| class="btn btn-primary" | ||
| (click)="requestFeedback()" | ||
| [class.btn-sm]="smallButtons()" | ||
| [disabled]="!participation?.submissions?.last()?.submitted || isGeneratingFeedback()" | ||
| [id]="'request-feedback-' + exercise().id" | ||
| [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate" | ||
| > | ||
| <fa-icon [icon]="faPenSquare" [fixedWidth]="true" /> | ||
| <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback"></span> | ||
| </button> | ||
| } @else { | ||
| <a | ||
| class="btn btn-primary" | ||
| (click)="requestFeedback()" | ||
| [class.btn-sm]="smallButtons()" | ||
| [id]="'request-feedback-' + exercise().id" | ||
| [ngbTooltip]="'artemisApp.exerciseActions.requestAutomaticFeedbackTooltip' | artemisTranslate" | ||
| > | ||
| <fa-icon [icon]="faPenSquare" [fixedWidth]="true" /> | ||
| <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestAutomaticFeedback"></span> | ||
| </a> | ||
undernagruzez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } @else { | ||
| <a | ||
| class="btn btn-primary" | ||
| (click)="requestFeedback()" | ||
| [class.btn-sm]="smallButtons()" | ||
| [id]="'request-feedback-' + exercise().id" | ||
| [ngbTooltip]="'artemisApp.exerciseActions.requestManualFeedbackTooltip' | artemisTranslate" | ||
| > | ||
| <fa-icon [icon]="faPenSquare" [fixedWidth]="true" /> | ||
| <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseActions.requestManualFeedback"></span> | ||
| </a> | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider using
AccessForbiddenExceptioninstead ofBadRequestAlertExceptionRequesting feedback after the due date is a forbidden action. Using
AccessForbiddenException, which results in a 403 Forbidden status code, would more accurately represent the access restriction compared toBadRequestAlertException(400 Bad Request).