diff options
| author | nsfisis <nsfisis@gmail.com> | 2025-12-31 03:00:21 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2025-12-31 03:00:21 +0900 |
| commit | d2acc670e1f312296212b096b87014c2f91284bc (patch) | |
| tree | c4b096558c2efdfe5027ff9e3a5db3919bede778 /src | |
| parent | 6aa496b60879526b51fdf736c38f09aede283bde (diff) | |
| download | kioku-d2acc670e1f312296212b096b87014c2f91284bc.tar.gz kioku-d2acc670e1f312296212b096b87014c2f91284bc.tar.zst kioku-d2acc670e1f312296212b096b87014c2f91284bc.zip | |
feat(client): add CreateNoteModal for note-based card creation
Replace CreateCardModal with CreateNoteModal in DeckDetailPage. The new
modal allows users to select a note type and dynamically enter field
values based on the selected type's fields. Cards are auto-generated
from the note with preview of how many cards will be created.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/components/CreateNoteModal.test.tsx | 688 | ||||
| -rw-r--r-- | src/client/components/CreateNoteModal.tsx | 401 | ||||
| -rw-r--r-- | src/client/pages/DeckDetailPage.test.tsx | 2 | ||||
| -rw-r--r-- | src/client/pages/DeckDetailPage.tsx | 12 |
4 files changed, 1096 insertions, 7 deletions
diff --git a/src/client/components/CreateNoteModal.test.tsx b/src/client/components/CreateNoteModal.test.tsx new file mode 100644 index 0000000..5e6932b --- /dev/null +++ b/src/client/components/CreateNoteModal.test.tsx @@ -0,0 +1,688 @@ +/** + * @vitest-environment jsdom + */ +import { cleanup, render, screen, waitFor } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { apiClient } from "../api/client"; + +vi.mock("../api/client", () => ({ + apiClient: { + getAuthHeader: vi.fn(), + }, + ApiClientError: class ApiClientError extends Error { + constructor( + message: string, + public status: number, + public code?: string, + ) { + super(message); + this.name = "ApiClientError"; + } + }, +})); + +// Import after mock is set up +import { CreateNoteModal } from "./CreateNoteModal"; + +// Mock fetch globally +const mockFetch = vi.fn(); +global.fetch = mockFetch; + +describe("CreateNoteModal", () => { + const defaultProps = { + isOpen: true, + deckId: "deck-123", + onClose: vi.fn(), + onNoteCreated: vi.fn(), + }; + + const mockNoteTypes = [ + { id: "note-type-1", name: "Basic", isReversible: false }, + { id: "note-type-2", name: "Basic (reversed)", isReversible: true }, + ]; + + const mockNoteTypeWithFields = { + id: "note-type-1", + name: "Basic", + frontTemplate: "{{Front}}", + backTemplate: "{{Back}}", + isReversible: false, + fields: [ + { id: "field-1", name: "Front", order: 0 }, + { id: "field-2", name: "Back", order: 1 }, + ], + }; + + beforeEach(() => { + vi.clearAllMocks(); + vi.mocked(apiClient.getAuthHeader).mockReturnValue({ + Authorization: "Bearer access-token", + }); + }); + + afterEach(() => { + cleanup(); + vi.restoreAllMocks(); + }); + + it("does not render when closed", () => { + render(<CreateNoteModal {...defaultProps} isOpen={false} />); + + expect(screen.queryByRole("dialog")).toBeNull(); + }); + + it("renders modal when open", async () => { + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + expect(screen.getByRole("dialog")).toBeDefined(); + expect( + screen.getByRole("heading", { name: "Create New Note" }), + ).toBeDefined(); + + // Wait for note types to load + await waitFor(() => { + expect(screen.getByLabelText("Note Type")).toBeDefined(); + }); + }); + + it("loads note types on open", async () => { + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(mockFetch).toHaveBeenCalledWith("/api/note-types", { + headers: { Authorization: "Bearer access-token" }, + }); + }); + }); + + it("auto-selects first note type and loads its fields", async () => { + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + // Wait for fields to be loaded + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + expect(screen.getByLabelText("Back")).toBeDefined(); + }); + + // Verify the note type details were fetched + expect(mockFetch).toHaveBeenCalledWith("/api/note-types/note-type-1", { + headers: { Authorization: "Bearer access-token" }, + }); + }); + + it("displays note type options in select", async () => { + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + const select = screen.getByLabelText("Note Type"); + expect(select).toBeDefined(); + }); + + const options = screen.getAllByRole("option"); + expect(options).toHaveLength(2); + expect(options[0]?.textContent).toBe("Basic"); + expect(options[1]?.textContent).toBe("Basic (reversed) (reversed)"); + }); + + it("shows message when no note types available", async () => { + mockFetch.mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: [] }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect( + screen.getByText( + "No note types available. Please create a note type first.", + ), + ).toBeDefined(); + }); + }); + + it("shows message when note type has no fields", async () => { + const noteTypeWithNoFields = { + ...mockNoteTypeWithFields, + fields: [], + }; + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: noteTypeWithNoFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect( + screen.getByText( + "This note type has no fields. Please add fields to the note type first.", + ), + ).toBeDefined(); + }); + }); + + it("disables create button when fields are empty", async () => { + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + const createButton = screen.getByRole("button", { name: "Create Note" }); + expect(createButton).toHaveProperty("disabled", true); + }); + + it("enables create button when all fields have values", async () => { + const user = userEvent.setup(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + await user.type(screen.getByLabelText("Front"), "Question"); + await user.type(screen.getByLabelText("Back"), "Answer"); + + const createButton = screen.getByRole("button", { name: "Create Note" }); + expect(createButton).toHaveProperty("disabled", false); + }); + + it("calls onClose when Cancel is clicked", async () => { + const user = userEvent.setup(); + const onClose = vi.fn(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} onClose={onClose} />); + + await waitFor(() => { + expect(screen.getByRole("button", { name: "Cancel" })).toBeDefined(); + }); + + await user.click(screen.getByRole("button", { name: "Cancel" })); + + expect(onClose).toHaveBeenCalledTimes(1); + }); + + it("calls onClose when clicking outside the modal", async () => { + const user = userEvent.setup(); + const onClose = vi.fn(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} onClose={onClose} />); + + await waitFor(() => { + expect(screen.getByRole("dialog")).toBeDefined(); + }); + + // Click on the backdrop (the dialog element itself) + const dialog = screen.getByRole("dialog"); + await user.click(dialog); + + expect(onClose).toHaveBeenCalledTimes(1); + }); + + it("creates note with field values", async () => { + const user = userEvent.setup(); + const onClose = vi.fn(); + const onNoteCreated = vi.fn(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ + note: { id: "note-1" }, + fieldValues: [], + cards: [{ id: "card-1", isReversed: false }], + }), + }); + + render( + <CreateNoteModal + isOpen={true} + deckId="deck-123" + onClose={onClose} + onNoteCreated={onNoteCreated} + />, + ); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + await user.type(screen.getByLabelText("Front"), "What is 2+2?"); + await user.type(screen.getByLabelText("Back"), "4"); + await user.click(screen.getByRole("button", { name: "Create Note" })); + + await waitFor(() => { + expect(mockFetch).toHaveBeenCalledWith("/api/decks/deck-123/notes", { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: "Bearer access-token", + }, + body: JSON.stringify({ + noteTypeId: "note-type-1", + fields: { + "field-1": "What is 2+2?", + "field-2": "4", + }, + }), + }); + }); + + expect(onNoteCreated).toHaveBeenCalledTimes(1); + expect(onClose).toHaveBeenCalledTimes(1); + }); + + it("trims whitespace from field values", async () => { + const user = userEvent.setup(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ + note: { id: "note-1" }, + fieldValues: [], + cards: [], + }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + await user.type(screen.getByLabelText("Front"), " Question "); + await user.type(screen.getByLabelText("Back"), " Answer "); + await user.click(screen.getByRole("button", { name: "Create Note" })); + + await waitFor(() => { + expect(mockFetch).toHaveBeenCalledWith("/api/decks/deck-123/notes", { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: "Bearer access-token", + }, + body: JSON.stringify({ + noteTypeId: "note-type-1", + fields: { + "field-1": "Question", + "field-2": "Answer", + }, + }), + }); + }); + }); + + it("shows loading state during submission", async () => { + const user = userEvent.setup(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }) + .mockImplementationOnce(() => new Promise(() => {})); // Never resolves + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + await user.type(screen.getByLabelText("Front"), "Question"); + await user.type(screen.getByLabelText("Back"), "Answer"); + await user.click(screen.getByRole("button", { name: "Create Note" })); + + expect(screen.getByRole("button", { name: "Creating..." })).toBeDefined(); + expect(screen.getByRole("button", { name: "Creating..." })).toHaveProperty( + "disabled", + true, + ); + }); + + it("displays API error message", async () => { + const user = userEvent.setup(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }) + .mockResolvedValueOnce({ + ok: false, + status: 400, + json: async () => ({ error: "Note type not found" }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + await user.type(screen.getByLabelText("Front"), "Question"); + await user.type(screen.getByLabelText("Back"), "Answer"); + await user.click(screen.getByRole("button", { name: "Create Note" })); + + await waitFor(() => { + expect(screen.getByRole("alert").textContent).toContain( + "Note type not found", + ); + }); + }); + + it("displays generic error on unexpected failure", async () => { + const user = userEvent.setup(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }) + .mockRejectedValueOnce(new Error("Network error")); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + await user.type(screen.getByLabelText("Front"), "Question"); + await user.type(screen.getByLabelText("Back"), "Answer"); + await user.click(screen.getByRole("button", { name: "Create Note" })); + + await waitFor(() => { + expect(screen.getByRole("alert").textContent).toContain( + "Failed to create note. Please try again.", + ); + }); + }); + + it("switches note type and loads new fields", async () => { + const user = userEvent.setup(); + + const reversedNoteType = { + id: "note-type-2", + name: "Basic (reversed)", + frontTemplate: "{{Front}}", + backTemplate: "{{Back}}", + isReversible: true, + fields: [ + { id: "field-3", name: "Question", order: 0 }, + { id: "field-4", name: "Answer", order: 1 }, + ], + }; + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: reversedNoteType }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + // Change note type + const select = screen.getByLabelText("Note Type"); + await user.selectOptions(select, "note-type-2"); + + // Wait for new fields to load + await waitFor(() => { + expect(screen.getByLabelText("Question")).toBeDefined(); + expect(screen.getByLabelText("Answer")).toBeDefined(); + }); + + // Verify the note type details were fetched for the new type + expect(mockFetch).toHaveBeenCalledWith("/api/note-types/note-type-2", { + headers: { Authorization: "Bearer access-token" }, + }); + }); + + it("shows card count preview for reversible note type", async () => { + const reversedNoteType = { + ...mockNoteTypeWithFields, + isReversible: true, + }; + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: reversedNoteType }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByText("2 cards")).toBeDefined(); + expect(screen.getByText(/normal and reversed/)).toBeDefined(); + }); + }); + + it("shows card count preview for non-reversible note type", async () => { + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByText("1 card")).toBeDefined(); + }); + }); + + it("displays error when note types fail to load", async () => { + mockFetch.mockResolvedValueOnce({ + ok: false, + status: 500, + json: async () => ({ error: "Server error" }), + }); + + render(<CreateNoteModal {...defaultProps} />); + + await waitFor(() => { + expect(screen.getByRole("alert").textContent).toContain("Server error"); + }); + }); + + it("resets form when closed and reopened", async () => { + const user = userEvent.setup(); + const onClose = vi.fn(); + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + const { rerender } = render( + <CreateNoteModal + isOpen={true} + deckId="deck-123" + onClose={onClose} + onNoteCreated={vi.fn()} + />, + ); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + // Type something in the form + await user.type(screen.getByLabelText("Front"), "Question"); + await user.type(screen.getByLabelText("Back"), "Answer"); + + // Click cancel to close + await user.click(screen.getByRole("button", { name: "Cancel" })); + + // Setup mocks for reopening + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteTypes: mockNoteTypes }), + }) + .mockResolvedValueOnce({ + ok: true, + json: async () => ({ noteType: mockNoteTypeWithFields }), + }); + + // Reopen the modal + rerender( + <CreateNoteModal + isOpen={true} + deckId="deck-123" + onClose={onClose} + onNoteCreated={vi.fn()} + />, + ); + + await waitFor(() => { + expect(screen.getByLabelText("Front")).toBeDefined(); + }); + + // Form should be reset + expect(screen.getByLabelText("Front")).toHaveProperty("value", ""); + expect(screen.getByLabelText("Back")).toHaveProperty("value", ""); + }); +}); diff --git a/src/client/components/CreateNoteModal.tsx b/src/client/components/CreateNoteModal.tsx new file mode 100644 index 0000000..86a02a5 --- /dev/null +++ b/src/client/components/CreateNoteModal.tsx @@ -0,0 +1,401 @@ +import { faSpinner } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { type FormEvent, useCallback, useEffect, useState } from "react"; +import { ApiClientError, apiClient } from "../api"; + +interface NoteField { + id: string; + name: string; + order: number; +} + +interface NoteType { + id: string; + name: string; + frontTemplate: string; + backTemplate: string; + isReversible: boolean; + fields: NoteField[]; +} + +interface NoteTypeSummary { + id: string; + name: string; + isReversible: boolean; +} + +interface CreateNoteModalProps { + isOpen: boolean; + deckId: string; + onClose: () => void; + onNoteCreated: () => void; +} + +export function CreateNoteModal({ + isOpen, + deckId, + onClose, + onNoteCreated, +}: CreateNoteModalProps) { + const [noteTypes, setNoteTypes] = useState<NoteTypeSummary[]>([]); + const [selectedNoteType, setSelectedNoteType] = useState<NoteType | null>( + null, + ); + const [fieldValues, setFieldValues] = useState<Record<string, string>>({}); + const [error, setError] = useState<string | null>(null); + const [isLoadingNoteTypes, setIsLoadingNoteTypes] = useState(false); + const [isLoadingNoteType, setIsLoadingNoteType] = useState(false); + const [isSubmitting, setIsSubmitting] = useState(false); + const [hasLoadedNoteTypes, setHasLoadedNoteTypes] = useState(false); + + const fetchNoteTypeDetails = useCallback(async (noteTypeId: string) => { + setIsLoadingNoteType(true); + setError(null); + + try { + const authHeader = apiClient.getAuthHeader(); + if (!authHeader) { + throw new ApiClientError("Not authenticated", 401); + } + + const res = await fetch(`/api/note-types/${noteTypeId}`, { + headers: authHeader, + }); + + if (!res.ok) { + const errorBody = await res.json().catch(() => ({})); + throw new ApiClientError( + (errorBody as { error?: string }).error || + `Request failed with status ${res.status}`, + res.status, + ); + } + + const data = await res.json(); + setSelectedNoteType(data.noteType); + + // Initialize field values for the new note type + const initialValues: Record<string, string> = {}; + for (const field of data.noteType.fields) { + initialValues[field.id] = ""; + } + setFieldValues(initialValues); + } catch (err) { + if (err instanceof ApiClientError) { + setError(err.message); + } else { + setError("Failed to load note type details. Please try again."); + } + } finally { + setIsLoadingNoteType(false); + } + }, []); + + const fetchNoteTypes = useCallback(async () => { + setIsLoadingNoteTypes(true); + setError(null); + + try { + const authHeader = apiClient.getAuthHeader(); + if (!authHeader) { + throw new ApiClientError("Not authenticated", 401); + } + + const res = await fetch("/api/note-types", { + headers: authHeader, + }); + + if (!res.ok) { + const errorBody = await res.json().catch(() => ({})); + throw new ApiClientError( + (errorBody as { error?: string }).error || + `Request failed with status ${res.status}`, + res.status, + ); + } + + const data = await res.json(); + setNoteTypes(data.noteTypes); + setHasLoadedNoteTypes(true); + + // Auto-select first note type if available + if (data.noteTypes.length > 0) { + await fetchNoteTypeDetails(data.noteTypes[0].id); + } + } catch (err) { + if (err instanceof ApiClientError) { + setError(err.message); + } else { + setError("Failed to load note types. Please try again."); + } + } finally { + setIsLoadingNoteTypes(false); + } + }, [fetchNoteTypeDetails]); + + useEffect(() => { + if (isOpen && !hasLoadedNoteTypes) { + fetchNoteTypes(); + } + }, [isOpen, hasLoadedNoteTypes, fetchNoteTypes]); + + const resetForm = () => { + // Reset field values to empty for current note type + if (selectedNoteType) { + const initialValues: Record<string, string> = {}; + for (const field of selectedNoteType.fields) { + initialValues[field.id] = ""; + } + setFieldValues(initialValues); + } else { + setFieldValues({}); + } + setError(null); + }; + + const handleClose = () => { + resetForm(); + onClose(); + }; + + const handleNoteTypeChange = async (noteTypeId: string) => { + if (noteTypeId !== selectedNoteType?.id) { + await fetchNoteTypeDetails(noteTypeId); + } + }; + + const handleFieldChange = (fieldId: string, value: string) => { + setFieldValues((prev) => ({ + ...prev, + [fieldId]: value, + })); + }; + + const handleSubmit = async (e: FormEvent) => { + e.preventDefault(); + setError(null); + + if (!selectedNoteType) { + setError("Please select a note type."); + return; + } + + setIsSubmitting(true); + + try { + const authHeader = apiClient.getAuthHeader(); + if (!authHeader) { + throw new ApiClientError("Not authenticated", 401); + } + + // Trim all field values + const trimmedFields: Record<string, string> = {}; + for (const [fieldId, value] of Object.entries(fieldValues)) { + trimmedFields[fieldId] = value.trim(); + } + + const res = await fetch(`/api/decks/${deckId}/notes`, { + method: "POST", + headers: { + "Content-Type": "application/json", + ...authHeader, + }, + body: JSON.stringify({ + noteTypeId: selectedNoteType.id, + fields: trimmedFields, + }), + }); + + if (!res.ok) { + const errorBody = await res.json().catch(() => ({})); + throw new ApiClientError( + (errorBody as { error?: string }).error || + `Request failed with status ${res.status}`, + res.status, + ); + } + + resetForm(); + onNoteCreated(); + onClose(); + } catch (err) { + if (err instanceof ApiClientError) { + setError(err.message); + } else { + setError("Failed to create note. Please try again."); + } + } finally { + setIsSubmitting(false); + } + }; + + if (!isOpen) { + return null; + } + + // Check if all required fields have values + const isFormValid = + selectedNoteType && + selectedNoteType.fields.length > 0 && + selectedNoteType.fields.every((field) => fieldValues[field.id]?.trim()); + + const isLoading = isLoadingNoteTypes || isLoadingNoteType; + + return ( + <div + role="dialog" + aria-modal="true" + aria-labelledby="create-note-title" + className="fixed inset-0 bg-ink/40 backdrop-blur-sm flex items-center justify-center z-50 p-4 animate-fade-in" + onClick={(e) => { + if (e.target === e.currentTarget) { + handleClose(); + } + }} + onKeyDown={(e) => { + if (e.key === "Escape") { + handleClose(); + } + }} + > + <div className="bg-white rounded-2xl shadow-xl w-full max-w-lg animate-scale-in"> + <div className="p-6"> + <h2 + id="create-note-title" + className="font-display text-xl font-medium text-ink mb-6" + > + Create New Note + </h2> + + <form onSubmit={handleSubmit} className="space-y-4"> + {error && ( + <div + role="alert" + className="bg-error/5 text-error text-sm px-4 py-3 rounded-lg border border-error/20" + > + {error} + </div> + )} + + {/* Note Type Selector */} + <div> + <label + htmlFor="note-type-select" + className="block text-sm font-medium text-slate mb-1.5" + > + Note Type + </label> + {isLoadingNoteTypes ? ( + <div className="flex items-center gap-2 text-muted text-sm py-2"> + <FontAwesomeIcon + icon={faSpinner} + className="h-4 w-4 animate-spin" + aria-hidden="true" + /> + Loading note types... + </div> + ) : noteTypes.length === 0 ? ( + <div className="text-muted text-sm py-2"> + No note types available. Please create a note type first. + </div> + ) : ( + <select + id="note-type-select" + value={selectedNoteType?.id || ""} + onChange={(e) => handleNoteTypeChange(e.target.value)} + disabled={isSubmitting || isLoading} + className="w-full px-4 py-2.5 bg-ivory border border-border rounded-lg text-slate transition-all duration-200 hover:border-muted focus:border-primary focus:ring-2 focus:ring-primary/10 disabled:opacity-50 disabled:cursor-not-allowed" + > + {noteTypes.map((noteType) => ( + <option key={noteType.id} value={noteType.id}> + {noteType.name} + {noteType.isReversible ? " (reversed)" : ""} + </option> + ))} + </select> + )} + </div> + + {/* Loading indicator for note type details */} + {isLoadingNoteType && ( + <div className="flex items-center gap-2 text-muted text-sm py-4"> + <FontAwesomeIcon + icon={faSpinner} + className="h-4 w-4 animate-spin" + aria-hidden="true" + /> + Loading fields... + </div> + )} + + {/* Dynamic Field Inputs */} + {selectedNoteType && !isLoadingNoteType && ( + <> + {selectedNoteType.fields.length === 0 ? ( + <div className="text-muted text-sm py-2"> + This note type has no fields. Please add fields to the note + type first. + </div> + ) : ( + selectedNoteType.fields + .sort((a, b) => a.order - b.order) + .map((field) => ( + <div key={field.id}> + <label + htmlFor={`field-${field.id}`} + className="block text-sm font-medium text-slate mb-1.5" + > + {field.name} + </label> + <textarea + id={`field-${field.id}`} + value={fieldValues[field.id] || ""} + onChange={(e) => + handleFieldChange(field.id, e.target.value) + } + required + disabled={isSubmitting} + rows={3} + placeholder={`Enter ${field.name.toLowerCase()}`} + className="w-full px-4 py-2.5 bg-ivory border border-border rounded-lg text-slate placeholder-muted transition-all duration-200 hover:border-muted focus:border-primary focus:ring-2 focus:ring-primary/10 disabled:opacity-50 disabled:cursor-not-allowed resize-none" + /> + </div> + )) + )} + + {/* Card Preview Info */} + {selectedNoteType.fields.length > 0 && ( + <div className="bg-ivory rounded-lg px-4 py-3 text-sm text-muted"> + This will create{" "} + <span className="font-medium text-slate"> + {selectedNoteType.isReversible ? "2 cards" : "1 card"} + </span> + {selectedNoteType.isReversible && " (normal and reversed)"} + </div> + )} + </> + )} + + <div className="flex gap-3 justify-end pt-2"> + <button + type="button" + onClick={handleClose} + disabled={isSubmitting} + className="px-4 py-2 text-slate hover:bg-ivory rounded-lg transition-colors disabled:opacity-50" + > + Cancel + </button> + <button + type="submit" + disabled={isSubmitting || !isFormValid || isLoading} + className="px-4 py-2 bg-primary hover:bg-primary-dark text-white font-medium rounded-lg transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed" + > + {isSubmitting ? "Creating..." : "Create Note"} + </button> + </div> + </form> + </div> + </div> + </div> + ); +} diff --git a/src/client/pages/DeckDetailPage.test.tsx b/src/client/pages/DeckDetailPage.test.tsx index e4ecade..a6b8531 100644 --- a/src/client/pages/DeckDetailPage.test.tsx +++ b/src/client/pages/DeckDetailPage.test.tsx @@ -171,7 +171,7 @@ describe("DeckDetailPage", () => { await waitFor(() => { expect(screen.getByText("No cards yet")).toBeDefined(); }); - expect(screen.getByText("Add cards to start studying")).toBeDefined(); + expect(screen.getByText("Add notes to start studying")).toBeDefined(); }); it("displays list of cards", async () => { diff --git a/src/client/pages/DeckDetailPage.tsx b/src/client/pages/DeckDetailPage.tsx index 5a3c14e..9a158f6 100644 --- a/src/client/pages/DeckDetailPage.tsx +++ b/src/client/pages/DeckDetailPage.tsx @@ -11,7 +11,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { useCallback, useEffect, useState } from "react"; import { Link, useParams } from "wouter"; import { ApiClientError, apiClient } from "../api"; -import { CreateCardModal } from "../components/CreateCardModal"; +import { CreateNoteModal } from "../components/CreateNoteModal"; import { DeleteCardModal } from "../components/DeleteCardModal"; import { EditCardModal } from "../components/EditCardModal"; @@ -238,7 +238,7 @@ export function DeckDetailPage() { className="w-5 h-5" aria-hidden="true" /> - Add Card + Add Note </button> </div> @@ -256,7 +256,7 @@ export function DeckDetailPage() { No cards yet </h3> <p className="text-muted text-sm mb-4"> - Add cards to start studying + Add notes to start studying </p> <button type="button" @@ -268,7 +268,7 @@ export function DeckDetailPage() { className="w-5 h-5" aria-hidden="true" /> - Add Your First Card + Add Your First Note </button> </div> )} @@ -360,11 +360,11 @@ export function DeckDetailPage() { {/* Modals */} {deckId && ( - <CreateCardModal + <CreateNoteModal isOpen={isCreateModalOpen} deckId={deckId} onClose={() => setIsCreateModalOpen(false)} - onCardCreated={fetchCards} + onNoteCreated={fetchCards} /> )} |
