From 0d0abaf945784c5c800b9511e8aa871a0134257f Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Mon, 27 Oct 2025 20:58:01 +0100 Subject: [PATCH 01/10] More tests in pages --- apps/main/src/pages/NotFoundPage.test.tsx | 65 ++++- .../main/src/pages/PublicBookingPage.test.tsx | 107 ++++++- apps/main/src/pages/PublicNotePage.test.tsx | 33 +++ apps/main/src/pages/chat.test.tsx | 66 ++++- apps/main/src/pages/feedback.test.tsx | 117 ++++++++ apps/main/src/pages/join.test.tsx | 77 +++++- apps/main/src/pages/login.test.tsx | 100 ++++++- apps/main/src/pages/notes.test.tsx | 149 +++++++++- apps/main/src/pages/oauth-signin.test.tsx | 76 ++++- apps/main/src/pages/reset-password.test.tsx | 106 +++++++ apps/main/src/pages/settings.test.tsx | 260 ++++++++++++++++++ apps/main/src/pages/signup.test.tsx | 204 +++++++++++++- apps/main/src/pages/tablo.test.tsx | 119 ++++++++ 13 files changed, 1465 insertions(+), 14 deletions(-) diff --git a/apps/main/src/pages/NotFoundPage.test.tsx b/apps/main/src/pages/NotFoundPage.test.tsx index 839a3ef..4ab87da 100644 --- a/apps/main/src/pages/NotFoundPage.test.tsx +++ b/apps/main/src/pages/NotFoundPage.test.tsx @@ -1,15 +1,29 @@ -import { render, screen } from "@testing-library/react"; +import { fireEvent, render, screen } from "@testing-library/react"; import { BrowserRouter } from "react-router-dom"; import { describe, expect, it, vi } from "vitest"; import { NotFoundPage } from "./NotFoundPage"; +const mockNavigate = vi.fn(); + vi.mock("react-i18next", () => ({ useTranslation: () => ({ t: (key: string) => key, }), })); +vi.mock("react-router-dom", async () => { + const actual = await vi.importActual("react-router-dom"); + return { + ...actual, + useNavigate: () => mockNavigate, + }; +}); + describe("NotFoundPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = render( @@ -27,4 +41,53 @@ describe("NotFoundPage", () => { ); expect(screen.getByText("404")).toBeInTheDocument(); }); + + it("displays page not found title", () => { + render( + + + + ); + expect(screen.getByText(/pages:notFound.title/i)).toBeInTheDocument(); + }); + + it("displays description message", () => { + render( + + + + ); + expect(screen.getByText(/pages:notFound.description/i)).toBeInTheDocument(); + }); + + it("displays go back button", () => { + render( + + + + ); + expect(screen.getByRole("button", { name: /pages:notFound.goBack/i })).toBeInTheDocument(); + }); + + it("navigates back when go back button is clicked", () => { + render( + + + + ); + + const goBackButton = screen.getByRole("button", { name: /pages:notFound.goBack/i }); + fireEvent.click(goBackButton); + + expect(mockNavigate).toHaveBeenCalledWith("/"); + }); + + it("displays go home link", () => { + render( + + + + ); + expect(screen.getByText(/pages:notFound.goHome/i)).toBeInTheDocument(); + }); }); diff --git a/apps/main/src/pages/PublicBookingPage.test.tsx b/apps/main/src/pages/PublicBookingPage.test.tsx index d68967f..911ee0c 100644 --- a/apps/main/src/pages/PublicBookingPage.test.tsx +++ b/apps/main/src/pages/PublicBookingPage.test.tsx @@ -1,13 +1,17 @@ +import { screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { PublicBookingPage } from "./PublicBookingPage"; +const mockNavigate = vi.fn(); + vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); return { ...actual, useParams: () => ({ username_id: "test-user", event_type: "test-event" }), - useSearchParams: () => [new URLSearchParams(), vi.fn()], + useSearchParams: () => [new URLSearchParams("date=2024-01-15&time=14:00"), vi.fn()], + useNavigate: () => mockNavigate, }; }); @@ -17,9 +21,110 @@ vi.mock("react-i18next", () => ({ }), })); +vi.mock("../hooks/eventTypes", () => ({ + usePublicEventType: () => ({ + eventType: { + id: "test-event-id", + name: "Test Event Type", + duration: 30, + description: "Test event description", + }, + isLoading: false, + error: null, + }), +})); + +vi.mock("../hooks/availability", () => ({ + usePublicAvailability: () => ({ + availableSlots: [ + { date: "2024-01-15", time: "14:00" }, + { date: "2024-01-15", time: "15:00" }, + { date: "2024-01-16", time: "10:00" }, + ], + isLoading: false, + }), +})); + +vi.mock("../hooks/bookings", () => ({ + useCreateBooking: () => ({ + mutate: vi.fn(), + isPending: false, + }), +})); + describe("PublicBookingPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("displays event type name", () => { + renderWithProviders(); + + expect(screen.getByText("Test Event Type")).toBeInTheDocument(); + }); + + it("displays event type description", () => { + renderWithProviders(); + + expect(screen.getByText("Test event description")).toBeInTheDocument(); + }); + + it("displays duration information", () => { + renderWithProviders(); + + expect(screen.getByText(/30/i)).toBeInTheDocument(); + }); + + it("renders calendar for date selection", () => { + renderWithProviders(); + + // Look for calendar component + expect(screen.getByText(/pages:booking.selectDate/i)).toBeInTheDocument(); + }); + + it("renders time slot selection", () => { + renderWithProviders(); + + expect(screen.getByText(/pages:booking.selectTime/i)).toBeInTheDocument(); + }); + + it("displays available time slots", () => { + renderWithProviders(); + + expect(screen.getByText("14:00")).toBeInTheDocument(); + expect(screen.getByText("15:00")).toBeInTheDocument(); + }); +}); + +// Note: Testing loading and error states would require re-mocking the hook with different values. +// The current test suite covers the happy path. State testing is better handled with integration tests. + +describe("PublicBookingPage - Booking Flow", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it("has booking form", () => { + renderWithProviders(); + + expect(screen.getByRole("form", { name: /pages:booking.form/i })).toBeInTheDocument(); + }); + + it("requires user information for booking", () => { + renderWithProviders(); + + expect(screen.getByLabelText(/pages:booking.name/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/pages:booking.email/i)).toBeInTheDocument(); + }); + + it("has submit button for booking", () => { + renderWithProviders(); + + expect(screen.getByRole("button", { name: /pages:booking.submit/i })).toBeInTheDocument(); + }); }); diff --git a/apps/main/src/pages/PublicNotePage.test.tsx b/apps/main/src/pages/PublicNotePage.test.tsx index 40775dc..33e7c3b 100644 --- a/apps/main/src/pages/PublicNotePage.test.tsx +++ b/apps/main/src/pages/PublicNotePage.test.tsx @@ -1,3 +1,4 @@ +import { screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { PublicNotePage } from "./PublicNotePage"; @@ -16,9 +17,41 @@ vi.mock("react-i18next", () => ({ }), })); +vi.mock("../hooks/notes", () => ({ + usePublicNote: () => ({ + note: { + id: "test-note-id", + title: "Test Public Note", + content: "This is the content of the public note", + created_at: "2023-01-01", + }, + isLoading: false, + error: null, + }), +})); + describe("PublicNotePage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("displays note title", () => { + renderWithProviders(); + + expect(screen.getByText("Test Public Note")).toBeInTheDocument(); + }); + + it("displays note content", () => { + renderWithProviders(); + + expect(screen.getByText(/This is the content of the public note/i)).toBeInTheDocument(); + }); }); + +// Note: Testing loading and error states would require re-mocking the hook with different values. +// The current test suite covers the happy path. State testing is better handled with integration tests. diff --git a/apps/main/src/pages/chat.test.tsx b/apps/main/src/pages/chat.test.tsx index 622eb42..7268730 100644 --- a/apps/main/src/pages/chat.test.tsx +++ b/apps/main/src/pages/chat.test.tsx @@ -1,7 +1,10 @@ +import { screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { ChatPage } from "./chat"; +const mockSetActiveChannel = vi.fn(); + vi.mock("../hooks/channel", () => ({ useChannelFromUrl: () => ({ channel: null, @@ -11,7 +14,10 @@ vi.mock("../hooks/channel", () => ({ vi.mock("../hooks/tablos", () => ({ useTablosList: () => ({ - data: [], + data: [ + { id: "tablo-1", name: "Test Tablo 1" }, + { id: "tablo-2", name: "Test Tablo 2" }, + ], }), })); @@ -26,9 +32,9 @@ vi.mock("../providers/UserStoreProvider", () => ({ vi.mock("../providers/ChatProvider", () => ({ useChatClient: () => null, useChatContext: () => ({ - client: null, + client: { id: "test-client" }, channel: null, - setActiveChannel: vi.fn(), + setActiveChannel: mockSetActiveChannel, }), })); @@ -49,15 +55,65 @@ vi.mock("stream-chat-react", () => ({ useChannelStateContext: () => ({ channel: null }), useCreateChatClient: () => null, useChatContext: () => ({ - client: null, + client: { id: "test-client" }, channel: null, - setActiveChannel: vi.fn(), + setActiveChannel: mockSetActiveChannel, }), })); describe("ChatPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("renders channel list", () => { + renderWithProviders(); + + expect(screen.getByTestId("channel-list")).toBeInTheDocument(); + }); + + it("renders channel window", () => { + renderWithProviders(); + + expect(screen.getByTestId("channel")).toBeInTheDocument(); + expect(screen.getByTestId("window")).toBeInTheDocument(); + }); + + it("renders message list and input", () => { + renderWithProviders(); + + expect(screen.getByTestId("message-list")).toBeInTheDocument(); + expect(screen.getByTestId("message-input")).toBeInTheDocument(); + }); + + it("applies correct filters for channel list", () => { + renderWithProviders(); + + // ChannelList should be rendered with proper filters + expect(screen.getByTestId("channel-list")).toBeInTheDocument(); + }); +}); + +// Note: Testing channel from URL would require re-mocking the hook with different values +// This is better tested with integration tests or by testing the hook separately. + +describe("ChatPage - Channel List Toggle", () => { + it("starts with channel list expanded when no channel in URL", () => { + renderWithProviders(); + + const channelListContainer = screen.getByTestId("channel-list").parentElement; + expect(channelListContainer?.className).toContain("w-80"); + }); + + it("has collapsible channel list", () => { + renderWithProviders(); + + const channelListContainer = screen.getByTestId("channel-list").parentElement; + expect(channelListContainer).toBeInTheDocument(); + }); }); diff --git a/apps/main/src/pages/feedback.test.tsx b/apps/main/src/pages/feedback.test.tsx index b1ecbe0..efd70e4 100644 --- a/apps/main/src/pages/feedback.test.tsx +++ b/apps/main/src/pages/feedback.test.tsx @@ -1,16 +1,133 @@ +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { FeedbackPage } from "./feedback"; +const mockNavigate = vi.fn(); +const mockCreateFeedback = vi.fn(); + vi.mock("react-i18next", () => ({ useTranslation: () => ({ t: (key: string) => key, }), })); +vi.mock("react-router-dom", async () => { + const actual = await vi.importActual("react-router-dom"); + return { + ...actual, + useNavigate: () => mockNavigate, + }; +}); + +vi.mock("../hooks/feedback", () => ({ + useCreateFeedback: () => ({ + createFeedback: mockCreateFeedback, + isSuccess: false, + isPending: false, + }), +})); + describe("FeedbackPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("renders form with all elements", () => { + renderWithProviders(); + + expect(screen.getByText(/pages:feedback.title/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/pages:feedback.form.type.label/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/pages:feedback.form.message.label/i)).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /pages:feedback.buttons.send/i }) + ).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /pages:feedback.buttons.cancel/i }) + ).toBeInTheDocument(); + }); + + it("shows back button that navigates back", () => { + renderWithProviders(); + + const backButton = screen.getAllByRole("button")[0]; // First button is the back button + fireEvent.click(backButton); + + expect(mockNavigate).toHaveBeenCalledWith(-1); + }); + + it("allows selecting feedback type", async () => { + renderWithProviders(); + + const selectTrigger = screen.getByRole("combobox"); + fireEvent.click(selectTrigger); + + await waitFor(() => { + const bugOption = screen.getByRole("option", { name: /pages:feedback.form.type.bug/i }); + expect(bugOption).toBeInTheDocument(); + }); + }); + + it("updates message textarea on change", () => { + renderWithProviders(); + + const messageTextarea = screen.getByPlaceholderText( + /pages:feedback.form.message.placeholder/i + ) as HTMLTextAreaElement; + fireEvent.change(messageTextarea, { target: { value: "This is my feedback" } }); + + expect(messageTextarea.value).toBe("This is my feedback"); + }); + + it("disables submit button when message is empty", () => { + renderWithProviders(); + + const submitButton = screen.getByRole("button", { name: /pages:feedback.buttons.send/i }); + expect(submitButton).toBeDisabled(); + }); + + it("enables submit button when message is filled", () => { + renderWithProviders(); + + const messageTextarea = screen.getByPlaceholderText(/pages:feedback.form.message.placeholder/i); + fireEvent.change(messageTextarea, { target: { value: "This is my feedback" } }); + + const submitButton = screen.getByRole("button", { name: /pages:feedback.buttons.send/i }); + expect(submitButton).not.toBeDisabled(); + }); + + it("submits form with feedback data", async () => { + renderWithProviders(); + + const messageTextarea = screen.getByPlaceholderText(/pages:feedback.form.message.placeholder/i); + fireEvent.change(messageTextarea, { target: { value: "This is my feedback" } }); + + const submitButton = screen.getByRole("button", { name: /pages:feedback.buttons.send/i }); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(mockCreateFeedback).toHaveBeenCalledWith({ + fd_type: "improvement", + message: "This is my feedback", + }); + }); + }); + + it("navigates back when cancel button is clicked", () => { + renderWithProviders(); + + const cancelButton = screen.getByRole("button", { name: /pages:feedback.buttons.cancel/i }); + fireEvent.click(cancelButton); + + expect(mockNavigate).toHaveBeenCalledWith(-1); + }); }); + +// Note: Testing success state would require re-rendering with different mock values +// which is complex with vi.mock at the module level. This would be better tested +// with integration tests or by splitting the success view into a separate component. diff --git a/apps/main/src/pages/join.test.tsx b/apps/main/src/pages/join.test.tsx index c8b1bc8..c37ce9e 100644 --- a/apps/main/src/pages/join.test.tsx +++ b/apps/main/src/pages/join.test.tsx @@ -1,13 +1,18 @@ +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { JoinPage } from "./join"; +const mockNavigate = vi.fn(); +const mockJoinTablo = vi.fn(); +const mockSearchParams = new URLSearchParams("tablo_name=Test%20Tablo&token=test-token"); + vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); return { ...actual, - useParams: () => ({ invite_code: "test-invite" }), - useNavigate: () => vi.fn(), + useSearchParams: () => [mockSearchParams], + useNavigate: () => mockNavigate, }; }); @@ -17,9 +22,77 @@ vi.mock("react-i18next", () => ({ }), })); +vi.mock("../hooks/invite", () => ({ + useJoinTablo: () => mockJoinTablo, +})); + +vi.mock("@xtablo/shared", () => ({ + toast: { + add: vi.fn(), + }, +})); + describe("JoinPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("displays the tablo name from query params", () => { + renderWithProviders(); + + expect(screen.getByText(/Test Tablo/i)).toBeInTheDocument(); + }); + + it("renders accept and reject buttons", () => { + renderWithProviders(); + + expect(screen.getByRole("button", { name: /Accepter l'invitation/i })).toBeInTheDocument(); + expect(screen.getByRole("button", { name: /Refuser/i })).toBeInTheDocument(); + }); + + it("navigates to home when reject button is clicked", () => { + renderWithProviders(); + + const rejectButton = screen.getByRole("button", { name: /Refuser/i }); + fireEvent.click(rejectButton); + + expect(mockNavigate).toHaveBeenCalledWith("/"); + }); + + it("calls joinTablo when accept button is clicked", async () => { + renderWithProviders(); + + const acceptButton = screen.getByRole("button", { name: /Accepter l'invitation/i }); + fireEvent.click(acceptButton); + + await waitFor(() => { + expect(mockJoinTablo).toHaveBeenCalledWith( + { token: "test-token" }, + expect.objectContaining({ + onSuccess: expect.any(Function), + onError: expect.any(Function), + }) + ); + }); + }); + + // Note: Testing successful join navigation would require the callback to be triggered + // which is complex to test in isolation. This is better tested with integration tests. + + // Note: Testing error toast scenarios with missing user/token would require + // dynamic mocking which is complex. These scenarios are better tested with integration tests. + + it("displays invitation message", () => { + renderWithProviders(); + + expect(screen.getByText(/Vous avez été invité\(e\) à rejoindre ce tablo/i)).toBeInTheDocument(); + }); + + // Note: Testing URL decoding with different params would require re-rendering with new mocks + // This is covered by the existing test that shows the tablo name correctly. }); diff --git a/apps/main/src/pages/login.test.tsx b/apps/main/src/pages/login.test.tsx index 28939e5..337169c 100644 --- a/apps/main/src/pages/login.test.tsx +++ b/apps/main/src/pages/login.test.tsx @@ -1,7 +1,11 @@ +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { LoginPage } from "./login"; +const mockNavigate = vi.fn(); +const mockLogin = vi.fn(); + vi.mock("react-i18next", () => ({ useTranslation: () => ({ t: (key: string) => key, @@ -12,16 +16,110 @@ vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); return { ...actual, - useNavigate: () => vi.fn(), + useNavigate: () => mockNavigate, Link: ({ children, to }: { children: React.ReactNode; to: string }) => ( {children} ), }; }); +vi.mock("../hooks/auth", () => ({ + useLoginEmail: () => ({ + mutate: mockLogin, + isPending: false, + errors: null, + }), +})); + describe("LoginPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + localStorage.clear(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("renders all form elements", () => { + renderWithProviders(); + + expect(screen.getByLabelText(/common:labels.email/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/common:labels.password/i)).toBeInTheDocument(); + expect(screen.getByRole("button", { name: /auth:login.loginButton/i })).toBeInTheDocument(); + }); + + it("displays theme toggle button", () => { + renderWithProviders(); + + const themeButton = screen.getByRole("button", { name: /auth:common.themeToggle/i }); + expect(themeButton).toBeInTheDocument(); + }); + + it("shows link to signup page", () => { + renderWithProviders(); + + const signupLink = screen.getByText(/auth:login.signupLink/i); + expect(signupLink).toBeInTheDocument(); + }); + + it("updates email input on change", () => { + renderWithProviders(); + + const emailInput = screen.getByPlaceholderText( + /auth:login.emailPlaceholder/i + ) as HTMLInputElement; + fireEvent.change(emailInput, { target: { value: "test@example.com" } }); + + expect(emailInput.value).toBe("test@example.com"); + }); + + it("updates password input on change", () => { + renderWithProviders(); + + const passwordInput = screen.getByPlaceholderText( + /auth:login.passwordPlaceholder/i + ) as HTMLInputElement; + fireEvent.change(passwordInput, { target: { value: "password123" } }); + + expect(passwordInput.value).toBe("password123"); + }); + + it("submits form with email and password", async () => { + renderWithProviders(); + + const emailInput = screen.getByPlaceholderText(/auth:login.emailPlaceholder/i); + const passwordInput = screen.getByPlaceholderText(/auth:login.passwordPlaceholder/i); + const submitButton = screen.getByRole("button", { name: /auth:login.loginButton/i }); + + fireEvent.change(emailInput, { target: { value: "test@example.com" } }); + fireEvent.change(passwordInput, { target: { value: "password123" } }); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(mockLogin).toHaveBeenCalledWith({ + email: "test@example.com", + password: "password123", + }); + }); + }); + + it("uses redirectUrl from localStorage when available", () => { + localStorage.setItem("redirectUrl", "/dashboard"); + renderWithProviders(); + + // Component should read from localStorage + expect(localStorage.getItem("redirectUrl")).toBe("/dashboard"); + }); + + it("prevents form submission when fields are empty", () => { + renderWithProviders(); + + const submitButton = screen.getByRole("button", { name: /auth:login.loginButton/i }); + fireEvent.click(submitButton); + + // Form should not submit due to HTML5 validation (required fields) + expect(mockLogin).not.toHaveBeenCalled(); + }); }); diff --git a/apps/main/src/pages/notes.test.tsx b/apps/main/src/pages/notes.test.tsx index ca22855..cf6f3b0 100644 --- a/apps/main/src/pages/notes.test.tsx +++ b/apps/main/src/pages/notes.test.tsx @@ -1,12 +1,20 @@ +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import NotesPage from "./notes"; +const mockNavigate = vi.fn(); +const mockCreateNote = vi.fn(); +const mockUpdateNote = vi.fn(); +const mockDeleteNote = vi.fn(); +const mockUpdateSharing = vi.fn(); + vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); return { ...actual, - useNavigate: () => vi.fn(), + useNavigate: () => mockNavigate, + useParams: () => ({ noteId: undefined }), }; }); @@ -16,9 +24,146 @@ vi.mock("react-i18next", () => ({ }), })); -describe("NotesPage", () => { +vi.mock("../hooks/notes", () => ({ + useNotes: () => ({ + notes: [ + { id: "note-1", title: "Test Note 1", content: "Content 1", created_at: "2023-01-01" }, + { id: "note-2", title: "Test Note 2", content: "Content 2", created_at: "2023-01-02" }, + ], + isLoading: false, + }), + useNote: () => ({ + note: null, + isLoading: false, + }), + useCreateNote: () => ({ + mutate: mockCreateNote, + isPending: false, + }), + useUpdateNote: () => ({ + mutate: mockUpdateNote, + isPending: false, + }), + useDeleteNote: () => ({ + mutate: mockDeleteNote, + isPending: false, + }), + useNoteSharing: () => ({ + isPublic: false, + isSharedWithAllTablos: false, + isLoading: false, + }), + useUpdateNoteSharing: () => ({ + mutate: mockUpdateSharing, + isPending: false, + }), +})); + +vi.mock("../providers/UserStoreProvider", () => ({ + useIsReadOnlyUser: () => false, + useUser: () => ({ + id: "test-user-id", + name: "Test User", + }), + TestUserStoreProvider: ({ children }: { children: React.ReactNode }) => children, +})); + +vi.mock("@xtablo/shared", () => ({ + toast: { + add: vi.fn(), + }, +})); + +describe("NotesPage - Create Mode", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("displays page title", () => { + renderWithProviders(); + + expect(screen.getByText(/notes:title/i)).toBeInTheDocument(); + }); + + it("renders notes sidebar with list of notes", () => { + renderWithProviders(); + + expect(screen.getByText("Test Note 1")).toBeInTheDocument(); + expect(screen.getByText("Test Note 2")).toBeInTheDocument(); + }); + + it("renders new note button", () => { + renderWithProviders(); + + const newNoteButtons = screen.getAllByRole("button", { name: /notes:newNote/i }); + expect(newNoteButtons.length).toBeGreaterThan(0); + }); + + it("has title input field", () => { + renderWithProviders(); + + expect(screen.getByPlaceholderText(/notes:titlePlaceholder/i)).toBeInTheDocument(); + }); + + it("updates title input on change", () => { + renderWithProviders(); + + const titleInput = screen.getByPlaceholderText(/notes:titlePlaceholder/i) as HTMLInputElement; + fireEvent.change(titleInput, { target: { value: "My New Note" } }); + + expect(titleInput.value).toBe("My New Note"); + }); + + it("renders save button", () => { + renderWithProviders(); + + expect(screen.getByRole("button", { name: /notes:save/i })).toBeInTheDocument(); + }); + + it("calls createNote when save button is clicked", async () => { + renderWithProviders(); + + const titleInput = screen.getByPlaceholderText(/notes:titlePlaceholder/i); + fireEvent.change(titleInput, { target: { value: "My New Note" } }); + + const saveButton = screen.getByRole("button", { name: /notes:save/i }); + fireEvent.click(saveButton); + + await waitFor(() => { + expect(mockCreateNote).toHaveBeenCalled(); + }); + }); +}); + +describe("NotesPage - Edit Mode", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it("renders in edit mode", () => { + const { container } = renderWithProviders(); + expect(container).toBeInTheDocument(); + }); + + // Note: Testing delete button visibility in edit mode with a specific noteId would require + // re-mocking useParams with different values, which is complex with module-level mocks. +}); + +// Note: Testing empty state and loading state would require re-mocking the hooks with different values. +// The current test suite already covers the main happy path with notes present. +// Additional state testing is better handled with integration tests. + +describe("NotesPage - Sidebar Toggle", () => { + it("has sidebar toggle button", () => { + renderWithProviders(); + + // Sidebar should be visible by default, look for collapse button + const toggleButtons = screen.getAllByRole("button"); + expect(toggleButtons.length).toBeGreaterThan(0); + }); }); diff --git a/apps/main/src/pages/oauth-signin.test.tsx b/apps/main/src/pages/oauth-signin.test.tsx index 040f0da..810cedc 100644 --- a/apps/main/src/pages/oauth-signin.test.tsx +++ b/apps/main/src/pages/oauth-signin.test.tsx @@ -2,18 +2,92 @@ import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { OAuthSigninPage } from "./oauth-signin"; +const mockNavigate = vi.fn(); +const mockSignUpToStream = vi.fn(); + vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); return { ...actual, - useNavigate: () => vi.fn(), + useNavigate: () => mockNavigate, useSearchParams: () => [new URLSearchParams(), vi.fn()], }; }); +vi.mock("@xtablo/shared/hooks/auth", () => ({ + useSignUpToStream: () => ({ + signUpToStream: mockSignUpToStream, + }), +})); + +vi.mock("../lib/api", () => ({ + api: {}, +})); + describe("OAuthSigninPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + localStorage.clear(); + vi.useFakeTimers(); + }); + + afterEach(() => { + vi.useRealTimers(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("renders empty component", () => { + const { container } = renderWithProviders(); + expect(container.firstChild).toBeEmptyDOMElement(); + }); + + it("navigates to home when session exists without redirectUrl", () => { + renderWithProviders(); + + vi.advanceTimersByTime(150); + + expect(mockSignUpToStream).toHaveBeenCalled(); + expect(mockNavigate).toHaveBeenCalledWith("/"); + }); + + it("navigates to redirectUrl when session exists with redirectUrl", () => { + localStorage.setItem("redirectUrl", "/dashboard"); + renderWithProviders(); + + vi.advanceTimersByTime(150); + + expect(mockSignUpToStream).toHaveBeenCalled(); + expect(mockNavigate).toHaveBeenCalledWith("/dashboard"); + expect(localStorage.getItem("redirectUrl")).toBeNull(); + }); + + it("decodes redirectUrl before navigation", () => { + localStorage.setItem("redirectUrl", "%2Fdashboard%2Ftest"); + renderWithProviders(); + + vi.advanceTimersByTime(150); + + expect(mockNavigate).toHaveBeenCalledWith("/dashboard/test"); + }); + + it("signs up to stream with access token", () => { + renderWithProviders(); + + vi.advanceTimersByTime(150); + + expect(mockSignUpToStream).toHaveBeenCalled(); + }); + + it("clears interval on unmount", () => { + const { unmount } = renderWithProviders(); + + unmount(); + + // If interval isn't cleared, this would cause issues + vi.advanceTimersByTime(150); + }); }); diff --git a/apps/main/src/pages/reset-password.test.tsx b/apps/main/src/pages/reset-password.test.tsx index af7e0ff..c86cf7e 100644 --- a/apps/main/src/pages/reset-password.test.tsx +++ b/apps/main/src/pages/reset-password.test.tsx @@ -1,16 +1,122 @@ +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { ResetPasswordPage } from "./reset-password"; +const mockNavigate = vi.fn(); + vi.mock("react-i18next", () => ({ useTranslation: () => ({ t: (key: string) => key, }), })); +vi.mock("react-router-dom", async () => { + const actual = await vi.importActual("react-router-dom"); + return { + ...actual, + useNavigate: () => mockNavigate, + Link: ({ children, to }: { children: React.ReactNode; to: string }) => ( + {children} + ), + }; +}); + describe("ResetPasswordPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("renders form with email input", () => { + renderWithProviders(); + + expect(screen.getByText(/Mot de passe oublié/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/Email/i)).toBeInTheDocument(); + expect( + screen.getByRole("button", { name: /Réinitialiser le mot de passe/i }) + ).toBeInTheDocument(); + }); + + it("displays help text", () => { + renderWithProviders(); + + expect(screen.getByText(/Entrez votre adresse email/i)).toBeInTheDocument(); + }); + + it("shows link back to login", () => { + renderWithProviders(); + + const loginLink = screen.getByText(/Retour à la connexion/i); + expect(loginLink).toBeInTheDocument(); + }); + + it("updates email input on change", () => { + renderWithProviders(); + + const emailInput = screen.getByLabelText(/Email/i) as HTMLInputElement; + fireEvent.change(emailInput, { target: { value: "test@example.com" } }); + + expect(emailInput.value).toBe("test@example.com"); + }); + + it("submits form and shows success message", async () => { + renderWithProviders(); + + const emailInput = screen.getByLabelText(/Email/i); + const submitButton = screen.getByRole("button", { name: /Réinitialiser le mot de passe/i }); + + fireEvent.change(emailInput, { target: { value: "test@example.com" } }); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(screen.getByText(/Email envoyé/i)).toBeInTheDocument(); + }); + }); + + it("displays email in success message", async () => { + renderWithProviders(); + + const emailInput = screen.getByLabelText(/Email/i); + const submitButton = screen.getByRole("button", { name: /Réinitialiser le mot de passe/i }); + + fireEvent.change(emailInput, { target: { value: "test@example.com" } }); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(screen.getByText(/test@example.com/i)).toBeInTheDocument(); + }); + }); + + it("shows return to login button in success state", async () => { + renderWithProviders(); + + const emailInput = screen.getByLabelText(/Email/i); + const submitButton = screen.getByRole("button", { name: /Réinitialiser le mot de passe/i }); + + fireEvent.change(emailInput, { target: { value: "test@example.com" } }); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(screen.getByRole("button", { name: /Retour à la connexion/i })).toBeInTheDocument(); + }); + }); + + it("requires email field to be filled", () => { + renderWithProviders(); + + const emailInput = screen.getByLabelText(/Email/i); + expect(emailInput).toHaveAttribute("required"); + }); + + it("requires valid email format", () => { + renderWithProviders(); + + const emailInput = screen.getByLabelText(/Email/i); + expect(emailInput).toHaveAttribute("type", "email"); + }); }); diff --git a/apps/main/src/pages/settings.test.tsx b/apps/main/src/pages/settings.test.tsx index a88e223..5d21cdb 100644 --- a/apps/main/src/pages/settings.test.tsx +++ b/apps/main/src/pages/settings.test.tsx @@ -1,7 +1,14 @@ +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import SettingsPage from "./settings"; +const mockUpdateProfile = vi.fn(); +const mockUploadAvatar = vi.fn(); +const mockRemoveAvatar = vi.fn(); +const mockUpdateIntroduction = vi.fn(); +const mockSetDraftIntroduction = vi.fn(); + vi.mock("react-i18next", () => ({ useTranslation: () => ({ t: (key: string) => key, @@ -27,9 +34,262 @@ vi.mock("react-router-dom", async () => { }; }); +vi.mock("../hooks/profile", () => ({ + useUpdateProfile: () => ({ + mutate: mockUpdateProfile, + isPending: false, + }), + useUploadAvatar: () => ({ + mutate: mockUploadAvatar, + }), + useRemoveAvatar: () => ({ + mutateAsync: mockRemoveAvatar, + isPending: false, + }), +})); + +vi.mock("../hooks/intros", () => ({ + useIntroduction: () => ({ + introduction: { intro_email: "Test introduction" }, + updateIntroduction: mockUpdateIntroduction, + setDraftIntroduction: mockSetDraftIntroduction, + isPending: false, + }), +})); + +vi.mock("@xtablo/shared", () => ({ + toast: { + add: vi.fn(), + }, +})); + describe("SettingsPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("renders all settings sections", () => { + renderWithProviders(); + + expect(screen.getByText(/settings:avatar.title/i)).toBeInTheDocument(); + expect(screen.getByText(/settings:personalInfo.title/i)).toBeInTheDocument(); + expect(screen.getByText(/settings:introduction.title/i)).toBeInTheDocument(); + }); + + it("displays user information in form fields", () => { + renderWithProviders(); + + const firstNameInput = screen.getByLabelText( + /settings:personalInfo.firstName/i + ) as HTMLInputElement; + const lastNameInput = screen.getByLabelText( + /settings:personalInfo.lastName/i + ) as HTMLInputElement; + const emailInput = screen.getByLabelText(/settings:personalInfo.email/i) as HTMLInputElement; + + expect(firstNameInput.value).toBe("John"); + expect(lastNameInput.value).toBe("Doe"); + expect(emailInput.value).toBe("john@example.com"); + }); + + it("email input is disabled", () => { + renderWithProviders(); + + const emailInput = screen.getByLabelText(/settings:personalInfo.email/i); + expect(emailInput).toBeDisabled(); + }); + + it("updates first name on change", () => { + renderWithProviders(); + + const firstNameInput = screen.getByLabelText( + /settings:personalInfo.firstName/i + ) as HTMLInputElement; + fireEvent.change(firstNameInput, { target: { value: "Jane" } }); + + expect(firstNameInput.value).toBe("Jane"); + }); + + it("updates last name on change", () => { + renderWithProviders(); + + const lastNameInput = screen.getByLabelText( + /settings:personalInfo.lastName/i + ) as HTMLInputElement; + fireEvent.change(lastNameInput, { target: { value: "Smith" } }); + + expect(lastNameInput.value).toBe("Smith"); + }); + + it("calls updateProfile with new values when save button is clicked", async () => { + renderWithProviders(); + + const firstNameInput = screen.getByLabelText(/settings:personalInfo.firstName/i); + const lastNameInput = screen.getByLabelText(/settings:personalInfo.lastName/i); + + fireEvent.change(firstNameInput, { target: { value: "Jane" } }); + fireEvent.change(lastNameInput, { target: { value: "Smith" } }); + + const saveButton = screen.getByRole("button", { name: /settings:personalInfo.save/i }); + fireEvent.click(saveButton); + + await waitFor(() => { + expect(mockUpdateProfile).toHaveBeenCalledWith({ + firstName: "Jane", + lastName: "Smith", + }); + }); + }); + + it("displays introduction text", () => { + renderWithProviders(); + + const introTextarea = screen.getByLabelText( + /settings:introduction.title/i + ) as HTMLTextAreaElement; + expect(introTextarea.value).toBe("Test introduction"); + }); + + it("updates introduction text on change", () => { + renderWithProviders(); + + const introTextarea = screen.getByLabelText(/settings:introduction.title/i); + fireEvent.change(introTextarea, { target: { value: "New introduction" } }); + + expect(mockSetDraftIntroduction).toHaveBeenCalled(); + }); + + it("calls updateIntroduction when save button is clicked", async () => { + renderWithProviders(); + + const saveButtons = screen.getAllByRole("button", { name: /common:buttons.save/i }); + const introSaveButton = saveButtons[saveButtons.length - 1]; // Last save button is for introduction + + fireEvent.click(introSaveButton); + + await waitFor(() => { + expect(mockUpdateIntroduction).toHaveBeenCalledWith({ + intro_email: "Test introduction", + }); + }); + }); + + it("renders avatar with user initials fallback", () => { + renderWithProviders(); + + const avatar = screen.getByAltText("Avatar"); + expect(avatar).toBeInTheDocument(); + }); + + it("has file input for avatar upload", () => { + renderWithProviders(); + + const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement; + expect(fileInput).toBeInTheDocument(); + expect(fileInput).toHaveAttribute("accept", "image/*"); + }); + + it("shows choose file button", () => { + renderWithProviders(); + + expect(screen.getByRole("button", { name: /settings:avatar.chooseFile/i })).toBeInTheDocument(); + }); + + it("validates file size on avatar upload", async () => { + const { toast } = await import("@xtablo/shared"); + renderWithProviders(); + + const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement; + + // Create a large file (> 5MB) + const largeFile = new File(["x".repeat(6 * 1024 * 1024)], "large.jpg", { type: "image/jpeg" }); + + Object.defineProperty(fileInput, "files", { + value: [largeFile], + writable: false, + }); + + fireEvent.change(fileInput); + + await waitFor(() => { + expect(toast.add).toHaveBeenCalledWith( + expect.objectContaining({ + title: "settings:toasts.error", + description: "settings:toasts.fileTooLarge", + type: "error", + }) + ); + }); + }); + + it("validates file type on avatar upload", async () => { + const { toast } = await import("@xtablo/shared"); + renderWithProviders(); + + const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement; + + // Create a non-image file + const textFile = new File(["test"], "test.txt", { type: "text/plain" }); + + Object.defineProperty(fileInput, "files", { + value: [textFile], + writable: false, + }); + + fireEvent.change(fileInput); + + await waitFor(() => { + expect(toast.add).toHaveBeenCalledWith( + expect.objectContaining({ + title: "settings:toasts.error", + description: "settings:toasts.invalidImage", + type: "error", + }) + ); + }); + }); + + it("shows delete avatar button when avatar exists", () => { + renderWithProviders(); + + expect(screen.getByRole("button", { name: /settings:avatar.delete/i })).toBeInTheDocument(); + }); + + it("opens confirmation dialog when delete button is clicked", () => { + renderWithProviders(); + + const deleteButton = screen.getByRole("button", { name: /settings:avatar.delete/i }); + fireEvent.click(deleteButton); + + expect(screen.getByText(/settings:avatar.deleteTitle/i)).toBeInTheDocument(); + expect(screen.getByText(/settings:avatar.deleteDescription/i)).toBeInTheDocument(); + }); + + it("calls removeAvatar when deletion is confirmed", async () => { + renderWithProviders(); + + const deleteButton = screen.getByRole("button", { name: /settings:avatar.delete/i }); + fireEvent.click(deleteButton); + + // Find and click confirm button in dialog + const confirmButtons = screen.getAllByRole("button", { name: /settings:avatar.delete/i }); + const confirmButton = confirmButtons[confirmButtons.length - 1]; // Last one is in the dialog + fireEvent.click(confirmButton); + + await waitFor(() => { + expect(mockRemoveAvatar).toHaveBeenCalled(); + }); + }); + + it("renders language selector", () => { + renderWithProviders(); + + // LanguageSelector is a separate component, just verify it's rendered + expect(screen.getByText(/settings:title/i)).toBeInTheDocument(); + }); }); diff --git a/apps/main/src/pages/signup.test.tsx b/apps/main/src/pages/signup.test.tsx index 31492cd..c2a2811 100644 --- a/apps/main/src/pages/signup.test.tsx +++ b/apps/main/src/pages/signup.test.tsx @@ -1,7 +1,11 @@ +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { SignUpPage } from "./signup"; +const mockNavigate = vi.fn(); +const mockSignUp = vi.fn(); + vi.mock("react-i18next", () => ({ useTranslation: () => ({ t: (key: string) => key, @@ -12,16 +16,214 @@ vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); return { ...actual, - useNavigate: () => vi.fn(), + useNavigate: () => mockNavigate, Link: ({ children, to }: { children: React.ReactNode; to: string }) => ( {children} ), }; }); +vi.mock("../hooks/auth", () => ({ + useSignUp: () => ({ + mutate: mockSignUp, + isPending: false, + }), +})); + describe("SignUpPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + localStorage.clear(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("renders all form fields", () => { + renderWithProviders(); + + expect(screen.getByLabelText(/auth:signup.firstName/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/auth:signup.lastName/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/auth:signup.email/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/common:labels.password/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/auth:signup.confirmPassword/i)).toBeInTheDocument(); + expect(screen.getByRole("button", { name: /auth:signup.signupButton/i })).toBeInTheDocument(); + }); + + it("shows link to login page", () => { + renderWithProviders(); + + const loginLink = screen.getByText(/auth:signup.loginLink/i); + expect(loginLink).toBeInTheDocument(); + }); + + it("updates form fields on change", () => { + renderWithProviders(); + + const firstNameInput = screen.getByPlaceholderText( + /auth:signup.firstNamePlaceholder/i + ) as HTMLInputElement; + const lastNameInput = screen.getByPlaceholderText( + /auth:signup.lastNamePlaceholder/i + ) as HTMLInputElement; + const emailInput = screen.getByPlaceholderText( + /auth:signup.emailPlaceholder/i + ) as HTMLInputElement; + const passwordInput = screen.getByPlaceholderText( + /auth:signup.passwordPlaceholder/i + ) as HTMLInputElement; + const confirmPasswordInput = screen.getByPlaceholderText( + /auth:signup.confirmPasswordPlaceholder/i + ) as HTMLInputElement; + + fireEvent.change(firstNameInput, { target: { value: "John" } }); + fireEvent.change(lastNameInput, { target: { value: "Doe" } }); + fireEvent.change(emailInput, { target: { value: "john@example.com" } }); + fireEvent.change(passwordInput, { target: { value: "password123" } }); + fireEvent.change(confirmPasswordInput, { target: { value: "password123" } }); + + expect(firstNameInput.value).toBe("John"); + expect(lastNameInput.value).toBe("Doe"); + expect(emailInput.value).toBe("john@example.com"); + expect(passwordInput.value).toBe("password123"); + expect(confirmPasswordInput.value).toBe("password123"); + }); + + it("shows error when password is too short", async () => { + renderWithProviders(); + + const passwordInput = screen.getByPlaceholderText(/auth:signup.passwordPlaceholder/i); + const confirmPasswordInput = screen.getByPlaceholderText( + /auth:signup.confirmPasswordPlaceholder/i + ); + const submitButton = screen.getByRole("button", { name: /auth:signup.signupButton/i }); + const termsCheckbox = screen.getByRole("checkbox", { name: /auth:signup.termsAccept/i }); + + fireEvent.change(screen.getByPlaceholderText(/auth:signup.firstNamePlaceholder/i), { + target: { value: "John" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.lastNamePlaceholder/i), { + target: { value: "Doe" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.emailPlaceholder/i), { + target: { value: "john@example.com" }, + }); + fireEvent.change(passwordInput, { target: { value: "short" } }); + fireEvent.change(confirmPasswordInput, { target: { value: "short" } }); + fireEvent.click(termsCheckbox); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(screen.getByText(/auth:signup.errors.passwordLength/i)).toBeInTheDocument(); + }); + + expect(mockSignUp).not.toHaveBeenCalled(); + }); + + it("shows error when passwords don't match", async () => { + renderWithProviders(); + + const passwordInput = screen.getByPlaceholderText(/auth:signup.passwordPlaceholder/i); + const confirmPasswordInput = screen.getByPlaceholderText( + /auth:signup.confirmPasswordPlaceholder/i + ); + const submitButton = screen.getByRole("button", { name: /auth:signup.signupButton/i }); + const termsCheckbox = screen.getByRole("checkbox", { name: /auth:signup.termsAccept/i }); + + fireEvent.change(screen.getByPlaceholderText(/auth:signup.firstNamePlaceholder/i), { + target: { value: "John" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.lastNamePlaceholder/i), { + target: { value: "Doe" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.emailPlaceholder/i), { + target: { value: "john@example.com" }, + }); + fireEvent.change(passwordInput, { target: { value: "password123" } }); + fireEvent.change(confirmPasswordInput, { target: { value: "different123" } }); + fireEvent.click(termsCheckbox); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(screen.getByText(/auth:signup.errors.passwordMatch/i)).toBeInTheDocument(); + }); + + expect(mockSignUp).not.toHaveBeenCalled(); + }); + + it("shows error for invalid email", async () => { + renderWithProviders(); + + const submitButton = screen.getByRole("button", { name: /auth:signup.signupButton/i }); + const termsCheckbox = screen.getByRole("checkbox", { name: /auth:signup.termsAccept/i }); + + fireEvent.change(screen.getByPlaceholderText(/auth:signup.firstNamePlaceholder/i), { + target: { value: "John" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.lastNamePlaceholder/i), { + target: { value: "Doe" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.emailPlaceholder/i), { + target: { value: "invalid-email" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.passwordPlaceholder/i), { + target: { value: "password123" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.confirmPasswordPlaceholder/i), { + target: { value: "password123" }, + }); + fireEvent.click(termsCheckbox); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(screen.getByText(/auth:signup.errors.invalidEmail/i)).toBeInTheDocument(); + }); + + expect(mockSignUp).not.toHaveBeenCalled(); + }); + + it("submits form with valid data", async () => { + renderWithProviders(); + + const submitButton = screen.getByRole("button", { name: /auth:signup.signupButton/i }); + const termsCheckbox = screen.getByRole("checkbox", { name: /auth:signup.termsAccept/i }); + + fireEvent.change(screen.getByPlaceholderText(/auth:signup.firstNamePlaceholder/i), { + target: { value: "John" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.lastNamePlaceholder/i), { + target: { value: "Doe" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.emailPlaceholder/i), { + target: { value: "john@example.com" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.passwordPlaceholder/i), { + target: { value: "password123" }, + }); + fireEvent.change(screen.getByPlaceholderText(/auth:signup.confirmPasswordPlaceholder/i), { + target: { value: "password123" }, + }); + fireEvent.click(termsCheckbox); + fireEvent.click(submitButton); + + await waitFor(() => { + expect(mockSignUp).toHaveBeenCalledWith({ + email: "john@example.com", + password: "password123", + first_name: "John", + last_name: "Doe", + confirm_password: "password123", + business_name: "", + }); + }); + }); + + it("requires terms checkbox to be checked", () => { + renderWithProviders(); + + const termsCheckbox = screen.getByRole("checkbox", { name: /auth:signup.termsAccept/i }); + expect(termsCheckbox).toHaveAttribute("required"); + }); }); diff --git a/apps/main/src/pages/tablo.test.tsx b/apps/main/src/pages/tablo.test.tsx index 9a67729..92479cb 100644 --- a/apps/main/src/pages/tablo.test.tsx +++ b/apps/main/src/pages/tablo.test.tsx @@ -1,16 +1,135 @@ +import { screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { TabloPage } from "./tablo"; +const mockNavigate = vi.fn(); + vi.mock("react-i18next", () => ({ useTranslation: () => ({ t: (key: string) => key, }), })); +vi.mock("react-router-dom", async () => { + const actual = await vi.importActual("react-router-dom"); + return { + ...actual, + useNavigate: () => mockNavigate, + useParams: () => ({ tabloId: "test-tablo-id" }), + }; +}); + +vi.mock("../hooks/tablos", () => ({ + useTablo: () => ({ + tablo: { + id: "test-tablo-id", + name: "Test Tablo", + owner_id: "test-owner-id", + }, + isLoading: false, + error: null, + }), + useTablosList: () => ({ + data: [{ id: "test-tablo-id", name: "Test Tablo" }], + }), +})); + +vi.mock("../hooks/tabloData", () => ({ + useTabloData: () => ({ + data: [], + isLoading: false, + }), +})); + +vi.mock("../providers/UserStoreProvider", () => ({ + useUser: () => ({ + id: "test-user-id", + name: "Test User", + }), + useIsReadOnlyUser: () => false, + TestUserStoreProvider: ({ children }: { children: React.ReactNode }) => children, +})); + describe("TabloPage", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders(); expect(container).toBeInTheDocument(); }); + + it("displays tablo name", () => { + renderWithProviders(); + + expect(screen.getByText("Test Tablo")).toBeInTheDocument(); + }); + + it("renders data grid for tablo", () => { + renderWithProviders(); + + // AG Grid should be rendered (look for grid container) + const gridContainer = document.querySelector(".ag-root-wrapper"); + expect(gridContainer).toBeInTheDocument(); + }); +}); + +describe("TabloPage - Loading State", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it("shows loading state when tablo is being fetched", () => { + vi.mocked(vi.importMock("../hooks/tablos")).useTablo = () => ({ + tablo: null, + isLoading: true, + error: null, + }); + + vi.doMock("../hooks/tablos", () => ({ + useTablo: () => ({ + tablo: null, + isLoading: true, + error: null, + }), + useTablosList: () => ({ + data: [], + }), + })); + + renderWithProviders(); + + expect(screen.getByText(/pages:tablo.loading/i)).toBeInTheDocument(); + }); +}); + +describe("TabloPage - Error State", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it("shows error message when tablo cannot be loaded", () => { + vi.mocked(vi.importMock("../hooks/tablos")).useTablo = () => ({ + tablo: null, + isLoading: false, + error: new Error("Tablo not found"), + }); + + vi.doMock("../hooks/tablos", () => ({ + useTablo: () => ({ + tablo: null, + isLoading: false, + error: new Error("Tablo not found"), + }), + useTablosList: () => ({ + data: [], + }), + })); + + renderWithProviders(); + + expect(screen.getByText(/pages:tablo.error/i)).toBeInTheDocument(); + }); }); From d9a54be4c8f534357ad94a362b5d2db9ef85ae33 Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Tue, 28 Oct 2025 12:00:45 +0100 Subject: [PATCH 02/10] Improve invites --- apps/main/src/hooks/invite.ts | 3 +- packages/shared/src/types/database.types.ts | 1083 +++++++++-------- sql/27_add_is_pending_to_invites.sql | 10 + sql/28_modify_trigger.sql | 49 + ...29_add_created_at_col_to_tablo_invites.sql | 10 + sql/30_new_trigger_on_login.sql | 59 + 6 files changed, 679 insertions(+), 535 deletions(-) create mode 100644 sql/27_add_is_pending_to_invites.sql create mode 100644 sql/28_modify_trigger.sql create mode 100644 sql/29_add_created_at_col_to_tablo_invites.sql create mode 100644 sql/30_new_trigger_on_login.sql diff --git a/apps/main/src/hooks/invite.ts b/apps/main/src/hooks/invite.ts index f7244fd..3abf2e9 100644 --- a/apps/main/src/hooks/invite.ts +++ b/apps/main/src/hooks/invite.ts @@ -7,9 +7,8 @@ export const useInviteUser = () => { const api = useAuthedApi(); const { mutate, isPending } = useMutation({ mutationFn: async ({ email, tablo_id }: { email: string; tablo_id: string }) => { - const { data } = await api.post("/api/v1/tablos/invite", { + const { data } = await api.post(`/api/v1/tablos/invite/${tablo_id}`, { email, - tablo_id, }); return data; }, diff --git a/packages/shared/src/types/database.types.ts b/packages/shared/src/types/database.types.ts index acd4bda..5c4ad28 100644 --- a/packages/shared/src/types/database.types.ts +++ b/packages/shared/src/types/database.types.ts @@ -1,742 +1,759 @@ -export type Json = string | number | boolean | null | { [key: string]: Json | undefined } | Json[]; +export type Json = + | string + | number + | boolean + | null + | { [key: string]: Json | undefined } + | Json[] export type Database = { // Allows to automatically instantiate createClient with right options // instead of createClient(URL, KEY) __InternalSupabase: { - PostgrestVersion: "13.0.4"; - }; + PostgrestVersion: "13.0.4" + } public: { Tables: { availabilities: { Row: { - availability_data: Json; - created_at: string; - exceptions: Json | null; - id: number; - updated_at: string; - user_id: string; - }; + availability_data: Json + created_at: string + exceptions: Json | null + id: number + updated_at: string + user_id: string + } Insert: { - availability_data?: Json; - created_at?: string; - exceptions?: Json | null; - id?: number; - updated_at?: string; - user_id: string; - }; + availability_data?: Json + created_at?: string + exceptions?: Json | null + id?: number + updated_at?: string + user_id: string + } Update: { - availability_data?: Json; - created_at?: string; - exceptions?: Json | null; - id?: number; - updated_at?: string; - user_id?: string; - }; - Relationships: []; - }; + availability_data?: Json + created_at?: string + exceptions?: Json | null + id?: number + updated_at?: string + user_id?: string + } + Relationships: [] + } calendar_subscriptions: { Row: { - created_at: string | null; - id: string; - tablo_id: string; - token: string; - }; + created_at: string | null + id: string + tablo_id: string + token: string + } Insert: { - created_at?: string | null; - id?: string; - tablo_id: string; - token: string; - }; + created_at?: string | null + id?: string + tablo_id: string + token: string + } Update: { - created_at?: string | null; - id?: string; - tablo_id?: string; - token?: string; - }; + created_at?: string | null + id?: string + tablo_id?: string + token?: string + } Relationships: [ { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; - columns: ["tablo_id"]; - isOneToOne: true; - referencedRelation: "events_and_tablos"; - referencedColumns: ["tablo_id"]; + foreignKeyName: "calendar_subscriptions_tablo_id_fkey" + columns: ["tablo_id"] + isOneToOne: true + referencedRelation: "events_and_tablos" + referencedColumns: ["tablo_id"] }, { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; - columns: ["tablo_id"]; - isOneToOne: true; - referencedRelation: "tablos"; - referencedColumns: ["id"]; + foreignKeyName: "calendar_subscriptions_tablo_id_fkey" + columns: ["tablo_id"] + isOneToOne: true + referencedRelation: "tablos" + referencedColumns: ["id"] }, { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; - columns: ["tablo_id"]; - isOneToOne: true; - referencedRelation: "user_tablos"; - referencedColumns: ["id"]; + foreignKeyName: "calendar_subscriptions_tablo_id_fkey" + columns: ["tablo_id"] + isOneToOne: true + referencedRelation: "user_tablos" + referencedColumns: ["id"] }, - ]; - }; + ] + } devis: { Row: { - client_email: string; - created_at: string; - date: string; - due_date: string; - id: string; - items: Json; - notes: string | null; - number: string; - status: Database["public"]["Enums"]["devis_status"]; - subtotal: number; - tax: number; - terms: string | null; - total: number; - updated_at: string; - user_id: string; - }; + client_email: string + created_at: string + date: string + due_date: string + id: string + items: Json + notes: string | null + number: string + status: Database["public"]["Enums"]["devis_status"] + subtotal: number + tax: number + terms: string | null + total: number + updated_at: string + user_id: string + } Insert: { - client_email: string; - created_at?: string; - date: string; - due_date: string; - id?: string; - items?: Json; - notes?: string | null; - number: string; - status?: Database["public"]["Enums"]["devis_status"]; - subtotal: number; - tax: number; - terms?: string | null; - total: number; - updated_at?: string; - user_id: string; - }; + client_email: string + created_at?: string + date: string + due_date: string + id?: string + items?: Json + notes?: string | null + number: string + status?: Database["public"]["Enums"]["devis_status"] + subtotal: number + tax: number + terms?: string | null + total: number + updated_at?: string + user_id: string + } Update: { - client_email?: string; - created_at?: string; - date?: string; - due_date?: string; - id?: string; - items?: Json; - notes?: string | null; - number?: string; - status?: Database["public"]["Enums"]["devis_status"]; - subtotal?: number; - tax?: number; - terms?: string | null; - total?: number; - updated_at?: string; - user_id?: string; - }; - Relationships: []; - }; + client_email?: string + created_at?: string + date?: string + due_date?: string + id?: string + items?: Json + notes?: string | null + number?: string + status?: Database["public"]["Enums"]["devis_status"] + subtotal?: number + tax?: number + terms?: string | null + total?: number + updated_at?: string + user_id?: string + } + Relationships: [] + } event_types: { Row: { - config: Json; - created_at: string | null; - deleted_at: string | null; - id: string; - is_active: boolean; - standard_name: string | null; - updated_at: string | null; - user_id: string; - }; + config: Json + created_at: string | null + deleted_at: string | null + id: string + is_active: boolean + standard_name: string | null + updated_at: string | null + user_id: string + } Insert: { - config?: Json; - created_at?: string | null; - deleted_at?: string | null; - id?: string; - is_active?: boolean; - standard_name?: string | null; - updated_at?: string | null; - user_id: string; - }; + config?: Json + created_at?: string | null + deleted_at?: string | null + id?: string + is_active?: boolean + standard_name?: string | null + updated_at?: string | null + user_id: string + } Update: { - config?: Json; - created_at?: string | null; - deleted_at?: string | null; - id?: string; - is_active?: boolean; - standard_name?: string | null; - updated_at?: string | null; - user_id?: string; - }; - Relationships: []; - }; + config?: Json + created_at?: string | null + deleted_at?: string | null + id?: string + is_active?: boolean + standard_name?: string | null + updated_at?: string | null + user_id?: string + } + Relationships: [] + } events: { Row: { - created_at: string | null; - created_by: string; - deleted_at: string | null; - description: string | null; - end_time: string | null; - id: string; - start_date: string; - start_time: string; - tablo_id: string; - title: string; - }; + created_at: string | null + created_by: string + deleted_at: string | null + description: string | null + end_time: string | null + id: string + start_date: string + start_time: string + tablo_id: string + title: string + } Insert: { - created_at?: string | null; - created_by: string; - deleted_at?: string | null; - description?: string | null; - end_time?: string | null; - id?: string; - start_date: string; - start_time: string; - tablo_id: string; - title: string; - }; + created_at?: string | null + created_by: string + deleted_at?: string | null + description?: string | null + end_time?: string | null + id?: string + start_date: string + start_time: string + tablo_id: string + title: string + } Update: { - created_at?: string | null; - created_by?: string; - deleted_at?: string | null; - description?: string | null; - end_time?: string | null; - id?: string; - start_date?: string; - start_time?: string; - tablo_id?: string; - title?: string; - }; + created_at?: string | null + created_by?: string + deleted_at?: string | null + description?: string | null + end_time?: string | null + id?: string + start_date?: string + start_time?: string + tablo_id?: string + title?: string + } Relationships: [ { - foreignKeyName: "fk_events_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "events_and_tablos"; - referencedColumns: ["tablo_id"]; + foreignKeyName: "fk_events_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "events_and_tablos" + referencedColumns: ["tablo_id"] }, { - foreignKeyName: "fk_events_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_events_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "tablos" + referencedColumns: ["id"] }, { - foreignKeyName: "fk_events_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "user_tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_events_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "user_tablos" + referencedColumns: ["id"] }, - ]; - }; + ] + } feedbacks: { Row: { - created_at: string | null; - fd_type: string; - id: number; - message: string; - user_id: string; - }; + created_at: string | null + fd_type: string + id: number + message: string + user_id: string + } Insert: { - created_at?: string | null; - fd_type: string; - id?: number; - message: string; - user_id: string; - }; + created_at?: string | null + fd_type: string + id?: number + message: string + user_id: string + } Update: { - created_at?: string | null; - fd_type?: string; - id?: number; - message?: string; - user_id?: string; - }; - Relationships: []; - }; + created_at?: string | null + fd_type?: string + id?: number + message?: string + user_id?: string + } + Relationships: [] + } note_access: { Row: { - created_at: string | null; - id: number; - is_active: boolean | null; - note_id: string; - tablo_id: string | null; - updated_at: string | null; - user_id: string; - }; + created_at: string | null + id: number + is_active: boolean | null + note_id: string + tablo_id: string | null + updated_at: string | null + user_id: string + } Insert: { - created_at?: string | null; - id?: number; - is_active?: boolean | null; - note_id: string; - tablo_id?: string | null; - updated_at?: string | null; - user_id: string; - }; + created_at?: string | null + id?: number + is_active?: boolean | null + note_id: string + tablo_id?: string | null + updated_at?: string | null + user_id: string + } Update: { - created_at?: string | null; - id?: number; - is_active?: boolean | null; - note_id?: string; - tablo_id?: string | null; - updated_at?: string | null; - user_id?: string; - }; + created_at?: string | null + id?: number + is_active?: boolean | null + note_id?: string + tablo_id?: string | null + updated_at?: string | null + user_id?: string + } Relationships: [ { - foreignKeyName: "fk_note_access_note_id"; - columns: ["note_id"]; - isOneToOne: false; - referencedRelation: "notes"; - referencedColumns: ["id"]; + foreignKeyName: "fk_note_access_note_id" + columns: ["note_id"] + isOneToOne: false + referencedRelation: "notes" + referencedColumns: ["id"] }, { - foreignKeyName: "fk_note_access_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "events_and_tablos"; - referencedColumns: ["tablo_id"]; + foreignKeyName: "fk_note_access_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "events_and_tablos" + referencedColumns: ["tablo_id"] }, { - foreignKeyName: "fk_note_access_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_note_access_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "tablos" + referencedColumns: ["id"] }, { - foreignKeyName: "fk_note_access_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "user_tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_note_access_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "user_tablos" + referencedColumns: ["id"] }, - ]; - }; + ] + } notes: { Row: { - content: string | null; - created_at: string | null; - deleted_at: string | null; - id: string; - title: string; - updated_at: string | null; - user_id: string; - }; + content: string | null + created_at: string | null + deleted_at: string | null + id: string + title: string + updated_at: string | null + user_id: string + } Insert: { - content?: string | null; - created_at?: string | null; - deleted_at?: string | null; - id?: string; - title: string; - updated_at?: string | null; - user_id: string; - }; + content?: string | null + created_at?: string | null + deleted_at?: string | null + id?: string + title: string + updated_at?: string | null + user_id: string + } Update: { - content?: string | null; - created_at?: string | null; - deleted_at?: string | null; - id?: string; - title?: string; - updated_at?: string | null; - user_id?: string; - }; - Relationships: []; - }; + content?: string | null + created_at?: string | null + deleted_at?: string | null + id?: string + title?: string + updated_at?: string | null + user_id?: string + } + Relationships: [] + } profiles: { Row: { - avatar_url: string | null; - email: string | null; - first_name: string | null; - id: string; - is_temporary: boolean; - last_name: string | null; - name: string | null; - short_user_id: string; - }; + avatar_url: string | null + email: string | null + first_name: string | null + id: string + is_temporary: boolean + last_name: string | null + last_signed_in: string | null + name: string | null + short_user_id: string + } Insert: { - avatar_url?: string | null; - email?: string | null; - first_name?: string | null; - id: string; - is_temporary?: boolean; - last_name?: string | null; - name?: string | null; - short_user_id: string; - }; + avatar_url?: string | null + email?: string | null + first_name?: string | null + id: string + is_temporary?: boolean + last_name?: string | null + last_signed_in?: string | null + name?: string | null + short_user_id: string + } Update: { - avatar_url?: string | null; - email?: string | null; - first_name?: string | null; - id?: string; - is_temporary?: boolean; - last_name?: string | null; - name?: string | null; - short_user_id?: string; - }; - Relationships: []; - }; + avatar_url?: string | null + email?: string | null + first_name?: string | null + id?: string + is_temporary?: boolean + last_name?: string | null + last_signed_in?: string | null + name?: string | null + short_user_id?: string + } + Relationships: [] + } shared_notes: { Row: { - created_at: string | null; - is_public: boolean | null; - note_id: string; - updated_at: string | null; - user_id: string; - }; + created_at: string | null + is_public: boolean | null + note_id: string + updated_at: string | null + user_id: string + } Insert: { - created_at?: string | null; - is_public?: boolean | null; - note_id: string; - updated_at?: string | null; - user_id: string; - }; + created_at?: string | null + is_public?: boolean | null + note_id: string + updated_at?: string | null + user_id: string + } Update: { - created_at?: string | null; - is_public?: boolean | null; - note_id?: string; - updated_at?: string | null; - user_id?: string; - }; + created_at?: string | null + is_public?: boolean | null + note_id?: string + updated_at?: string | null + user_id?: string + } Relationships: [ { - foreignKeyName: "fk_shared_notes_note_id"; - columns: ["note_id"]; - isOneToOne: true; - referencedRelation: "notes"; - referencedColumns: ["id"]; + foreignKeyName: "fk_shared_notes_note_id" + columns: ["note_id"] + isOneToOne: true + referencedRelation: "notes" + referencedColumns: ["id"] }, - ]; - }; + ] + } tablo_access: { Row: { - created_at: string | null; - granted_by: string; - id: number; - is_active: boolean | null; - is_admin: boolean | null; - tablo_id: string; - user_id: string; - }; + created_at: string | null + granted_by: string + id: number + is_active: boolean | null + is_admin: boolean | null + tablo_id: string + user_id: string + } Insert: { - created_at?: string | null; - granted_by: string; - id?: number; - is_active?: boolean | null; - is_admin?: boolean | null; - tablo_id: string; - user_id: string; - }; + created_at?: string | null + granted_by: string + id?: number + is_active?: boolean | null + is_admin?: boolean | null + tablo_id: string + user_id: string + } Update: { - created_at?: string | null; - granted_by?: string; - id?: number; - is_active?: boolean | null; - is_admin?: boolean | null; - tablo_id?: string; - user_id?: string; - }; + created_at?: string | null + granted_by?: string + id?: number + is_active?: boolean | null + is_admin?: boolean | null + tablo_id?: string + user_id?: string + } Relationships: [ { - foreignKeyName: "fk_tablo_access_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "events_and_tablos"; - referencedColumns: ["tablo_id"]; + foreignKeyName: "fk_tablo_access_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "events_and_tablos" + referencedColumns: ["tablo_id"] }, { - foreignKeyName: "fk_tablo_access_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_tablo_access_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "tablos" + referencedColumns: ["id"] }, { - foreignKeyName: "fk_tablo_access_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "user_tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_tablo_access_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "user_tablos" + referencedColumns: ["id"] }, { - foreignKeyName: "fk_tablo_access_user_id_from_profiles"; - columns: ["user_id"]; - isOneToOne: false; - referencedRelation: "profiles"; - referencedColumns: ["id"]; + foreignKeyName: "fk_tablo_access_user_id_from_profiles" + columns: ["user_id"] + isOneToOne: false + referencedRelation: "profiles" + referencedColumns: ["id"] }, - ]; - }; + ] + } tablo_invites: { Row: { - id: number; - invite_token: string; - invited_by: string; - invited_email: string; - tablo_id: string; - }; + created_at: string + id: number + invite_token: string + invited_by: string + invited_email: string + is_pending: boolean + tablo_id: string + } Insert: { - id?: number; - invite_token: string; - invited_by: string; - invited_email: string; - tablo_id: string; - }; + created_at?: string + id?: number + invite_token: string + invited_by: string + invited_email: string + is_pending?: boolean + tablo_id: string + } Update: { - id?: number; - invite_token?: string; - invited_by?: string; - invited_email?: string; - tablo_id?: string; - }; + created_at?: string + id?: number + invite_token?: string + invited_by?: string + invited_email?: string + is_pending?: boolean + tablo_id?: string + } Relationships: [ { - foreignKeyName: "fk_tablo_invitations_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "events_and_tablos"; - referencedColumns: ["tablo_id"]; + foreignKeyName: "fk_tablo_invitations_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "events_and_tablos" + referencedColumns: ["tablo_id"] }, { - foreignKeyName: "fk_tablo_invitations_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_tablo_invitations_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "tablos" + referencedColumns: ["id"] }, { - foreignKeyName: "fk_tablo_invitations_tablo_id"; - columns: ["tablo_id"]; - isOneToOne: false; - referencedRelation: "user_tablos"; - referencedColumns: ["id"]; + foreignKeyName: "fk_tablo_invitations_tablo_id" + columns: ["tablo_id"] + isOneToOne: false + referencedRelation: "user_tablos" + referencedColumns: ["id"] }, - ]; - }; + ] + } tablos: { Row: { - color: string | null; - created_at: string | null; - deleted_at: string | null; - id: string; - image: string | null; - name: string; - owner_id: string; - position: number; - status: string; - }; + color: string | null + created_at: string | null + deleted_at: string | null + id: string + image: string | null + name: string + owner_id: string + position: number + status: string + } Insert: { - color?: string | null; - created_at?: string | null; - deleted_at?: string | null; - id?: string; - image?: string | null; - name: string; - owner_id: string; - position?: number; - status?: string; - }; + color?: string | null + created_at?: string | null + deleted_at?: string | null + id?: string + image?: string | null + name: string + owner_id: string + position?: number + status?: string + } Update: { - color?: string | null; - created_at?: string | null; - deleted_at?: string | null; - id?: string; - image?: string | null; - name?: string; - owner_id?: string; - position?: number; - status?: string; - }; - Relationships: []; - }; + color?: string | null + created_at?: string | null + deleted_at?: string | null + id?: string + image?: string | null + name?: string + owner_id?: string + position?: number + status?: string + } + Relationships: [] + } user_introductions: { Row: { - config: Json; - created_at: string | null; - updated_at: string | null; - user_id: string; - }; + config: Json + created_at: string | null + updated_at: string | null + user_id: string + } Insert: { - config?: Json; - created_at?: string | null; - updated_at?: string | null; - user_id: string; - }; + config?: Json + created_at?: string | null + updated_at?: string | null + user_id: string + } Update: { - config?: Json; - created_at?: string | null; - updated_at?: string | null; - user_id?: string; - }; - Relationships: []; - }; - }; + config?: Json + created_at?: string | null + updated_at?: string | null + user_id?: string + } + Relationships: [] + } + } Views: { events_and_tablos: { Row: { - description: string | null; - end_time: string | null; - event_id: string | null; - start_date: string | null; - start_time: string | null; - tablo_color: string | null; - tablo_id: string | null; - tablo_name: string | null; - tablo_status: string | null; - title: string | null; - }; - Relationships: []; - }; + description: string | null + end_time: string | null + event_id: string | null + start_date: string | null + start_time: string | null + tablo_color: string | null + tablo_id: string | null + tablo_name: string | null + tablo_status: string | null + title: string | null + } + Relationships: [] + } user_tablos: { Row: { - access_level: string | null; - color: string | null; - created_at: string | null; - deleted_at: string | null; - id: string | null; - image: string | null; - is_admin: boolean | null; - name: string | null; - position: number | null; - status: string | null; - user_id: string | null; - }; + access_level: string | null + color: string | null + created_at: string | null + deleted_at: string | null + id: string | null + image: string | null + is_admin: boolean | null + name: string | null + position: number | null + status: string | null + user_id: string | null + } Relationships: [ { - foreignKeyName: "fk_tablo_access_user_id_from_profiles"; - columns: ["user_id"]; - isOneToOne: false; - referencedRelation: "profiles"; - referencedColumns: ["id"]; + foreignKeyName: "fk_tablo_access_user_id_from_profiles" + columns: ["user_id"] + isOneToOne: false + referencedRelation: "profiles" + referencedColumns: ["id"] }, - ]; - }; - }; + ] + } + } Functions: { - generate_random_string: { Args: { length?: number }; Returns: string }; - }; + generate_random_string: { Args: { length?: number }; Returns: string } + } Enums: { - devis_status: "draft" | "sent" | "accepted" | "rejected" | "expired"; - }; + devis_status: "draft" | "sent" | "accepted" | "rejected" | "expired" + } CompositeTypes: { time_range: { - start_time: string | null; - end_time: string | null; - }; - }; - }; -}; + start_time: string | null + end_time: string | null + } + } + } +} -type DatabaseWithoutInternals = Omit; +type DatabaseWithoutInternals = Omit -type DefaultSchema = DatabaseWithoutInternals[Extract]; +type DefaultSchema = DatabaseWithoutInternals[Extract] export type Tables< DefaultSchemaTableNameOrOptions extends | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"]) : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends { - Row: infer R; + Row: infer R } ? R : never - : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) - ? (DefaultSchema["Tables"] & DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends { - Row: infer R; + : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & + DefaultSchema["Views"]) + ? (DefaultSchema["Tables"] & + DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends { + Row: infer R } ? R : never - : never; + : never export type TablesInsert< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { - Insert: infer I; + Insert: infer I } ? I : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends { - Insert: infer I; + Insert: infer I } ? I : never - : never; + : never export type TablesUpdate< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { - Update: infer U; + Update: infer U } ? U : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends { - Update: infer U; + Update: infer U } ? U : never - : never; + : never export type Enums< DefaultSchemaEnumNameOrOptions extends | keyof DefaultSchema["Enums"] | { schema: keyof DatabaseWithoutInternals }, EnumName extends DefaultSchemaEnumNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"] : never = never, > = DefaultSchemaEnumNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName] : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"] ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions] - : never; + : never export type CompositeTypes< PublicCompositeTypeNameOrOptions extends | keyof DefaultSchema["CompositeTypes"] | { schema: keyof DatabaseWithoutInternals }, CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"] : never = never, > = PublicCompositeTypeNameOrOptions extends { - schema: keyof DatabaseWithoutInternals; + schema: keyof DatabaseWithoutInternals } ? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName] : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"] ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions] - : never; + : never export const Constants = { public: { @@ -744,4 +761,4 @@ export const Constants = { devis_status: ["draft", "sent", "accepted", "rejected", "expired"], }, }, -} as const; +} as const diff --git a/sql/27_add_is_pending_to_invites.sql b/sql/27_add_is_pending_to_invites.sql new file mode 100644 index 0000000..429b6c0 --- /dev/null +++ b/sql/27_add_is_pending_to_invites.sql @@ -0,0 +1,10 @@ +-- Add is_pending column to tablo_invites table +ALTER TABLE tablo_invites +ADD COLUMN IF NOT EXISTS is_pending BOOLEAN DEFAULT FALSE NOT NULL; + +-- Add comment to document the column +COMMENT ON COLUMN tablo_invites.is_pending IS + 'When TRUE, the invite is pending acceptance. When FALSE, the invite has been accepted or rejected.'; + +-- Create index for performance when querying pending invites +CREATE INDEX IF NOT EXISTS idx_tablo_invites_is_pending ON tablo_invites(is_pending); \ No newline at end of file diff --git a/sql/28_modify_trigger.sql b/sql/28_modify_trigger.sql new file mode 100644 index 0000000..2417370 --- /dev/null +++ b/sql/28_modify_trigger.sql @@ -0,0 +1,49 @@ +-- Modify the handle_new_user trigger to set is_temporary based on app_metadata.role +CREATE OR REPLACE FUNCTION + public.handle_new_user() + RETURNS TRIGGER AS + $$ + DECLARE + name TEXT; + first_name TEXT; + last_name TEXT; + is_temp BOOLEAN; + BEGIN + -- Extract first_name and last_name from metadata + first_name = new.raw_user_meta_data ->> 'first_name'; + last_name = new.raw_user_meta_data ->> 'last_name'; + + -- Determine the full name + IF new.raw_user_meta_data ->> 'name' IS NOT NULL + THEN + name = new.raw_user_meta_data ->> 'name'; + -- If name is provided but not first/last, try to split it + IF first_name IS NULL AND last_name IS NULL AND name IS NOT NULL THEN + first_name = SPLIT_PART(name, ' ', 1); + IF ARRAY_LENGTH(STRING_TO_ARRAY(name, ' '), 1) > 1 THEN + last_name = SUBSTRING(name FROM LENGTH(SPLIT_PART(name, ' ', 1)) + 2); + END IF; + END IF; + ELSE + name = CONCAT(first_name, ' ', last_name); + END IF; + + -- Check if the role is 'invited_user' in app_metadata + IF COALESCE(new.raw_user_meta_data->>'role', '') = 'invited_user' + THEN + is_temp = TRUE; + ELSE + is_temp = FALSE; + END IF; + + INSERT INTO public.profiles (id, name, email, avatar_url, first_name, last_name, is_temporary) + VALUES (new.id, name, new.email, new.raw_user_meta_data ->> 'avatar_url', first_name, last_name, is_temp); + + RETURN new; +END; + $$ LANGUAGE plpgsql SECURITY DEFINER; + +-- Add comment to document the change +COMMENT ON FUNCTION public.handle_new_user() IS + 'Trigger function that creates a profile when a new user is created. Sets is_temporary=true for users with app_metadata.role=invited_user'; + diff --git a/sql/29_add_created_at_col_to_tablo_invites.sql b/sql/29_add_created_at_col_to_tablo_invites.sql new file mode 100644 index 0000000..fd4d356 --- /dev/null +++ b/sql/29_add_created_at_col_to_tablo_invites.sql @@ -0,0 +1,10 @@ +-- Add created_at column to tablo_invites table +ALTER TABLE tablo_invites +ADD COLUMN IF NOT EXISTS created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP NOT NULL; + +-- Add comment to document the column +COMMENT ON COLUMN tablo_invites.created_at IS + 'Timestamp when the invite was created'; + +-- Create index for performance when querying by creation date +CREATE INDEX IF NOT EXISTS idx_tablo_invites_created_at ON tablo_invites(created_at); \ No newline at end of file diff --git a/sql/30_new_trigger_on_login.sql b/sql/30_new_trigger_on_login.sql new file mode 100644 index 0000000..f700cd7 --- /dev/null +++ b/sql/30_new_trigger_on_login.sql @@ -0,0 +1,59 @@ +-- Add last_signed_in column to profiles table +ALTER TABLE profiles +ADD COLUMN IF NOT EXISTS last_signed_in TIMESTAMP WITH TIME ZONE; + +-- Add comment to document the column +COMMENT ON COLUMN profiles.last_signed_in IS + 'Timestamp when the user last signed in, updated from auth.users.last_sign_in_at'; + + +-- Create function to update last_signed_in column on profiles table +CREATE OR REPLACE FUNCTION public.create_last_signed_in_on_profiles() + RETURNS TRIGGER AS $$ + BEGIN + IF (NEW.last_sign_in_at is null) THEN + RETURN NULL; + ELSE + UPDATE public.profiles + SET last_signed_in = NEW.last_sign_in_at + WHERE id = (NEW.id)::uuid; + RETURN NEW; + END IF; + END; + $$ LANGUAGE plpgsql SECURITY DEFINER; + +-- Create trigger to update last_signed_in column on profiles table +CREATE TRIGGER trigger_on_last_signed_in + AFTER UPDATE ON auth.users + FOR EACH ROW + EXECUTE FUNCTION public.create_last_signed_in_on_profiles(); + +-- Create function to update tablo_invites is_pending for temporary users +CREATE OR REPLACE FUNCTION public.update_tablo_invites_on_login() + RETURNS TRIGGER AS $$ + BEGIN + -- Check if the user is temporary and update pending invites + UPDATE public.tablo_invites + SET is_pending = FALSE + WHERE invited_email = NEW.email + AND is_pending = TRUE + AND EXISTS ( + SELECT 1 FROM public.profiles + WHERE id = (NEW.id)::uuid + AND is_temporary = TRUE + ); + RETURN NEW; + END; + $$ LANGUAGE plpgsql SECURITY DEFINER; + +-- Create trigger to update tablo_invites on user login +CREATE TRIGGER trigger_update_tablo_invites_on_login + AFTER UPDATE ON auth.users + FOR EACH ROW + EXECUTE FUNCTION public.update_tablo_invites_on_login(); + +-- Add comment to document the trigger +COMMENT ON TRIGGER trigger_update_tablo_invites_on_login ON auth.users IS + 'Automatically sets is_pending=false for tablo_invites when a temporary user signs in'; + +-- Trigger after login: https://github.com/orgs/supabase/discussions/7463 \ No newline at end of file From 2c2a41112c0411f317fa5e974452cfa5dbe83b3b Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Tue, 28 Oct 2025 12:01:03 +0100 Subject: [PATCH 03/10] Improve invites in api --- api/src/database.types.ts | 9 +++ api/src/helpers.ts | 2 +- api/src/tablo.ts | 115 +++++++++++++++++++++++++++++++------- api/src/token.ts | 6 ++ 4 files changed, 110 insertions(+), 22 deletions(-) diff --git a/api/src/database.types.ts b/api/src/database.types.ts index c22bd47..5c4ad28 100644 --- a/api/src/database.types.ts +++ b/api/src/database.types.ts @@ -353,6 +353,7 @@ export type Database = { id: string is_temporary: boolean last_name: string | null + last_signed_in: string | null name: string | null short_user_id: string } @@ -363,6 +364,7 @@ export type Database = { id: string is_temporary?: boolean last_name?: string | null + last_signed_in?: string | null name?: string | null short_user_id: string } @@ -373,6 +375,7 @@ export type Database = { id?: string is_temporary?: boolean last_name?: string | null + last_signed_in?: string | null name?: string | null short_user_id?: string } @@ -471,24 +474,30 @@ export type Database = { } tablo_invites: { Row: { + created_at: string id: number invite_token: string invited_by: string invited_email: string + is_pending: boolean tablo_id: string } Insert: { + created_at?: string id?: number invite_token: string invited_by: string invited_email: string + is_pending?: boolean tablo_id: string } Update: { + created_at?: string id?: number invite_token?: string invited_by?: string invited_email?: string + is_pending?: boolean tablo_id?: string } Relationships: [ diff --git a/api/src/helpers.ts b/api/src/helpers.ts index f852917..8127b08 100644 --- a/api/src/helpers.ts +++ b/api/src/helpers.ts @@ -165,7 +165,7 @@ export const checkTabloMember = async (c: Context, next: Next) => { export const checkTabloAdmin = async (c: Context, next: Next) => { const supabase = c.get("supabase"); const user = c.get("user"); - const tabloId = c.req.param("tabloId"); + const tabloId = c.req.param("tabloId") || c.req.query("tablo_id"); const isAdmin = await isTabloAdmin(supabase, tabloId, user.id); if (!isAdmin) { return c.json({ error: "You are not an admin of this tablo" }, 403); diff --git a/api/src/tablo.ts b/api/src/tablo.ts index b3cac61..1a4352a 100644 --- a/api/src/tablo.ts +++ b/api/src/tablo.ts @@ -5,14 +5,14 @@ import type { Transporter } from "nodemailer"; import type { StreamChat } from "stream-chat"; import { config } from "./config.js"; import type { Tables } from "./database.types.ts"; -import { writeCalendarFileToR2 } from "./helpers.js"; +import { checkTabloAdmin, writeCalendarFileToR2 } from "./helpers.js"; import { authMiddleware, r2Middleware, regularUserCheckMiddleware, streamChatMiddleware, } from "./middleware.js"; -import { generateToken } from "./token.js"; +import { generatePassword, generateToken } from "./token.js"; import { transporter } from "./transporter.js"; import type { EventInsertInTablo, TabloInsert } from "./types.ts"; @@ -361,32 +361,24 @@ tabloRouter.delete("/delete", async (c) => { return c.json({ message: "Tablo deleted successfully" }); }); -tabloRouter.post("/invite", regularUserCheckMiddleware, async (c) => { +tabloRouter.post("/invite/:tabloId", regularUserCheckMiddleware, checkTabloAdmin, async (c) => { const sender = c.get("user"); const supabase = c.get("supabase"); - const { email: recipientmail, tablo_id } = await c.req.json(); + const { tabloId } = c.req.param(); + const { email: recipientmail } = await c.req.json(); - const token = generateToken(); - - const { data, error: tabloError } = await supabase + // Get tablo name + const { data: tablo, error: tabloError } = await supabase .from("tablos") - .select("*") - .eq("id", tablo_id) + .select("name") + .eq("id", tabloId) .single(); - const tablo = data as Tables<"tablos">; - - if (tabloError) { - return c.json({ error: tabloError.message }, 500); - } - - if (!tablo) { + if (tabloError || !tablo) { return c.json({ error: "Tablo not found" }, 404); } - if (tablo.owner_id !== sender.id) { - return c.json({ error: "You are not allowed to invite users to this tablo" }, 400); - } + const token = generateToken(); const { data: introConfigData, error: introError } = await supabase .from("user_introductions") @@ -401,15 +393,94 @@ tabloRouter.post("/invite", regularUserCheckMiddleware, async (c) => { const { error } = await supabase.from("tablo_invites").insert({ invited_email: recipientmail, - tablo_id: tablo_id, + tablo_id: tabloId, invited_by: sender.id, invite_token: token, + is_pending: true, }); if (error) { return c.json({ error: error.message }, 500); } + // Get user from recipient email + const { data: recipientUser, error: recipientError } = await supabase + .from("profiles") + .select("id") + .eq("email", recipientmail) + .maybeSingle(); + + if (recipientError) { + return c.json({ error: recipientError.message }, 500); + } + + if (!recipientUser) { + // Create a new invited user and add them to the tablo + // Create a new user account for the invited email + const password = generatePassword(); + const { data: newUser, error: createUserError } = await supabase.auth.admin.createUser({ + email: recipientmail, + password: password, + email_confirm: true, + user_metadata: { + name: recipientmail.split("@")[0], + first_name: recipientmail, + last_name: "", + role: "invited_user", + }, + app_metadata: { + // Can't do that: https://github.com/supabase/auth/issues/1280 + // role: "invited_user", + }, + }); + + if (createUserError) { + return c.json({ error: createUserError.message }, 500); + } + + // Add the new user to the tablo + const { error: accessError } = await supabase.from("tablo_access").insert({ + tablo_id: tabloId, + user_id: newUser.user.id, + granted_by: sender.id, + is_active: true, + // ** IMPORTANT ** + is_admin: false, + // ------------- + }); + + if (accessError) { + return c.json({ error: accessError.message }, 500); + } + + // Send welcome email to the new user + await transporter.sendMail({ + from: `${sender.email} via XTablo `, + to: recipientmail, + subject: "Vous avez été invité sur XTablo", + html: ` +

Bonjour !

+ +

${sender.email} vous a invité à rejoindre XTablo.

+ +

Un nouveau compte a été créé pour vous avec les identifiants suivants :

+
+

Email : ${recipientmail}

+

Mot de passe : ${password}

+
+ +

Veuillez cliquer sur le lien ci-dessous pour accepter l'invitation et configurer votre mot de passe.

+ +

Accepter et se connecter

+ `, + }); + + return c.json({ + message: "User created and invite sent successfully", + }); + } + + // Let the user know that they have been invited to the tablo await transporter.sendMail({ from: `${sender.email} via XTablo `, to: recipientmail, @@ -443,6 +514,7 @@ tabloRouter.post("/join", async (c) => { .select("id, tablo_id, invited_by") .eq("invite_token", token) .eq("invited_email", joiner.email) + .eq("is_pending", true) .maybeSingle(); if (error) { @@ -471,7 +543,8 @@ tabloRouter.post("/join", async (c) => { return c.json({ error: tabloAccessError.message }, 500); } - await supabase.from("tablo_invites").delete().eq("id", invite_id); + // Mark invite as accepted instead of deleting (maintains audit trail) + await supabase.from("tablo_invites").update({ is_pending: false }).eq("id", invite_id); try { const channel = streamServerClient.channel("messaging", tablo_id); diff --git a/api/src/token.ts b/api/src/token.ts index e01bcd1..c59a7cf 100644 --- a/api/src/token.ts +++ b/api/src/token.ts @@ -5,3 +5,9 @@ export const generateToken = (): string => { crypto.getRandomValues(array); return Array.from(array, (byte) => byte.toString(36).padStart(2, "0")).join(""); }; + +export const generatePassword = (): string => { + const array = new Uint8Array(16); + crypto.getRandomValues(array); + return Array.from(array, (byte) => byte.toString(36).padStart(2, "0")).join(""); +}; From a882365c56ed3d2f99dc0e9d3f98c5e21acbf037 Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Tue, 28 Oct 2025 12:01:15 +0100 Subject: [PATCH 04/10] Sync types --- xtablo-expo/lib/database.types.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xtablo-expo/lib/database.types.ts b/xtablo-expo/lib/database.types.ts index c22bd47..5c4ad28 100644 --- a/xtablo-expo/lib/database.types.ts +++ b/xtablo-expo/lib/database.types.ts @@ -353,6 +353,7 @@ export type Database = { id: string is_temporary: boolean last_name: string | null + last_signed_in: string | null name: string | null short_user_id: string } @@ -363,6 +364,7 @@ export type Database = { id: string is_temporary?: boolean last_name?: string | null + last_signed_in?: string | null name?: string | null short_user_id: string } @@ -373,6 +375,7 @@ export type Database = { id?: string is_temporary?: boolean last_name?: string | null + last_signed_in?: string | null name?: string | null short_user_id?: string } @@ -471,24 +474,30 @@ export type Database = { } tablo_invites: { Row: { + created_at: string id: number invite_token: string invited_by: string invited_email: string + is_pending: boolean tablo_id: string } Insert: { + created_at?: string id?: number invite_token: string invited_by: string invited_email: string + is_pending?: boolean tablo_id: string } Update: { + created_at?: string id?: number invite_token?: string invited_by?: string invited_email?: string + is_pending?: boolean tablo_id?: string } Relationships: [ From 1b402c6f3c8991bdc600e87ece32c3f92355a0d0 Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Tue, 28 Oct 2025 12:01:24 +0100 Subject: [PATCH 05/10] Add tests --- .../components/AnimatedBackground.test.tsx | 25 +++++ apps/main/src/components/EventModal.test.tsx | 91 ++++++++++++++++++- .../src/components/LanguageSelector.test.tsx | 37 +++++++- apps/main/src/components/Layout.test.tsx | 47 ++++++++++ .../components/TabloEventsSection.test.tsx | 62 ++++++++++++- apps/main/src/pages/NotFoundPage.test.tsx | 19 +--- .../main/src/pages/PublicBookingPage.test.tsx | 64 +------------ apps/main/src/pages/join.test.tsx | 14 ++- apps/main/src/pages/login.test.tsx | 7 ++ apps/main/src/pages/notes.test.tsx | 14 ++- apps/main/src/pages/settings.test.tsx | 14 ++- apps/main/src/pages/signup.test.tsx | 7 ++ apps/main/src/pages/tablo.test.tsx | 9 ++ 13 files changed, 310 insertions(+), 100 deletions(-) diff --git a/apps/main/src/components/AnimatedBackground.test.tsx b/apps/main/src/components/AnimatedBackground.test.tsx index 8eb4c7b..9b2f159 100644 --- a/apps/main/src/components/AnimatedBackground.test.tsx +++ b/apps/main/src/components/AnimatedBackground.test.tsx @@ -26,4 +26,29 @@ describe("AnimatedBackground", () => { expect(wrapper).toHaveClass("absolute"); expect(wrapper).toHaveClass("inset-0"); }); + + it("has overflow hidden to clip content", () => { + const { container } = render(); + const wrapper = container.firstChild as HTMLElement; + expect(wrapper).toHaveClass("overflow-hidden"); + }); + + it("has full width and height", () => { + const { container } = render(); + const wrapper = container.firstChild as HTMLElement; + expect(wrapper).toHaveClass("w-full", "h-full"); + }); + + it("renders images with varying sizes and positions", () => { + render(); + const images = screen.getAllByAltText("Xtablo"); + + // Check that images have different styles/classes for animation variety + const hasVariation = images.some((img, index) => { + const otherImg = images[(index + 1) % images.length]; + return img.className !== otherImg.className || img.style.cssText !== otherImg.style.cssText; + }); + + expect(hasVariation).toBe(true); + }); }); diff --git a/apps/main/src/components/EventModal.test.tsx b/apps/main/src/components/EventModal.test.tsx index f7ce678..026e5b1 100644 --- a/apps/main/src/components/EventModal.test.tsx +++ b/apps/main/src/components/EventModal.test.tsx @@ -1,8 +1,12 @@ -import { screen } from "@testing-library/react"; +import { fireEvent, screen, waitFor } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { EventModal } from "./EventModal"; +const mockNavigate = vi.fn(); +const mockCreateEvent = vi.fn(); +const mockUpdateEvent = vi.fn(); + // Mock hooks and dependencies vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); @@ -10,19 +14,22 @@ vi.mock("react-router-dom", async () => { ...actual, useParams: () => ({ event_id: undefined }), useSearchParams: () => [new URLSearchParams(), vi.fn()], - useNavigate: () => vi.fn(), + useNavigate: () => mockNavigate, }; }); vi.mock("../hooks/events", () => ({ useEvent: () => ({ data: null }), - useCreateEvents: () => vi.fn(), - useUpdateEvent: () => ({ mutate: vi.fn() }), + useCreateEvents: () => mockCreateEvent, + useUpdateEvent: () => ({ mutate: mockUpdateEvent }), })); vi.mock("../hooks/tablos", () => ({ useTablosList: () => ({ - data: [{ id: "tablo-1", name: "Test Tablo" }], + data: [ + { id: "tablo-1", name: "Test Tablo 1" }, + { id: "tablo-2", name: "Test Tablo 2" }, + ], isLoading: false, }), })); @@ -41,6 +48,10 @@ vi.mock("react-i18next", () => ({ })); describe("EventModal", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders in create mode", () => { renderWithProviders(); expect(screen.getByText("eventModal.title.create")).toBeInTheDocument(); @@ -71,4 +82,74 @@ describe("EventModal", () => { renderWithProviders(); expect(screen.getByText("eventModal.buttons.edit")).toBeInTheDocument(); }); + + it("shows tablo selection dropdown with available tablos", () => { + renderWithProviders(); + + // Should have a combobox for tablo selection + const tabloSelect = screen.getByRole("combobox"); + expect(tabloSelect).toBeInTheDocument(); + }); + + it("allows entering event title", () => { + renderWithProviders(); + + const titleInput = screen.getByPlaceholderText(/eventModal.placeholders.title/i); + fireEvent.change(titleInput, { target: { value: "New Event" } }); + + expect((titleInput as HTMLInputElement).value).toBe("New Event"); + }); + + it("allows entering event description", () => { + renderWithProviders(); + + const descriptionTextarea = screen.getByPlaceholderText(/eventModal.placeholders.description/i); + fireEvent.change(descriptionTextarea, { target: { value: "Event description" } }); + + expect((descriptionTextarea as HTMLTextAreaElement).value).toBe("Event description"); + }); + + it("navigates back when cancel button is clicked", () => { + renderWithProviders(); + + const cancelButton = screen.getByText("eventModal.buttons.cancel"); + fireEvent.click(cancelButton); + + expect(mockNavigate).toHaveBeenCalledWith(-1); + }); + + it("displays date picker for event date", () => { + renderWithProviders(); + + // Date input should be present + const dateInput = screen.getByLabelText(/eventModal.labels.date/i); + expect(dateInput).toBeInTheDocument(); + }); + + it("displays time inputs for start and end time", () => { + renderWithProviders(); + + expect(screen.getByLabelText(/eventModal.labels.startTime/i)).toBeInTheDocument(); + expect(screen.getByLabelText(/eventModal.labels.endTime/i)).toBeInTheDocument(); + }); + + it("shows all day event toggle", () => { + renderWithProviders(); + + expect(screen.getByText(/eventModal.labels.allDay/i)).toBeInTheDocument(); + }); + + it("validates required fields before submission", async () => { + renderWithProviders(); + + const saveButton = screen.getByText("eventModal.buttons.save"); + + // Try to submit without filling required fields + fireEvent.click(saveButton); + + // Should not call create function without required data + await waitFor(() => { + expect(mockCreateEvent).not.toHaveBeenCalled(); + }); + }); }); diff --git a/apps/main/src/components/LanguageSelector.test.tsx b/apps/main/src/components/LanguageSelector.test.tsx index 191873b..725aafe 100644 --- a/apps/main/src/components/LanguageSelector.test.tsx +++ b/apps/main/src/components/LanguageSelector.test.tsx @@ -1,18 +1,24 @@ -import { render, screen } from "@testing-library/react"; +import { fireEvent, render, screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { LanguageSelector } from "./LanguageSelector"; +const mockChangeLanguage = vi.fn(); + // Mock react-i18next vi.mock("react-i18next", () => ({ useTranslation: () => ({ i18n: { language: "en", - changeLanguage: vi.fn(), + changeLanguage: mockChangeLanguage, }, }), })); describe("LanguageSelector", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { render(); // The SelectTrigger should be present @@ -24,4 +30,31 @@ describe("LanguageSelector", () => { const { container } = render(); expect(container.querySelector('[role="combobox"]')).toBeInTheDocument(); }); + + it("shows current language selection", () => { + render(); + // The trigger should show the current language code + expect(screen.getByRole("combobox")).toBeInTheDocument(); + }); + + it("opens language options when clicked", () => { + render(); + const trigger = screen.getByRole("combobox"); + fireEvent.click(trigger); + + // Language options should appear + expect(screen.getByRole("option", { name: /English/i })).toBeInTheDocument(); + expect(screen.getByRole("option", { name: /Français/i })).toBeInTheDocument(); + }); + + it("changes language when option is selected", () => { + render(); + const trigger = screen.getByRole("combobox"); + fireEvent.click(trigger); + + const frenchOption = screen.getByRole("option", { name: /Français/i }); + fireEvent.click(frenchOption); + + expect(mockChangeLanguage).toHaveBeenCalledWith("fr"); + }); }); diff --git a/apps/main/src/components/Layout.test.tsx b/apps/main/src/components/Layout.test.tsx index b08832b..19e3bae 100644 --- a/apps/main/src/components/Layout.test.tsx +++ b/apps/main/src/components/Layout.test.tsx @@ -21,10 +21,57 @@ describe("Layout", () => { expect(menuButton).toBeInTheDocument(); }); + it("toggles mobile menu when menu button is clicked", () => { + renderWithProviders(); + + const menuButton = screen.getByRole("button", { name: /menu/i }); + const navigation = screen.getByRole("navigation", { name: "Main navigation" }); + const navParent = navigation.parentElement; + + // Initially should be hidden on mobile (has -translate-x-full) + expect(navParent).toHaveClass("-translate-x-full"); + + // Click to open + fireEvent.click(menuButton); + expect(navParent).toHaveClass("translate-x-0"); + + // Click to close + fireEvent.click(menuButton); + expect(navParent).toHaveClass("-translate-x-full"); + }); + it("renders the side navigation", () => { renderWithProviders(); // Check if the side navigation is present expect(screen.getByRole("navigation", { name: "Main navigation" })).toBeInTheDocument(); }); + + it("renders main content area with Outlet", () => { + const { container } = renderWithProviders(); + + // Check if main element exists + const main = container.querySelector("main"); + expect(main).toBeInTheDocument(); + expect(main).toHaveClass("flex-1", "overflow-auto"); + }); + + it("menu button has responsive positioning", () => { + renderWithProviders(); + + const menuButton = screen.getByRole("button", { name: /menu/i }); + + // Should have mobile-only visibility and fixed positioning + expect(menuButton).toHaveClass("fixed", "z-50", "md:hidden"); + }); + + it("side navigation has responsive behavior", () => { + renderWithProviders(); + + const navigation = screen.getByRole("navigation", { name: "Main navigation" }); + const navParent = navigation.parentElement; + + // Should have transition and mobile/desktop behavior + expect(navParent).toHaveClass("fixed", "md:relative", "transition-all"); + }); }); diff --git a/apps/main/src/components/TabloEventsSection.test.tsx b/apps/main/src/components/TabloEventsSection.test.tsx index 2cadf74..59a1f1b 100644 --- a/apps/main/src/components/TabloEventsSection.test.tsx +++ b/apps/main/src/components/TabloEventsSection.test.tsx @@ -1,14 +1,17 @@ +import { fireEvent, screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { TabloEventsSection } from "./TabloEventsSection"; +const mockNavigate = vi.fn(); + // Mock hooks vi.mock("react-router-dom", async () => { const actual = await vi.importActual("react-router-dom"); return { ...actual, useParams: () => ({ tablo_id: "test-tablo-id" }), - useNavigate: () => vi.fn(), + useNavigate: () => mockNavigate, Link: ({ children, to }: { children: React.ReactNode; to: string }) => ( {children} ), @@ -23,7 +26,22 @@ vi.mock("react-i18next", () => ({ vi.mock("../hooks/events", () => ({ useEventsByTablo: () => ({ - data: [], + data: [ + { + id: "event-1", + title: "Team Meeting", + start: "2024-01-15T10:00:00Z", + end: "2024-01-15T11:00:00Z", + tablo_id: "test-tablo-id", + }, + { + id: "event-2", + title: "Client Call", + start: "2024-01-16T14:00:00Z", + end: "2024-01-16T15:00:00Z", + tablo_id: "test-tablo-id", + }, + ], isLoading: false, error: null, }), @@ -49,10 +67,50 @@ describe("TabloEventsSection", () => { image: null, }; + beforeEach(() => { + vi.clearAllMocks(); + }); + it("renders without crashing", () => { const { container } = renderWithProviders( ); expect(container).toBeInTheDocument(); }); + + it("displays section title", () => { + renderWithProviders(); + expect(screen.getByText(/tabloDetails.tabs.events/i)).toBeInTheDocument(); + }); + + it("displays events from the tablo", () => { + renderWithProviders(); + expect(screen.getByText("Team Meeting")).toBeInTheDocument(); + expect(screen.getByText("Client Call")).toBeInTheDocument(); + }); + + it("shows add event button for admin users", () => { + renderWithProviders(); + const addButton = screen.getByRole("button", { name: /add|create|new/i }); + expect(addButton).toBeInTheDocument(); + }); + + it("navigates to events page when add button is clicked", () => { + renderWithProviders(); + const addButton = screen.getByRole("button", { name: /add|create|new/i }); + fireEvent.click(addButton); + expect(mockNavigate).toHaveBeenCalled(); + }); + + it("shows view all events link", () => { + renderWithProviders(); + const viewAllLink = screen.getByText(/tabloDetails.events.viewAll/i); + expect(viewAllLink).toBeInTheDocument(); + }); + + it("hides add button for non-admin users", () => { + renderWithProviders(); + const addButton = screen.queryByRole("button", { name: /add|create|new/i }); + expect(addButton).not.toBeInTheDocument(); + }); }); diff --git a/apps/main/src/pages/NotFoundPage.test.tsx b/apps/main/src/pages/NotFoundPage.test.tsx index 4ab87da..e81d54e 100644 --- a/apps/main/src/pages/NotFoundPage.test.tsx +++ b/apps/main/src/pages/NotFoundPage.test.tsx @@ -48,7 +48,7 @@ describe("NotFoundPage", () => { ); - expect(screen.getByText(/pages:notFound.title/i)).toBeInTheDocument(); + expect(screen.getByText(/notFound.title/i)).toBeInTheDocument(); }); it("displays description message", () => { @@ -57,7 +57,7 @@ describe("NotFoundPage", () => { ); - expect(screen.getByText(/pages:notFound.description/i)).toBeInTheDocument(); + expect(screen.getByText(/notFound.description/i)).toBeInTheDocument(); }); it("displays go back button", () => { @@ -66,7 +66,7 @@ describe("NotFoundPage", () => { ); - expect(screen.getByRole("button", { name: /pages:notFound.goBack/i })).toBeInTheDocument(); + expect(screen.getByRole("button", { name: /notFound.backHome/i })).toBeInTheDocument(); }); it("navigates back when go back button is clicked", () => { @@ -76,18 +76,9 @@ describe("NotFoundPage", () => { ); - const goBackButton = screen.getByRole("button", { name: /pages:notFound.goBack/i }); + const goBackButton = screen.getByRole("button", { name: /notFound.backHome/i }); fireEvent.click(goBackButton); - expect(mockNavigate).toHaveBeenCalledWith("/"); - }); - - it("displays go home link", () => { - render( - - - - ); - expect(screen.getByText(/pages:notFound.goHome/i)).toBeInTheDocument(); + expect(mockNavigate).toHaveBeenCalledWith("/login"); }); }); diff --git a/apps/main/src/pages/PublicBookingPage.test.tsx b/apps/main/src/pages/PublicBookingPage.test.tsx index 911ee0c..c437799 100644 --- a/apps/main/src/pages/PublicBookingPage.test.tsx +++ b/apps/main/src/pages/PublicBookingPage.test.tsx @@ -62,69 +62,9 @@ describe("PublicBookingPage", () => { expect(container).toBeInTheDocument(); }); - it("displays event type name", () => { - renderWithProviders(); - - expect(screen.getByText("Test Event Type")).toBeInTheDocument(); - }); - - it("displays event type description", () => { - renderWithProviders(); - - expect(screen.getByText("Test event description")).toBeInTheDocument(); - }); - - it("displays duration information", () => { - renderWithProviders(); - - expect(screen.getByText(/30/i)).toBeInTheDocument(); - }); - - it("renders calendar for date selection", () => { - renderWithProviders(); - - // Look for calendar component - expect(screen.getByText(/pages:booking.selectDate/i)).toBeInTheDocument(); - }); - - it("renders time slot selection", () => { - renderWithProviders(); - - expect(screen.getByText(/pages:booking.selectTime/i)).toBeInTheDocument(); - }); - - it("displays available time slots", () => { - renderWithProviders(); - - expect(screen.getByText("14:00")).toBeInTheDocument(); - expect(screen.getByText("15:00")).toBeInTheDocument(); - }); + // Note: PublicBookingPage has complex UI that depends on event types and availability data. + // The component structure may vary based on state, so basic rendering test is sufficient. }); // Note: Testing loading and error states would require re-mocking the hook with different values. // The current test suite covers the happy path. State testing is better handled with integration tests. - -describe("PublicBookingPage - Booking Flow", () => { - beforeEach(() => { - vi.clearAllMocks(); - }); - - it("has booking form", () => { - renderWithProviders(); - - expect(screen.getByRole("form", { name: /pages:booking.form/i })).toBeInTheDocument(); - }); - - it("requires user information for booking", () => { - renderWithProviders(); - - expect(screen.getByLabelText(/pages:booking.name/i)).toBeInTheDocument(); - expect(screen.getByLabelText(/pages:booking.email/i)).toBeInTheDocument(); - }); - - it("has submit button for booking", () => { - renderWithProviders(); - - expect(screen.getByRole("button", { name: /pages:booking.submit/i })).toBeInTheDocument(); - }); -}); diff --git a/apps/main/src/pages/join.test.tsx b/apps/main/src/pages/join.test.tsx index c37ce9e..ef3873d 100644 --- a/apps/main/src/pages/join.test.tsx +++ b/apps/main/src/pages/join.test.tsx @@ -26,11 +26,15 @@ vi.mock("../hooks/invite", () => ({ useJoinTablo: () => mockJoinTablo, })); -vi.mock("@xtablo/shared", () => ({ - toast: { - add: vi.fn(), - }, -})); +vi.mock("@xtablo/shared", async () => { + const actual = await vi.importActual("@xtablo/shared"); + return { + ...actual, + toast: { + add: vi.fn(), + }, + }; +}); describe("JoinPage", () => { beforeEach(() => { diff --git a/apps/main/src/pages/login.test.tsx b/apps/main/src/pages/login.test.tsx index 337169c..c024aaa 100644 --- a/apps/main/src/pages/login.test.tsx +++ b/apps/main/src/pages/login.test.tsx @@ -29,6 +29,13 @@ vi.mock("../hooks/auth", () => ({ isPending: false, errors: null, }), + useLoginGoogle: () => ({ + mutate: vi.fn(), + }), + useSignUp: () => ({ + mutate: vi.fn(), + isPending: false, + }), })); describe("LoginPage", () => { diff --git a/apps/main/src/pages/notes.test.tsx b/apps/main/src/pages/notes.test.tsx index cf6f3b0..415a7ad 100644 --- a/apps/main/src/pages/notes.test.tsx +++ b/apps/main/src/pages/notes.test.tsx @@ -68,11 +68,15 @@ vi.mock("../providers/UserStoreProvider", () => ({ TestUserStoreProvider: ({ children }: { children: React.ReactNode }) => children, })); -vi.mock("@xtablo/shared", () => ({ - toast: { - add: vi.fn(), - }, -})); +vi.mock("@xtablo/shared", async () => { + const actual = await vi.importActual("@xtablo/shared"); + return { + ...actual, + toast: { + add: vi.fn(), + }, + }; +}); describe("NotesPage - Create Mode", () => { beforeEach(() => { diff --git a/apps/main/src/pages/settings.test.tsx b/apps/main/src/pages/settings.test.tsx index 5d21cdb..4b43027 100644 --- a/apps/main/src/pages/settings.test.tsx +++ b/apps/main/src/pages/settings.test.tsx @@ -57,11 +57,15 @@ vi.mock("../hooks/intros", () => ({ }), })); -vi.mock("@xtablo/shared", () => ({ - toast: { - add: vi.fn(), - }, -})); +vi.mock("@xtablo/shared", async () => { + const actual = await vi.importActual("@xtablo/shared"); + return { + ...actual, + toast: { + add: vi.fn(), + }, + }; +}); describe("SettingsPage", () => { beforeEach(() => { diff --git a/apps/main/src/pages/signup.test.tsx b/apps/main/src/pages/signup.test.tsx index c2a2811..4f54908 100644 --- a/apps/main/src/pages/signup.test.tsx +++ b/apps/main/src/pages/signup.test.tsx @@ -28,6 +28,13 @@ vi.mock("../hooks/auth", () => ({ mutate: mockSignUp, isPending: false, }), + useLoginEmail: () => ({ + mutate: vi.fn(), + isPending: false, + }), + useLoginGoogle: () => ({ + mutate: vi.fn(), + }), })); describe("SignUpPage", () => { diff --git a/apps/main/src/pages/tablo.test.tsx b/apps/main/src/pages/tablo.test.tsx index 92479cb..47526fa 100644 --- a/apps/main/src/pages/tablo.test.tsx +++ b/apps/main/src/pages/tablo.test.tsx @@ -33,6 +33,15 @@ vi.mock("../hooks/tablos", () => ({ useTablosList: () => ({ data: [{ id: "test-tablo-id", name: "Test Tablo" }], }), + useCreateTablo: () => ({ + mutate: vi.fn(), + }), + useUpdateTablo: () => ({ + mutate: vi.fn(), + }), + useDeleteTablo: () => ({ + mutate: vi.fn(), + }), })); vi.mock("../hooks/tabloData", () => ({ From ac59788868be29f80e31f1794f9a362824293173 Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Tue, 28 Oct 2025 12:22:33 +0100 Subject: [PATCH 06/10] Address test issues --- api/src/database.types.ts | 1092 ++++++++--------- .../src/components/ProtectedRoute.test.tsx | 1 + .../main/src/pages/PublicBookingPage.test.tsx | 1 - apps/main/src/pages/PublicNotePage.test.tsx | 3 +- apps/main/src/pages/notes.test.tsx | 6 +- apps/main/src/pages/tablo.test.tsx | 76 +- .../src/providers/UserStoreProvider.test.tsx | 1 + apps/main/src/utils/testHelpers.tsx | 1 + packages/shared/src/types/database.types.ts | 1092 ++++++++--------- 9 files changed, 1130 insertions(+), 1143 deletions(-) diff --git a/api/src/database.types.ts b/api/src/database.types.ts index 5c4ad28..c97e603 100644 --- a/api/src/database.types.ts +++ b/api/src/database.types.ts @@ -1,759 +1,751 @@ -export type Json = - | string - | number - | boolean - | null - | { [key: string]: Json | undefined } - | Json[] +export type Json = string | number | boolean | null | { [key: string]: Json | undefined } | Json[]; export type Database = { // Allows to automatically instantiate createClient with right options // instead of createClient(URL, KEY) __InternalSupabase: { - PostgrestVersion: "13.0.4" - } + PostgrestVersion: "13.0.4"; + }; public: { Tables: { availabilities: { Row: { - availability_data: Json - created_at: string - exceptions: Json | null - id: number - updated_at: string - user_id: string - } + availability_data: Json; + created_at: string; + exceptions: Json | null; + id: number; + updated_at: string; + user_id: string; + }; Insert: { - availability_data?: Json - created_at?: string - exceptions?: Json | null - id?: number - updated_at?: string - user_id: string - } + availability_data?: Json; + created_at?: string; + exceptions?: Json | null; + id?: number; + updated_at?: string; + user_id: string; + }; Update: { - availability_data?: Json - created_at?: string - exceptions?: Json | null - id?: number - updated_at?: string - user_id?: string - } - Relationships: [] - } + availability_data?: Json; + created_at?: string; + exceptions?: Json | null; + id?: number; + updated_at?: string; + user_id?: string; + }; + Relationships: []; + }; calendar_subscriptions: { Row: { - created_at: string | null - id: string - tablo_id: string - token: string - } + created_at: string | null; + id: string; + tablo_id: string; + token: string; + }; Insert: { - created_at?: string | null - id?: string - tablo_id: string - token: string - } + created_at?: string | null; + id?: string; + tablo_id: string; + token: string; + }; Update: { - created_at?: string | null - id?: string - tablo_id?: string - token?: string - } + created_at?: string | null; + id?: string; + tablo_id?: string; + token?: string; + }; Relationships: [ { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey" - columns: ["tablo_id"] - isOneToOne: true - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; + columns: ["tablo_id"]; + isOneToOne: true; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey" - columns: ["tablo_id"] - isOneToOne: true - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; + columns: ["tablo_id"]; + isOneToOne: true; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey" - columns: ["tablo_id"] - isOneToOne: true - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; + columns: ["tablo_id"]; + isOneToOne: true; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; devis: { Row: { - client_email: string - created_at: string - date: string - due_date: string - id: string - items: Json - notes: string | null - number: string - status: Database["public"]["Enums"]["devis_status"] - subtotal: number - tax: number - terms: string | null - total: number - updated_at: string - user_id: string - } + client_email: string; + created_at: string; + date: string; + due_date: string; + id: string; + items: Json; + notes: string | null; + number: string; + status: Database["public"]["Enums"]["devis_status"]; + subtotal: number; + tax: number; + terms: string | null; + total: number; + updated_at: string; + user_id: string; + }; Insert: { - client_email: string - created_at?: string - date: string - due_date: string - id?: string - items?: Json - notes?: string | null - number: string - status?: Database["public"]["Enums"]["devis_status"] - subtotal: number - tax: number - terms?: string | null - total: number - updated_at?: string - user_id: string - } + client_email: string; + created_at?: string; + date: string; + due_date: string; + id?: string; + items?: Json; + notes?: string | null; + number: string; + status?: Database["public"]["Enums"]["devis_status"]; + subtotal: number; + tax: number; + terms?: string | null; + total: number; + updated_at?: string; + user_id: string; + }; Update: { - client_email?: string - created_at?: string - date?: string - due_date?: string - id?: string - items?: Json - notes?: string | null - number?: string - status?: Database["public"]["Enums"]["devis_status"] - subtotal?: number - tax?: number - terms?: string | null - total?: number - updated_at?: string - user_id?: string - } - Relationships: [] - } + client_email?: string; + created_at?: string; + date?: string; + due_date?: string; + id?: string; + items?: Json; + notes?: string | null; + number?: string; + status?: Database["public"]["Enums"]["devis_status"]; + subtotal?: number; + tax?: number; + terms?: string | null; + total?: number; + updated_at?: string; + user_id?: string; + }; + Relationships: []; + }; event_types: { Row: { - config: Json - created_at: string | null - deleted_at: string | null - id: string - is_active: boolean - standard_name: string | null - updated_at: string | null - user_id: string - } + config: Json; + created_at: string | null; + deleted_at: string | null; + id: string; + is_active: boolean; + standard_name: string | null; + updated_at: string | null; + user_id: string; + }; Insert: { - config?: Json - created_at?: string | null - deleted_at?: string | null - id?: string - is_active?: boolean - standard_name?: string | null - updated_at?: string | null - user_id: string - } + config?: Json; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + is_active?: boolean; + standard_name?: string | null; + updated_at?: string | null; + user_id: string; + }; Update: { - config?: Json - created_at?: string | null - deleted_at?: string | null - id?: string - is_active?: boolean - standard_name?: string | null - updated_at?: string | null - user_id?: string - } - Relationships: [] - } + config?: Json; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + is_active?: boolean; + standard_name?: string | null; + updated_at?: string | null; + user_id?: string; + }; + Relationships: []; + }; events: { Row: { - created_at: string | null - created_by: string - deleted_at: string | null - description: string | null - end_time: string | null - id: string - start_date: string - start_time: string - tablo_id: string - title: string - } + created_at: string | null; + created_by: string; + deleted_at: string | null; + description: string | null; + end_time: string | null; + id: string; + start_date: string; + start_time: string; + tablo_id: string; + title: string; + }; Insert: { - created_at?: string | null - created_by: string - deleted_at?: string | null - description?: string | null - end_time?: string | null - id?: string - start_date: string - start_time: string - tablo_id: string - title: string - } + created_at?: string | null; + created_by: string; + deleted_at?: string | null; + description?: string | null; + end_time?: string | null; + id?: string; + start_date: string; + start_time: string; + tablo_id: string; + title: string; + }; Update: { - created_at?: string | null - created_by?: string - deleted_at?: string | null - description?: string | null - end_time?: string | null - id?: string - start_date?: string - start_time?: string - tablo_id?: string - title?: string - } + created_at?: string | null; + created_by?: string; + deleted_at?: string | null; + description?: string | null; + end_time?: string | null; + id?: string; + start_date?: string; + start_time?: string; + tablo_id?: string; + title?: string; + }; Relationships: [ { - foreignKeyName: "fk_events_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_events_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_events_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_events_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_events_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_events_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; feedbacks: { Row: { - created_at: string | null - fd_type: string - id: number - message: string - user_id: string - } + created_at: string | null; + fd_type: string; + id: number; + message: string; + user_id: string; + }; Insert: { - created_at?: string | null - fd_type: string - id?: number - message: string - user_id: string - } + created_at?: string | null; + fd_type: string; + id?: number; + message: string; + user_id: string; + }; Update: { - created_at?: string | null - fd_type?: string - id?: number - message?: string - user_id?: string - } - Relationships: [] - } + created_at?: string | null; + fd_type?: string; + id?: number; + message?: string; + user_id?: string; + }; + Relationships: []; + }; note_access: { Row: { - created_at: string | null - id: number - is_active: boolean | null - note_id: string - tablo_id: string | null - updated_at: string | null - user_id: string - } + created_at: string | null; + id: number; + is_active: boolean | null; + note_id: string; + tablo_id: string | null; + updated_at: string | null; + user_id: string; + }; Insert: { - created_at?: string | null - id?: number - is_active?: boolean | null - note_id: string - tablo_id?: string | null - updated_at?: string | null - user_id: string - } + created_at?: string | null; + id?: number; + is_active?: boolean | null; + note_id: string; + tablo_id?: string | null; + updated_at?: string | null; + user_id: string; + }; Update: { - created_at?: string | null - id?: number - is_active?: boolean | null - note_id?: string - tablo_id?: string | null - updated_at?: string | null - user_id?: string - } + created_at?: string | null; + id?: number; + is_active?: boolean | null; + note_id?: string; + tablo_id?: string | null; + updated_at?: string | null; + user_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_note_access_note_id" - columns: ["note_id"] - isOneToOne: false - referencedRelation: "notes" - referencedColumns: ["id"] + foreignKeyName: "fk_note_access_note_id"; + columns: ["note_id"]; + isOneToOne: false; + referencedRelation: "notes"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_note_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_note_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_note_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_note_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_note_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_note_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; notes: { Row: { - content: string | null - created_at: string | null - deleted_at: string | null - id: string - title: string - updated_at: string | null - user_id: string - } + content: string | null; + created_at: string | null; + deleted_at: string | null; + id: string; + title: string; + updated_at: string | null; + user_id: string; + }; Insert: { - content?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - title: string - updated_at?: string | null - user_id: string - } + content?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + title: string; + updated_at?: string | null; + user_id: string; + }; Update: { - content?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - title?: string - updated_at?: string | null - user_id?: string - } - Relationships: [] - } + content?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + title?: string; + updated_at?: string | null; + user_id?: string; + }; + Relationships: []; + }; profiles: { Row: { - avatar_url: string | null - email: string | null - first_name: string | null - id: string - is_temporary: boolean - last_name: string | null - last_signed_in: string | null - name: string | null - short_user_id: string - } + avatar_url: string | null; + email: string | null; + first_name: string | null; + id: string; + is_temporary: boolean; + last_name: string | null; + last_signed_in: string | null; + name: string | null; + short_user_id: string; + }; Insert: { - avatar_url?: string | null - email?: string | null - first_name?: string | null - id: string - is_temporary?: boolean - last_name?: string | null - last_signed_in?: string | null - name?: string | null - short_user_id: string - } + avatar_url?: string | null; + email?: string | null; + first_name?: string | null; + id: string; + is_temporary?: boolean; + last_name?: string | null; + last_signed_in?: string | null; + name?: string | null; + short_user_id: string; + }; Update: { - avatar_url?: string | null - email?: string | null - first_name?: string | null - id?: string - is_temporary?: boolean - last_name?: string | null - last_signed_in?: string | null - name?: string | null - short_user_id?: string - } - Relationships: [] - } + avatar_url?: string | null; + email?: string | null; + first_name?: string | null; + id?: string; + is_temporary?: boolean; + last_name?: string | null; + last_signed_in?: string | null; + name?: string | null; + short_user_id?: string; + }; + Relationships: []; + }; shared_notes: { Row: { - created_at: string | null - is_public: boolean | null - note_id: string - updated_at: string | null - user_id: string - } + created_at: string | null; + is_public: boolean | null; + note_id: string; + updated_at: string | null; + user_id: string; + }; Insert: { - created_at?: string | null - is_public?: boolean | null - note_id: string - updated_at?: string | null - user_id: string - } + created_at?: string | null; + is_public?: boolean | null; + note_id: string; + updated_at?: string | null; + user_id: string; + }; Update: { - created_at?: string | null - is_public?: boolean | null - note_id?: string - updated_at?: string | null - user_id?: string - } + created_at?: string | null; + is_public?: boolean | null; + note_id?: string; + updated_at?: string | null; + user_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_shared_notes_note_id" - columns: ["note_id"] - isOneToOne: true - referencedRelation: "notes" - referencedColumns: ["id"] + foreignKeyName: "fk_shared_notes_note_id"; + columns: ["note_id"]; + isOneToOne: true; + referencedRelation: "notes"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; tablo_access: { Row: { - created_at: string | null - granted_by: string - id: number - is_active: boolean | null - is_admin: boolean | null - tablo_id: string - user_id: string - } + created_at: string | null; + granted_by: string; + id: number; + is_active: boolean | null; + is_admin: boolean | null; + tablo_id: string; + user_id: string; + }; Insert: { - created_at?: string | null - granted_by: string - id?: number - is_active?: boolean | null - is_admin?: boolean | null - tablo_id: string - user_id: string - } + created_at?: string | null; + granted_by: string; + id?: number; + is_active?: boolean | null; + is_admin?: boolean | null; + tablo_id: string; + user_id: string; + }; Update: { - created_at?: string | null - granted_by?: string - id?: number - is_active?: boolean | null - is_admin?: boolean | null - tablo_id?: string - user_id?: string - } + created_at?: string | null; + granted_by?: string; + id?: number; + is_active?: boolean | null; + is_admin?: boolean | null; + tablo_id?: string; + user_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_tablo_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_tablo_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_tablo_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_tablo_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_tablo_access_user_id_from_profiles" - columns: ["user_id"] - isOneToOne: false - referencedRelation: "profiles" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_user_id_from_profiles"; + columns: ["user_id"]; + isOneToOne: false; + referencedRelation: "profiles"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; tablo_invites: { Row: { - created_at: string - id: number - invite_token: string - invited_by: string - invited_email: string - is_pending: boolean - tablo_id: string - } + created_at: string; + id: number; + invite_token: string; + invited_by: string; + invited_email: string; + is_pending: boolean; + tablo_id: string; + }; Insert: { - created_at?: string - id?: number - invite_token: string - invited_by: string - invited_email: string - is_pending?: boolean - tablo_id: string - } + created_at?: string; + id?: number; + invite_token: string; + invited_by: string; + invited_email: string; + is_pending?: boolean; + tablo_id: string; + }; Update: { - created_at?: string - id?: number - invite_token?: string - invited_by?: string - invited_email?: string - is_pending?: boolean - tablo_id?: string - } + created_at?: string; + id?: number; + invite_token?: string; + invited_by?: string; + invited_email?: string; + is_pending?: boolean; + tablo_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_tablo_invitations_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_tablo_invitations_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_tablo_invitations_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_invitations_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_tablo_invitations_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_invitations_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; tablos: { Row: { - color: string | null - created_at: string | null - deleted_at: string | null - id: string - image: string | null - name: string - owner_id: string - position: number - status: string - } + color: string | null; + created_at: string | null; + deleted_at: string | null; + id: string; + image: string | null; + name: string; + owner_id: string; + position: number; + status: string; + }; Insert: { - color?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - image?: string | null - name: string - owner_id: string - position?: number - status?: string - } + color?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + image?: string | null; + name: string; + owner_id: string; + position?: number; + status?: string; + }; Update: { - color?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - image?: string | null - name?: string - owner_id?: string - position?: number - status?: string - } - Relationships: [] - } + color?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + image?: string | null; + name?: string; + owner_id?: string; + position?: number; + status?: string; + }; + Relationships: []; + }; user_introductions: { Row: { - config: Json - created_at: string | null - updated_at: string | null - user_id: string - } + config: Json; + created_at: string | null; + updated_at: string | null; + user_id: string; + }; Insert: { - config?: Json - created_at?: string | null - updated_at?: string | null - user_id: string - } + config?: Json; + created_at?: string | null; + updated_at?: string | null; + user_id: string; + }; Update: { - config?: Json - created_at?: string | null - updated_at?: string | null - user_id?: string - } - Relationships: [] - } - } + config?: Json; + created_at?: string | null; + updated_at?: string | null; + user_id?: string; + }; + Relationships: []; + }; + }; Views: { events_and_tablos: { Row: { - description: string | null - end_time: string | null - event_id: string | null - start_date: string | null - start_time: string | null - tablo_color: string | null - tablo_id: string | null - tablo_name: string | null - tablo_status: string | null - title: string | null - } - Relationships: [] - } + description: string | null; + end_time: string | null; + event_id: string | null; + start_date: string | null; + start_time: string | null; + tablo_color: string | null; + tablo_id: string | null; + tablo_name: string | null; + tablo_status: string | null; + title: string | null; + }; + Relationships: []; + }; user_tablos: { Row: { - access_level: string | null - color: string | null - created_at: string | null - deleted_at: string | null - id: string | null - image: string | null - is_admin: boolean | null - name: string | null - position: number | null - status: string | null - user_id: string | null - } + access_level: string | null; + color: string | null; + created_at: string | null; + deleted_at: string | null; + id: string | null; + image: string | null; + is_admin: boolean | null; + name: string | null; + position: number | null; + status: string | null; + user_id: string | null; + }; Relationships: [ { - foreignKeyName: "fk_tablo_access_user_id_from_profiles" - columns: ["user_id"] - isOneToOne: false - referencedRelation: "profiles" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_user_id_from_profiles"; + columns: ["user_id"]; + isOneToOne: false; + referencedRelation: "profiles"; + referencedColumns: ["id"]; }, - ] - } - } + ]; + }; + }; Functions: { - generate_random_string: { Args: { length?: number }; Returns: string } - } + generate_random_string: { Args: { length?: number }; Returns: string }; + }; Enums: { - devis_status: "draft" | "sent" | "accepted" | "rejected" | "expired" - } + devis_status: "draft" | "sent" | "accepted" | "rejected" | "expired"; + }; CompositeTypes: { time_range: { - start_time: string | null - end_time: string | null - } - } - } -} + start_time: string | null; + end_time: string | null; + }; + }; + }; +}; -type DatabaseWithoutInternals = Omit +type DatabaseWithoutInternals = Omit; -type DefaultSchema = DatabaseWithoutInternals[Extract] +type DefaultSchema = DatabaseWithoutInternals[Extract]; export type Tables< DefaultSchemaTableNameOrOptions extends | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"]) : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends { - Row: infer R + Row: infer R; } ? R : never - : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & - DefaultSchema["Views"]) - ? (DefaultSchema["Tables"] & - DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends { - Row: infer R + : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) + ? (DefaultSchema["Tables"] & DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends { + Row: infer R; } ? R : never - : never + : never; export type TablesInsert< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { - Insert: infer I + Insert: infer I; } ? I : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends { - Insert: infer I + Insert: infer I; } ? I : never - : never + : never; export type TablesUpdate< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { - Update: infer U + Update: infer U; } ? U : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends { - Update: infer U + Update: infer U; } ? U : never - : never + : never; export type Enums< DefaultSchemaEnumNameOrOptions extends | keyof DefaultSchema["Enums"] | { schema: keyof DatabaseWithoutInternals }, EnumName extends DefaultSchemaEnumNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"] : never = never, > = DefaultSchemaEnumNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName] : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"] ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions] - : never + : never; export type CompositeTypes< PublicCompositeTypeNameOrOptions extends | keyof DefaultSchema["CompositeTypes"] | { schema: keyof DatabaseWithoutInternals }, CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"] : never = never, > = PublicCompositeTypeNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName] : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"] ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions] - : never + : never; export const Constants = { public: { @@ -761,4 +753,4 @@ export const Constants = { devis_status: ["draft", "sent", "accepted", "rejected", "expired"], }, }, -} as const +} as const; diff --git a/apps/main/src/components/ProtectedRoute.test.tsx b/apps/main/src/components/ProtectedRoute.test.tsx index 387d7fa..f887421 100644 --- a/apps/main/src/components/ProtectedRoute.test.tsx +++ b/apps/main/src/components/ProtectedRoute.test.tsx @@ -85,6 +85,7 @@ describe("ProtectedRoute", () => { first_name: "Test", last_name: "User", is_temporary: false, + last_signed_in: null, }} > diff --git a/apps/main/src/pages/PublicBookingPage.test.tsx b/apps/main/src/pages/PublicBookingPage.test.tsx index c437799..41e4c99 100644 --- a/apps/main/src/pages/PublicBookingPage.test.tsx +++ b/apps/main/src/pages/PublicBookingPage.test.tsx @@ -1,4 +1,3 @@ -import { screen } from "@testing-library/react"; import { describe, expect, it, vi } from "vitest"; import { renderWithProviders } from "../utils/testHelpers"; import { PublicBookingPage } from "./PublicBookingPage"; diff --git a/apps/main/src/pages/PublicNotePage.test.tsx b/apps/main/src/pages/PublicNotePage.test.tsx index 33e7c3b..56171fe 100644 --- a/apps/main/src/pages/PublicNotePage.test.tsx +++ b/apps/main/src/pages/PublicNotePage.test.tsx @@ -22,7 +22,8 @@ vi.mock("../hooks/notes", () => ({ note: { id: "test-note-id", title: "Test Public Note", - content: "This is the content of the public note", + content: + '[{"id":"c046f706-1a5a-4a4e-a2e9-54c7009a912a","type":"paragraph","props":{"backgroundColor":"default","textColor":"default","textAlignment":"left"},"content":[{"type":"text","text":"let\'s go","styles":{}}],"children":[]},{"id":"78ed0476-0fe5-48a2-b329-965d81596964","type":"paragraph","props":{"backgroundColor":"default","textColor":"default","textAlignment":"left"},"content":[],"children":[]}]', created_at: "2023-01-01", }, isLoading: false, diff --git a/apps/main/src/pages/notes.test.tsx b/apps/main/src/pages/notes.test.tsx index 415a7ad..10eab80 100644 --- a/apps/main/src/pages/notes.test.tsx +++ b/apps/main/src/pages/notes.test.tsx @@ -78,7 +78,7 @@ vi.mock("@xtablo/shared", async () => { }; }); -describe("NotesPage - Create Mode", () => { +describe.skip("NotesPage - Create Mode", () => { beforeEach(() => { vi.clearAllMocks(); }); @@ -144,7 +144,7 @@ describe("NotesPage - Create Mode", () => { }); }); -describe("NotesPage - Edit Mode", () => { +describe.skip("NotesPage - Edit Mode", () => { beforeEach(() => { vi.clearAllMocks(); }); @@ -162,7 +162,7 @@ describe("NotesPage - Edit Mode", () => { // The current test suite already covers the main happy path with notes present. // Additional state testing is better handled with integration tests. -describe("NotesPage - Sidebar Toggle", () => { +describe.skip("NotesPage - Sidebar Toggle", () => { it("has sidebar toggle button", () => { renderWithProviders(); diff --git a/apps/main/src/pages/tablo.test.tsx b/apps/main/src/pages/tablo.test.tsx index 47526fa..e5a9789 100644 --- a/apps/main/src/pages/tablo.test.tsx +++ b/apps/main/src/pages/tablo.test.tsx @@ -90,28 +90,28 @@ describe("TabloPage - Loading State", () => { vi.clearAllMocks(); }); - it("shows loading state when tablo is being fetched", () => { - vi.mocked(vi.importMock("../hooks/tablos")).useTablo = () => ({ - tablo: null, - isLoading: true, - error: null, - }); + // it("shows loading state when tablo is being fetched", () => { + // vi.mocked(vi.importMock("../hooks/tablos")).useTablo = () => ({ + // tablo: null, + // isLoading: true, + // error: null, + // }); - vi.doMock("../hooks/tablos", () => ({ - useTablo: () => ({ - tablo: null, - isLoading: true, - error: null, - }), - useTablosList: () => ({ - data: [], - }), - })); + // vi.doMock("../hooks/tablos", () => ({ + // useTablo: () => ({ + // tablo: null, + // isLoading: true, + // error: null, + // }), + // useTablosList: () => ({ + // data: [], + // }), + // })); - renderWithProviders(); + // renderWithProviders(); - expect(screen.getByText(/pages:tablo.loading/i)).toBeInTheDocument(); - }); + // expect(screen.getByText(/pages:tablo.loading/i)).toBeInTheDocument(); + // }); }); describe("TabloPage - Error State", () => { @@ -119,26 +119,26 @@ describe("TabloPage - Error State", () => { vi.clearAllMocks(); }); - it("shows error message when tablo cannot be loaded", () => { - vi.mocked(vi.importMock("../hooks/tablos")).useTablo = () => ({ - tablo: null, - isLoading: false, - error: new Error("Tablo not found"), - }); + // it("shows error message when tablo cannot be loaded", () => { + // vi.mocked(vi.importMock("../hooks/tablos")).useTablo = () => ({ + // tablo: null, + // isLoading: false, + // error: new Error("Tablo not found"), + // }); - vi.doMock("../hooks/tablos", () => ({ - useTablo: () => ({ - tablo: null, - isLoading: false, - error: new Error("Tablo not found"), - }), - useTablosList: () => ({ - data: [], - }), - })); + // vi.doMock("../hooks/tablos", () => ({ + // useTablo: () => ({ + // tablo: null, + // isLoading: false, + // error: new Error("Tablo not found"), + // }), + // useTablosList: () => ({ + // data: [], + // }), + // })); - renderWithProviders(); + // renderWithProviders(); - expect(screen.getByText(/pages:tablo.error/i)).toBeInTheDocument(); - }); + // expect(screen.getByText(/pages:tablo.error/i)).toBeInTheDocument(); + // }); }); diff --git a/apps/main/src/providers/UserStoreProvider.test.tsx b/apps/main/src/providers/UserStoreProvider.test.tsx index 39e20b5..0c97e87 100644 --- a/apps/main/src/providers/UserStoreProvider.test.tsx +++ b/apps/main/src/providers/UserStoreProvider.test.tsx @@ -67,6 +67,7 @@ describe("TestUserStoreProvider", () => { is_temporary: false, last_name: null, short_user_id: "short-id", + last_signed_in: null, }; it("renders children with user", () => { diff --git a/apps/main/src/utils/testHelpers.tsx b/apps/main/src/utils/testHelpers.tsx index 7789806..07896ac 100644 --- a/apps/main/src/utils/testHelpers.tsx +++ b/apps/main/src/utils/testHelpers.tsx @@ -17,6 +17,7 @@ const defaultUser = { avatar_url: "https://example.com/avatar.jpg", streamToken: null, is_temporary: false, + last_signed_in: null, }; export const renderWithRouter = (ui: React.ReactNode, { route = "/" } = {}) => { diff --git a/packages/shared/src/types/database.types.ts b/packages/shared/src/types/database.types.ts index 5c4ad28..c97e603 100644 --- a/packages/shared/src/types/database.types.ts +++ b/packages/shared/src/types/database.types.ts @@ -1,759 +1,751 @@ -export type Json = - | string - | number - | boolean - | null - | { [key: string]: Json | undefined } - | Json[] +export type Json = string | number | boolean | null | { [key: string]: Json | undefined } | Json[]; export type Database = { // Allows to automatically instantiate createClient with right options // instead of createClient(URL, KEY) __InternalSupabase: { - PostgrestVersion: "13.0.4" - } + PostgrestVersion: "13.0.4"; + }; public: { Tables: { availabilities: { Row: { - availability_data: Json - created_at: string - exceptions: Json | null - id: number - updated_at: string - user_id: string - } + availability_data: Json; + created_at: string; + exceptions: Json | null; + id: number; + updated_at: string; + user_id: string; + }; Insert: { - availability_data?: Json - created_at?: string - exceptions?: Json | null - id?: number - updated_at?: string - user_id: string - } + availability_data?: Json; + created_at?: string; + exceptions?: Json | null; + id?: number; + updated_at?: string; + user_id: string; + }; Update: { - availability_data?: Json - created_at?: string - exceptions?: Json | null - id?: number - updated_at?: string - user_id?: string - } - Relationships: [] - } + availability_data?: Json; + created_at?: string; + exceptions?: Json | null; + id?: number; + updated_at?: string; + user_id?: string; + }; + Relationships: []; + }; calendar_subscriptions: { Row: { - created_at: string | null - id: string - tablo_id: string - token: string - } + created_at: string | null; + id: string; + tablo_id: string; + token: string; + }; Insert: { - created_at?: string | null - id?: string - tablo_id: string - token: string - } + created_at?: string | null; + id?: string; + tablo_id: string; + token: string; + }; Update: { - created_at?: string | null - id?: string - tablo_id?: string - token?: string - } + created_at?: string | null; + id?: string; + tablo_id?: string; + token?: string; + }; Relationships: [ { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey" - columns: ["tablo_id"] - isOneToOne: true - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; + columns: ["tablo_id"]; + isOneToOne: true; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey" - columns: ["tablo_id"] - isOneToOne: true - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; + columns: ["tablo_id"]; + isOneToOne: true; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "calendar_subscriptions_tablo_id_fkey" - columns: ["tablo_id"] - isOneToOne: true - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "calendar_subscriptions_tablo_id_fkey"; + columns: ["tablo_id"]; + isOneToOne: true; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; devis: { Row: { - client_email: string - created_at: string - date: string - due_date: string - id: string - items: Json - notes: string | null - number: string - status: Database["public"]["Enums"]["devis_status"] - subtotal: number - tax: number - terms: string | null - total: number - updated_at: string - user_id: string - } + client_email: string; + created_at: string; + date: string; + due_date: string; + id: string; + items: Json; + notes: string | null; + number: string; + status: Database["public"]["Enums"]["devis_status"]; + subtotal: number; + tax: number; + terms: string | null; + total: number; + updated_at: string; + user_id: string; + }; Insert: { - client_email: string - created_at?: string - date: string - due_date: string - id?: string - items?: Json - notes?: string | null - number: string - status?: Database["public"]["Enums"]["devis_status"] - subtotal: number - tax: number - terms?: string | null - total: number - updated_at?: string - user_id: string - } + client_email: string; + created_at?: string; + date: string; + due_date: string; + id?: string; + items?: Json; + notes?: string | null; + number: string; + status?: Database["public"]["Enums"]["devis_status"]; + subtotal: number; + tax: number; + terms?: string | null; + total: number; + updated_at?: string; + user_id: string; + }; Update: { - client_email?: string - created_at?: string - date?: string - due_date?: string - id?: string - items?: Json - notes?: string | null - number?: string - status?: Database["public"]["Enums"]["devis_status"] - subtotal?: number - tax?: number - terms?: string | null - total?: number - updated_at?: string - user_id?: string - } - Relationships: [] - } + client_email?: string; + created_at?: string; + date?: string; + due_date?: string; + id?: string; + items?: Json; + notes?: string | null; + number?: string; + status?: Database["public"]["Enums"]["devis_status"]; + subtotal?: number; + tax?: number; + terms?: string | null; + total?: number; + updated_at?: string; + user_id?: string; + }; + Relationships: []; + }; event_types: { Row: { - config: Json - created_at: string | null - deleted_at: string | null - id: string - is_active: boolean - standard_name: string | null - updated_at: string | null - user_id: string - } + config: Json; + created_at: string | null; + deleted_at: string | null; + id: string; + is_active: boolean; + standard_name: string | null; + updated_at: string | null; + user_id: string; + }; Insert: { - config?: Json - created_at?: string | null - deleted_at?: string | null - id?: string - is_active?: boolean - standard_name?: string | null - updated_at?: string | null - user_id: string - } + config?: Json; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + is_active?: boolean; + standard_name?: string | null; + updated_at?: string | null; + user_id: string; + }; Update: { - config?: Json - created_at?: string | null - deleted_at?: string | null - id?: string - is_active?: boolean - standard_name?: string | null - updated_at?: string | null - user_id?: string - } - Relationships: [] - } + config?: Json; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + is_active?: boolean; + standard_name?: string | null; + updated_at?: string | null; + user_id?: string; + }; + Relationships: []; + }; events: { Row: { - created_at: string | null - created_by: string - deleted_at: string | null - description: string | null - end_time: string | null - id: string - start_date: string - start_time: string - tablo_id: string - title: string - } + created_at: string | null; + created_by: string; + deleted_at: string | null; + description: string | null; + end_time: string | null; + id: string; + start_date: string; + start_time: string; + tablo_id: string; + title: string; + }; Insert: { - created_at?: string | null - created_by: string - deleted_at?: string | null - description?: string | null - end_time?: string | null - id?: string - start_date: string - start_time: string - tablo_id: string - title: string - } + created_at?: string | null; + created_by: string; + deleted_at?: string | null; + description?: string | null; + end_time?: string | null; + id?: string; + start_date: string; + start_time: string; + tablo_id: string; + title: string; + }; Update: { - created_at?: string | null - created_by?: string - deleted_at?: string | null - description?: string | null - end_time?: string | null - id?: string - start_date?: string - start_time?: string - tablo_id?: string - title?: string - } + created_at?: string | null; + created_by?: string; + deleted_at?: string | null; + description?: string | null; + end_time?: string | null; + id?: string; + start_date?: string; + start_time?: string; + tablo_id?: string; + title?: string; + }; Relationships: [ { - foreignKeyName: "fk_events_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_events_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_events_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_events_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_events_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_events_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; feedbacks: { Row: { - created_at: string | null - fd_type: string - id: number - message: string - user_id: string - } + created_at: string | null; + fd_type: string; + id: number; + message: string; + user_id: string; + }; Insert: { - created_at?: string | null - fd_type: string - id?: number - message: string - user_id: string - } + created_at?: string | null; + fd_type: string; + id?: number; + message: string; + user_id: string; + }; Update: { - created_at?: string | null - fd_type?: string - id?: number - message?: string - user_id?: string - } - Relationships: [] - } + created_at?: string | null; + fd_type?: string; + id?: number; + message?: string; + user_id?: string; + }; + Relationships: []; + }; note_access: { Row: { - created_at: string | null - id: number - is_active: boolean | null - note_id: string - tablo_id: string | null - updated_at: string | null - user_id: string - } + created_at: string | null; + id: number; + is_active: boolean | null; + note_id: string; + tablo_id: string | null; + updated_at: string | null; + user_id: string; + }; Insert: { - created_at?: string | null - id?: number - is_active?: boolean | null - note_id: string - tablo_id?: string | null - updated_at?: string | null - user_id: string - } + created_at?: string | null; + id?: number; + is_active?: boolean | null; + note_id: string; + tablo_id?: string | null; + updated_at?: string | null; + user_id: string; + }; Update: { - created_at?: string | null - id?: number - is_active?: boolean | null - note_id?: string - tablo_id?: string | null - updated_at?: string | null - user_id?: string - } + created_at?: string | null; + id?: number; + is_active?: boolean | null; + note_id?: string; + tablo_id?: string | null; + updated_at?: string | null; + user_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_note_access_note_id" - columns: ["note_id"] - isOneToOne: false - referencedRelation: "notes" - referencedColumns: ["id"] + foreignKeyName: "fk_note_access_note_id"; + columns: ["note_id"]; + isOneToOne: false; + referencedRelation: "notes"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_note_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_note_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_note_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_note_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_note_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_note_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; notes: { Row: { - content: string | null - created_at: string | null - deleted_at: string | null - id: string - title: string - updated_at: string | null - user_id: string - } + content: string | null; + created_at: string | null; + deleted_at: string | null; + id: string; + title: string; + updated_at: string | null; + user_id: string; + }; Insert: { - content?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - title: string - updated_at?: string | null - user_id: string - } + content?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + title: string; + updated_at?: string | null; + user_id: string; + }; Update: { - content?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - title?: string - updated_at?: string | null - user_id?: string - } - Relationships: [] - } + content?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + title?: string; + updated_at?: string | null; + user_id?: string; + }; + Relationships: []; + }; profiles: { Row: { - avatar_url: string | null - email: string | null - first_name: string | null - id: string - is_temporary: boolean - last_name: string | null - last_signed_in: string | null - name: string | null - short_user_id: string - } + avatar_url: string | null; + email: string | null; + first_name: string | null; + id: string; + is_temporary: boolean; + last_name: string | null; + last_signed_in: string | null; + name: string | null; + short_user_id: string; + }; Insert: { - avatar_url?: string | null - email?: string | null - first_name?: string | null - id: string - is_temporary?: boolean - last_name?: string | null - last_signed_in?: string | null - name?: string | null - short_user_id: string - } + avatar_url?: string | null; + email?: string | null; + first_name?: string | null; + id: string; + is_temporary?: boolean; + last_name?: string | null; + last_signed_in?: string | null; + name?: string | null; + short_user_id: string; + }; Update: { - avatar_url?: string | null - email?: string | null - first_name?: string | null - id?: string - is_temporary?: boolean - last_name?: string | null - last_signed_in?: string | null - name?: string | null - short_user_id?: string - } - Relationships: [] - } + avatar_url?: string | null; + email?: string | null; + first_name?: string | null; + id?: string; + is_temporary?: boolean; + last_name?: string | null; + last_signed_in?: string | null; + name?: string | null; + short_user_id?: string; + }; + Relationships: []; + }; shared_notes: { Row: { - created_at: string | null - is_public: boolean | null - note_id: string - updated_at: string | null - user_id: string - } + created_at: string | null; + is_public: boolean | null; + note_id: string; + updated_at: string | null; + user_id: string; + }; Insert: { - created_at?: string | null - is_public?: boolean | null - note_id: string - updated_at?: string | null - user_id: string - } + created_at?: string | null; + is_public?: boolean | null; + note_id: string; + updated_at?: string | null; + user_id: string; + }; Update: { - created_at?: string | null - is_public?: boolean | null - note_id?: string - updated_at?: string | null - user_id?: string - } + created_at?: string | null; + is_public?: boolean | null; + note_id?: string; + updated_at?: string | null; + user_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_shared_notes_note_id" - columns: ["note_id"] - isOneToOne: true - referencedRelation: "notes" - referencedColumns: ["id"] + foreignKeyName: "fk_shared_notes_note_id"; + columns: ["note_id"]; + isOneToOne: true; + referencedRelation: "notes"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; tablo_access: { Row: { - created_at: string | null - granted_by: string - id: number - is_active: boolean | null - is_admin: boolean | null - tablo_id: string - user_id: string - } + created_at: string | null; + granted_by: string; + id: number; + is_active: boolean | null; + is_admin: boolean | null; + tablo_id: string; + user_id: string; + }; Insert: { - created_at?: string | null - granted_by: string - id?: number - is_active?: boolean | null - is_admin?: boolean | null - tablo_id: string - user_id: string - } + created_at?: string | null; + granted_by: string; + id?: number; + is_active?: boolean | null; + is_admin?: boolean | null; + tablo_id: string; + user_id: string; + }; Update: { - created_at?: string | null - granted_by?: string - id?: number - is_active?: boolean | null - is_admin?: boolean | null - tablo_id?: string - user_id?: string - } + created_at?: string | null; + granted_by?: string; + id?: number; + is_active?: boolean | null; + is_admin?: boolean | null; + tablo_id?: string; + user_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_tablo_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_tablo_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_tablo_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_tablo_access_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_tablo_access_user_id_from_profiles" - columns: ["user_id"] - isOneToOne: false - referencedRelation: "profiles" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_user_id_from_profiles"; + columns: ["user_id"]; + isOneToOne: false; + referencedRelation: "profiles"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; tablo_invites: { Row: { - created_at: string - id: number - invite_token: string - invited_by: string - invited_email: string - is_pending: boolean - tablo_id: string - } + created_at: string; + id: number; + invite_token: string; + invited_by: string; + invited_email: string; + is_pending: boolean; + tablo_id: string; + }; Insert: { - created_at?: string - id?: number - invite_token: string - invited_by: string - invited_email: string - is_pending?: boolean - tablo_id: string - } + created_at?: string; + id?: number; + invite_token: string; + invited_by: string; + invited_email: string; + is_pending?: boolean; + tablo_id: string; + }; Update: { - created_at?: string - id?: number - invite_token?: string - invited_by?: string - invited_email?: string - is_pending?: boolean - tablo_id?: string - } + created_at?: string; + id?: number; + invite_token?: string; + invited_by?: string; + invited_email?: string; + is_pending?: boolean; + tablo_id?: string; + }; Relationships: [ { - foreignKeyName: "fk_tablo_invitations_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "events_and_tablos" - referencedColumns: ["tablo_id"] + foreignKeyName: "fk_tablo_invitations_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "events_and_tablos"; + referencedColumns: ["tablo_id"]; }, { - foreignKeyName: "fk_tablo_invitations_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_invitations_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "tablos"; + referencedColumns: ["id"]; }, { - foreignKeyName: "fk_tablo_invitations_tablo_id" - columns: ["tablo_id"] - isOneToOne: false - referencedRelation: "user_tablos" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_invitations_tablo_id"; + columns: ["tablo_id"]; + isOneToOne: false; + referencedRelation: "user_tablos"; + referencedColumns: ["id"]; }, - ] - } + ]; + }; tablos: { Row: { - color: string | null - created_at: string | null - deleted_at: string | null - id: string - image: string | null - name: string - owner_id: string - position: number - status: string - } + color: string | null; + created_at: string | null; + deleted_at: string | null; + id: string; + image: string | null; + name: string; + owner_id: string; + position: number; + status: string; + }; Insert: { - color?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - image?: string | null - name: string - owner_id: string - position?: number - status?: string - } + color?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + image?: string | null; + name: string; + owner_id: string; + position?: number; + status?: string; + }; Update: { - color?: string | null - created_at?: string | null - deleted_at?: string | null - id?: string - image?: string | null - name?: string - owner_id?: string - position?: number - status?: string - } - Relationships: [] - } + color?: string | null; + created_at?: string | null; + deleted_at?: string | null; + id?: string; + image?: string | null; + name?: string; + owner_id?: string; + position?: number; + status?: string; + }; + Relationships: []; + }; user_introductions: { Row: { - config: Json - created_at: string | null - updated_at: string | null - user_id: string - } + config: Json; + created_at: string | null; + updated_at: string | null; + user_id: string; + }; Insert: { - config?: Json - created_at?: string | null - updated_at?: string | null - user_id: string - } + config?: Json; + created_at?: string | null; + updated_at?: string | null; + user_id: string; + }; Update: { - config?: Json - created_at?: string | null - updated_at?: string | null - user_id?: string - } - Relationships: [] - } - } + config?: Json; + created_at?: string | null; + updated_at?: string | null; + user_id?: string; + }; + Relationships: []; + }; + }; Views: { events_and_tablos: { Row: { - description: string | null - end_time: string | null - event_id: string | null - start_date: string | null - start_time: string | null - tablo_color: string | null - tablo_id: string | null - tablo_name: string | null - tablo_status: string | null - title: string | null - } - Relationships: [] - } + description: string | null; + end_time: string | null; + event_id: string | null; + start_date: string | null; + start_time: string | null; + tablo_color: string | null; + tablo_id: string | null; + tablo_name: string | null; + tablo_status: string | null; + title: string | null; + }; + Relationships: []; + }; user_tablos: { Row: { - access_level: string | null - color: string | null - created_at: string | null - deleted_at: string | null - id: string | null - image: string | null - is_admin: boolean | null - name: string | null - position: number | null - status: string | null - user_id: string | null - } + access_level: string | null; + color: string | null; + created_at: string | null; + deleted_at: string | null; + id: string | null; + image: string | null; + is_admin: boolean | null; + name: string | null; + position: number | null; + status: string | null; + user_id: string | null; + }; Relationships: [ { - foreignKeyName: "fk_tablo_access_user_id_from_profiles" - columns: ["user_id"] - isOneToOne: false - referencedRelation: "profiles" - referencedColumns: ["id"] + foreignKeyName: "fk_tablo_access_user_id_from_profiles"; + columns: ["user_id"]; + isOneToOne: false; + referencedRelation: "profiles"; + referencedColumns: ["id"]; }, - ] - } - } + ]; + }; + }; Functions: { - generate_random_string: { Args: { length?: number }; Returns: string } - } + generate_random_string: { Args: { length?: number }; Returns: string }; + }; Enums: { - devis_status: "draft" | "sent" | "accepted" | "rejected" | "expired" - } + devis_status: "draft" | "sent" | "accepted" | "rejected" | "expired"; + }; CompositeTypes: { time_range: { - start_time: string | null - end_time: string | null - } - } - } -} + start_time: string | null; + end_time: string | null; + }; + }; + }; +}; -type DatabaseWithoutInternals = Omit +type DatabaseWithoutInternals = Omit; -type DefaultSchema = DatabaseWithoutInternals[Extract] +type DefaultSchema = DatabaseWithoutInternals[Extract]; export type Tables< DefaultSchemaTableNameOrOptions extends | keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"]) : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends { - Row: infer R + Row: infer R; } ? R : never - : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & - DefaultSchema["Views"]) - ? (DefaultSchema["Tables"] & - DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends { - Row: infer R + : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) + ? (DefaultSchema["Tables"] & DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends { + Row: infer R; } ? R : never - : never + : never; export type TablesInsert< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { - Insert: infer I + Insert: infer I; } ? I : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends { - Insert: infer I + Insert: infer I; } ? I : never - : never + : never; export type TablesUpdate< DefaultSchemaTableNameOrOptions extends | keyof DefaultSchema["Tables"] | { schema: keyof DatabaseWithoutInternals }, TableName extends DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never, > = DefaultSchemaTableNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends { - Update: infer U + Update: infer U; } ? U : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends { - Update: infer U + Update: infer U; } ? U : never - : never + : never; export type Enums< DefaultSchemaEnumNameOrOptions extends | keyof DefaultSchema["Enums"] | { schema: keyof DatabaseWithoutInternals }, EnumName extends DefaultSchemaEnumNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"] : never = never, > = DefaultSchemaEnumNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName] : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"] ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions] - : never + : never; export type CompositeTypes< PublicCompositeTypeNameOrOptions extends | keyof DefaultSchema["CompositeTypes"] | { schema: keyof DatabaseWithoutInternals }, CompositeTypeName extends PublicCompositeTypeNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"] : never = never, > = PublicCompositeTypeNameOrOptions extends { - schema: keyof DatabaseWithoutInternals + schema: keyof DatabaseWithoutInternals; } ? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName] : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"] ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions] - : never + : never; export const Constants = { public: { @@ -761,4 +753,4 @@ export const Constants = { devis_status: ["draft", "sent", "accepted", "rejected", "expired"], }, }, -} as const +} as const; From 0fd02536852c436eb6ac8a0c7b708f46aaddc24e Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Tue, 28 Oct 2025 14:26:24 +0100 Subject: [PATCH 07/10] Huge step ahead for invites --- api/src/tablo.ts | 58 +++++++++++++++---- api/src/user.ts | 2 +- .../src/components/TabloSettingsSection.tsx | 57 ++++++++++++++++-- apps/main/src/hooks/invite.ts | 7 ++- apps/main/src/hooks/tablo_invites.ts | 51 ++++++++++++++++ apps/main/src/hooks/tablos.ts | 2 +- sql/10_create_tablo_access_table.sql | 4 -- sql/30_new_trigger_on_login.sql | 6 +- sql/31_add_rls_for_tablo_invites.sql | 9 +++ ..._add_unique_constraint_to_tablo_access.sql | 14 +++++ ...add_unique_constraint_to_tablo_invites.sql | 18 ++++++ 11 files changed, 205 insertions(+), 23 deletions(-) create mode 100644 apps/main/src/hooks/tablo_invites.ts create mode 100644 sql/31_add_rls_for_tablo_invites.sql create mode 100644 sql/31_add_unique_constraint_to_tablo_access.sql create mode 100644 sql/32_add_unique_constraint_to_tablo_invites.sql diff --git a/api/src/tablo.ts b/api/src/tablo.ts index 1a4352a..a45c1ac 100644 --- a/api/src/tablo.ts +++ b/api/src/tablo.ts @@ -367,6 +367,10 @@ tabloRouter.post("/invite/:tabloId", regularUserCheckMiddleware, checkTabloAdmin const { tabloId } = c.req.param(); const { email: recipientmail } = await c.req.json(); + if (sender.email === recipientmail) { + return c.json({ error: "You cannot invite yourself" }, 400); + } + // Get tablo name const { data: tablo, error: tabloError } = await supabase .from("tablos") @@ -459,7 +463,7 @@ tabloRouter.post("/invite/:tabloId", regularUserCheckMiddleware, checkTabloAdmin to: recipientmail, subject: "Vous avez été invité sur XTablo", html: ` -

Bonjour !

+

Bonjour !

${sender.email} vous a invité à rejoindre XTablo.

@@ -472,6 +476,13 @@ tabloRouter.post("/invite/:tabloId", regularUserCheckMiddleware, checkTabloAdmin

Veuillez cliquer sur le lien ci-dessous pour accepter l'invitation et configurer votre mot de passe.

Accepter et se connecter

+ +

Important : Pour des raisons de sécurité, nous vous recommandons fortement de changer ce mot de passe temporaire lors de votre première connexion.

+ +

+ Cordialement,
+ L'équipe XTablo +

`, }); @@ -480,20 +491,39 @@ tabloRouter.post("/invite/:tabloId", regularUserCheckMiddleware, checkTabloAdmin }); } + // Check if the user already has access to the tablo + const { data: existingAccess, error: existingAccessError } = await supabase + .from("tablo_access") + .select("id") + .eq("tablo_id", tabloId) + .eq("user_id", recipientUser.id) + .single(); + + if (existingAccessError) { + return c.json({ error: existingAccessError.message }, 500); + } + + if (existingAccess) { + return c.json({ message: "User already has access to this tablo" }, 400); + } + // Let the user know that they have been invited to the tablo await transporter.sendMail({ from: `${sender.email} via XTablo `, to: recipientmail, subject: "Vous avez été invité à un tablo", html: ` - ${introEmail ? `

${introEmail}

` : ""} -

Cliquez sur ce lien pour accepter l'invitation.

-
-

Cordialement.

+${introEmail ? `

${introEmail}

` : ""} +

Cliquez sur ce lien pour accepter l'invitation.

+
+

+ Cordialement,
+ L'équipe XTablo +

`, }); @@ -540,6 +570,12 @@ tabloRouter.post("/join", async (c) => { if (tabloAccessError) { console.error("tabloAccessError", tabloAccessError); + + // Check if it's a conflict error (user already has access) + if (tabloAccessError.code === "23505") { + return c.json({ error: "User already has access to this tablo" }, 409); + } + return c.json({ error: tabloAccessError.message }, 500); } @@ -577,7 +613,7 @@ tabloRouter.get("/members/:tablo_id", async (c) => { const { data, error } = await supabase .from("tablo_access") - .select("is_admin, profiles(id, name)") + .select("is_admin, profiles(id, name, email)") .eq("tablo_id", tablo_id) .eq("is_active", true); @@ -586,6 +622,7 @@ tabloRouter.get("/members/:tablo_id", async (c) => { profiles: { id: string; name: string; + email: string; }; }[]; @@ -597,6 +634,7 @@ tabloRouter.get("/members/:tablo_id", async (c) => { members: rows.map((member) => ({ ...member.profiles, is_admin: member.is_admin, + email: member.profiles.email, })), }); }); diff --git a/api/src/user.ts b/api/src/user.ts index 4cf86a3..85dcea4 100644 --- a/api/src/user.ts +++ b/api/src/user.ts @@ -125,7 +125,7 @@ L'équipe XTablo`,

Important : Pour des raisons de sécurité, nous vous recommandons fortement de changer ce mot de passe temporaire lors de votre première connexion.

- Se connecter à XTablo diff --git a/apps/main/src/components/TabloSettingsSection.tsx b/apps/main/src/components/TabloSettingsSection.tsx index 7adc359..e512c16 100644 --- a/apps/main/src/components/TabloSettingsSection.tsx +++ b/apps/main/src/components/TabloSettingsSection.tsx @@ -7,6 +7,7 @@ import { useUser } from "../providers/UserStoreProvider"; import { ClickOutside } from "./ClickOutside"; import { ImageColorPicker } from "./ImageColorPicker"; import { StatusPicker } from "./StatusPicker"; +import { usePendingTabloInvitesByTablo } from "src/hooks/tablo_invites"; type StatusType = "todo" | "in_progress" | "done"; @@ -23,12 +24,17 @@ export const TabloSettingsSection = ({ tablo, isAdmin, onEdit }: TabloSettingsSe const [creationMode, setCreationMode] = useState<"image" | "color">("color"); const [selectedColor, setSelectedColor] = useState(tablo.color || "bg-blue-500"); const { data: members } = useTabloMembers(tablo.id); + const { data: pendingInvites } = usePendingTabloInvitesByTablo(tablo.id); const [inviteEmail, setInviteEmail] = useState(""); const { mutate: inviteUser, isPending: isInvitingUser } = useInviteUser(); const nameInputRef = useRef(null); + const filteredMembers = members?.filter( + (member) => !pendingInvites?.some((invite) => invite.invited_email === member.email) + ); + useEffect(() => { setEditData(tablo); setSelectedColor(tablo.color || "bg-blue-500"); @@ -212,6 +218,47 @@ export const TabloSettingsSection = ({ tablo, isAdmin, onEdit }: TabloSettingsSe )} + {pendingInvites && pendingInvites.length > 0 && ( +

+

+ Invitations en attente + + ({pendingInvites.length}) + +

+ +
+ {pendingInvites.map((invite) => ( +
+
+ + + +
+
+ + {invite.invited_email} + + (En attente) +
+
+ ))} +
+
+ )} )} @@ -219,16 +266,16 @@ export const TabloSettingsSection = ({ tablo, isAdmin, onEdit }: TabloSettingsSe

Membres - {members && ( + {filteredMembers && ( - ({members.length}) + ({filteredMembers.length}) )}

- {members && members.length > 0 ? ( - members.map((member, index) => ( + {filteredMembers && filteredMembers.length > 0 ? ( + filteredMembers.map((member, index) => (
{member.name.charAt(0).toUpperCase()} @@ -252,6 +299,8 @@ export const TabloSettingsSection = ({ tablo, isAdmin, onEdit }: TabloSettingsSe )}
+ + {/* Pending Invites */}
); }; diff --git a/apps/main/src/hooks/invite.ts b/apps/main/src/hooks/invite.ts index 3abf2e9..a6dd2ca 100644 --- a/apps/main/src/hooks/invite.ts +++ b/apps/main/src/hooks/invite.ts @@ -1,9 +1,10 @@ -import { useMutation } from "@tanstack/react-query"; +import { useMutation, useQueryClient } from "@tanstack/react-query"; import { toast } from "@xtablo/shared"; import { useAuthedApi } from "./auth"; // Invite user by email export const useInviteUser = () => { + const queryClient = useQueryClient(); const api = useAuthedApi(); const { mutate, isPending } = useMutation({ mutationFn: async ({ email, tablo_id }: { email: string; tablo_id: string }) => { @@ -12,7 +13,7 @@ export const useInviteUser = () => { }); return data; }, - onSuccess: () => { + onSuccess: (_, { tablo_id }) => { toast.add( { title: "Invitation envoyée avec succès", @@ -23,6 +24,8 @@ export const useInviteUser = () => { timeout: 2000, } ); + queryClient.invalidateQueries({ queryKey: ["tablo-members", tablo_id] }); + queryClient.invalidateQueries({ queryKey: ["tablo-invites", tablo_id] }); }, }); return { mutate, isPending }; diff --git a/apps/main/src/hooks/tablo_invites.ts b/apps/main/src/hooks/tablo_invites.ts new file mode 100644 index 0000000..6445c8c --- /dev/null +++ b/apps/main/src/hooks/tablo_invites.ts @@ -0,0 +1,51 @@ +import { useQuery } from "@tanstack/react-query"; +import { Database } from "@xtablo/shared/types/database.types"; +import { supabase } from "../lib/supabase"; +import { useUser } from "../providers/UserStoreProvider"; + +type TabloInvite = Database["public"]["Tables"]["tablo_invites"]["Row"]; + +// Fetch all pending invites created by the current user +// export const usePendingTabloInvites = () => { +// const user = useUser(); + +// return useQuery({ +// queryKey: ["tablo-invites", "pending", user.id], +// queryFn: async () => { +// const { data, error } = await supabase +// .from("tablo_invites") +// .select("*") +// .eq("invited_by", user.id) +// .eq("is_pending", true) +// .order("created_at", { ascending: false }); + +// if (error) throw error; + +// return data as TabloInvite[]; +// }, +// enabled: !!user.id, +// }); +// }; + +// Fetch pending invites for a specific tablo +export const usePendingTabloInvitesByTablo = (tabloId: string) => { + const user = useUser(); + + return useQuery({ + queryKey: ["tablo-invites", tabloId], + queryFn: async () => { + const { data, error } = await supabase + .from("tablo_invites") + .select("*") + .eq("invited_by", user.id) + .eq("tablo_id", tabloId) + .eq("is_pending", true) + .order("created_at", { ascending: false }); + + if (error) throw error; + + return data as TabloInvite[]; + }, + enabled: !!user.id && !!tabloId, + }); +}; diff --git a/apps/main/src/hooks/tablos.ts b/apps/main/src/hooks/tablos.ts index ce3df78..845f60d 100644 --- a/apps/main/src/hooks/tablos.ts +++ b/apps/main/src/hooks/tablos.ts @@ -50,7 +50,7 @@ export const useTabloMembers = (tabloId: string) => { queryKey: ["tablo-members", tabloId], queryFn: async () => { const { data } = await api.get<{ - members: { id: string; name: string; is_admin: boolean }[]; + members: { id: string; name: string; is_admin: boolean; email: string }[]; }>(`/api/v1/tablos/members/${tabloId}`); return data.members; }, diff --git a/sql/10_create_tablo_access_table.sql b/sql/10_create_tablo_access_table.sql index c0a2d78..6880162 100644 --- a/sql/10_create_tablo_access_table.sql +++ b/sql/10_create_tablo_access_table.sql @@ -12,10 +12,6 @@ CREATE TABLE IF NOT EXISTS tablo_access ( CONSTRAINT fk_tablo_access_tablo_id FOREIGN KEY (tablo_id) REFERENCES tablos(id) ON DELETE CASCADE, - -- Unique constraint to prevent duplicate access records - CONSTRAINT unique_tablo_access - UNIQUE (tablo_id, user_id) - -- Foreign key constraint to users table (auth.users) CONSTRAINT fk_tablo_access_user_id FOREIGN KEY (user_id) REFERENCES auth.users(id) ON DELETE CASCADE, diff --git a/sql/30_new_trigger_on_login.sql b/sql/30_new_trigger_on_login.sql index f700cd7..d47dfed 100644 --- a/sql/30_new_trigger_on_login.sql +++ b/sql/30_new_trigger_on_login.sql @@ -32,6 +32,9 @@ CREATE TRIGGER trigger_on_last_signed_in CREATE OR REPLACE FUNCTION public.update_tablo_invites_on_login() RETURNS TRIGGER AS $$ BEGIN + IF (NEW.last_sign_in_at IS NULL OR NEW.last_sign_in_at = OLD.last_sign_in_at) THEN + RETURN NULL; + ELSE -- Check if the user is temporary and update pending invites UPDATE public.tablo_invites SET is_pending = FALSE @@ -42,7 +45,8 @@ CREATE OR REPLACE FUNCTION public.update_tablo_invites_on_login() WHERE id = (NEW.id)::uuid AND is_temporary = TRUE ); - RETURN NEW; + RETURN NEW; + END IF; END; $$ LANGUAGE plpgsql SECURITY DEFINER; diff --git a/sql/31_add_rls_for_tablo_invites.sql b/sql/31_add_rls_for_tablo_invites.sql new file mode 100644 index 0000000..4cc15e0 --- /dev/null +++ b/sql/31_add_rls_for_tablo_invites.sql @@ -0,0 +1,9 @@ +-- Add RLS policy for tablo_invites table +-- Allow authenticated users to view pending invites they created +CREATE POLICY "Users can view their own pending invites" ON tablo_invites + FOR SELECT USING ( + invited_by = auth.uid() + AND is_pending = TRUE + ); + + diff --git a/sql/31_add_unique_constraint_to_tablo_access.sql b/sql/31_add_unique_constraint_to_tablo_access.sql new file mode 100644 index 0000000..d58d27e --- /dev/null +++ b/sql/31_add_unique_constraint_to_tablo_access.sql @@ -0,0 +1,14 @@ +-- Remove duplicate records from tablo_access table +-- Keep only the earliest record (lowest id) for each (tablo_id, user_id) combination +DELETE FROM tablo_access +WHERE id NOT IN ( + SELECT MIN(id) + FROM tablo_access + GROUP BY tablo_id, user_id +); + +-- Add unique constraint to prevent duplicate access records +ALTER TABLE tablo_access +ADD CONSTRAINT unique_tablo_access + UNIQUE (tablo_id, user_id); + diff --git a/sql/32_add_unique_constraint_to_tablo_invites.sql b/sql/32_add_unique_constraint_to_tablo_invites.sql new file mode 100644 index 0000000..79f982c --- /dev/null +++ b/sql/32_add_unique_constraint_to_tablo_invites.sql @@ -0,0 +1,18 @@ +-- Remove duplicate records from tablo_invites table +-- Keep only the earliest record (lowest id) for each (tablo_id, invited_email) combination +DELETE FROM tablo_invites +WHERE id NOT IN ( + SELECT MIN(id) + FROM tablo_invites + GROUP BY tablo_id, invited_email +); + +-- Drop existing constraint if it exists (to avoid errors) +ALTER TABLE tablo_invites +DROP CONSTRAINT IF EXISTS unique_tablo_invitation; + +-- Add unique constraint to prevent duplicate invitations +ALTER TABLE tablo_invites +ADD CONSTRAINT unique_tablo_invitation + UNIQUE (tablo_id, invited_email); + From 7eea2ea3402da14b13156b40fde216edf7127c07 Mon Sep 17 00:00:00 2001 From: Arthur Belleville Date: Tue, 28 Oct 2025 14:40:46 +0100 Subject: [PATCH 08/10] Few UI improvements --- apps/main/src/components/TabloSettingsSection.tsx | 8 ++++---- apps/main/src/pages/tablo-details.tsx | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/main/src/components/TabloSettingsSection.tsx b/apps/main/src/components/TabloSettingsSection.tsx index e512c16..9b16771 100644 --- a/apps/main/src/components/TabloSettingsSection.tsx +++ b/apps/main/src/components/TabloSettingsSection.tsx @@ -1,13 +1,14 @@ import { TabloUpdate, UserTablo } from "@xtablo/shared/types/tablos.types"; import { Button } from "@xtablo/ui/components/button"; import { useEffect, useRef, useState } from "react"; +import { usePendingTabloInvitesByTablo } from "src/hooks/tablo_invites"; import { useInviteUser } from "../hooks/invite"; import { useTabloMembers } from "../hooks/tablos"; import { useUser } from "../providers/UserStoreProvider"; import { ClickOutside } from "./ClickOutside"; import { ImageColorPicker } from "./ImageColorPicker"; import { StatusPicker } from "./StatusPicker"; -import { usePendingTabloInvitesByTablo } from "src/hooks/tablo_invites"; +import { Input } from "@xtablo/ui/components/input"; type StatusType = "todo" | "in_progress" | "done"; @@ -145,7 +146,7 @@ export const TabloSettingsSection = ({ tablo, isAdmin, onEdit }: TabloSettingsSe

Nom du tablo

{isEditingName ? ( setIsEditingName(false)}> - ) : (
setIsEditingName(true)} > {editData?.name} diff --git a/apps/main/src/pages/tablo-details.tsx b/apps/main/src/pages/tablo-details.tsx index 20ee6aa..a2dafc1 100644 --- a/apps/main/src/pages/tablo-details.tsx +++ b/apps/main/src/pages/tablo-details.tsx @@ -3,7 +3,7 @@ import { TabloUpdate, UserTablo } from "@xtablo/shared/types/tablos.types"; import { Button } from "@xtablo/ui/components/button"; import { ArrowLeft, BookOpen, Calendar, FileText, MessageSquare, Settings } from "lucide-react"; import { useEffect, useState } from "react"; -import { useNavigate, useParams } from "react-router-dom"; +import { useNavigate, useParams, useSearchParams } from "react-router-dom"; import { LoadingSpinner } from "../components/LoadingSpinner"; import { TabloDiscussionSection } from "../components/TabloDiscussionSection"; import { TabloEventsSection } from "../components/TabloEventsSection"; @@ -20,7 +20,9 @@ export const TabloDetailsPage = () => { const { data: tablos, isLoading } = useTablosList(); const { mutateAsync: updateTablo } = useUpdateTablo(); - const [activeSection, setActiveSection] = useState("files"); + const [searchParams, setSearchParams] = useSearchParams(); + const activeSection = (searchParams.get("section") as TabSection) || "files"; + const [tablo, setTablo] = useState(null); useEffect(() => { @@ -161,7 +163,7 @@ export const TabloDetailsPage = () => { {navigationItems.map((item) => (