Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion apps/web/playwright.ui.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ import shared from "./playwright.shared";
const port = Number(process.env.BOOK_UI_PORT || 4173);
if (!Number.isInteger(port) || port < 1024 || port > 65535)
throw new Error("BOOK_UI_PORT must be a port between 1024 and 65535");
const browserName = process.env.BOOK_UI_BROWSER || "chromium";
if (
browserName !== "chromium" &&
browserName !== "firefox" &&
browserName !== "webkit"
)
throw new Error("BOOK_UI_BROWSER must be chromium, firefox, or webkit");
const baseURL = `http://127.0.0.1:${port}`;

// Fully mocked browser journeys only: no PostgreSQL, Python API, migrations, or worker.
Expand All @@ -12,7 +19,7 @@ export default defineConfig({
testDir: "./tests/ui",
reporter: [["list"], ["junit", { outputFile: "test-results/ui.xml" }]],
outputDir: "test-results/ui",
use: { ...shared.use, baseURL },
use: { ...shared.use, baseURL, browserName },
webServer: {
command: `node node_modules/vite/bin/vite.js preview --config vite.ui.config.ts --host 127.0.0.1 --port ${port} --strictPort`,
url: baseURL,
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/api/schema.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 51 additions & 15 deletions apps/web/src/components/CatalogEditions.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import EditionFormatSelect, { type EditionFormat } from "./EditionFormatSelect";
import { useState } from "react";
import BookPagination from "./BookPagination";
import { Link } from "react-router-dom";
Expand All @@ -20,6 +21,10 @@ export default function CatalogEditions({
}) {
const cache = useQueryClient();
const [page, setPage] = useState(1);
const [format, setFormat] = useState<EditionFormat>("all");
const providerEditions = (readerBook?.editions || []).filter(
(edition) => format === "all" || edition.medium === format,
);
const [providerPage, setProviderPage] = useState(1);
const group = useQuery({
queryKey: ["work-grouping", work.id],
Expand Down Expand Up @@ -51,13 +56,18 @@ export default function CatalogEditions({
},
});
const query = useQuery({
queryKey: ["reader-work-metadata", work.id, "editions", page],
queryKey: ["reader-work-metadata", work.id, "editions", page, format],
queryFn: async ({ signal }) =>
result(
await api.GET("/api/metadata/works/{work_id}", {
params: {
path: { work_id: work.id },
query: { offset: (page - 1) * 20, limit: 20, scope: "display" },
query: {
offset: (page - 1) * 20,
limit: 20,
scope: "display",
medium: format === "all" ? undefined : format,
},
},
signal,
}),
Expand All @@ -71,7 +81,21 @@ export default function CatalogEditions({
<span className="muted">{query.data.versions_total} editions</span>
)}
</div>
<EditionFormatSelect
value={format}
onChange={(value) => {
setFormat(value);
setPage(1);
setProviderPage(1);
}}
/>
<Notice error={query.error || group.error || primary.error} />
{query.data?.sources.some((source) => source.editions_more) && (
<p className="muted">
Some catalog editions have not been loaded. More formats may be
available; use Book metadata to load more editions.
</p>
)}
{query.isPending && <Loading />}
{query.error && (
<button onClick={() => query.refetch()}>Retry editions</button>
Expand Down Expand Up @@ -186,8 +210,10 @@ export default function CatalogEditions({
</div>
) : (
<p className="muted">
No editions are linked yet. Use Book metadata to match or refresh a
catalog source.
{format === "all"
? "No editions are linked yet."
: "No linked editions match this format."}{" "}
Use Book metadata to match or refresh a catalog source.
</p>
))}
{query.data && (
Expand Down Expand Up @@ -218,12 +244,12 @@ export default function CatalogEditions({
</button>
</div>
)}
{!!readerBook?.editions?.length && (
{readerBook && (
<section aria-label="Hardcover editions">
<div className="book-tab-heading">
<h3>On Hardcover</h3>
<span className="muted">
{readerBook.editions.length}
{providerEditions.length}
{readerBook.editions_more ? "+" : ""} editions
</span>
</div>
Expand All @@ -238,7 +264,7 @@ export default function CatalogEditions({
</tr>
</thead>
<tbody>
{readerBook.editions
{providerEditions
.slice((providerPage - 1) * 20, providerPage * 20)
.map((edition) => (
<tr key={edition.external_id}>
Expand Down Expand Up @@ -273,18 +299,28 @@ export default function CatalogEditions({
</div>
<BookPagination
page={providerPage}
total={readerBook.editions.length}
total={providerEditions.length}
onPage={setProviderPage}
label="Hardcover editions"
/>
{!providerEditions.length && (
<p className="muted">
No editions matching this format are in the loaded Hardcover
results.
</p>
)}
{readerBook.editions_more && (
<a
href={`https://hardcover.app/books/${encodeURIComponent(readerBook.external_id)}`}
target="_blank"
rel="noreferrer"
>
Explore all editions on Hardcover →
</a>
<p className="muted">
Only the first {readerBook.editions?.length || 0} editions are
loaded. More formats may be available.{" "}
<a
href={`https://hardcover.app/books/${encodeURIComponent(readerBook.external_id)}`}
target="_blank"
rel="noreferrer"
>
Explore all editions on Hardcover →
</a>
</p>
)}
</section>
)}
Expand Down
25 changes: 25 additions & 0 deletions apps/web/src/components/EditionFormatSelect.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
export type EditionFormat = "all" | "ebook" | "audio" | "print" | "unknown";

export default function EditionFormatSelect({
value,
onChange,
}: {
value: EditionFormat;
onChange: (value: EditionFormat) => void;
}) {
return (
<label>
Edition format
<select
value={value}
onChange={(event) => onChange(event.target.value as EditionFormat)}
>
<option value="all">All formats</option>
<option value="ebook">Ebook</option>
<option value="audio">Audiobook</option>
<option value="print">Print</option>
<option value="unknown">Other / unspecified</option>
</select>
</label>
);
}
Loading
Loading