From dd8bb2ab50e49625db335b73805a3b067af6e37a Mon Sep 17 00:00:00 2001
From: adi-herwana-nus <adi.hwn@nus.edu.sg>
Date: Sun, 27 Sep 2026 23:21:37 +0800
Subject: [PATCH] feat(submissions): index page style adjustments

- replace ConfirmationDialog calls with Prompt
- improve formatting of action buttons
- tweak mass-publish confirmation string
---
 .../pages/SubmissionsIndex/index.tsx          | 61 ++++++++++++-------
 .../assessment/submission/translations.ts     |  2 +-
 client/locales/en.json                        |  2 +-
 client/locales/ko.json                        |  2 +-
 client/locales/zh.json                        |  2 +-
 .../assessment/submission/submissions_spec.rb |  4 +-
 6 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/client/app/bundles/course/assessment/submission/pages/SubmissionsIndex/index.tsx b/client/app/bundles/course/assessment/submission/pages/SubmissionsIndex/index.tsx
index a0c0a550e80..648a322a17e 100644
--- a/client/app/bundles/course/assessment/submission/pages/SubmissionsIndex/index.tsx
+++ b/client/app/bundles/course/assessment/submission/pages/SubmissionsIndex/index.tsx
@@ -17,7 +17,6 @@ import CourseUserTypeTabs, {
   CourseUserTypeTabValue,
   getCurrentSelectedUserType,
 } from 'lib/components/core/CourseUserTypeTabs';
-import ConfirmationDialog from 'lib/components/core/dialogs/ConfirmationDialog';
 import Prompt from 'lib/components/core/dialogs/Prompt';
 import Page from 'lib/components/core/layouts/Page';
 import LoadingIndicator from 'lib/components/core/LoadingIndicator';
@@ -244,28 +243,36 @@ const AssessmentSubmissionsIndex: FC = () => {
       : translations.forceSubmitConfirmation;
 
     return (
-      <ConfirmationDialog
-        message={t(message, values)}
-        onCancel={() => setIsConfirmingForceSubmit(false)}
-        onConfirm={() => {
+      <Prompt
+        cancelColor="secondary"
+        onClickPrimary={() => {
           dispatch(forceSubmitSubmissions(currentSelectedUserType));
           setIsConfirmingForceSubmit(false);
         }}
+        onClose={() => setIsConfirmingForceSubmit(false)}
         open={isConfirmingForceSubmit}
-      />
+        primaryLabel={t(formTranslations.continue)}
+      >
+        <Typography variant="body2">{t(message, values)}</Typography>
+      </Prompt>
     );
   };
 
   const renderFetchFromKoditsuConfirmation = (): JSX.Element => (
-    <ConfirmationDialog
-      message={t(translations.fetchSubmissionsFromKoditsuConfirmation)}
-      onCancel={() => setIsConfirmingFetchFromKoditsu(false)}
-      onConfirm={() => {
+    <Prompt
+      cancelColor="secondary"
+      onClickPrimary={() => {
         dispatch(fetchSubmissionsFromKoditsu());
         setIsConfirmingFetchFromKoditsu(false);
       }}
+      onClose={() => setIsConfirmingFetchFromKoditsu(false)}
       open={isConfirmingFetchFromKoditsu}
-    />
+      primaryLabel={t(formTranslations.continue)}
+    >
+      <Typography variant="body2">
+        {t(translations.fetchSubmissionsFromKoditsuConfirmation)}
+      </Typography>
+    </Prompt>
   );
 
   const renderStatusChart = (): JSX.Element => {
@@ -318,7 +325,7 @@ const AssessmentSubmissionsIndex: FC = () => {
 
         {renderStatusChart()}
 
-        <section className="flex-wrap space-x-4">
+        <section className="flex flex-wrap gap-3">
           {canPublishGrades && (
             <Button
               color="primary"
@@ -445,15 +452,20 @@ const AssessmentSubmissionsIndex: FC = () => {
     };
 
     return (
-      <ConfirmationDialog
-        message={t(translations.publishConfirmation, values)}
-        onCancel={() => setIsConfirmingPublish(false)}
-        onConfirm={() => {
+      <Prompt
+        cancelColor="secondary"
+        onClickPrimary={() => {
           dispatch(publishSubmissions(currentSelectedUserType));
           setIsConfirmingPublish(false);
         }}
+        onClose={() => setIsConfirmingPublish(false)}
         open={isConfirmingPublish}
-      />
+        primaryLabel={t(formTranslations.continue)}
+      >
+        <Typography variant="body2">
+          {t(translations.publishConfirmation, values)}
+        </Typography>
+      </Prompt>
     );
   };
 
@@ -471,10 +483,9 @@ const AssessmentSubmissionsIndex: FC = () => {
     };
 
     return (
-      <ConfirmationDialog
-        message={t(translations.sendReminderEmailConfirmation, values)}
-        onCancel={() => setIsConfirmingRemind(false)}
-        onConfirm={() => {
+      <Prompt
+        cancelColor="secondary"
+        onClickPrimary={() => {
           dispatch(
             sendAssessmentReminderEmail(
               parsedAssessmentId,
@@ -483,8 +494,14 @@ const AssessmentSubmissionsIndex: FC = () => {
           );
           setIsConfirmingRemind(false);
         }}
+        onClose={() => setIsConfirmingRemind(false)}
         open={isConfirmingRemind}
-      />
+        primaryLabel={t(formTranslations.continue)}
+      >
+        <Typography variant="body2">
+          {t(translations.sendReminderEmailConfirmation, values)}
+        </Typography>
+      </Prompt>
     );
   };
 
diff --git a/client/app/bundles/course/assessment/submission/translations.ts b/client/app/bundles/course/assessment/submission/translations.ts
index f59a367069e..dcab32e1670 100644
--- a/client/app/bundles/course/assessment/submission/translations.ts
+++ b/client/app/bundles/course/assessment/submission/translations.ts
@@ -318,7 +318,7 @@ const translations = defineMessages({
   publishRubricFeedbackConfirmation: {
     id: 'course.assessment.submission.publishRubricFeedbackConfirmation',
     defaultMessage:
-      'You are about to publish {count} AI rubric-based feedback {count, plural, one {comment} other {comments}} on written answers. Students will be able to see them straight away.',
+      'You are about to publish {count} AI rubric-based feedback {count, plural, one {comment} other {comments}} on written answers. The receiving students will be able to see them immediately.',
   },
   publishAutoFeedbackConfirmationPleaseRate: {
     id: 'course.assessment.submission.publishAutoFeedbackConfirmationPleaseRate',
diff --git a/client/locales/en.json b/client/locales/en.json
index a7f6a801fbe..34437af1ee0 100644
--- a/client/locales/en.json
+++ b/client/locales/en.json
@@ -3528,7 +3528,7 @@
     "defaultMessage": "Include phantom users"
   },
   "course.assessment.submission.publishRubricFeedbackConfirmation": {
-    "defaultMessage": "You are about to publish {count} AI rubric-based feedback {count, plural, one {comment} other {comments}} on written answers. Students will be able to see them straight away."
+    "defaultMessage": "You are about to publish {count} AI rubric-based feedback {count, plural, one {comment} other {comments}} on written answers. The receiving students will be able to see them immediately."
   },
   "course.assessment.submission.publishRubricFeedbackSuccess": {
     "defaultMessage": "All AI rubric-based feedback has been published."
diff --git a/client/locales/ko.json b/client/locales/ko.json
index bcf0a710a99..25759dc7327 100644
--- a/client/locales/ko.json
+++ b/client/locales/ko.json
@@ -3522,7 +3522,7 @@
     "defaultMessage": "팬텀 사용자 포함"
   },
   "course.assessment.submission.publishRubricFeedbackConfirmation": {
-    "defaultMessage": "서술형 답안에 대한 AI 루브릭 기반 피드백 댓글 {count}개를 게시하려고 합니다. 학생들이 바로 볼 수 있게 됩니다."
+    "defaultMessage": "서술형 답안에 대한 AI 루브릭 기반 피드백 댓글 {count}개를 게시하려고 합니다. 해당 학생들이 즉시 볼 수 있게 됩니다."
   },
   "course.assessment.submission.publishRubricFeedbackSuccess": {
     "defaultMessage": "모든 AI 루브릭 기반 피드백이 게시되었습니다."
diff --git a/client/locales/zh.json b/client/locales/zh.json
index 4262d92af03..d68682a11de 100644
--- a/client/locales/zh.json
+++ b/client/locales/zh.json
@@ -3528,7 +3528,7 @@
     "defaultMessage": "包括旁听学生"
   },
   "course.assessment.submission.publishRubricFeedbackConfirmation": {
-    "defaultMessage": "您即将发布 {count} 条针对书面答案的 AI 评分标准反馈评语。学生将立即可以看到这些评语。"
+    "defaultMessage": "您即将发布 {count} 条针对书面答案的 AI 评分标准反馈评语。收到评语的学生将立即看到这些评语。"
   },
   "course.assessment.submission.publishRubricFeedbackSuccess": {
     "defaultMessage": "所有 AI 评分标准反馈均已发布。"
diff --git a/spec/features/course/assessment/submission/submissions_spec.rb b/spec/features/course/assessment/submission/submissions_spec.rb
index 5dfe7c52128..7555e03aaa1 100644
--- a/spec/features/course/assessment/submission/submissions_spec.rb
+++ b/spec/features/course/assessment/submission/submissions_spec.rb
@@ -149,7 +149,7 @@
 
         expect(page).to have_text('Graded, unpublished')
         click_button('Publish Grades')
-        accept_confirm_dialog
+        accept_prompt
         wait_for_job
         expect(page).not_to have_text('Graded, unpublished')
 
@@ -170,7 +170,7 @@
         expect(page).to have_text('Not Started')
 
         click_button('Force Submit Remaining')
-        accept_confirm_dialog
+        accept_prompt
         wait_for_job
 
         expect(page).not_to have_text('Attempting')