Skip to content

fix: tidy form dialogs, stop double submits and fix reported LMS bugs (backport #3256) - #3327

Merged
raizasafeel merged 19 commits into
version-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-3256
Nov 17, 2026
Merged

raizasafeel merged 19 commits into
version-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-3256

Conversation

@mergify

@mergify mergify Bot commented Nov 16, 2026

Copy link
Copy Markdown

Summary

On large batches, staff saw an error when sending an announcement even though it went out, so they sent it again and students got it twice. A double click on Post published a discussion reply twice. Learners couldn't find the batch they were in, because the batch list opened on Upcoming, which hides batches that have started. Visitors had to open the logo menu to find Log in. Edit Program showed empty member rows. This PR fixes all of these. It makes every action button show loading and ignore repeat clicks, and replaces a repeated toast instead of stacking copies.

FormShell (every form dialog)
├── loading  → one centered spinner, no buttons, no empty footer
├── message  → "can't do this" toast, and the form closes without opening
└── neither  → the form and its buttons
  • Announcements: queued as a background job, keyed by batch and content, so a retry while one is pending is ignored and the request no longer times out.
  • Double submits: about 60 buttons that save, send, delete, enroll or generate now show loading and ignore repeat clicks. Confirm dialogs stay open with a loading button until the request finishes.
  • Toasts: the same message replaces the toast already on screen. Bulk certificate failures show one summary toast instead of one per student.
  • Forms that can't be used: when a form can't be used (no students to announce to or certify, certificates off, no permission, read-only site), its reason shows as a toast and the form doesn't open. This covers direct links to a form too.
  • Batch with no students: Make Announcement and Generate Certificates are hidden until someone is enrolled. The Announcements tab says so instead and offers Enroll Students, which opens the enroll form on the Dashboard tab.
  • Batches: signed-in learners open on Enrolled. Guests still see Upcoming, and staff see Active.
  • Log in: visitors see a Log in card in the desktop sidebar that returns them to the same page. Mobile already has a Log in tab.
  • Edit Program: member names come from the program document. Frappe's child-table list API drops level-1 fields such as member and full name for every user (a frappe bug, to be reported separately).
  • Tests: removes mocked frontend tests that only checked CSS classes, labels or stub wiring (26 files, about 400 tests). Tests that guard permissions, payloads, data loss and races stay.

Intent

This is for Frappe Learning admins, instructors and learners. It finishes the dialog clean-up started in #3255 and fixes bugs reported by a large customer: double sends and posts, a hard-to-find batch, a hard-to-find Log in, and blank member rows in Edit Program. It also stops action buttons from running twice and toasts from stacking. Finally, it removes mocked frontend tests that only checked layout or stub wiring. Backporting the quiz-insert fix (#2853) and the upstream frappe permission bug behind the blank member rows are left out on purpose.

  1. Every form dialog shows its loading state the same way, with one centered spinner and no buttons or empty footer. When a form can't be used, its reason shows as a toast and the form does not open.
  2. Buttons that save, send, delete, enroll or generate show loading and ignore repeat clicks while running, and a repeated toast replaces the one on screen.
  3. Batch announcements send in the background and only once per batch and content, discussion replies and topics post once, and Edit Program lists member names.
  4. Signed-in learners open the batch list on Enrolled, and visitors see a Log in card in the sidebar that brings them back to the page they were on.
  5. Must not: change server permission rules, or drop tests that guard permissions, payloads, data-loss or race conditions.

Evidence

Before shots are from develop (with #3255), after shots from this branch.

1. A refusal is a toast, and loading is one centered spinner · live

The batch menu on a batch with certificates on and no students, typing the Generate Certificates link (/batches/<batch>/certificates) by hand for a batch without certificates, and New Announcement while the batch loads. The menu item now only shows on batches with certificates and students, so a hand-typed link is the only way to reach the refusal:

Before After
Batch menu, certificates on, no students Batch menu before: Generate Certificates listed Batch menu after: only Delete batch
Batch menu, mobile Batch menu on mobile before: Generate Certificates listed Batch menu on mobile after: Unpublish and Delete batch only
Typed link Refusal before: a dialog with only the message and an empty footer Typed link: a toast on the batch page, no dialog
Typed link, mobile Typed link on mobile before: a full-page form with only the message Typed link on mobile: a toast, no dialog
Loading Loading before: Loading... text in the corner Loading after: one centered spinner, no buttons
Loading, mobile Loading before on mobile: Loading... text at the top Loading after on mobile: spinner in the middle of the page

The same spinner is the default in Student Progress, Live Class Attendance, Video Statistics, Schedule Evaluation and Course Progress. A form can pass a skeleton in FormShell's loading slot instead.

2. Five clicks on Post with an empty reply show one toast · live

Before After
Five stacked "Reply cannot be empty." toasts One "Reply cannot be empty." toast after five clicks

3. A double-clicked reply posts once, an announcement queues once, and Edit Program shows members · live

A double click on Post took the reply count from 0 to 2 before and from 0 to 1 after.

Before After
The reply posted twice The reply posted once
$ two POSTs to lms.lms.api.send_batch_announcement, same batch/subject/content
request 1: HTTP 200 in 0.006409s
request 2: HTTP 200 in 0.008882s
queued announcement jobs for test-batch: 1
communications with subject: 0

Communications is 0 because no background worker ran in this dev setup. The test job was removed afterwards.

Before After
Edit Program before: blank member rows Edit Program after: member email and name

4. Learners open on Enrolled, and visitors get a Log in card · live

Before After
Learner batches Learner before: Upcoming, their running batch missing Learner after: Enrolled, their running batch listed
Learner, mobile Learner on mobile before: Upcoming, their running batch missing Learner on mobile: Enrolled
Visitor sidebar Visitor before: no Log in in the sidebar Visitor after: Log in card

Clicking Log in went to /login?redirect-to=%2Flms%2Fcourses%3Fcategory%3Ddesign.

5. A batch with no students shows an enroll step, not Make Announcement · live

Before After
Announcements tab Before: Make Announcement in the header and a No announcements yet empty state Empty state: No one to announce to yet, with an Enroll Students button and no Make Announcement
Announcements tab, mobile Before on mobile: the send icon in the header The same empty state on mobile
After Enroll Students Before: Enroll Students form over the Announcements tab Enroll Students form open over the Dashboard tab
After Enroll Students, mobile Before on mobile: Enroll Students form Enroll Students form on mobile

After, no Make Announcement button was on the page at either width, and Enroll Students went to /lms/batches/test-batch-10/student/new#dashboard (before: #announcements). A batch with students still shows Make Announcement.

Review

✅ Approve · 0 blockers · 0 issues · 0 nits, reviewed 3222540; the refusal-toast-and-spinner and no-students commits sit on top, checked live and by the full test suite but not by a review round; commits regrouped one per fix and rebased onto develop 651512a

  • Round 1: 2 blockers and 7 smaller findings, all fixed. The blockers were the Enroll Students and Question dialogs bypassing FormShell, and removed upload-privacy tests, which are now restored. The others: the shared login redirect, deriving the busy state from resources, the clear-demo-data confirm, toast typing, comments, and wording.
  • Round 2: correctness approved with no findings. Taste raised 3 nits (Assignments delete toasts, a long comment, an untranslated toast), fixed in b6ee6cf.

Tidy commits (no behaviour change):

  • b016c71 refactor: trim history and restating comments
  • b6ee6cf refactor: align assignment delete toasts and translate the import toast

Each fix's follow-up refactors are folded into its own commit, so the history is one commit per fix.

Test fixes (tests only; neither test is otherwise changed by this branch):

  • test(e2e): find the preview video input by its accessible name. Develop's tooltip change to the course media fields moved the label away from the input, so the course creation spec timed out.
  • test: clear the cached website settings in the sign-up tests. On a fresh site sign-up starts disabled, and the cached copy on frappe.local made test_a_new_address_creates_the_user fail depending on test order.

Local runs on f288882, all green: Vitest 2357/2357, server tests 2180 (run-tests --app lms on a fresh frappe + payments + lms site, 3 skipped), Playwright 12/12 on a fresh site set up like CI.

Decisions:

  • 1b: hand-written busy flags were replaced with frappe-ui resources in this PR. A few flags stay on purpose, where a resource's loading would end before a page change or the work spans several requests: course enroll, setup finish, default email account, and the note and lesson create queue.

Follow-ups:

  • Backport the quiz-insert fix (fix: render and save an assessment block on insert #2853) to version-15 and version-16.
  • Report frappe's child-table permlevel check (reportview validate_fields) upstream.
  • An announcement is still one email with every student in BCC, and some mail providers cap recipients per message.
  • Other /login links without a return page (NoPermission, AssessmentBlock, QuizBlock, router, and others) should move to redirectToLogin().
  • Notes and LessonForm could use useAutosave for "save during create".
  • A failed batch-course delete or quiz answer check still shows no message beyond the console.

Declined to judge:

  • The FormShell statusClass prop name.
  • The bare /login links above, which predate this change.
  • JobForm falling into create while an existing job's document is still loading, which also predates it.

Merge Danger

Door: two-way. Every change is in code; there are no schema changes or patches. Reverting restores the old behaviour.

Blast radius: wide. About 80 frontend files change: form dialogs, action buttons and toasts across courses, batches, programs, settings and profiles. Batch announcements now need a background worker on the long queue to actually send.


This is an automatic backport of pull request #3256 done by [Mergify](https://mergify.com).

(cherry picked from commit 4dbf303)

# Conflicts:
#	frontend/src/pages/Programs/ProgramEnrollment.vue
(cherry picked from commit eefb240)

# Conflicts:
#	frontend/src/pages/Batches/Batches.vue
(cherry picked from commit e1e0766)

# Conflicts:
#	frontend/src/components/Sidebar/AppSidebar.vue
#	frontend/src/pages/Lesson.vue
(cherry picked from commit c612645)

# Conflicts:
#	frontend/src/components/Layouts/settings/desktop/SettingsFieldsPanel.vue
#	frontend/src/components/Profile/ChangePasswordDialog.vue
#	frontend/src/components/Settings/Categories.vue
#	frontend/src/components/Settings/EmailAccount/EmailAccountDefaults.vue
#	frontend/src/components/Settings/GoogleCalendar/GoogleCalendarDetail.vue
#	frontend/src/components/Settings/Members/members.ts
#	frontend/src/components/Settings/Services/Services.vue
#	frontend/src/pages/Setup.vue
#	frontend/src/tests/emailAccountDefaultsPanel.test.ts
(cherry picked from commit ffe35ba)

# Conflicts:
#	frontend/src/tests/CourseOverviewOutline.test.ts
#	frontend/src/tests/FormShell.test.ts
#	frontend/src/tests/LessonHelp.test.ts
#	frontend/src/tests/UploadPlugin.test.ts
#	frontend/src/tests/a11y-keyboard.test.ts
#	frontend/src/tests/a11y-media.test.ts
#	frontend/src/tests/announcementForm.test.ts
#	frontend/src/tests/assignmentCard.test.ts
#	frontend/src/tests/assignmentForm.test.ts
#	frontend/src/tests/assignmentStudentView.test.ts
#	frontend/src/tests/assignmentsCount.test.ts
#	frontend/src/tests/badgeForm.test.ts
#	frontend/src/tests/batchStudentForm.test.ts
#	frontend/src/tests/bulkCertificatesForm.test.ts
#	frontend/src/tests/chapterForm.test.ts
#	frontend/src/tests/chapterTitleAutofocus.test.ts
#	frontend/src/tests/commandPalette.test.ts
#	frontend/src/tests/courseDetailOutlet.test.ts
#	frontend/src/tests/courseEnrollmentForm.test.ts
#	frontend/src/tests/courseImportForm.test.ts
#	frontend/src/tests/coursePublishSettings.test.ts
#	frontend/src/tests/emailAccountForm.test.ts
#	frontend/src/tests/emailTemplateForm.test.ts
#	frontend/src/tests/embeddedExerciseSubmission.test.ts
#	frontend/src/tests/jobApplicationsWithoutEmails.test.ts
#	frontend/src/tests/jobDetailLogo.test.ts
#	frontend/src/tests/lessonInlineMenu.test.ts
#	frontend/src/tests/lessonLocking.test.ts
#	frontend/src/tests/listHeaderButtons.test.ts
#	frontend/src/tests/liveClassForm.test.ts
#	frontend/src/tests/memberFormRoute.test.ts
#	frontend/src/tests/mobileBottomBar.test.ts
#	frontend/src/tests/newBatchForm.test.ts
#	frontend/src/tests/newCourseForm.test.ts
#	frontend/src/tests/programForm.test.ts
#	frontend/src/tests/questionEditorSizing.test.ts
#	frontend/src/tests/ravenSettings.test.ts
#	frontend/src/tests/resourceCacheRemount.test.ts
#	frontend/src/tests/responsiveListView.test.ts
#	frontend/src/tests/routeTables.test.ts
#	frontend/src/tests/searchFilterDoubleFetch.test.ts
#	frontend/src/tests/settingsDialogWidth.test.ts
#	frontend/src/tests/settingsList.test.ts
#	frontend/src/tests/settingsListSearch.test.ts
#	frontend/src/tests/settingsTableScroll.test.ts
#	frontend/src/tests/submissionsPage.test.ts
#	frontend/src/tests/switchRow.test.ts
#	frontend/src/tests/tabbedDetailPage.test.ts
#	frontend/src/tests/upcomingEvaluationsNotice.test.ts
#	frontend/src/tests/uploadFailureToast.test.ts
#	frontend/src/tests/userAvatarIndicator.test.ts
#	frontend/src/tests/userDropdownTheme.test.ts
…spinner

(cherry picked from commit 3a1f127)

# Conflicts:
#	frontend/src/components/Modals/VideoStatistics.vue
#	frontend/src/tests/courseImportForm.test.ts
#	frontend/src/tests/liveClassForm.test.ts
#	frontend/src/tests/memberFormRoute.test.ts
…nt enrolls

A batch with no students has nobody to announce to or certify, so Make Announcement and Generate Certificates stay hidden until someone is enrolled. The Announcements tab instead explains that and offers Enroll Students, which opens the enroll form on the Dashboard tab where students are listed.

(cherry picked from commit 2076c53)

# Conflicts:
#	frontend/src/pages/Batches/components/Announcements.vue
The preview video label now shares a row with its info button, so the label's parent no longer holds the input and the old lookup timed out.

(cherry picked from commit c7edd17)
get_website_settings keeps a copy on frappe.local for the whole process. On a fresh site sign-up starts disabled, so a test run that read the settings earlier left the sign-up tests seeing it disabled even after they turned it on.

(cherry picked from commit f288882)
@mergify

mergify Bot commented Nov 16, 2026

Copy link
Copy Markdown
Author

Cherry-pick of 4dbf303 has failed:

On branch mergify/bp/version-15-hotfix/pr-3256
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 4dbf303.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/components/Enrollment/EnrollStudentsForm.vue
	modified:   frontend/src/components/FormShell.vue
	new file:   frontend/src/components/FormShellStatus.vue
	modified:   frontend/src/components/Quiz/QuestionDialog.vue
	modified:   frontend/src/pages/Forms/AnnouncementForm.vue
	modified:   frontend/src/pages/Forms/AssessmentForm.vue
	modified:   frontend/src/pages/Forms/AssignmentForm.vue
	modified:   frontend/src/pages/Forms/BatchCourseForm.vue
	modified:   frontend/src/pages/Forms/BulkCertificatesForm.vue
	modified:   frontend/src/pages/Forms/ChapterForm.vue
	modified:   frontend/src/pages/Forms/CourseImportForm.vue
	modified:   frontend/src/pages/Forms/EmailTemplateForm.vue
	modified:   frontend/src/pages/Forms/LiveClassForm.vue
	modified:   frontend/src/pages/Forms/MemberForm.vue
	modified:   frontend/src/pages/Forms/NewBatchForm.vue
	modified:   frontend/src/pages/Forms/NewCourseForm.vue
	modified:   frontend/src/pages/Forms/ProfileEditForm.vue
	modified:   frontend/src/pages/Forms/ProgramForm.vue
	modified:   frontend/src/tests/FormShell.test.ts
	modified:   frontend/src/tests/enrollStudentsForm.test.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/pages/Programs/ProgramEnrollment.vue

Cherry-pick of eefb240 has failed:

On branch mergify/bp/version-15-hotfix/pr-3256
Your branch is ahead of 'origin/version-15-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit eefb240.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/tests/batchesStudentFilter.test.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/pages/Batches/Batches.vue

Cherry-pick of e1e0766 has failed:

On branch mergify/bp/version-15-hotfix/pr-3256
Your branch is ahead of 'origin/version-15-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e1e0766.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/components/CourseCardOverlay.vue
	modified:   frontend/src/pages/Batches/components/BatchOverlay.vue
	modified:   frontend/src/pages/Billing.vue
	modified:   frontend/src/pages/JobDetail.vue
	modified:   frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue
	modified:   frontend/src/tests/batchOverlayLoginRedirect.test.ts
	new file:   frontend/src/tests/sidebarLogIn.test.ts
	new file:   frontend/src/utils/login.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/Sidebar/AppSidebar.vue
	both modified:   frontend/src/pages/Lesson.vue

Cherry-pick of c612645 has failed:

On branch mergify/bp/version-15-hotfix/pr-3256
Your branch is ahead of 'origin/version-15-hotfix' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c612645.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/components/ContactUsEmail.vue
	modified:   frontend/src/components/CourseCardOverlay.vue
	modified:   frontend/src/components/Modals/EvaluationModal.vue
	modified:   frontend/src/components/Modals/Event.vue
	modified:   frontend/src/components/Modals/ReviewModal.vue
	modified:   frontend/src/components/Notes/InlineLessonMenu.vue
	modified:   frontend/src/components/Notes/Notes.vue
	modified:   frontend/src/components/Notifications/NotificationPanel.vue
	modified:   frontend/src/components/Profile/ProfileEvaluatorCalendar.vue
	modified:   frontend/src/components/Quiz.vue
	modified:   frontend/src/components/Settings/Raven/ChannelView.vue
	modified:   frontend/src/components/Settings/Raven/RavenSettings.vue
	modified:   frontend/src/components/Settings/Transactions/AddressModal.vue
	modified:   frontend/src/components/Sidebar/UserDropdown.vue
	modified:   frontend/src/composables/raven/useChannelRules.ts
	modified:   frontend/src/composables/raven/useMappingList.ts
	modified:   frontend/src/composables/raven/useWorkspaceGeneral.ts
	modified:   frontend/src/pages/Assignments.vue
	modified:   frontend/src/pages/Batches/BatchDetail.vue
	modified:   frontend/src/pages/Batches/BatchForm.vue
	modified:   frontend/src/pages/Batches/components/Assessments.vue
	modified:   frontend/src/pages/Batches/components/BatchCourses.vue
	modified:   frontend/src/pages/Batches/components/BatchFeedback.vue
	modified:   frontend/src/pages/Batches/components/BatchOverlay.vue
	modified:   frontend/src/pages/Batches/components/LiveClass.vue
	modified:   frontend/src/pages/Billing.vue
	modified:   frontend/src/pages/Courses/CourseDetail.vue
	modified:   frontend/src/pages/Courses/CourseForm.vue
	modified:   frontend/src/pages/Forms/AssessmentForm.vue
	modified:   frontend/src/pages/Forms/AssignmentForm.vue
	modified:   frontend/src/pages/Forms/BatchCourseForm.vue
	modified:   frontend/src/pages/Forms/ChapterForm.vue
	modified:   frontend/src/pages/Forms/CourseImportForm.vue
	modified:   frontend/src/pages/Forms/EmailTemplateForm.vue
	modified:   frontend/src/pages/Forms/JobForm.vue
	modified:   frontend/src/pages/Forms/LiveClassForm.vue
	modified:   frontend/src/pages/Forms/NewCourseForm.vue
	modified:   frontend/src/pages/Forms/ProfileEditForm.vue
	modified:   frontend/src/pages/Forms/ProgramForm.vue
	modified:   frontend/src/pages/Forms/ProgrammingExerciseForm.vue
	modified:   frontend/src/pages/Forms/QuizForm.vue
	modified:   frontend/src/pages/JobApplications.vue
	modified:   frontend/src/pages/Lesson.vue
	modified:   frontend/src/pages/LessonForm.vue
	modified:   frontend/src/pages/Profile.vue
	modified:   frontend/src/pages/ProfileEvaluator.vue
	modified:   frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
	modified:   frontend/src/pages/Programs/ProgramEnrollment.vue
	modified:   frontend/src/pages/QuizSubmission.vue
	modified:   frontend/src/pages/QuizSubmissions.vue
	modified:   frontend/src/pages/SCORMChapter.vue
	modified:   frontend/src/tests/Quiz.test.ts
	modified:   frontend/src/tests/contactUsEmail.test.ts
	modified:   frontend/src/tests/courseImportForm.test.ts
	new file:   frontend/src/tests/doubleSubmit-components.test.ts
	new file:   frontend/src/tests/doubleSubmit-course-batch-forms.test.ts
	new file:   frontend/src/tests/doubleSubmit-pages.test.ts
	new file:   frontend/src/tests/doubleSubmit-settings.test.ts
	new file:   frontend/src/tests/lessonCreateOnce.test.ts
	modified:   frontend/src/types/api.ts
	modified:   frontend/src/types/notes.ts
	modified:   frontend/src/utils/index.js

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   frontend/src/components/Layouts/settings/desktop/SettingsFieldsPanel.vue
	deleted by us:   frontend/src/components/Profile/ChangePasswordDialog.vue
	both modified:   frontend/src/components/Settings/Categories.vue
	deleted by us:   frontend/src/components/Settings/EmailAccount/EmailAccountDefaults.vue
	deleted by us:   frontend/src/components/Settings/GoogleCalendar/GoogleCalendarDetail.vue
	deleted by us:   frontend/src/components/Settings/Members/members.ts
	deleted by us:   frontend/src/components/Settings/Services/Services.vue
	deleted by us:   frontend/src/pages/Setup.vue
	deleted by us:   frontend/src/tests/emailAccountDefaultsPanel.test.ts

Cherry-pick of ffe35ba has failed:

On branch mergify/bp/version-15-hotfix/pr-3256
Your branch is ahead of 'origin/version-15-hotfix' by 11 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ffe35ba.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/components/Controls/Uploader.vue
	modified:   frontend/src/tests/CourseReviews.test.ts
	modified:   frontend/src/tests/Discussions.test.ts
	modified:   frontend/src/tests/ProfileEvaluator.test.ts
	deleted:    frontend/src/tests/RelatedCourses.test.ts
	modified:   frontend/src/tests/ReviewModal.test.ts
	modified:   frontend/src/tests/adminBatchDashboardFilters.test.ts
	modified:   frontend/src/tests/assessmentBlock.test.ts
	deleted:    frontend/src/tests/assessmentFormTypes.test.ts
	modified:   frontend/src/tests/assignmentEmbedded.test.ts
	modified:   frontend/src/tests/assignmentSubmissions.test.ts
	modified:   frontend/src/tests/batchDetailOpeners.test.ts
	modified:   frontend/src/tests/blockPreview.test.ts
	modified:   frontend/src/tests/chapterRoute.test.ts
	modified:   frontend/src/tests/courseCertification.test.ts
	deleted:    frontend/src/tests/coursePublishEmptyQuizWarning.test.ts
	modified:   frontend/src/tests/coursesFilters.test.ts
	modified:   frontend/src/tests/editorBold.test.ts
	modified:   frontend/src/tests/emailAccountDefaultsPanel.test.ts
	modified:   frontend/src/tests/enrollSteps.test.ts
	modified:   frontend/src/tests/enrollStudentsForm.test.ts
	deleted:    frontend/src/tests/lessonEmbedRounding.test.ts
	modified:   frontend/src/tests/linkOnCreate.test.ts
	modified:   frontend/src/tests/listPage.test.ts
	modified:   frontend/src/tests/mobileYou.test.ts
	modified:   frontend/src/tests/multiLink.test.ts
	modified:   frontend/src/tests/pageHeader.test.ts
	modified:   frontend/src/tests/profileEditRoute.test.ts
	modified:   frontend/src/tests/profileEvaluationSchedule.test.ts
	modified:   frontend/src/tests/profileUsernameKeys.test.ts
	modified:   frontend/src/tests/programEnrollment.test.ts
	modified:   frontend/src/tests/programStudentView.test.ts
	modified:   frontend/src/tests/programmingExerciseForm.test.ts
	modified:   frontend/src/tests/programmingExerciseSubmissions.test.ts
	modified:   frontend/src/tests/programsFilters.test.ts
	modified:   frontend/src/tests/quizTimerLifecycle.test.ts
	modified:   frontend/src/tests/ravenRuleModel.test.ts
	modified:   frontend/src/tests/scormChapterLocking.test.ts
	modified:   frontend/src/tests/settingsListResource.test.ts
	modified:   frontend/src/tests/settingsTableBadges.test.ts
	modified:   frontend/src/tests/studentLessonSidebar.test.ts
	modified:   frontend/src/tests/studentPicker.test.ts
	modified:   frontend/src/tests/unreadNotifications.test.ts
	new file:   frontend/src/tests/uploadErrorMessage.test.ts
	new file:   frontend/src/utils/uploadErrorMessage.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: frontend/src/tests/CourseOverviewOutline.test.ts
	both modified:   frontend/src/tests/FormShell.test.ts
	deleted by them: frontend/src/tests/LessonHelp.test.ts
	both modified:   frontend/src/tests/UploadPlugin.test.ts
	deleted by us:   frontend/src/tests/a11y-keyboard.test.ts
	deleted by us:   frontend/src/tests/a11y-media.test.ts
	both modified:   frontend/src/tests/announcementForm.test.ts
	both modified:   frontend/src/tests/assignmentCard.test.ts
	both modified:   frontend/src/tests/assignmentForm.test.ts
	both modified:   frontend/src/tests/assignmentStudentView.test.ts
	deleted by them: frontend/src/tests/assignmentsCount.test.ts
	both modified:   frontend/src/tests/badgeForm.test.ts
	both modified:   frontend/src/tests/batchStudentForm.test.ts
	both modified:   frontend/src/tests/bulkCertificatesForm.test.ts
	both modified:   frontend/src/tests/chapterForm.test.ts
	deleted by them: frontend/src/tests/chapterTitleAutofocus.test.ts
	both modified:   frontend/src/tests/commandPalette.test.ts
	deleted by them: frontend/src/tests/courseDetailOutlet.test.ts
	both modified:   frontend/src/tests/courseEnrollmentForm.test.ts
	both modified:   frontend/src/tests/courseImportForm.test.ts
	deleted by them: frontend/src/tests/coursePublishSettings.test.ts
	deleted by us:   frontend/src/tests/emailAccountForm.test.ts
	both modified:   frontend/src/tests/emailTemplateForm.test.ts
	both modified:   frontend/src/tests/embeddedExerciseSubmission.test.ts
	deleted by them: frontend/src/tests/jobApplicationsWithoutEmails.test.ts
	deleted by them: frontend/src/tests/jobDetailLogo.test.ts
	deleted by them: frontend/src/tests/lessonInlineMenu.test.ts
	both modified:   frontend/src/tests/lessonLocking.test.ts
	deleted by them: frontend/src/tests/listHeaderButtons.test.ts
	both modified:   frontend/src/tests/liveClassForm.test.ts
	both modified:   frontend/src/tests/memberFormRoute.test.ts
	deleted by them: frontend/src/tests/mobileBottomBar.test.ts
	both modified:   frontend/src/tests/newBatchForm.test.ts
	both modified:   frontend/src/tests/newCourseForm.test.ts
	both modified:   frontend/src/tests/programForm.test.ts
	both modified:   frontend/src/tests/questionEditorSizing.test.ts
	both modified:   frontend/src/tests/ravenSettings.test.ts
	both modified:   frontend/src/tests/resourceCacheRemount.test.ts
	both modified:   frontend/src/tests/responsiveListView.test.ts
	deleted by us:   frontend/src/tests/routeTables.test.ts
	deleted by them: frontend/src/tests/searchFilterDoubleFetch.test.ts
	deleted by them: frontend/src/tests/settingsDialogWidth.test.ts
	both modified:   frontend/src/tests/settingsList.test.ts
	deleted by them: frontend/src/tests/settingsListSearch.test.ts
	deleted by them: frontend/src/tests/settingsTableScroll.test.ts
	both modified:   frontend/src/tests/submissionsPage.test.ts
	both modified:   frontend/src/tests/switchRow.test.ts
	both modified:   frontend/src/tests/tabbedDetailPage.test.ts
	deleted by them: frontend/src/tests/upcomingEvaluationsNotice.test.ts
	deleted by them: frontend/src/tests/uploadFailureToast.test.ts
	both modified:   frontend/src/tests/userAvatarIndicator.test.ts
	deleted by them: frontend/src/tests/userDropdownTheme.test.ts

Cherry-pick of 3a1f127 has failed:

On branch mergify/bp/version-15-hotfix/pr-3256
Your branch is ahead of 'origin/version-15-hotfix' by 14 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3a1f127.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/components/FormShell.vue
	renamed:    frontend/src/components/FormShellStatus.vue -> frontend/src/components/ModalLoading.vue
	modified:   frontend/src/components/Modals/EvaluationModal.vue
	modified:   frontend/src/components/Modals/LiveClassAttendance.vue
	modified:   frontend/src/pages/Batches/components/BatchStudentProgress.vue
	modified:   frontend/src/pages/Courses/StudentCourseProgress.vue
	modified:   frontend/src/tests/announcementForm.test.ts
	modified:   frontend/src/tests/assignmentForm.test.ts
	modified:   frontend/src/tests/bulkCertificatesForm.test.ts
	modified:   frontend/src/tests/chapterForm.test.ts
	modified:   frontend/src/tests/emailTemplateForm.test.ts
	modified:   frontend/src/tests/enrollStudentsForm.test.ts
	modified:   frontend/src/tests/newBatchForm.test.ts
	modified:   frontend/src/tests/newCourseForm.test.ts
	modified:   frontend/src/tests/profileEditRoute.test.ts
	modified:   frontend/src/tests/programEnrollment.test.ts
	modified:   frontend/src/tests/programForm.test.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/components/Modals/VideoStatistics.vue
	both modified:   frontend/src/tests/courseImportForm.test.ts
	both modified:   frontend/src/tests/liveClassForm.test.ts
	both modified:   frontend/src/tests/memberFormRoute.test.ts

Cherry-pick of 2076c53 has failed:

On branch mergify/bp/version-15-hotfix/pr-3256
Your branch is ahead of 'origin/version-15-hotfix' by 15 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2076c53.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frontend/src/pages/Batches/BatchDetail.vue

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frontend/src/pages/Batches/components/Announcements.vue

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@raizasafeel
raizasafeel merged commit 9fbf0ef into version-15-hotfix Nov 17, 2026
11 checks passed
@raizasafeel
raizasafeel deleted the mergify/bp/version-15-hotfix/pr-3256 branch November 17, 2026 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant