From 78073b2f94515f58f8555736ac16aa9155c0c9b0 Mon Sep 17 00:00:00 2001
From: tomolld <tomoki2757@gmail.com>
Date: Mon, 12 Aug 2024 17:14:08 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB=E3=82=82?=
 =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utils/extractNumberedElements.ts          |  5 +-
 .../components/ContentWithTranslations.tsx    | 22 ++++-
 .../page+/$slug+/components/Translation.tsx   | 16 +++-
 .../components/UserAITranslationStatus.tsx    |  2 +-
 .../$userName+/page+/$slug+/edit/_edit.tsx    |  7 +-
 .../routes/$userName+/page+/$slug+/index.tsx  | 48 +++++++---
 .../$slug+/lib/get-best-translation.client.ts |  5 +-
 .../{edit => }/utils/addNumbersToContent.ts   |  0
 .../$slug+/{edit => }/utils/extractArticle.ts |  0
 .../utils/extractNumberedElements.ts          |  5 +-
 web/app/routes/resources+/footer.tsx          | 91 ++++++++++---------
 web/app/routes/translator/route.tsx           |  5 +-
 12 files changed, 136 insertions(+), 70 deletions(-)
 rename web/app/routes/$userName+/page+/$slug+/{edit => }/utils/addNumbersToContent.ts (100%)
 rename web/app/routes/$userName+/page+/$slug+/{edit => }/utils/extractArticle.ts (100%)
 rename web/app/routes/$userName+/page+/$slug+/{edit => }/utils/extractNumberedElements.ts (93%)

diff --git a/web/app/features/prepare-html-for-translate/utils/extractNumberedElements.ts b/web/app/features/prepare-html-for-translate/utils/extractNumberedElements.ts
index 0a31d75c..2bb05f46 100644
--- a/web/app/features/prepare-html-for-translate/utils/extractNumberedElements.ts
+++ b/web/app/features/prepare-html-for-translate/utils/extractNumberedElements.ts
@@ -2,9 +2,12 @@ import { JSDOM } from "jsdom";
 
 export function extractNumberedElements(
 	content: string,
+	title: string,
 ): Array<{ number: number; text: string }> {
 	const doc = new JSDOM(content);
-	const numberedElements: Array<{ number: number; text: string }> = [];
+	const numberedElements: Array<{ number: number; text: string }> = [
+		{ number: 0, text: title },
+	];
 	// <br>のみを改行とする
 	doc.window.document.body.innerHTML = doc.window.document.body.innerHTML
 		.replace(/\n/g, "")
diff --git a/web/app/routes/$userName+/page+/$slug+/components/ContentWithTranslations.tsx b/web/app/routes/$userName+/page+/$slug+/components/ContentWithTranslations.tsx
index 064b2ab9..63a44c96 100644
--- a/web/app/routes/$userName+/page+/$slug+/components/ContentWithTranslations.tsx
+++ b/web/app/routes/$userName+/page+/$slug+/components/ContentWithTranslations.tsx
@@ -5,16 +5,22 @@ import type { SourceTextWithTranslations } from "../types";
 import { Translation } from "./Translation";
 
 interface ContentWithTranslationsProps {
+	title: string;
 	content: string;
 	sourceTextWithTranslations: SourceTextWithTranslations[];
 	userId: number | null;
 }
 
 export const ContentWithTranslations = memo(function ContentWithTranslations({
+	title,
 	content,
 	sourceTextWithTranslations,
 	userId,
 }: ContentWithTranslationsProps) {
+	const titleTranslation = useMemo(() => {
+		return sourceTextWithTranslations.find((info) => info.number === 0);
+	}, [sourceTextWithTranslations]);
+
 	const parsedContent = useMemo(() => {
 		if (typeof window === "undefined") {
 			return null;
@@ -63,5 +69,19 @@ export const ContentWithTranslations = memo(function ContentWithTranslations({
 		return <div>Loading...</div>;
 	}
 
-	return <>{parsedContent}</>;
+	return (
+		<>
+			<h1>
+				{title}
+				{titleTranslation && (
+					<Translation
+						translationsWithVotes={titleTranslation.translationsWithVotes}
+						userId={userId}
+						sourceTextId={titleTranslation.sourceTextId}
+					/>
+				)}
+			</h1>
+			{parsedContent}
+		</>
+	);
 });
diff --git a/web/app/routes/$userName+/page+/$slug+/components/Translation.tsx b/web/app/routes/$userName+/page+/$slug+/components/Translation.tsx
index b380137a..6e72cbec 100644
--- a/web/app/routes/$userName+/page+/$slug+/components/Translation.tsx
+++ b/web/app/routes/$userName+/page+/$slug+/components/Translation.tsx
@@ -46,14 +46,22 @@ export function Translation({
 
 	const alternativeTranslationsWithVotes = useMemo(
 		() =>
-			translationsWithVotes.filter((t) => t.id !== bestTranslationWithVote.id),
+			bestTranslationWithVote
+				? translationsWithVotes.filter(
+						(t) => t.id !== bestTranslationWithVote.id,
+					)
+				: [],
 		[translationsWithVotes, bestTranslationWithVote],
 	);
 
 	const sanitizedAndParsedText = useMemo(() => {
-		const sanitized = sanitizeAndParseText(bestTranslationWithVote.text);
-		return sanitized;
-	}, [bestTranslationWithVote.text]);
+		if (!bestTranslationWithVote) return null;
+		return sanitizeAndParseText(bestTranslationWithVote.text);
+	}, [bestTranslationWithVote]);
+
+	if (!bestTranslationWithVote || !sanitizedAndParsedText) {
+		return null;
+	}
 
 	return (
 		<div className="group relative">
diff --git a/web/app/routes/$userName+/page+/$slug+/components/UserAITranslationStatus.tsx b/web/app/routes/$userName+/page+/$slug+/components/UserAITranslationStatus.tsx
index bf2b698e..2f2c1014 100644
--- a/web/app/routes/$userName+/page+/$slug+/components/UserAITranslationStatus.tsx
+++ b/web/app/routes/$userName+/page+/$slug+/components/UserAITranslationStatus.tsx
@@ -34,7 +34,7 @@ export function UserAITranslationStatus({
 	return (
 		<Card className="mt-6">
 			<CardHeader className="flex flex-row items-center justify-between">
-				<CardTitle>Translation Status</CardTitle>
+				<CardTitle>Your AI Translation Status</CardTitle>
 				<Button
 					variant="ghost"
 					size="sm"
diff --git a/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx b/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx
index b545934b..54ab8367 100644
--- a/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx
+++ b/web/app/routes/$userName+/page+/$slug+/edit/_edit.tsx
@@ -20,12 +20,12 @@ import { ArrowDownToLine } from "lucide-react";
 import { z } from "zod";
 import { Button } from "~/components/ui/button";
 import { authenticator } from "~/utils/auth.server";
+import { addNumbersToContent } from "../utils/addNumbersToContent";
+import { extractNumberedElements } from "../utils/extractNumberedElements";
 import { Header } from "./components/Header";
 import { createOrUpdateSourceTexts } from "./functions/mutations.server";
 import { getOrCreatePage } from "./functions/mutations.server";
 import { getPageBySlug } from "./functions/queries.server";
-import { addNumbersToContent } from "./utils/addNumbersToContent";
-import { extractNumberedElements } from "./utils/extractNumberedElements";
 
 const schema = z.object({
 	title: z.string().min(1, "Required"),
@@ -67,9 +67,8 @@ export const action: ActionFunction = async ({ request, params }) => {
 
 	const { title, pageContent } = submission.value;
 	const numberedContent = addNumbersToContent(pageContent);
-	console.log(numberedContent);
 	const page = await getOrCreatePage(safeUser.id, slug, title, numberedContent);
-	const numberedElements = extractNumberedElements(numberedContent);
+	const numberedElements = extractNumberedElements(numberedContent, title);
 	await createOrUpdateSourceTexts(numberedElements, page.id);
 
 	return redirect(`/${userName}/page/${slug}`);
diff --git a/web/app/routes/$userName+/page+/$slug+/index.tsx b/web/app/routes/$userName+/page+/$slug+/index.tsx
index 9c80f6a7..0081cc5a 100644
--- a/web/app/routes/$userName+/page+/$slug+/index.tsx
+++ b/web/app/routes/$userName+/page+/$slug+/index.tsx
@@ -9,8 +9,8 @@ import { Languages } from "lucide-react";
 import { useState } from "react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { LoadingSpinner } from "~/components/LoadingSpinner";
+import { Alert, AlertDescription, AlertTitle } from "~/components/ui/alert";
 import { Button } from "~/components/ui/button";
-import { extractNumberedElements } from "~/features/prepare-html-for-translate/utils/extractNumberedElements";
 import { AIModelSelector } from "~/features/translate/components/AIModelSelector";
 import { getTranslateUserQueue } from "~/features/translate/translate-user-queue";
 import { GeminiApiKeyDialog } from "~/routes/resources+/gemini-api-key-dialog";
@@ -31,7 +31,7 @@ import {
 	getDbUser,
 } from "./functions/queries.server";
 import { actionSchema } from "./types";
-
+import { extractNumberedElements } from "./utils/extractNumberedElements";
 export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 	const { slug } = params;
 
@@ -77,10 +77,11 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 		return {
 			intent: null,
 			lastResult: submission.reply({ formErrors: ["User not authenticated"] }),
+			slug: null,
 		};
 	}
 	if (submission.status !== "success") {
-		return { intent: null, lastResult: submission.reply() };
+		return { intent: null, lastResult: submission.reply(), slug: null };
 	}
 	const { intent } = submission.value;
 	switch (intent) {
@@ -90,7 +91,11 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 				submission.value.isUpvote,
 				safeUserId,
 			);
-			return { intent, lastResult: submission.reply({ resetForm: true }) };
+			return {
+				intent,
+				lastResult: submission.reply({ resetForm: true }),
+				slug: null,
+			};
 		case "add":
 			handleAddTranslationAction(
 				submission.value.sourceTextId,
@@ -98,7 +103,11 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 				safeUserId,
 				targetLanguage,
 			);
-			return { intent, lastResult: submission.reply({ resetForm: true }) };
+			return {
+				intent,
+				lastResult: submission.reply({ resetForm: true }),
+				slug: null,
+			};
 		case "translate": {
 			const dbUser = await getDbUser(safeUser.id);
 			if (!dbUser?.geminiApiKey) {
@@ -106,6 +115,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 					lastResult: submission.reply({
 						formErrors: ["Gemini API key is not set"],
 					}),
+					intent: null,
 					slug: null,
 				};
 			}
@@ -115,6 +125,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 					lastResult: submission.reply({
 						formErrors: ["Page not found"],
 					}),
+					intent: null,
 					slug: null,
 				};
 			}
@@ -125,7 +136,10 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 				targetLanguage,
 			);
 
-			const numberedElements = extractNumberedElements(page.content);
+			const numberedElements = extractNumberedElements(
+				page.content,
+				page.title,
+			);
 			const queue = getTranslateUserQueue(safeUser.id);
 			const job = await queue.add(`translate-${safeUser.id}`, {
 				userAITranslationInfoId: userAITranslationInfo.id,
@@ -138,7 +152,11 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 				numberedContent: page.content,
 				numberedElements,
 			});
-			return { intent, lastResult: submission.reply({ resetForm: true }) };
+			return {
+				intent,
+				lastResult: submission.reply({ resetForm: true }),
+				slug: page.slug,
+			};
 		}
 		default:
 			throw new Error("Invalid Intent");
@@ -205,17 +223,23 @@ export default function ReaderView() {
 						)}
 					</div>
 				</Form>
+				{actionData?.slug && (
+					<Alert className="bg-blue-50 border-blue-200 text-blue-800 animate-in fade-in duration-300">
+						<AlertTitle className="text-center">
+							Translation Job Started
+						</AlertTitle>
+						<AlertDescription className="text-center">
+							<strong className="font-semibold ">{actionData.slug}</strong>
+						</AlertDescription>
+					</Alert>
+				)}
 				<UserAITranslationStatus
 					userAITranslationInfo={userAITranslationInfo}
 				/>
 			</div>
 			<article className="prose dark:prose-invert lg:prose-xl">
-				<h1>
-					{pageData.title}
-					<div>{pageData.translationTitle}</div>
-				</h1>
-				<hr />
 				<ContentWithTranslations
+					title={pageData.title}
 					content={pageData.content}
 					sourceTextWithTranslations={pageData.sourceTextWithTranslations}
 					userId={safeUser?.id ?? null}
diff --git a/web/app/routes/$userName+/page+/$slug+/lib/get-best-translation.client.ts b/web/app/routes/$userName+/page+/$slug+/lib/get-best-translation.client.ts
index 44acf9f9..f65a6494 100644
--- a/web/app/routes/$userName+/page+/$slug+/lib/get-best-translation.client.ts
+++ b/web/app/routes/$userName+/page+/$slug+/lib/get-best-translation.client.ts
@@ -2,7 +2,10 @@ import type { TranslationWithVote } from "../types";
 
 export function getBestTranslation(
 	translationsWithVotes: TranslationWithVote[],
-): TranslationWithVote {
+): TranslationWithVote | null {
+	if (translationsWithVotes.length === 0) {
+		return null;
+	}
 	const upvotedTranslations = translationsWithVotes.filter(
 		(t) => t.userVote?.isUpvote,
 	);
diff --git a/web/app/routes/$userName+/page+/$slug+/edit/utils/addNumbersToContent.ts b/web/app/routes/$userName+/page+/$slug+/utils/addNumbersToContent.ts
similarity index 100%
rename from web/app/routes/$userName+/page+/$slug+/edit/utils/addNumbersToContent.ts
rename to web/app/routes/$userName+/page+/$slug+/utils/addNumbersToContent.ts
diff --git a/web/app/routes/$userName+/page+/$slug+/edit/utils/extractArticle.ts b/web/app/routes/$userName+/page+/$slug+/utils/extractArticle.ts
similarity index 100%
rename from web/app/routes/$userName+/page+/$slug+/edit/utils/extractArticle.ts
rename to web/app/routes/$userName+/page+/$slug+/utils/extractArticle.ts
diff --git a/web/app/routes/$userName+/page+/$slug+/edit/utils/extractNumberedElements.ts b/web/app/routes/$userName+/page+/$slug+/utils/extractNumberedElements.ts
similarity index 93%
rename from web/app/routes/$userName+/page+/$slug+/edit/utils/extractNumberedElements.ts
rename to web/app/routes/$userName+/page+/$slug+/utils/extractNumberedElements.ts
index 0a31d75c..2bb05f46 100644
--- a/web/app/routes/$userName+/page+/$slug+/edit/utils/extractNumberedElements.ts
+++ b/web/app/routes/$userName+/page+/$slug+/utils/extractNumberedElements.ts
@@ -2,9 +2,12 @@ import { JSDOM } from "jsdom";
 
 export function extractNumberedElements(
 	content: string,
+	title: string,
 ): Array<{ number: number; text: string }> {
 	const doc = new JSDOM(content);
-	const numberedElements: Array<{ number: number; text: string }> = [];
+	const numberedElements: Array<{ number: number; text: string }> = [
+		{ number: 0, text: title },
+	];
 	// <br>のみを改行とする
 	doc.window.document.body.innerHTML = doc.window.document.body.innerHTML
 		.replace(/\n/g, "")
diff --git a/web/app/routes/resources+/footer.tsx b/web/app/routes/resources+/footer.tsx
index e071e396..4797798b 100644
--- a/web/app/routes/resources+/footer.tsx
+++ b/web/app/routes/resources+/footer.tsx
@@ -42,50 +42,36 @@ export function Footer({ safeUser }: FooterProps) {
 	return (
 		<footer className="bottom-0 left-0 right-0 border-t border-gray-200 dark:border-gray-700">
 			<div className="max-w-7xl mx-auto py-4 px-4 sm:px-6 lg:px-8">
-				<div className="flex justify-between items-center">
-					<div className="flex items-center">
-						<Link to="/">
-							<img
-								src="/title-logo-dark.png"
-								alt="::COMPANY_NAME::"
-								className="w-32"
-							/>
-						</Link>
-					</div>
-					<Link to={`/${safeUser?.userName}`}>
-						<Button variant="outline">{safeUser?.userName}</Button>
-					</Link>
-
-					<div className="flex items-center space-x-4 text-sm text-gray-6000 dark:text-gray-300">
-						<Link
-							to="/privacy"
-							className="hover:text-gray-900 dark:hover:text-white"
-						>
-							Privacy Policy
-						</Link>
-						<Link
-							to="/terms"
-							className="hover:text-gray-900 dark:hover:text-white"
-						>
-							Terms of Service
-						</Link>
-						<p>© {currentYear} EveEve</p>
-					</div>
-
-					<div>
-						{safeUser ? (
-							<Form method="post" action="/resources/footer">
-								<Button
-									type="submit"
-									name="intent"
-									value="logout"
-									variant="outline"
-								>
-									<LogOut className="w-4 h-4 mr-2" />
-									Log out
-								</Button>
-							</Form>
-						) : (
+				<div className="flex flex-col space-y-4">
+					<div className="flex justify-between items-center">
+						<div className="flex items-center space-x-4">
+							<Link to="/">
+								<img
+									src="/title-logo-dark.png"
+									alt="::COMPANY_NAME::"
+									className="w-32"
+								/>
+							</Link>
+							{safeUser && (
+								<>
+									<Link to={`/${safeUser.userName}`}>
+										<Button variant="outline">{safeUser.userName}</Button>
+									</Link>
+									<Form method="post" action="/resources/footer">
+										<Button
+											type="submit"
+											name="intent"
+											value="logout"
+											variant="outline"
+										>
+											<LogOut className="w-4 h-4 mr-2" />
+											Log out
+										</Button>
+									</Form>
+								</>
+							)}
+						</div>
+						{!safeUser && (
 							<Form method="post" action="/resources/footer">
 								<Button
 									type="submit"
@@ -99,6 +85,23 @@ export function Footer({ safeUser }: FooterProps) {
 							</Form>
 						)}
 					</div>
+					<div className="flex justify-between items-center text-sm text-gray-600 dark:text-gray-300 mt-8">
+						<div className="flex space-x-4">
+							<Link
+								to="/privacy"
+								className="hover:text-gray-900 dark:hover:text-white"
+							>
+								Privacy Policy
+							</Link>
+							<Link
+								to="/terms"
+								className="hover:text-gray-900 dark:hover:text-white"
+							>
+								Terms of Service
+							</Link>
+						</div>
+						<p>© {currentYear} EveEve</p>
+					</div>
 				</div>
 			</div>
 		</footer>
diff --git a/web/app/routes/translator/route.tsx b/web/app/routes/translator/route.tsx
index 48a10600..eec246f5 100644
--- a/web/app/routes/translator/route.tsx
+++ b/web/app/routes/translator/route.tsx
@@ -127,7 +127,10 @@ export async function action({ request }: ActionFunctionArgs) {
 					targetLanguage,
 				);
 
-				const numberedElements = extractNumberedElements(numberedContent);
+				const numberedElements = extractNumberedElements(
+					numberedContent,
+					title,
+				);
 				await createOrUpdateSourceTexts(numberedElements, page.id);
 				// ファイルの翻訳ジョブをキューに追加
 				await queue.add(`translate-${safeUser.id}`, {