Skip to content
This repository was archived by the owner on Oct 17, 2025. It is now read-only.

Commit a2254f7

Browse files
committed
Revert "作品一覧回り"
This reverts commit c98ec8d.
1 parent c98ec8d commit a2254f7

3 files changed

Lines changed: 13 additions & 24 deletions

File tree

workspaces/admin/src/pages/BookListPage/index.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import { useFormik } from 'formik';
2121
import { useId, useMemo, useState } from 'react';
2222
import { create } from 'zustand';
2323

24-
import type { GetBookResponse } from '@wsh-2024/schema/src/api/books/GetBookResponse';
25-
2624
import { useBookList } from '../../features/books/hooks/useBookList';
2725
import { isContains } from '../../lib/filter/isContains';
2826

@@ -51,7 +49,7 @@ type BookModalState =
5149
}
5250
| {
5351
mode: typeof BookModalMode.Detail;
54-
params: { book: GetBookResponse };
52+
params: { bookId: string };
5553
}
5654
| {
5755
mode: typeof BookModalMode.Create;
@@ -61,7 +59,7 @@ type BookModalState =
6159
type BookModalAction = {
6260
close: () => void;
6361
openCreate: () => void;
64-
openDetail: (book: GetBookResponse) => void;
62+
openDetail: (bookId: string) => void;
6563
};
6664

6765
export const BookListPage: React.FC = () => {
@@ -121,8 +119,8 @@ export const BookListPage: React.FC = () => {
121119
openCreate() {
122120
set({ mode: BookModalMode.Create, params: {} });
123121
},
124-
openDetail(book) {
125-
set({ mode: BookModalMode.Detail, params: { book } });
122+
openDetail(bookId) {
123+
set({ mode: BookModalMode.Detail, params: { bookId } });
126124
},
127125
},
128126
}));
@@ -220,7 +218,7 @@ export const BookListPage: React.FC = () => {
220218
{filteredBookList.map((book) => (
221219
<Tr key={book.id}>
222220
<Td textAlign="center" verticalAlign="middle">
223-
<Button colorScheme="teal" onClick={() => modalState.openDetail(book)} variant="solid">
221+
<Button colorScheme="teal" onClick={() => modalState.openDetail(book.id)} variant="solid">
224222
詳細
225223
</Button>
226224
</Td>
@@ -245,7 +243,7 @@ export const BookListPage: React.FC = () => {
245243
</Stack>
246244

247245
{modalState.mode === BookModalMode.Detail ? (
248-
<BookDetailModal isOpen book={modalState.params.book} onClose={() => modalState.close()} />
246+
<BookDetailModal isOpen bookId={modalState.params.bookId} onClose={() => modalState.close()} />
249247
) : null}
250248
{modalState.mode === BookModalMode.Create ? <CreateBookModal isOpen onClose={() => modalState.close()} /> : null}
251249
</>

workspaces/admin/src/pages/BookListPage/internal/BookDetailModal/index.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@ import {
1919
import { Link } from '@tanstack/react-router';
2020
import { useToggle } from '@uidotdev/usehooks';
2121

22-
import type { GetBookResponse } from '@wsh-2024/schema/src/api/books/GetBookResponse';
23-
22+
import { useBook } from '../../../../features/books/hooks/useBook';
2423
import { useEpisodeList } from '../../../../features/episodes/hooks/useEpisodeList';
2524

2625
import { BookDetailContent } from './BookDetailContent';
2726
import { BookEditContent } from './BookEditContent';
2827

2928
type Props = {
30-
book: GetBookResponse;
29+
bookId: string;
3130
isOpen: boolean;
3231
onClose: () => void;
3332
};
3433

35-
export const BookDetailModal: React.FC<Props> = ({ book, isOpen, onClose }) => {
36-
const { data: episodeList } = useEpisodeList({ bookId: book.id });
37-
// const { data: book } = useBook({ bookId });
34+
export const BookDetailModal: React.FC<Props> = ({ bookId, isOpen, onClose }) => {
35+
const { data: episodeList } = useEpisodeList({ bookId });
36+
const { data: book } = useBook({ bookId });
3837

3938
const [isEdit, toggleIEdit] = useToggle(false);
4039

@@ -76,7 +75,7 @@ export const BookDetailModal: React.FC<Props> = ({ book, isOpen, onClose }) => {
7675
as={Link}
7776
colorScheme="teal"
7877
role="button"
79-
to={`/admin/books/${book.id}/episodes/${episode.id}`}
78+
to={`/admin/books/${bookId}/episodes/${episode.id}`}
8079
variant="solid"
8180
>
8281
編集
@@ -108,7 +107,7 @@ export const BookDetailModal: React.FC<Props> = ({ book, isOpen, onClose }) => {
108107
colorScheme="teal"
109108
mt={4}
110109
role="button"
111-
to={`/admin/books/${book.id}/episodes/new`}
110+
to={`/admin/books/${bookId}/episodes/new`}
112111
variant="solid"
113112
>
114113
エピソードを追加

workspaces/schema/src/api/books/GetBookListResponse.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,7 @@ export const GetBookListResponseSchema = createSelectSchema(book)
2525
}),
2626
episodes: createSelectSchema(episode)
2727
.pick({
28-
chapter: true,
29-
description: true,
3028
id: true,
31-
name: true,
32-
})
33-
.extend({
34-
image: createSelectSchema(image).pick({
35-
id: true,
36-
}),
3729
})
3830
.array(),
3931
image: createSelectSchema(image).pick({

0 commit comments

Comments
 (0)