From 81bde2700802528f1e0471a6db0f02a50f06d379 Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:02:02 +0000
Subject: [PATCH 1/2] =?UTF-8?q?fix(admin):=20=E8=A9=B3=E7=B4=B0=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E3=81=AE=E3=80=8C=E4=B8=80=E8=A6=A7=E3=81=AB=E6=88=BB?=
 =?UTF-8?q?=E3=82=8B=E3=80=8D=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=AB=E3=82=92=E4=BB=96=E3=83=9C=E3=82=BF?=
 =?UTF-8?q?=E3=83=B3=E3=81=AB=E6=8F=83=E3=81=88=E3=82=8B=20(#1106=20?=
 =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

みんなの課題/バグ報告/クラス・課題/期限切れ復元の各詳細画面の
「← 一覧に戻る」が class 無しの素の button で、既定ブラウザ表示のまま
浮いていた。共通の .admin-back-button (白背景・1px枠・角丸=アクション
ボタンと同じ見た目) を追加し、6 箇所すべてに適用。

人間レビュー指摘 (Admin > みんなの課題詳細) への対応。同じ素ボタンが
他ビューにも全部あったので一括で揃えた。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 packages/admin/src/components/app.css           | 17 +++++++++++++++++
 .../admin/src/components/bug-reports-view.jsx   |  1 +
 .../admin/src/components/classrooms-view.jsx    |  4 ++++
 .../src/components/shared-assignments-view.jsx  |  1 +
 4 files changed, 23 insertions(+)

diff --git a/packages/admin/src/components/app.css b/packages/admin/src/components/app.css
index b29a6c7dd98..12365e65415 100644
--- a/packages/admin/src/components/app.css
+++ b/packages/admin/src/components/app.css
@@ -184,6 +184,23 @@ body {
     cursor: pointer;
 }
 
+/* 「← 一覧に戻る」など詳細画面の戻るボタン。既定の素ボタンだと浮くので
+   アクションボタンと同じ見た目に揃える（全ビュー共通）。 */
+.admin-back-button {
+    margin-bottom: 1rem;
+    padding: 0.4rem 0.9rem;
+    border: 1px solid hsl(220, 15%, 75%);
+    border-radius: 0.4rem;
+    background: white;
+    color: inherit;
+    font: inherit;
+    cursor: pointer;
+}
+
+.admin-back-button:hover {
+    background: hsl(220, 15%, 96%);
+}
+
 .admin-confirm {
     display: inline-flex;
     align-items: center;
diff --git a/packages/admin/src/components/bug-reports-view.jsx b/packages/admin/src/components/bug-reports-view.jsx
index bf2b1a4c6d5..d077f8fc081 100644
--- a/packages/admin/src/components/bug-reports-view.jsx
+++ b/packages/admin/src/components/bug-reports-view.jsx
@@ -116,6 +116,7 @@ const BugReportDetail = ({reportId, stage, onBack, onChanged}) => {
     return (
         <div data-testid="bug-admin-detail">
             <button
+                className="admin-back-button"
                 data-testid="bug-admin-back"
                 type="button"
                 onClick={onBack}
diff --git a/packages/admin/src/components/classrooms-view.jsx b/packages/admin/src/components/classrooms-view.jsx
index 50c2cee64ff..694576e9268 100644
--- a/packages/admin/src/components/classrooms-view.jsx
+++ b/packages/admin/src/components/classrooms-view.jsx
@@ -211,6 +211,7 @@ const ClassroomDetail = ({classroomId, onBack, onChanged}) => {
     return (
         <div data-testid="classroom-admin-detail">
             <button
+                className="admin-back-button"
                 data-testid="classroom-admin-back"
                 type="button"
                 onClick={onBack}
@@ -360,6 +361,7 @@ const RestorePanel = ({classroomId, onBack}) => {
                     </p>
                 )}
                 <button
+                    className="admin-back-button"
                     data-testid="restore-admin-done-back"
                     type="button"
                     onClick={onBack}
@@ -373,6 +375,7 @@ const RestorePanel = ({classroomId, onBack}) => {
             <div data-testid="restore-admin-alive">
                 <p>{'このクラスはまだ存在しています。アーカイブからの復旧は先生自身のクラス管理画面から行えます。'}</p>
                 <button
+                    className="admin-back-button"
                     data-testid="restore-admin-back"
                     type="button"
                     onClick={onBack}
@@ -384,6 +387,7 @@ const RestorePanel = ({classroomId, onBack}) => {
     return (
         <div data-testid="restore-admin-plan">
             <button
+                className="admin-back-button"
                 data-testid="restore-admin-back"
                 type="button"
                 onClick={onBack}
diff --git a/packages/admin/src/components/shared-assignments-view.jsx b/packages/admin/src/components/shared-assignments-view.jsx
index d933fb1ece0..7684c953945 100644
--- a/packages/admin/src/components/shared-assignments-view.jsx
+++ b/packages/admin/src/components/shared-assignments-view.jsx
@@ -117,6 +117,7 @@ const SharedDetail = ({sharedId, onBack, onChanged}) => {
     return (
         <div data-testid="shared-admin-detail">
             <button
+                className="admin-back-button"
                 data-testid="shared-admin-back"
                 type="button"
                 onClick={onBack}

From d314a7e7da03a2b3c92a1ccb56f8c61d8031afcc Mon Sep 17 00:00:00 2001
From: "smalruby3-editor-bot[bot]"
 <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com>
Date: Sun, 26 Jul 2026 00:06:36 +0000
Subject: [PATCH 2/2] =?UTF-8?q?fix(admin):=20=E6=88=BB=E3=82=8B=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=20+=20=E9=99=90=E5=AE=9A=E5=85=AC=E9=96=8B=E3=81=AE?=
 =?UTF-8?q?=E6=9C=AA=E5=85=A5=E5=8A=9B=E5=B1=9E=E6=80=A7=E3=82=92=E3=80=8C?=
 =?UTF-8?q?=E6=9C=AA=E6=8C=87=E5=AE=9A=E3=80=8D=E8=A1=A8=E7=A4=BA=20(#1106?=
 =?UTF-8?q?=20=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

人間レビュー指摘 2 点:
- 前コミットの .admin-back-button に font: inherit を付けたため UA 既定
  (13.3px) より大きくなり他ボタンより一回り大きく見えていた。
  .admin-actions button とセレクタを統合し font 未指定=UA 既定に揃えた
  (実測: 両者 font 13.33px / padding 6.4×14.4 / 高さ 32.8px で一致)
- みんなの課題詳細で限定公開項目の authorName/schoolLevel/subject 等が
  'undefined' と表示されていた。限定公開 (#1109) はこれらを省略できる
  ため欠損ではなく未入力。orUnspecified で undefined→「未指定」に
  フォールバック (詳細のクレジット行・属性行・一覧の投稿者)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 packages/admin/src/components/app.css         | 15 ++++--------
 .../components/shared-assignments-view.jsx    | 20 ++++++++++++----
 .../unit/shared-assignments-view.test.jsx     | 23 +++++++++++++++++++
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/packages/admin/src/components/app.css b/packages/admin/src/components/app.css
index 12365e65415..0290c5817b4 100644
--- a/packages/admin/src/components/app.css
+++ b/packages/admin/src/components/app.css
@@ -176,7 +176,11 @@ body {
     font: inherit;
 }
 
-.admin-actions button {
+/* 「← 一覧に戻る」など詳細画面の戻るボタンもアクションボタンと同一ルールに
+   統合して見た目を完全一致させる（font を指定すると UA 既定より大きくなり
+   一回り大きく見えたため、両者で font 未指定=UA 既定に揃える）。 */
+.admin-actions button,
+.admin-back-button {
     padding: 0.4rem 0.9rem;
     border: 1px solid hsl(220, 15%, 75%);
     border-radius: 0.4rem;
@@ -184,17 +188,8 @@ body {
     cursor: pointer;
 }
 
-/* 「← 一覧に戻る」など詳細画面の戻るボタン。既定の素ボタンだと浮くので
-   アクションボタンと同じ見た目に揃える（全ビュー共通）。 */
 .admin-back-button {
     margin-bottom: 1rem;
-    padding: 0.4rem 0.9rem;
-    border: 1px solid hsl(220, 15%, 75%);
-    border-radius: 0.4rem;
-    background: white;
-    color: inherit;
-    font: inherit;
-    cursor: pointer;
 }
 
 .admin-back-button:hover {
diff --git a/packages/admin/src/components/shared-assignments-view.jsx b/packages/admin/src/components/shared-assignments-view.jsx
index 7684c953945..8497bd5ed61 100644
--- a/packages/admin/src/components/shared-assignments-view.jsx
+++ b/packages/admin/src/components/shared-assignments-view.jsx
@@ -13,6 +13,15 @@ import {
     setSharedStatus
 } from '../lib/admin-api.js';
 
+// 限定公開は属性・著者名・教科などを省略できる（#1109）。データ欠損では
+// なく「先生が未入力」なので、運営が見て意味がわかるよう undefined を
+// そのまま出さず「未指定」と明示する。
+const UNSPECIFIED = '未指定';
+const orUnspecified = value => {
+    if (typeof value === 'undefined' || value === null || value === '') return UNSPECIFIED;
+    return value;
+};
+
 const StatusBadge = ({status}) => (
     <span className={`admin-badge ${status === 'published' ? 'admin-badge-ok' : 'admin-badge-muted'}`}>
         {status === 'published' ? '公開中' : '非公開'}
@@ -135,11 +144,13 @@ const SharedDetail = ({sharedId, onBack, onChanged}) => {
                 className="admin-meta"
                 data-testid="shared-admin-credit"
             >
-                {`© ${detail.authorName}${detail.authorAffiliation ? `（${detail.authorAffiliation}）` : ''} / CC BY 4.0`}
-                {` ・ 取り込み ${detail.reuseCount} 回`}
+                {`© ${orUnspecified(detail.authorName)}`}
+                {detail.authorAffiliation ? `（${detail.authorAffiliation}）` : ''}
+                {` / CC BY 4.0 ・ 取り込み ${detail.reuseCount} 回`}
             </p>
             <p className="admin-meta">
-                {`${detail.schoolLevel} / ${detail.subject} / タグ: ${(detail.tags || []).join(', ') || '-'}`}
+                {`${orUnspecified(detail.schoolLevel)} / ${orUnspecified(detail.subject)}`}
+                {` / タグ: ${(detail.tags || []).join(', ') || UNSPECIFIED}`}
             </p>
             {detail.supplementUrl ? (
                 <p
@@ -389,7 +400,8 @@ const SharedAssignmentsView = () => {
                                 <VisibilityBadge visibility={item.visibility} />
                                 <RecommendedBadge recommended={item.recommended} />
                                 <span className="admin-meta">
-                                    {`${item.authorName} ・ 取り込み ${item.reuseCount} 回 ・ ${item.createdAt}`}
+                                    {`${orUnspecified(item.authorName)} ・ 取り込み ${item.reuseCount} 回`}
+                                    {` ・ ${item.createdAt}`}
                                 </span>
                             </button>
                         </li>
diff --git a/packages/admin/test/unit/shared-assignments-view.test.jsx b/packages/admin/test/unit/shared-assignments-view.test.jsx
index 0bb892bf0f0..ffcdc1511d8 100644
--- a/packages/admin/test/unit/shared-assignments-view.test.jsx
+++ b/packages/admin/test/unit/shared-assignments-view.test.jsx
@@ -148,4 +148,27 @@ describe('SharedAssignmentsView (issue #1083)', () => {
         expect(mockSetStatus).not.toHaveBeenCalled();
         expect(screen.queryByTestId('shared-admin-confirm')).not.toBeInTheDocument();
     });
+
+    test('限定公開で未入力の属性は undefined でなく「未指定」と表示する (レビュー指摘)', async () => {
+        // 限定公開は authorName / schoolLevel / subject 等を省略できる
+        // （キーそのものが無い＝undefined になる）。
+        mockFetchDetail.mockResolvedValue({
+            sharedId: 's1',
+            title: 'smoke限定公開',
+            status: 'published',
+            visibility: 'limited',
+            tags: [],
+            reuseCount: 0,
+            pages: [{text: 'ページ1', imageUrl: null}],
+            starterUrl: null
+        });
+        render(<SharedAssignmentsView />);
+        await waitFor(() => screen.getByTestId('shared-admin-queue-item-s1'));
+        fireEvent.click(screen.getByTestId('shared-admin-queue-item-s1'));
+        await waitFor(() => screen.getByTestId('shared-admin-detail'));
+
+        const detailEl = screen.getByTestId('shared-admin-detail');
+        expect(detailEl.textContent).not.toContain('undefined');
+        expect(screen.getByTestId('shared-admin-credit').textContent).toContain('未指定');
+    });
 });