From f73d9e8ea688441411f80a6e70a33566882ce86a Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 11:20:28 +0000
Subject: [PATCH 1/9] =?UTF-8?q?refactor(classroom):=20=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=82=B9=E4=BD=9C=E6=88=90/=E8=AA=B2=E9=A1=8C=E4=BD=9C?=
 =?UTF-8?q?=E6=88=90/=E5=86=8D=E5=88=A9=E7=94=A8/=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=82=B9=E8=A8=AD=E5=AE=9A=E3=82=92=E7=94=BB=E9=9D=A2=E9=81=B7?=
 =?UTF-8?q?=E7=A7=BB=E3=81=AB=E7=B5=B1=E4=B8=80=EF=BC=88#1108=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

現在の画面上にモーダルっぽい popover を出すトグル UI をやめ、課題詳細→
Google Classroom に共有 と同じ「画面遷移＋キャンセル/実行で戻る」基本レイアウト
（パンくず＋タイトル＋フォーム＋フッター: プライマリー右下/キャンセル左下）に統一:

- クラス一覧「クラスを作る」: popover → 画面遷移（クラス一覧 > クラスを作る）
- クラス設定: インラインカード置換 → 画面遷移（クラス一覧 > 設定）。減員警告・
  アーカイブ確認の挙動は維持
- 課題一覧「課題を作る」「課題を再利用」: popover → 画面遷移。サブビュー中は
  上部アクションバーを隠し、パンくずに現在地を出す（「課題一覧」で戻る）
- 不要になった boardPopover 経由の inline form / inline settings を除去

data-testid は維持。unit テスト（class-list 12 + board 19 = 31）green。lint/prettier 通過。
実機で 4 画面が画面遷移・フッター統一・ヘッダ非表示になることを確認。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../teacher-assignment-board.jsx              | 227 +++++++++----
 .../classroom-modal/teacher-class-list.jsx    | 315 ++++++++++--------
 packages/scratch-gui/src/locales/ja-Hira.js   |   1 +
 packages/scratch-gui/src/locales/ja.js        |   1 +
 4 files changed, 346 insertions(+), 198 deletions(-)

diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
index 55609d212bc..e1b30ffc765 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
@@ -389,6 +389,58 @@ const TeacherAssignmentBoard = ({
         [onUpdateGroupTopics, group.groupId],
     );
 
+    // 画面遷移サブビュー（#1108）: 作成/再利用/共有/合言葉/カタログ。開いている間は
+    // 上部アクションバーを隠し、パンくずに現在地を出す。「課題一覧」で元に戻る。
+    const subView = showInlineCreate
+        ? 'create'
+        : showReuse
+          ? 'reuse'
+          : shared && shared.shareTarget
+            ? 'share'
+            : shared && shared.showPasscodeImport
+              ? 'passcode'
+              : shared && shared.showCatalog
+                ? 'catalog'
+                : null;
+    // 各 id の descriptor は元の使用箇所と一致させる（react-intl は同一 id で
+    // defaultMessage/description の不一致を許さない）。
+    const subViewMessages = {
+        create: {
+            defaultMessage: 'Create an assignment',
+            description: 'Button on the board to create a new assignment',
+            id: 'gui.classroom.board.create',
+        },
+        reuse: {
+            defaultMessage: 'Reuse an assignment',
+            description: 'Button on the board to reuse (duplicate) an existing assignment',
+            id: 'gui.classroom.board.reuse',
+        },
+        share: {
+            defaultMessage: 'Share this assignment',
+            description: 'Share step title',
+            id: 'gui.classroom.shared.shareStepTitle',
+        },
+        passcode: {
+            defaultMessage: 'Import by passcode',
+            description: 'Passcode import step title',
+            id: 'gui.classroom.shared.passcodeImportTitle',
+        },
+        catalog: {
+            defaultMessage: 'Find in みんなの課題',
+            description: 'Button that opens the shared assignment catalog',
+            id: 'gui.classroom.shared.openCatalog',
+        },
+    };
+    const handleBoardHome = useCallback(() => {
+        setShowInlineCreate(false);
+        setShowReuse(false);
+        if (shared) {
+            if (shared.shareTarget) shared.handleCloseShareForm();
+            if (shared.showPasscodeImport) shared.handleClosePasscodeImport();
+            if (shared.showCatalog) shared.handleCloseCatalog();
+        }
+    }, [shared]);
+
     return (
         <div className={styles.assignmentBoard} data-testid="classroom-board">
             <TeacherBreadcrumbs
@@ -402,16 +454,28 @@ const TeacherAssignmentBoard = ({
                         onClick: onShowClassList,
                         testId: 'classroom-breadcrumb-class-list',
                     },
-                    {
-                        label: intl.formatMessage({
-                            defaultMessage: 'Assignments',
-                            description: 'Breadcrumb label of the assignment board',
-                            id: 'gui.classroom.breadcrumbs.assignments',
-                        }),
-                    },
+                    // サブビュー中は「課題一覧」を戻るリンクにし、現在地の crumb を足す。
+                    subView
+                        ? {
+                              label: intl.formatMessage({
+                                  defaultMessage: 'Assignments',
+                                  description: 'Breadcrumb label of the assignment board',
+                                  id: 'gui.classroom.breadcrumbs.assignments',
+                              }),
+                              onClick: handleBoardHome,
+                              testId: 'classroom-breadcrumb-assignments',
+                          }
+                        : {
+                              label: intl.formatMessage({
+                                  defaultMessage: 'Assignments',
+                                  description: 'Breadcrumb label of the assignment board',
+                                  id: 'gui.classroom.breadcrumbs.assignments',
+                              }),
+                          },
+                    ...(subView ? [{ label: intl.formatMessage(subViewMessages[subView]) }] : []),
                 ]}
             />
-            {!(shared && (shared.shareTarget || shared.showPasscodeImport)) && (
+            {!subView && (
             <div className={styles.boardHeader}>
                 <h2 className={styles.boardTitle}>{formatClassLabel(group)}</h2>
                 <button
@@ -522,64 +586,91 @@ const TeacherAssignmentBoard = ({
                 />
             ) : shared && shared.showCatalog ? (
                 <SharedAssignmentCatalog group={group} isLoading={isLoading} shared={shared} />
-            ) : (
-                <React.Fragment>
-            {showInlineCreate ? (
+            ) : showInlineCreate ? (
+                // 課題を作る（#1108: popover → 画面遷移。フッター キャンセル左/作成右）
                 <form
-                    className={`${styles.boardPopover} ${styles.boardInlineCreate}`}
+                    className={styles.postAssignmentContainer}
+                    data-testid="classroom-board-create-view"
                     onSubmit={handleSubmitInlineCreate}
                 >
-                    <input
-                        autoFocus
-                        data-testid="classroom-board-create-name"
-                        disabled={isLoading}
-                        maxLength={50}
-                        placeholder={intl.formatMessage({
-                            defaultMessage: 'Assignment name (e.g. Move the cat)',
-                            description: 'Placeholder of the inline assignment name input',
-                            id: 'gui.classroom.board.createNamePlaceholder',
-                        })}
-                        type="text"
-                        value={newAssignmentName}
-                        onChange={handleNewAssignmentNameChange}
-                    />
-                    <button
-                        data-testid="classroom-board-create-submit"
-                        disabled={isLoading || newAssignmentName.trim().length === 0}
-                        type="submit"
-                    >
+                    <div className={styles.phaseTitle}>
                         <FormattedMessage
-                            defaultMessage="Create"
-                            description="Submit button of the inline assignment creation form"
-                            id="gui.classroom.board.createSubmit"
+                            defaultMessage="Create an assignment"
+                            description="Button on the board to create a new assignment"
+                            id="gui.classroom.board.create"
                         />
-                    </button>
-                    <button
-                        className={styles.popoverCancel}
-                        data-testid="classroom-board-create-cancel"
-                        type="button"
-                        onClick={handleToggleInlineCreate}
-                    >
-                        <FormattedMessage
-                            defaultMessage="Cancel"
-                            description="Cancel button of the inline assignment creation form"
-                            id="gui.classroom.board.createCancel"
+                    </div>
+                    <div className={styles.formGroup}>
+                        <label className={styles.label}>
+                            <FormattedMessage
+                                defaultMessage="Assignment name:"
+                                description="Label for the assignment name on the create screen"
+                                id="gui.classroom.board.createNameLabel"
+                            />
+                        </label>
+                        <input
+                            autoFocus
+                            className={styles.input}
+                            data-testid="classroom-board-create-name"
+                            disabled={isLoading}
+                            maxLength={50}
+                            placeholder={intl.formatMessage({
+                                defaultMessage: 'Assignment name (e.g. Move the cat)',
+                                description: 'Placeholder of the assignment name input',
+                                id: 'gui.classroom.board.createNamePlaceholder',
+                            })}
+                            type="text"
+                            value={newAssignmentName}
+                            onChange={handleNewAssignmentNameChange}
                         />
-                    </button>
+                    </div>
+                    <div className={styles.formFooter}>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-board-create-cancel"
+                            type="button"
+                            onClick={handleToggleInlineCreate}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Cancel"
+                                description="Cancel button of the assignment create screen"
+                                id="gui.classroom.board.createCancel"
+                            />
+                        </button>
+                        <button
+                            className={styles.primaryButton}
+                            data-testid="classroom-board-create-submit"
+                            disabled={isLoading || newAssignmentName.trim().length === 0}
+                            type="submit"
+                        >
+                            <FormattedMessage
+                                defaultMessage="Create"
+                                description="Submit button of the assignment create screen"
+                                id="gui.classroom.board.createSubmit"
+                            />
+                        </button>
+                    </div>
                 </form>
-            ) : null}
-            {showReuse ? (
-                <div
-                    className={`${styles.boardPopover} ${styles.boardSection}`}
-                    data-testid="classroom-board-reuse-view"
-                >
-                    <div className={styles.reuseFilter}>
+            ) : showReuse ? (
+                // 課題を再利用（#1108: popover → 画面遷移。コピーは候補ごと、キャンセル左）
+                <div className={styles.postAssignmentContainer} data-testid="classroom-board-reuse-view">
+                    <div className={styles.phaseTitle}>
+                        <FormattedMessage
+                            defaultMessage="Reuse an assignment"
+                            description="Button on the board to reuse (duplicate) an existing assignment"
+                            id="gui.classroom.board.reuse"
+                        />
+                    </div>
+                    <p className={styles.postAssignmentHint}>
                         <FormattedMessage
                             defaultMessage="Copy an existing assignment into this class:"
                             description="Explanation above the reuse picker"
                             id="gui.classroom.board.reuseHint"
                         />
+                    </p>
+                    <div className={styles.formGroup}>
                         <select
+                            className={styles.input}
                             data-testid="classroom-board-reuse-filter"
                             disabled={isLoading}
                             value={reuseFilterGroupId}
@@ -598,18 +689,6 @@ const TeacherAssignmentBoard = ({
                                 </option>
                             ))}
                         </select>
-                        <button
-                            className={styles.popoverCancel}
-                            data-testid="classroom-board-reuse-cancel"
-                            type="button"
-                            onClick={handleToggleReuse}
-                        >
-                            <FormattedMessage
-                                defaultMessage="Cancel"
-                                description="Close the reuse picker without copying"
-                                id="gui.classroom.board.reuseCancel"
-                            />
-                        </button>
                     </div>
                     <ul className={styles.boardRows}>
                         {reuseCandidates.map((c) => (
@@ -637,8 +716,24 @@ const TeacherAssignmentBoard = ({
                             </li>
                         ))}
                     </ul>
+                    <div className={styles.formFooter}>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-board-reuse-cancel"
+                            type="button"
+                            onClick={handleToggleReuse}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Cancel"
+                                description="Close the reuse picker without copying"
+                                id="gui.classroom.board.reuseCancel"
+                            />
+                        </button>
+                        <span />
+                    </div>
                 </div>
-            ) : null}
+            ) : (
+                <React.Fragment>
             <div className={styles.boardTopics}>
                 {topics.map((topic) => (
                     <TopicChip
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
index 2edb8821fe6..abb812893a9 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
@@ -522,69 +522,49 @@ const TeacherClassList = ({
     // migration failed). They must never be hidden — list them directly.
     const knownGroupIds = new Set(groups.map((g) => g.groupId));
     const ungrouped = classrooms.filter((c) => !c.groupId || !knownGroupIds.has(c.groupId));
+    const settingsGroup = groups.find((g) => g.groupId === settingsGroupId);
 
-    return (
-        <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
-            <TeacherBreadcrumbs
-                items={[
-                    {
-                        label: intl.formatMessage({
-                            defaultMessage: 'Class list',
-                            description: 'Breadcrumb label of the class list (current view)',
-                            id: 'gui.classroom.breadcrumbs.classList',
-                        }),
-                    },
-                ]}
-            />
-            <h2 className={styles.classListTitle}>
-                <FormattedMessage
-                    defaultMessage="Your classes"
-                    description="Title of the class list (post-login landing view)"
-                    id="gui.classroom.classList.title"
-                />
-            </h2>
-            <p className={styles.classListHint}>
-                <FormattedMessage
-                    defaultMessage="A class is one homeroom (e.g. Year 2 Class 1). Open a class to manage its assignments."
-                    description="Hint below the class list title"
-                    id="gui.classroom.classList.hint"
-                />
-            </p>
-            <ErrorDisplay error={error} errorTitle={errorTitle} />
-            <button
-                className={styles.classListCreateButton}
-                data-testid="classroom-class-create"
-                disabled={isLoading}
-                type="button"
-                onClick={handleToggleCreateForm}
-            >
-                <FormattedMessage
-                    defaultMessage="Create a class"
-                    description="Button that opens the combined class creation form"
-                    id="gui.classroom.classList.create"
+    const classListCrumb = {
+        label: intl.formatMessage({
+            defaultMessage: 'Class list',
+            description: 'Breadcrumb link back to the class list',
+            id: 'gui.classroom.breadcrumbs.classList',
+        }),
+        onClick: showCreateForm ? handleToggleCreateForm : handleCloseSettings,
+        testId: 'classroom-breadcrumb-class-list',
+    };
+
+    // クラスを作る（#1108: popover → 画面遷移。フッター キャンセル左/作成右）
+    if (showCreateForm) {
+        return (
+            <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
+                <TeacherBreadcrumbs
+                    items={[
+                        classListCrumb,
+                        {
+                            label: intl.formatMessage({
+                                defaultMessage: 'Create a class',
+                                description: 'Button that opens the combined class creation form',
+                                id: 'gui.classroom.classList.create',
+                            }),
+                        },
+                    ]}
                 />
-            </button>
-            {onShowGoogleCourses ? (
-                <button
-                    className={styles.classListImportButton}
-                    data-testid="classroom-class-import-gc"
-                    disabled={isLoading}
-                    type="button"
-                    onClick={onShowGoogleCourses}
-                >
-                    <FormattedMessage
-                        defaultMessage="Import from Google Classroom"
-                        description="Button on the class list to import a GC course as a class"
-                        id="gui.classroom.classList.importGc"
-                    />
-                </button>
-            ) : null}
-            {showCreateForm ? (
+                <ErrorDisplay error={error} errorTitle={errorTitle} />
                 <form
-                    className={`${styles.boardPopover} ${styles.classListCreateForm}`}
+                    className={styles.postAssignmentContainer}
+                    data-testid="classroom-class-create-view"
                     onSubmit={handleSubmit}
                 >
+                    <div className={styles.phaseTitle}>
+                        <FormattedMessage
+                            defaultMessage="Create a class"
+                            description="Button that opens the combined class creation form"
+                            id="gui.classroom.classList.create"
+                        />
+                    </div>
                     <input
+                        className={styles.input}
                         data-testid="classroom-class-create-name"
                         disabled={isLoading}
                         maxLength={50}
@@ -636,6 +616,7 @@ const TeacherClassList = ({
                         />
                     </div>
                     <input
+                        className={styles.input}
                         data-testid="classroom-class-create-assignment"
                         disabled={isLoading}
                         maxLength={50}
@@ -648,40 +629,132 @@ const TeacherClassList = ({
                         value={assignmentName}
                         onChange={handleAssignmentNameChange}
                     />
-                    <button
-                        data-testid="classroom-class-create-submit"
-                        disabled={!canSubmit || isLoading}
-                        type="submit"
-                    >
-                        {assignmentName.trim() ? (
-                            <FormattedMessage
-                                defaultMessage="Create class and assignment"
-                                description="Submit button when a first assignment is given"
-                                id="gui.classroom.classList.createSubmit"
-                            />
-                        ) : (
+                    <div className={styles.formFooter}>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-class-create-cancel"
+                            type="button"
+                            onClick={handleToggleCreateForm}
+                        >
                             <FormattedMessage
-                                defaultMessage="Create the class only"
-                                description="Submit button when no first assignment is given"
-                                id="gui.classroom.classList.createClassOnly"
+                                defaultMessage="Cancel"
+                                description="Cancel button of the class creation form"
+                                id="gui.classroom.classList.createCancel"
                             />
-                        )}
-                    </button>
-                    <button
-                        className={styles.popoverCancel}
-                        data-testid="classroom-class-create-cancel"
-                        type="button"
-                        onClick={handleToggleCreateForm}
-                    >
-                        <FormattedMessage
-                            defaultMessage="Cancel"
-                            description="Cancel button of the class creation form"
-                            id="gui.classroom.classList.createCancel"
-                        />
-                    </button>
+                        </button>
+                        <button
+                            className={styles.primaryButton}
+                            data-testid="classroom-class-create-submit"
+                            disabled={!canSubmit || isLoading}
+                            type="submit"
+                        >
+                            {assignmentName.trim() ? (
+                                <FormattedMessage
+                                    defaultMessage="Create class and assignment"
+                                    description="Submit button when a first assignment is given"
+                                    id="gui.classroom.classList.createSubmit"
+                                />
+                            ) : (
+                                <FormattedMessage
+                                    defaultMessage="Create the class only"
+                                    description="Submit button when no first assignment is given"
+                                    id="gui.classroom.classList.createClassOnly"
+                                />
+                            )}
+                        </button>
+                    </div>
                 </form>
+            </div>
+        );
+    }
+
+    // クラス設定（#1108: インラインカード → 画面遷移）
+    if (settingsGroup) {
+        return (
+            <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
+                <TeacherBreadcrumbs
+                    items={[
+                        classListCrumb,
+                        {
+                            label: intl.formatMessage({
+                                defaultMessage: 'Settings',
+                                description: 'Button on a class card to open its settings',
+                                id: 'gui.classroom.classList.settings',
+                            }),
+                        },
+                    ]}
+                />
+                <ErrorDisplay error={error} errorTitle={errorTitle} />
+                <div className={styles.postAssignmentContainer}>
+                    <div className={styles.phaseTitle}>{formatClassLabel(settingsGroup)}</div>
+                    <ClassSettingsForm
+                        group={settingsGroup}
+                        isLoading={isLoading}
+                        onCancel={handleCloseSettings}
+                        onUpdateGroup={onUpdateGroup}
+                    />
+                </div>
+            </div>
+        );
+    }
+
+    return (
+        <div className={styles.classList} data-testid="classroom-phase-teacher-class-list">
+            <TeacherBreadcrumbs
+                items={[
+                    {
+                        label: intl.formatMessage({
+                            defaultMessage: 'Class list',
+                            description: 'Breadcrumb label of the class list (current view)',
+                            id: 'gui.classroom.breadcrumbs.classList',
+                        }),
+                    },
+                ]}
+            />
+            <h2 className={styles.classListTitle}>
+                <FormattedMessage
+                    defaultMessage="Your classes"
+                    description="Title of the class list (post-login landing view)"
+                    id="gui.classroom.classList.title"
+                />
+            </h2>
+            <p className={styles.classListHint}>
+                <FormattedMessage
+                    defaultMessage="A class is one homeroom (e.g. Year 2 Class 1). Open a class to manage its assignments."
+                    description="Hint below the class list title"
+                    id="gui.classroom.classList.hint"
+                />
+            </p>
+            <ErrorDisplay error={error} errorTitle={errorTitle} />
+            <button
+                className={styles.classListCreateButton}
+                data-testid="classroom-class-create"
+                disabled={isLoading}
+                type="button"
+                onClick={handleToggleCreateForm}
+            >
+                <FormattedMessage
+                    defaultMessage="Create a class"
+                    description="Button that opens the combined class creation form"
+                    id="gui.classroom.classList.create"
+                />
+            </button>
+            {onShowGoogleCourses ? (
+                <button
+                    className={styles.classListImportButton}
+                    data-testid="classroom-class-import-gc"
+                    disabled={isLoading}
+                    type="button"
+                    onClick={onShowGoogleCourses}
+                >
+                    <FormattedMessage
+                        defaultMessage="Import from Google Classroom"
+                        description="Button on the class list to import a GC course as a class"
+                        id="gui.classroom.classList.importGc"
+                    />
+                </button>
             ) : null}
-            {activeGroups.length === 0 && !showCreateForm ? (
+            {activeGroups.length === 0 ? (
                 <p className={styles.classListEmpty} data-testid="classroom-class-list-empty">
                     <FormattedMessage
                         defaultMessage={'No classes yet. Press "Create a class" to get started.'}
@@ -721,28 +794,17 @@ const TeacherClassList = ({
                 </div>
             ) : null}
             <ul className={styles.classCards} data-testid="classroom-class-list">
-                {activeGroups.map((group) =>
-                    settingsGroupId === group.groupId ? (
-                        <li key={group.groupId} className={styles.classCard}>
-                            <ClassSettingsForm
-                                group={group}
-                                isLoading={isLoading}
-                                onCancel={handleCloseSettings}
-                                onUpdateGroup={onUpdateGroup}
-                            />
-                        </li>
-                    ) : (
-                        <ClassCard
-                            key={group.groupId}
-                            assignmentCount={countFor(group.groupId)}
-                            group={group}
-                            isLoading={isLoading}
-                            onSelectGroup={onSelectGroup}
-                            onShowEvaluation={onShowEvaluation}
-                            onShowSettings={handleShowSettings}
-                        />
-                    ),
-                )}
+                {activeGroups.map((group) => (
+                    <ClassCard
+                        key={group.groupId}
+                        assignmentCount={countFor(group.groupId)}
+                        group={group}
+                        isLoading={isLoading}
+                        onSelectGroup={onSelectGroup}
+                        onShowEvaluation={onShowEvaluation}
+                        onShowSettings={handleShowSettings}
+                    />
+                ))}
             </ul>
             {archivedGroups.length > 0 ? (
                 <div className={styles.archivedSection}>
@@ -764,29 +826,18 @@ const TeacherClassList = ({
                     </button>
                     {showArchived ? (
                         <ul className={styles.classCards} data-testid="classroom-archived-class-list">
-                            {archivedGroups.map((group) =>
-                                settingsGroupId === group.groupId ? (
-                                    <li key={group.groupId} className={styles.classCard}>
-                                        <ClassSettingsForm
-                                            group={group}
-                                            isLoading={isLoading}
-                                            onCancel={handleCloseSettings}
-                                            onUpdateGroup={onUpdateGroup}
-                                        />
-                                    </li>
-                                ) : (
-                                    <ClassCard
-                                        key={group.groupId}
-                                        assignmentCount={countFor(group.groupId)}
-                                        group={group}
-                                        isLoading={isLoading}
-                                        onRestoreGroup={handleRestoreGroup}
-                                        onSelectGroup={onSelectGroup}
-                                        onShowEvaluation={onShowEvaluation}
-                                        onShowSettings={handleShowSettings}
-                                    />
-                                ),
-                            )}
+                            {archivedGroups.map((group) => (
+                                <ClassCard
+                                    key={group.groupId}
+                                    assignmentCount={countFor(group.groupId)}
+                                    group={group}
+                                    isLoading={isLoading}
+                                    onRestoreGroup={handleRestoreGroup}
+                                    onSelectGroup={onSelectGroup}
+                                    onShowEvaluation={onShowEvaluation}
+                                    onShowSettings={handleShowSettings}
+                                />
+                            ))}
                         </ul>
                     ) : null}
                 </div>
diff --git a/packages/scratch-gui/src/locales/ja-Hira.js b/packages/scratch-gui/src/locales/ja-Hira.js
index d6bb7bf5c04..1d57534abb1 100644
--- a/packages/scratch-gui/src/locales/ja-Hira.js
+++ b/packages/scratch-gui/src/locales/ja-Hira.js
@@ -221,6 +221,7 @@ export default {
     'gui.classroom.breadcrumbs.assignmentDetail': 'かだいしょうさい',
     'gui.classroom.breadcrumbs.shareGc': 'Google Classroom に きょうゆう',
     'gui.classroom.board.createNamePlaceholder': 'かだいめい（れい: ねこをうごかそう）',
+    'gui.classroom.board.createNameLabel': 'かだいめい:',
     'gui.classroom.board.createSubmit': 'つくる',
     'gui.classroom.board.reuse': 'かだいをさいりよう',
     'gui.classroom.board.reuseHint': 'つくったかだいをこのクラスにふくせい:',
diff --git a/packages/scratch-gui/src/locales/ja.js b/packages/scratch-gui/src/locales/ja.js
index dbed6fb8647..9206e66fb37 100644
--- a/packages/scratch-gui/src/locales/ja.js
+++ b/packages/scratch-gui/src/locales/ja.js
@@ -217,6 +217,7 @@ export default {
     'gui.classroom.breadcrumbs.assignmentDetail': '課題詳細',
     'gui.classroom.breadcrumbs.shareGc': 'Google Classroom に共有',
     'gui.classroom.board.createNamePlaceholder': '課題名（例: ねこを動かそう）',
+    'gui.classroom.board.createNameLabel': '課題名:',
     'gui.classroom.board.createSubmit': '作成',
     'gui.classroom.board.reuse': '課題を再利用',
     'gui.classroom.board.reuseHint': '作成済みの課題をこのクラスに複製:',

From 629de4c40672656179ca80447f43b674a926b5d9 Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 11:23:04 +0000
Subject: [PATCH 2/9] =?UTF-8?q?refactor(classroom):=20=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=95?=
 =?UTF-8?q?=E3=83=83=E3=82=BF=E3=83=BC=E3=82=92=E5=9F=BA=E6=9C=AC=E3=83=9D?=
 =?UTF-8?q?=E3=83=AA=E3=82=B7=E3=83=BC=E3=81=AB=E7=B5=B1=E4=B8=80=EF=BC=88?=
 =?UTF-8?q?#1108=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Google Classroom からインポート画面のフッターを、右寄せ（インポートのみ）から
基本ポリシー（キャンセル左下 / インポート右下）に統一。キャンセルは戻る（クラス
一覧）と同じ挙動。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../classroom-teacher-modal.css               | 28 +++++++++++++++++++
 .../teacher-google-courses-phase.jsx          | 16 ++++++++++-
 packages/scratch-gui/src/locales/ja-Hira.js   |  1 +
 packages/scratch-gui/src/locales/ja.js        |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css b/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css
index 9f818ae70fd..5353f7c6756 100644
--- a/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css
+++ b/packages/scratch-gui/src/components/classroom-teacher-modal/classroom-teacher-modal.css
@@ -308,6 +308,34 @@
     text-align: right;
 }
 
+/* 基本ポリシーのフッター（#1108）: キャンセル左 / プライマリー右。 */
+.main-footer-split {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.5rem;
+    margin-top: 1rem;
+}
+
+.secondary-footer-button {
+    padding: 0.6rem 1.2rem;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    background-color: white;
+    color: #575e75;
+    font-size: 0.9rem;
+    cursor: pointer;
+}
+
+.secondary-footer-button:hover:not(:disabled) {
+    background-color: #f2f2f2;
+}
+
+.secondary-footer-button:disabled {
+    opacity: 0.5;
+    cursor: default;
+}
+
 .auth-hint-overlay {
     position: absolute;
     top: 0;
diff --git a/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx b/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx
index eb53b4f90c6..851009ed40a 100644
--- a/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx
+++ b/packages/scratch-gui/src/components/classroom-teacher-modal/teacher-google-courses-phase.jsx
@@ -169,7 +169,21 @@ const TeacherGoogleCoursesPhase = ({
                     onSelect={onSelectGoogleCourse}
                 />
             )}
-            <div className={styles.mainFooter}>
+            {/* フッターを基本ポリシーに統一（#1108）: キャンセル左 / インポート右 */}
+            <div className={styles.mainFooterSplit}>
+                <button
+                    className={styles.secondaryFooterButton}
+                    data-testid="classroom-google-import-cancel"
+                    disabled={isLoading}
+                    type="button"
+                    onClick={onBack}
+                >
+                    <FormattedMessage
+                        defaultMessage="Cancel"
+                        description="Cancel the Google Classroom import and go back to the class list"
+                        id="gui.classroom.management.importCancel"
+                    />
+                </button>
                 <button
                     className={styles.loginButton}
                     data-testid="classroom-google-import-confirm"
diff --git a/packages/scratch-gui/src/locales/ja-Hira.js b/packages/scratch-gui/src/locales/ja-Hira.js
index 1d57534abb1..f57ba251e12 100644
--- a/packages/scratch-gui/src/locales/ja-Hira.js
+++ b/packages/scratch-gui/src/locales/ja-Hira.js
@@ -471,6 +471,7 @@ export default {
     'gui.classroom.management.googleCoursesTitle': 'Google Classroomからインポート',
     'gui.classroom.management.noCourses': 'クラスがみつかりません',
     'gui.classroom.management.importButton': 'インポート',
+    'gui.classroom.management.importCancel': 'キャンセル',
     'gui.classroom.management.authHintTitle': 'Google Classroom からインポートするまえに',
     'gui.classroom.management.authHintGuide':
         'にんかのがめんがひょうじされたら、したのがぞうのようにすべてのチェックボックスにチェックをいれてください。',
diff --git a/packages/scratch-gui/src/locales/ja.js b/packages/scratch-gui/src/locales/ja.js
index 9206e66fb37..4ff22923f30 100644
--- a/packages/scratch-gui/src/locales/ja.js
+++ b/packages/scratch-gui/src/locales/ja.js
@@ -459,6 +459,7 @@ export default {
     'gui.classroom.management.googleCoursesTitle': 'Google Classroomからインポート',
     'gui.classroom.management.noCourses': 'クラスが見つかりません',
     'gui.classroom.management.importButton': 'インポート',
+    'gui.classroom.management.importCancel': 'キャンセル',
     'gui.classroom.management.authHintTitle': 'Google Classroom からインポートする前に',
     'gui.classroom.management.authHintGuide':
         '認可の画面が表示されたら、下の画像のようにすべてのチェックボックスにチェックを入れてください。',

From b379599dc67c69d308586cb15e7044aa26ea01e1 Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 12:36:21 +0000
Subject: [PATCH 3/9] =?UTF-8?q?fix(classroom):=20=E3=83=AC=E3=83=93?=
 =?UTF-8?q?=E3=83=A5=E3=83=BC=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C=EF=BC=88?=
 =?UTF-8?q?=E8=A9=95=E4=BE=A1=E3=82=AD=E3=83=A3=E3=83=B3=E3=82=BB=E3=83=AB?=
 =?UTF-8?q?=20/=20=E8=A8=AD=E5=AE=9A=E3=83=95=E3=83=83=E3=82=BF=E3=83=BC?=
 =?UTF-8?q?=20/=20=E3=82=A2=E3=83=BC=E3=82=AB=E3=82=A4=E3=83=96=E6=B8=88?=
 =?UTF-8?q?=E3=81=BF=E8=A8=AD=E5=AE=9A=E9=9D=9E=E8=A1=A8=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

人間レビューの指摘 3 点:
- 評価画面: 左下にキャンセルボタン（クラス一覧へ戻る）を追加
- クラス設定フッター: キャンセルを左下、アーカイブは保存の左（右グループ）に。
  アーカイブ押下中はキャンセル・保存を隠し「アーカイブしない/する」のみ表示、
  「しない」で元に戻す（キャンセル左・アーカイブ/保存右）
- アーカイブ済みのクラスカード: 設定ボタンを非表示（元に戻すのみ）

unit テスト更新（アーカイブ済みは設定非表示・アーカイブ確認でボタン切替）。
lint/prettier 通過。実機で 3 点とも確認。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../classroom-modal/classroom-modal.css       |   7 +
 .../classroom-modal/teacher-class-list.jsx    | 210 ++++++++++--------
 .../classroom-modal/teacher-evaluation.jsx    |  16 ++
 packages/scratch-gui/src/locales/ja-Hira.js   |   1 +
 packages/scratch-gui/src/locales/ja.js        |   1 +
 .../components/teacher-class-list.test.jsx    |  30 ++-
 6 files changed, 162 insertions(+), 103 deletions(-)

diff --git a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
index 44075ba0a0d..f22bce4157e 100644
--- a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
+++ b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
@@ -559,6 +559,13 @@
     margin-top: 1.5rem;
 }
 
+/* フッター右側のグループ（例: アーカイブ + 保存 を右寄せで並べる）。 */
+.footer-right-group {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+}
+
 /* 共有設定ステップ（#1109）: 公開範囲の選択カード + 合言葉の表示。 */
 .share-mode-row {
     display: flex;
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
index abb812893a9..9cb35d9f456 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
@@ -236,88 +236,107 @@ const ClassSettingsForm = ({ group, isLoading, onCancel, onUpdateGroup }) => {
                     />
                 </p>
             ) : null}
-            <div className={styles.classSettingsActions}>
-                <button
-                    data-testid="classroom-class-settings-archive"
-                    disabled={isLoading}
-                    type="button"
-                    onClick={handleToggleArchive}
-                >
-                    {group.status === 'archived' ? (
-                        <FormattedMessage
-                            defaultMessage="Unarchive"
-                            description="Button to unarchive a class"
-                            id="gui.classroom.classSettings.unarchive"
-                        />
-                    ) : confirmingArchive ? (
-                        <FormattedMessage
-                            defaultMessage="Yes, archive"
-                            description="Confirm button that actually archives the class"
-                            id="gui.classroom.classSettings.archiveConfirmYes"
-                        />
-                    ) : (
-                        <FormattedMessage
-                            defaultMessage="Archive"
-                            description="Button to archive a class"
-                            id="gui.classroom.classSettings.archive"
-                        />
-                    )}
-                </button>
+            {/* フッター（レビュー指摘）: 通常は キャンセル左 / アーカイブ・保存 右
+                （アーカイブは保存の左）。アーカイブ押下中は キャンセル・保存を隠し
+                「アーカイブしない / アーカイブする」のみ表示。 */}
+            <div className={styles.formFooter}>
                 {confirmingArchive ? (
-                    <button
-                        data-testid="classroom-class-settings-archive-cancel"
-                        disabled={isLoading}
-                        type="button"
-                        onClick={handleCancelArchive}
-                    >
-                        <FormattedMessage
-                            defaultMessage="Keep the class"
-                            description="Button that cancels archiving the class"
-                            id="gui.classroom.classSettings.archiveConfirmNo"
-                        />
-                    </button>
-                ) : null}
-                <span className={styles.classSettingsSpacer} />
-                <button
-                    data-testid="classroom-class-settings-cancel"
-                    disabled={isLoading}
-                    type="button"
-                    onClick={confirmingDecrease ? handleCancelDecrease : onCancel}
-                >
-                    {confirmingDecrease ? (
-                        <FormattedMessage
-                            defaultMessage="Keep the count"
-                            description="Button that cancels decreasing the student count"
-                            id="gui.classroom.classSettings.decreaseConfirmNo"
-                        />
-                    ) : (
-                        <FormattedMessage
-                            defaultMessage="Cancel"
-                            description="Cancel button of the class settings form"
-                            id="gui.classroom.classSettings.cancel"
-                        />
-                    )}
-                </button>
-                <button
-                    className={styles.classSettingsSave}
-                    data-testid="classroom-class-settings-save"
-                    disabled={!canSave || isLoading}
-                    type="submit"
-                >
-                    {confirmingDecrease ? (
-                        <FormattedMessage
-                            defaultMessage="Reduce and save"
-                            description="Confirm button that decreases the student count and saves"
-                            id="gui.classroom.classSettings.decreaseConfirmYes"
-                        />
-                    ) : (
-                        <FormattedMessage
-                            defaultMessage="Save"
-                            description="Save button of the class settings form"
-                            id="gui.classroom.classSettings.save"
-                        />
-                    )}
-                </button>
+                    <React.Fragment>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-class-settings-archive-cancel"
+                            disabled={isLoading}
+                            type="button"
+                            onClick={handleCancelArchive}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Keep the class"
+                                description="Button that cancels archiving the class"
+                                id="gui.classroom.classSettings.archiveConfirmNo"
+                            />
+                        </button>
+                        <button
+                            className={styles.dangerButton}
+                            data-testid="classroom-class-settings-archive"
+                            disabled={isLoading}
+                            type="button"
+                            onClick={handleToggleArchive}
+                        >
+                            <FormattedMessage
+                                defaultMessage="Yes, archive"
+                                description="Confirm button that actually archives the class"
+                                id="gui.classroom.classSettings.archiveConfirmYes"
+                            />
+                        </button>
+                    </React.Fragment>
+                ) : (
+                    <React.Fragment>
+                        <button
+                            className={styles.secondaryButton}
+                            data-testid="classroom-class-settings-cancel"
+                            disabled={isLoading}
+                            type="button"
+                            onClick={confirmingDecrease ? handleCancelDecrease : onCancel}
+                        >
+                            {confirmingDecrease ? (
+                                <FormattedMessage
+                                    defaultMessage="Keep the count"
+                                    description="Button that cancels decreasing the student count"
+                                    id="gui.classroom.classSettings.decreaseConfirmNo"
+                                />
+                            ) : (
+                                <FormattedMessage
+                                    defaultMessage="Cancel"
+                                    description="Cancel button of the class settings form"
+                                    id="gui.classroom.classSettings.cancel"
+                                />
+                            )}
+                        </button>
+                        <div className={styles.footerRightGroup}>
+                            <button
+                                className={styles.secondaryButton}
+                                data-testid="classroom-class-settings-archive"
+                                disabled={isLoading}
+                                type="button"
+                                onClick={handleToggleArchive}
+                            >
+                                {group.status === 'archived' ? (
+                                    <FormattedMessage
+                                        defaultMessage="Unarchive"
+                                        description="Button to unarchive a class"
+                                        id="gui.classroom.classSettings.unarchive"
+                                    />
+                                ) : (
+                                    <FormattedMessage
+                                        defaultMessage="Archive"
+                                        description="Button to archive a class"
+                                        id="gui.classroom.classSettings.archive"
+                                    />
+                                )}
+                            </button>
+                            <button
+                                className={styles.primaryButton}
+                                data-testid="classroom-class-settings-save"
+                                disabled={!canSave || isLoading}
+                                type="submit"
+                            >
+                                {confirmingDecrease ? (
+                                    <FormattedMessage
+                                        defaultMessage="Reduce and save"
+                                        description="Confirm button that decreases the student count and saves"
+                                        id="gui.classroom.classSettings.decreaseConfirmYes"
+                                    />
+                                ) : (
+                                    <FormattedMessage
+                                        defaultMessage="Save"
+                                        description="Save button of the class settings form"
+                                        id="gui.classroom.classSettings.save"
+                                    />
+                                )}
+                            </button>
+                        </div>
+                    </React.Fragment>
+                )}
             </div>
         </form>
     );
@@ -425,19 +444,22 @@ const ClassCard = ({
                     />
                 </button>
             )}
-            <button
-                className={styles.classCardEvaluate}
-                data-testid={`classroom-class-settings-open-${group.groupId}`}
-                disabled={isLoading}
-                type="button"
-                onClick={handleSettings}
-            >
-                <FormattedMessage
-                    defaultMessage="Settings"
-                    description="Button on a class card to open its settings"
-                    id="gui.classroom.classList.settings"
-                />
-            </button>
+            {/* アーカイブ済みは「元に戻す」だけ。設定ボタンは出さない（レビュー指摘）。 */}
+            {isArchived ? null : (
+                <button
+                    className={styles.classCardEvaluate}
+                    data-testid={`classroom-class-settings-open-${group.groupId}`}
+                    disabled={isLoading}
+                    type="button"
+                    onClick={handleSettings}
+                >
+                    <FormattedMessage
+                        defaultMessage="Settings"
+                        description="Button on a class card to open its settings"
+                        id="gui.classroom.classList.settings"
+                    />
+                </button>
+            )}
         </li>
     );
 };
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
index 351d9dc8fda..d3b4a7a8495 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
@@ -416,6 +416,22 @@ const TeacherEvaluation = ({
                     />
                 </button>
             </div>
+            {/* 左下にキャンセル（クラス一覧へ戻る）を追加（レビュー指摘）。 */}
+            <div className={styles.formFooter}>
+                <button
+                    className={styles.secondaryButton}
+                    data-testid="classroom-evaluation-cancel"
+                    type="button"
+                    onClick={onBack}
+                >
+                    <FormattedMessage
+                        defaultMessage="Cancel"
+                        description="Cancel button of the evaluation screen (returns to the class list)"
+                        id="gui.classroom.evaluation.cancel"
+                    />
+                </button>
+                <span />
+            </div>
         </div>
     );
 };
diff --git a/packages/scratch-gui/src/locales/ja-Hira.js b/packages/scratch-gui/src/locales/ja-Hira.js
index f57ba251e12..40aea9384e4 100644
--- a/packages/scratch-gui/src/locales/ja-Hira.js
+++ b/packages/scratch-gui/src/locales/ja-Hira.js
@@ -209,6 +209,7 @@ export default {
     'gui.classroom.evaluation.exportCsv': 'ひょうかCSV',
     'gui.classroom.evaluation.exportAuditCsv': 'けんしょうようCSV',
     'gui.classroom.evaluation.returnComments': 'コメントをへんきゃく',
+    'gui.classroom.evaluation.cancel': 'キャンセル',
     'gui.classroom.teacherDetail.descriptionTab': 'せつめい',
     'gui.classroom.teacherDetail.previewTitle': 'せいとにみえるないよう（プレビュー）',
     'gui.classroom.breadcrumbs.evaluation': 'ひょうか',
diff --git a/packages/scratch-gui/src/locales/ja.js b/packages/scratch-gui/src/locales/ja.js
index 4ff22923f30..90c78224389 100644
--- a/packages/scratch-gui/src/locales/ja.js
+++ b/packages/scratch-gui/src/locales/ja.js
@@ -205,6 +205,7 @@ export default {
     'gui.classroom.evaluation.exportCsv': '評価CSV',
     'gui.classroom.evaluation.exportAuditCsv': '検証用CSV',
     'gui.classroom.evaluation.returnComments': 'コメントを返却',
+    'gui.classroom.evaluation.cancel': 'キャンセル',
     'gui.classroom.teacherDetail.descriptionTab': '説明',
     'gui.classroom.teacherDetail.previewTitle': '生徒に見える内容（プレビュー）',
     'gui.classroom.breadcrumbs.evaluation': '評価',
diff --git a/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx b/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx
index 0fb8de979e4..ddf1bcf1c8b 100644
--- a/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx
+++ b/packages/scratch-gui/test/unit/components/teacher-class-list.test.jsx
@@ -249,17 +249,29 @@ describe('TeacherClassList — archived classes section (issue #1051)', () => {
         expect(byTestId('classroom-class-settings-archive-confirm-message')).not.toBeInTheDocument();
     });
 
-    test('unarchiving from settings stays immediate (no confirmation)', () => {
-        const onUpdateGroup = jest.fn();
-        renderList({
-            groups: [group({ groupId: 'g2', status: 'archived' })],
-            onUpdateGroup,
-        });
+    test('pressing Archive hides cancel/save and shows only archive yes/no (review feedback)', () => {
+        renderList();
+        fireEvent.click(byTestId('classroom-class-settings-open-g1'));
+        expect(byTestId('classroom-class-settings-cancel')).toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-save')).toBeInTheDocument();
 
-        fireEvent.click(byTestId('classroom-show-archived'));
-        fireEvent.click(byTestId('classroom-class-settings-open-g2'));
         fireEvent.click(byTestId('classroom-class-settings-archive'));
+        // Only the archive yes/no buttons remain.
+        expect(byTestId('classroom-class-settings-cancel')).not.toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-save')).not.toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-archive-cancel')).toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-archive')).toBeInTheDocument();
 
-        expect(onUpdateGroup).toHaveBeenCalledWith('g2', { status: 'active' });
+        // "Keep the class" restores cancel/save.
+        fireEvent.click(byTestId('classroom-class-settings-archive-cancel'));
+        expect(byTestId('classroom-class-settings-cancel')).toBeInTheDocument();
+        expect(byTestId('classroom-class-settings-save')).toBeInTheDocument();
+    });
+
+    test('archived classes have no settings button — only restore (review feedback)', () => {
+        renderList({ groups: [group({ groupId: 'g2', status: 'archived' })] });
+        fireEvent.click(byTestId('classroom-show-archived'));
+        expect(byTestId('classroom-class-settings-open-g2')).not.toBeInTheDocument();
+        expect(byTestId('classroom-class-restore-g2')).toBeInTheDocument();
     });
 });

From 8cb986acf012fd39140ee7ef1c66bd5f80889015 Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 12:42:23 +0000
Subject: [PATCH 4/9] =?UTF-8?q?fix(classroom):=20=E8=A9=95=E4=BE=A1?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E3=82=AD=E3=83=A3=E3=83=B3=E3=82=BB?=
 =?UTF-8?q?=E3=83=AB=E3=82=92=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E8=A1=8C=E3=81=AE=E5=B7=A6=E7=AB=AF?=
 =?UTF-8?q?=E3=81=AB=E6=8F=83=E3=81=88=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

キャンセルが別行の左下に出て他ボタンと位置がずれていた（レビュー指摘）。
アクションボタン行（.button-row）の先頭に移し、margin-right:auto で左端に寄せて
右寄せの他ボタンと同じ行に揃える。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../classroom-modal/classroom-modal.css       |  6 ++++
 .../classroom-modal/teacher-evaluation.jsx    | 30 ++++++++-----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
index f22bce4157e..06971f2dfa1 100644
--- a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
+++ b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
@@ -566,6 +566,12 @@
     gap: 0.5rem;
 }
 
+/* 評価画面: キャンセルをアクションボタン行の左端に置く（右寄せの他ボタンと
+   同じ行で左に離す。レビュー指摘）。 */
+.eval-cancel {
+    margin-right: auto;
+}
+
 /* 共有設定ステップ（#1109）: 公開範囲の選択カード + 合言葉の表示。 */
 .share-mode-row {
     display: flex;
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
index d3b4a7a8495..7bcd634fbf2 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-evaluation.jsx
@@ -353,8 +353,20 @@ const TeacherEvaluation = ({
                 </div>
             )}
 
-            {/* Actions */}
+            {/* Actions（左端にキャンセル、他ボタンは右寄せ。レビュー指摘で同一行に揃える） */}
             <div className={styles.buttonRow}>
+                <button
+                    className={classNames(styles.secondaryButton, styles.evalCancel)}
+                    data-testid="classroom-evaluation-cancel"
+                    type="button"
+                    onClick={onBack}
+                >
+                    <FormattedMessage
+                        defaultMessage="Cancel"
+                        description="Cancel button of the evaluation screen (returns to the class list)"
+                        id="gui.classroom.evaluation.cancel"
+                    />
+                </button>
                 <button
                     className={styles.primaryButton}
                     data-testid="classroom-eval-run-grade"
@@ -416,22 +428,6 @@ const TeacherEvaluation = ({
                     />
                 </button>
             </div>
-            {/* 左下にキャンセル（クラス一覧へ戻る）を追加（レビュー指摘）。 */}
-            <div className={styles.formFooter}>
-                <button
-                    className={styles.secondaryButton}
-                    data-testid="classroom-evaluation-cancel"
-                    type="button"
-                    onClick={onBack}
-                >
-                    <FormattedMessage
-                        defaultMessage="Cancel"
-                        description="Cancel button of the evaluation screen (returns to the class list)"
-                        id="gui.classroom.evaluation.cancel"
-                    />
-                </button>
-                <span />
-            </div>
         </div>
     );
 };

From 4bdb6df5e3043700b2a11db73cf34e997d65b35f Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 13:10:30 +0000
Subject: [PATCH 5/9] =?UTF-8?q?fix(classroom):=20=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=82=B9=E4=BD=9C=E6=88=90=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0?=
 =?UTF-8?q?=E3=82=92=E8=A8=AD=E5=AE=9AUI=E3=81=AB=E5=90=88=E3=82=8F?=
 =?UTF-8?q?=E3=81=9B=E3=81=A6=E6=9E=A0=E4=BB=98=E3=81=8D=EF=BC=8B=E5=85=A5?=
 =?UTF-8?q?=E5=8A=9B=E3=82=92=E7=B5=B1=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

クラスを作る画面のフォームに枠が無く、中央の年度/セクション/人数の入力が
ブラウザ既定の枠のままで浮いて見えた（レビュー指摘）。設定画面と同じ
.class-settings-form（紫の枠 + .class-settings-form input の統一スタイル）に
包み、タイトルは枠の外・上に出す。name/課題名の .input 直指定を外して
枠内スタイルに一本化。

実機で枠色 #855cd6・全入力の枠が name と一致することを確認。テスト 18 件 green。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../classroom-modal/teacher-class-list.jsx      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
index 9cb35d9f456..7f2290938cb 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
@@ -573,11 +573,8 @@ const TeacherClassList = ({
                     ]}
                 />
                 <ErrorDisplay error={error} errorTitle={errorTitle} />
-                <form
-                    className={styles.postAssignmentContainer}
-                    data-testid="classroom-class-create-view"
-                    onSubmit={handleSubmit}
-                >
+                <div className={styles.postAssignmentContainer}>
+                    {/* 設定画面と同じ枠付きフォーム（.class-settings-form）に揃える。 */}
                     <div className={styles.phaseTitle}>
                         <FormattedMessage
                             defaultMessage="Create a class"
@@ -585,8 +582,12 @@ const TeacherClassList = ({
                             id="gui.classroom.classList.create"
                         />
                     </div>
+                    <form
+                        className={styles.classSettingsForm}
+                        data-testid="classroom-class-create-view"
+                        onSubmit={handleSubmit}
+                    >
                     <input
-                        className={styles.input}
                         data-testid="classroom-class-create-name"
                         disabled={isLoading}
                         maxLength={50}
@@ -638,7 +639,6 @@ const TeacherClassList = ({
                         />
                     </div>
                     <input
-                        className={styles.input}
                         data-testid="classroom-class-create-assignment"
                         disabled={isLoading}
                         maxLength={50}
@@ -685,7 +685,8 @@ const TeacherClassList = ({
                             )}
                         </button>
                     </div>
-                </form>
+                    </form>
+                </div>
             </div>
         );
     }

From 0d4e237ebfa62aa31d6f49f9fed7b8a8764e30d4 Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 13:32:57 +0000
Subject: [PATCH 6/9] =?UTF-8?q?feat(classroom):=20=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=82=B9=E4=BD=9C=E6=88=90=E3=81=AB=E5=85=B1=E5=90=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=80=85=E3=81=AE=E8=AA=AC=E6=98=8E=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=88=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E6=8C=87?=
 =?UTF-8?q?=E6=91=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

クラスを作る画面に短い説明を追加し、共同管理者とは何か・あとから設定で
追加できることを先生に伝える:
「共同管理者（クラスを一緒に管理する先生）は、あとから「設定」で追加できます。」

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../src/components/classroom-modal/teacher-class-list.jsx  | 7 +++++++
 packages/scratch-gui/src/locales/ja-Hira.js                | 2 ++
 packages/scratch-gui/src/locales/ja.js                     | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
index 7f2290938cb..548ab6da179 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-class-list.jsx
@@ -651,6 +651,13 @@ const TeacherClassList = ({
                         value={assignmentName}
                         onChange={handleAssignmentNameChange}
                     />
+                    <p className={styles.formHint}>
+                        <FormattedMessage
+                            defaultMessage="You can add co-teachers (fellow teachers who help manage this class) later in Settings."
+                            description="Hint on the create form that co-teachers can be added later in settings"
+                            id="gui.classroom.classList.createCoTeacherHint"
+                        />
+                    </p>
                     <div className={styles.formFooter}>
                         <button
                             className={styles.secondaryButton}
diff --git a/packages/scratch-gui/src/locales/ja-Hira.js b/packages/scratch-gui/src/locales/ja-Hira.js
index 40aea9384e4..3e4b156180c 100644
--- a/packages/scratch-gui/src/locales/ja-Hira.js
+++ b/packages/scratch-gui/src/locales/ja-Hira.js
@@ -241,6 +241,8 @@ export default {
     'gui.classroom.classList.ungroupedHint':
         'どのクラスにもはいっていないかだい（きょうどうかんりできょうゆうされたもの・みいこうのもの）:',
     'gui.classroom.classList.createCancel': 'キャンセル',
+    'gui.classroom.classList.createCoTeacherHint':
+        'きょうどうかんりしゃ（クラスをいっしょにかんりするせんせい）は、あとから「せってい」でついかできます。',
     'gui.classroom.classList.createClassOnly': 'クラスのみつくる',
     'gui.classroom.classList.settings': 'せってい',
     'gui.classroom.classSettings.namePlaceholder': 'クラスめい（ひっす・れい: ぎじゅつ）',
diff --git a/packages/scratch-gui/src/locales/ja.js b/packages/scratch-gui/src/locales/ja.js
index 90c78224389..934b23d83f5 100644
--- a/packages/scratch-gui/src/locales/ja.js
+++ b/packages/scratch-gui/src/locales/ja.js
@@ -237,6 +237,8 @@ export default {
     'gui.classroom.classList.ungroupedHint':
         'どのクラスにも入っていない課題（共同管理で共有されたもの・未移行のもの）:',
     'gui.classroom.classList.createCancel': 'キャンセル',
+    'gui.classroom.classList.createCoTeacherHint':
+        '共同管理者（クラスを一緒に管理する先生）は、あとから「設定」で追加できます。',
     'gui.classroom.classList.createClassOnly': 'クラスのみ作成',
     'gui.classroom.classList.settings': '設定',
     'gui.classroom.classSettings.namePlaceholder': 'クラス名（必須・例: 技術）',

From ef8fa95aed1b170cbfc874345e05ea2ca72b78e4 Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 13:55:06 +0000
Subject: [PATCH 7/9] =?UTF-8?q?fix(classroom):=20=E8=AA=B2=E9=A1=8C?=
 =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=81=AE=E3=82=AF=E3=83=A9=E3=82=B9=E5=90=8D?=
 =?UTF-8?q?=E3=81=8C=E7=9C=81=E7=95=A5=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=88=E3=83=AC=E3=83=93?=
 =?UTF-8?q?=E3=83=A5=E3=83=BC=E6=8C=87=E6=91=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

クラス名とアクションボタンが同じ行にあり、クラス名が「自...」と省略されていた。
レビュー案どおり縦積みに:
- クラス名を独立行（.board-title の flex/ellipsis を廃止、省略しない）
- その下に画面の簡単な説明（.board-hint）を追加
- アクションボタンは折り返し行（.board-header を flex-wrap の左寄せ行に）
- 以降はトピック入力・課題一覧/空状態

実機で長いクラス名も省略されず、説明・ボタン行・トピックの順で並ぶことを確認。
テスト 14 件 green。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../classroom-modal/classroom-modal.css       | 22 +++++++++++++------
 .../teacher-assignment-board.jsx              | 13 ++++++++++-
 packages/scratch-gui/src/locales/ja-Hira.js   |  2 ++
 packages/scratch-gui/src/locales/ja.js        |  1 +
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
index 06971f2dfa1..5967fcb102e 100644
--- a/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
+++ b/packages/scratch-gui/src/components/classroom-modal/classroom-modal.css
@@ -2937,21 +2937,29 @@ button.detail-tabs-download-urgent:hover:not(:disabled) {
     overflow-y: auto;
 }
 
+/* クラス名を独立行にしたので、ヘッダーはアクションボタンの折り返し行にする
+   （左寄せ・省略しない。レビュー指摘 #1108）。 */
 .board-header {
     display: flex;
+    flex-wrap: wrap;
     align-items: center;
-    justify-content: space-between;
-    gap: 1rem;
+    gap: 0.5rem;
+    margin-bottom: 0.75rem;
 }
 
 .board-title {
-    flex: 1;
-    margin: 0;
+    margin: 0.25rem 0 0.25rem;
     font-size: 1.3rem;
+    font-weight: bold;
     color: #575e75;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+}
+
+/* 課題一覧（ボード）の簡単な説明。 */
+.board-hint {
+    font-size: 0.85rem;
+    color: #888;
+    line-height: 1.5;
+    margin: 0 0 0.75rem;
 }
 
 .board-year {
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
index e1b30ffc765..f142f5fb422 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
@@ -476,8 +476,18 @@ const TeacherAssignmentBoard = ({
                 ]}
             />
             {!subView && (
+            <React.Fragment>
+            {/* クラス名は独立行にして省略されないようにする（レビュー指摘）。
+                下に画面の説明、その下にアクションボタン行を置く。 */}
+            <h2 className={styles.boardTitle}>{formatClassLabel(group)}</h2>
+            <p className={styles.boardHint}>
+                <FormattedMessage
+                    defaultMessage="Create and organize this class's assignments here. Open an assignment to check submissions or grade."
+                    description="Short description of what the assignment board (課題一覧) is for"
+                    id="gui.classroom.board.hint"
+                />
+            </p>
             <div className={styles.boardHeader}>
-                <h2 className={styles.boardTitle}>{formatClassLabel(group)}</h2>
                 <button
                     className={styles.boardCreateButton}
                     data-testid="classroom-board-create"
@@ -554,6 +564,7 @@ const TeacherAssignmentBoard = ({
                     </button>
                 ) : null}
             </div>
+            </React.Fragment>
             )}
             <ErrorDisplay error={error} errorTitle={errorTitle} />
             {shared && shared.lastImported ? (
diff --git a/packages/scratch-gui/src/locales/ja-Hira.js b/packages/scratch-gui/src/locales/ja-Hira.js
index 3e4b156180c..08f84f426b8 100644
--- a/packages/scratch-gui/src/locales/ja-Hira.js
+++ b/packages/scratch-gui/src/locales/ja-Hira.js
@@ -230,6 +230,8 @@ export default {
     'gui.classroom.board.reuseCopy': 'このクラスにふくせい',
     'gui.classroom.board.yearLabel': '{year}ねんど',
     'gui.classroom.board.create': 'かだいをつくる',
+    'gui.classroom.board.hint':
+        'このクラスのかだいをさくせい・かんりします。かだいをひらくとていしゅつじょうきょうのかくにんやひょうかができます。',
     'gui.classroom.board.topicLabel': 'トピック',
     'gui.classroom.board.noTopic': '（トピックなし）',
     'gui.classroom.board.newTopicPlaceholder': 'あたらしいトピック',
diff --git a/packages/scratch-gui/src/locales/ja.js b/packages/scratch-gui/src/locales/ja.js
index 934b23d83f5..2504c6baecc 100644
--- a/packages/scratch-gui/src/locales/ja.js
+++ b/packages/scratch-gui/src/locales/ja.js
@@ -226,6 +226,7 @@ export default {
     'gui.classroom.board.reuseCopy': 'このクラスに複製',
     'gui.classroom.board.yearLabel': '{year}年度',
     'gui.classroom.board.create': '課題を作る',
+    'gui.classroom.board.hint': 'このクラスの課題を作成・管理します。課題を開くと提出状況の確認や評価ができます。',
     'gui.classroom.board.topicLabel': 'トピック',
     'gui.classroom.board.noTopic': '（トピックなし）',
     'gui.classroom.board.newTopicPlaceholder': '新しいトピック',

From 44cbb249b38888b8cbc06335cd04e8e9c090cebf Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 14:00:02 +0000
Subject: [PATCH 8/9] =?UTF-8?q?fix(classroom):=20=E8=AA=B2=E9=A1=8C?=
 =?UTF-8?q?=E3=81=AE=E5=86=8D=E5=88=A9=E7=94=A8=E3=81=8B=E3=82=89=E3=82=A2?=
 =?UTF-8?q?=E3=83=BC=E3=82=AB=E3=82=A4=E3=83=96=E6=B8=88=E3=81=BF=E3=81=AE?=
 =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E3=83=BB=E8=AA=B2=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E9=99=A4=E5=A4=96=EF=BC=88=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E6=8C=87=E6=91=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

再利用の候補・クラスフィルタにアーカイブ済みが混じっていた。以下を対象外に:
- アーカイブ済みの課題（classroom.status === 'archived'）
- アーカイブ済みのクラス（組）に属する課題
- クラスフィルタのドロップダウンからアーカイブ済みのクラスを除外

unit テスト追加（3種の除外を検証）。lint/prettier 通過。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../teacher-assignment-board.jsx              | 11 +++++--
 .../teacher-assignment-board.test.jsx         | 30 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
index f142f5fb422..1e367152c3b 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
@@ -362,8 +362,15 @@ const TeacherAssignmentBoard = ({
         [allClassrooms, onReuseAssignment, group],
     );
 
-    // Reuse picker: every assignment (any class), newest first, filterable.
+    // 再利用の対象はアクティブなクラス・課題のみ（レビュー指摘）。アーカイブ済みの
+    // クラス（組）に属する課題や、アーカイブ済みの課題は候補・フィルタから除外する。
+    const activeGroupIds = new Set(
+        (allGroups || []).filter((g) => g.status !== 'archived').map((g) => g.groupId),
+    );
+    const reuseGroups = (allGroups || []).filter((g) => g.status !== 'archived');
+    // Reuse picker: active assignments (of active classes), newest first, filterable.
     const reuseCandidates = (allClassrooms || [])
+        .filter((c) => c.status !== 'archived' && activeGroupIds.has(c.groupId))
         .filter((c) => !reuseFilterGroupId || c.groupId === reuseFilterGroupId)
         .sort((a, b) =>
             String(b.sortDate || b.createdAt || '').localeCompare(String(a.sortDate || a.createdAt || '')),
@@ -694,7 +701,7 @@ const TeacherAssignmentBoard = ({
                                     id: 'gui.classroom.board.reuseFilterAll',
                                 })}
                             </option>
-                            {(allGroups || []).map((g) => (
+                            {reuseGroups.map((g) => (
                                 <option key={g.groupId} value={g.groupId}>
                                     {formatClassLabel(g)}
                                 </option>
diff --git a/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx b/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx
index 93dc0a782ed..5d71610bf7c 100644
--- a/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx
+++ b/packages/scratch-gui/test/unit/components/teacher-assignment-board.test.jsx
@@ -199,3 +199,33 @@ describe('TeacherAssignmentBoard — retention notice (issue #1052)', () => {
         expect(byTestId('classroom-board-expiry-c1')).not.toBeInTheDocument();
     });
 });
+
+describe('TeacherAssignmentBoard — reuse excludes archived (review feedback)', () => {
+    test('reuse candidates and the class filter exclude archived classes and assignments', () => {
+        const allGroups = [
+            { groupId: 'g1', name: 'A', year: 2026, status: 'active', topics: [] },
+            { groupId: 'gArch', name: 'B', year: 2026, status: 'archived', topics: [] },
+        ];
+        const allClassrooms = [
+            { classroomId: 'active1', groupId: 'g1', assignmentName: 'A課題', status: 'active' },
+            { classroomId: 'archAssign', groupId: 'g1', assignmentName: 'アーカイブ課題', status: 'archived' },
+            { classroomId: 'inArchGroup', groupId: 'gArch', assignmentName: 'アーカイブ組の課題', status: 'active' },
+        ];
+        renderBoard({
+            group: { groupId: 'g1', name: 'A', year: 2026, topics: [] },
+            allGroups,
+            allClassrooms,
+        });
+        fireEvent.click(byTestId('classroom-board-reuse'));
+
+        // Only the active assignment of an active class is a candidate.
+        expect(byTestId('classroom-board-reuse-copy-active1')).toBeInTheDocument();
+        expect(byTestId('classroom-board-reuse-copy-archAssign')).not.toBeInTheDocument();
+        expect(byTestId('classroom-board-reuse-copy-inArchGroup')).not.toBeInTheDocument();
+
+        // The class filter lists only the active class.
+        const values = [...byTestId('classroom-board-reuse-filter').options].map((o) => o.value);
+        expect(values).toContain('g1');
+        expect(values).not.toContain('gArch');
+    });
+});

From 08f4d8c2a4f3cea304a4f799f9f5eca2d96ba280 Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sat, 25 Jul 2026 14:23:34 +0000
Subject: [PATCH 9/9] =?UTF-8?q?fix(classroom):=20=E8=AA=B2=E9=A1=8C?=
 =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=81=AE=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E4=B8=A6=E3=81=B3=E6=9B=BF=E3=81=88=E3=81=A8=E3=81=BF?=
 =?UTF-8?q?=E3=82=93=E3=81=AA=E3=81=AE=E8=AA=B2=E9=A1=8C=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=81=AE=E8=A6=8B=E3=81=9F=E7=9B=AE=E7=B5=B1=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

人間レビュー指摘の対応:

- 課題一覧のアクションボタンを 課題を作る → 課題を再利用 →
  みんなの課題からさがす → 合言葉で取り込み → 全課題の提出物をダウンロード
  の順に並び替え（ダウンロードを末尾へ移動）。
- みんなの課題カタログの「閉じる」ボタンのラベルを「キャンセル」に変更。
- すべて / 自分の投稿 タブの見た目を課題詳細の 説明 / メンバー タブに統一。
  アクティブタブに detailTab を常に適用したうえで detailTabActive を
  重ねるように classNames 化し、透明背景・下線・太字がベーススタイルから
  外れて既定ボタン見た目になっていた不整合を解消。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../shared-assignment-catalog.jsx             | 13 ++++--
 .../teacher-assignment-board.jsx              | 40 ++++++++++---------
 packages/scratch-gui/src/locales/ja-Hira.js   |  2 +-
 packages/scratch-gui/src/locales/ja.js        |  2 +-
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx b/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx
index 73f89e5a798..e4847c06596 100644
--- a/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/shared-assignment-catalog.jsx
@@ -4,6 +4,7 @@
  * manage the caller's own posts (unlist / republish). Supplement URLs open
  * behind an explicit confirmation that names the external domain (D4).
  */
+import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { useCallback, useState } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
@@ -390,8 +391,8 @@ const SharedAssignmentCatalog = ({ group, isLoading, shared }) => {
                 </h3>
                 <button data-testid="shared-catalog-close" type="button" onClick={shared.handleCloseCatalog}>
                     <FormattedMessage
-                        defaultMessage="Close"
-                        description="Close the shared catalog"
+                        defaultMessage="Cancel"
+                        description="Cancel button that leaves the shared catalog"
                         id="gui.classroom.shared.catalogClose"
                     />
                 </button>
@@ -399,7 +400,9 @@ const SharedAssignmentCatalog = ({ group, isLoading, shared }) => {
 
             <div className={styles.detailTabs} role="tablist">
                 <button
-                    className={shared.catalogTab === 'all' ? styles.detailTabActive : styles.detailTab}
+                    className={classNames(styles.detailTab, {
+                        [styles.detailTabActive]: shared.catalogTab === 'all',
+                    })}
                     data-testid="shared-catalog-tab-all"
                     type="button"
                     onClick={handleTabAll}
@@ -411,7 +414,9 @@ const SharedAssignmentCatalog = ({ group, isLoading, shared }) => {
                     />
                 </button>
                 <button
-                    className={shared.catalogTab === 'mine' ? styles.detailTabActive : styles.detailTab}
+                    className={classNames(styles.detailTab, {
+                        [styles.detailTabActive]: shared.catalogTab === 'mine',
+                    })}
                     data-testid="shared-catalog-tab-mine"
                     type="button"
                     onClick={handleTabMine}
diff --git a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
index 1e367152c3b..d2be7ee6e80 100644
--- a/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
+++ b/packages/scratch-gui/src/components/classroom-modal/teacher-assignment-board.jsx
@@ -521,25 +521,8 @@ const TeacherAssignmentBoard = ({
                         id="gui.classroom.board.reuse"
                     />
                 </button>
-                {onDownloadClassAll ? (
-                    <button
-                        className={styles.boardReuseButton}
-                        data-testid="classroom-board-download-class"
-                        disabled={isLoading || !!downloadProgress}
-                        type="button"
-                        onClick={handleDownloadClassAll}
-                    >
-                        {downloadProgress ? (
-                            `${downloadProgress.current}/${downloadProgress.total}`
-                        ) : (
-                            <FormattedMessage
-                                defaultMessage="Download all submissions"
-                                description="Button that downloads every assignment's submissions as one zip"
-                                id="gui.classroom.board.downloadClass"
-                            />
-                        )}
-                    </button>
-                ) : null}
+                {/* 並び順（レビュー指摘）: 作る → 再利用 → みんなの課題からさがす →
+                    合言葉で取り込み → 全課題の提出物をダウンロード。 */}
                 {shared ? (
                     <button
                         className={styles.boardReuseButton}
@@ -570,6 +553,25 @@ const TeacherAssignmentBoard = ({
                         />
                     </button>
                 ) : null}
+                {onDownloadClassAll ? (
+                    <button
+                        className={styles.boardReuseButton}
+                        data-testid="classroom-board-download-class"
+                        disabled={isLoading || !!downloadProgress}
+                        type="button"
+                        onClick={handleDownloadClassAll}
+                    >
+                        {downloadProgress ? (
+                            `${downloadProgress.current}/${downloadProgress.total}`
+                        ) : (
+                            <FormattedMessage
+                                defaultMessage="Download all submissions"
+                                description="Button that downloads every assignment's submissions as one zip"
+                                id="gui.classroom.board.downloadClass"
+                            />
+                        )}
+                    </button>
+                ) : null}
             </div>
             </React.Fragment>
             )}
diff --git a/packages/scratch-gui/src/locales/ja-Hira.js b/packages/scratch-gui/src/locales/ja-Hira.js
index 08f84f426b8..82068659ee6 100644
--- a/packages/scratch-gui/src/locales/ja-Hira.js
+++ b/packages/scratch-gui/src/locales/ja-Hira.js
@@ -422,7 +422,7 @@ export default {
     'gui.classroom.shared.passcodeImportBtn': 'このクラスにとりこむ',
     'gui.classroom.shared.openCatalog': 'みんなのかだいからさがす',
     'gui.classroom.shared.catalogTitle': 'みんなのかだい — ぜんこくのせんせいがきょうゆうしたかだい',
-    'gui.classroom.shared.catalogClose': 'とじる',
+    'gui.classroom.shared.catalogClose': 'キャンセル',
     'gui.classroom.shared.tabAll': 'すべて',
     'gui.classroom.shared.tabMine': 'じぶんのとうこう',
     'gui.classroom.shared.filterAllLevels': 'すべてのがっこうしゅ',
diff --git a/packages/scratch-gui/src/locales/ja.js b/packages/scratch-gui/src/locales/ja.js
index 2504c6baecc..40e0fbde79c 100644
--- a/packages/scratch-gui/src/locales/ja.js
+++ b/packages/scratch-gui/src/locales/ja.js
@@ -413,7 +413,7 @@ export default {
     'gui.classroom.shared.passcodeImportBtn': 'このクラスに取り込む',
     'gui.classroom.shared.openCatalog': 'みんなの課題からさがす',
     'gui.classroom.shared.catalogTitle': 'みんなの課題 — 全国の先生が共有した課題',
-    'gui.classroom.shared.catalogClose': '閉じる',
+    'gui.classroom.shared.catalogClose': 'キャンセル',
     'gui.classroom.shared.tabAll': 'すべて',
     'gui.classroom.shared.tabMine': '自分の投稿',
     'gui.classroom.shared.filterAllLevels': 'すべての学校種',