Skip to content

[CORE-8166] 2.4.8/filetype-question-fix-trunk #2640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trtshen merged 3 commits into from
Mar 18, 2026
Merged

[CORE-8166] 2.4.8/filetype-question-fix-trunk #2640

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a3b7fe
Merge pull request #2637 from intersective/2.4.8/CORE-8166/review-mis…
trtshen Mar 18, 2026
303ce04
[CORE-8166] fix: mark control as dirty and restore uploaded file data
trtshen Mar 18, 2026
88ab507
Merge remote-tracking branch 'origin/2.4.8/CORE-8166/filetype-questio…
trtshen Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions projects/v3/src/app/components/file-upload/file-upload.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ export class FileUploadComponent implements OnInit, OnDestroy {
if (this.control) {
this.control.setValue(this.innerValue);
this.control.markAsTouched();
this.control.markAsDirty();
}
this.triggerSave();
}
Expand Down Expand Up @@ -279,6 +280,10 @@ export class FileUploadComponent implements OnInit, OnDestroy {
if (this.control && !this.control.pristine) {
this.innerValue = this.control.value;
this.comment = this.control.value?.comment ?? this.review.comment;
// restore uploadedFile from saved file data so template shows file after pagination
if (this.innerValue?.file?.url) {
this.uploadedFile = { ...this.innerValue.file, cdnUrl: this.innerValue.file.url } as TusFileResponse;
}
} else {
this.innerValue = {
answer: this.review.answer,
Expand All @@ -291,6 +296,10 @@ export class FileUploadComponent implements OnInit, OnDestroy {
if ((this.submissionStatus === 'in progress') && (this.doAssessment)) {
if (this.control && !this.control.pristine) {
this.innerValue = this.control.value;
// restore uploadedFile from saved file data so template shows file after pagination
if (this.innerValue?.url) {
this.uploadedFile = { ...this.innerValue, cdnUrl: this.innerValue.url } as TusFileResponse;
}
} else {
this.innerValue = this.submission?.answer;
}
Expand Down
Loading