Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Add board state management with updateBoard and saveBoard methods.
Mike Cao68c56060b38f
diff --git a/package.json b/package.jsonindex e9d91cb2e..dea505fee 100644--- a/package.json+++ b/package.json@@ -113,6 +113,7 @@"react-dom": "^19.2.3","react-error-boundary": "^4.0.4","react-intl": "^7.1.14",+ "react-resizable-panels": "^4.4.1","react-simple-maps": "^2.3.0","react-use-measure": "^2.0.4","react-window": "^1.8.6",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex d8fe45f8a..f62924439 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -164,6 +164,9 @@ importers:react-intl:specifier: ^7.1.14version: 7.1.14([email protected])([email protected])+ react-resizable-panels:+ specifier: ^4.4.1react-simple-maps:specifier: ^2.3.0@@ -6181,6 +6184,12 @@ packages:redux:optional: true+ resolution: {integrity: sha512-dpM9oI6rGlAq7VYDeafSRA1JmkJv8aNuKySR+tZLQQLfaeqTnQLSM52EcoI/QdowzsjVUCk6jViKS0xHWITVRQ==}+ peerDependencies:+ react: ^18.0.0 || ^19.0.0+ react-dom: ^18.0.0 || ^19.0.0+resolution: {integrity: sha512-IZVeiPSRZKwD6I/2NvXpQ2uENYGDGZp8DvZjkapcxuJ/LQHTfl+Byb+KNgY7s+iatRA2ad8LnZ3AgqcjziCCsw==}peerDependencies:@@ -13909,6 +13918,11 @@ snapshots:'@types/react': 19.2.8redux: 5.0.1+ dependencies:+ react: 19.2.3+ react-dom: 19.2.3([email protected])+dependencies:d3-geo: 2.0.2diff --git a/src/app/(main)/boards/BoardProvider.tsx b/src/app/(main)/boards/BoardProvider.tsxindex 93d4e6f04..fa9c7c901 100644--- a/src/app/(main)/boards/BoardProvider.tsx+++ b/src/app/(main)/boards/BoardProvider.tsx@@ -1,17 +1,86 @@'use client';-import { Loading } from '@umami/react-zen';-import { createContext, type ReactNode } from 'react';+import { Loading, useToast } from '@umami/react-zen';+import { createContext, type ReactNode, useCallback, useEffect, useState } from 'react';+import { useApi, useMessages, useModified, useNavigation } from '@/components/hooks';import { useBoardQuery } from '@/components/hooks/queries/useBoardQuery';import type { Board } from '@/generated/prisma/client';-export const BoardContext = createContext<Board>(null);+export interface BoardContextValue {+ board: Partial<Board>;+ updateBoard: (data: Partial<Board>) => void;+ saveBoard: () => Promise<Board>;+ isPending: boolean;+}++export const BoardContext = createContext<BoardContextValue>(null);++const defaultBoard: Partial<Board> = {+ name: '',+ description: '',+};++export function BoardProvider({ boardId, children }: { boardId?: string; children: ReactNode }) {+ const { data, isFetching, isLoading } = useBoardQuery(boardId);+ const { post, useMutation } = useApi();+ const { touch } = useModified();+ const { toast } = useToast();+ const { formatMessage, labels, messages } = useMessages();+ const { router, renderUrl } = useNavigation();++ const [board, setBoard] = useState<Partial<Board>>(data ?? defaultBoard);++ useEffect(() => {+ if (data) {+ setBoard(data);+ }+ }, [data]);++ const { mutateAsync, isPending } = useMutation({+ mutationFn: (boardData: Partial<Board>) => {+ if (boardData.id) {+ return post(`/boards/${boardData.id}`, boardData);+ }+ return post('/boards', { ...boardData, type: 'dashboard', slug: '' });+ },+ });++ const updateBoard = useCallback((data: Partial<Board>) => {+ setBoard(current => ({ ...current, ...data }));+ }, []);++ const saveBoard = useCallback(async () => {+ const defaultName = formatMessage(labels.untitled);+ const result = await mutateAsync({ ...board, name: board.name || defaultName });++ toast(formatMessage(messages.saved));+ touch('boards');++ if (board.id) {+ touch(`board:${board.id}`);+ } else if (result?.id) {+ router.push(renderUrl(`/boards/${result.id}`));+ }-export function BoardProvider({ boardId, children }: { boardId: string; children: ReactNode }) {- const { data: board, isFetching, isLoading } = useBoardQuery(boardId);+ return result;+ }, [+ board,+ mutateAsync,+ toast,+ formatMessage,+ labels.untitled,+ messages.saved,+ touch,+ router,+ renderUrl,+ ]);- if (isFetching && isLoading) {+ if (boardId && isFetching && isLoading) {return <Loading placement="absolute" />;}- return <BoardContext.Provider value={board}>{children}</BoardContext.Provider>;+ return (+ <BoardContext.Provider value={{ board, updateBoard, saveBoard, isPending }}>+ {children}+ </BoardContext.Provider>+ );}diff --git a/src/app/(main)/boards/[boardId]/BoardBody.tsx b/src/app/(main)/boards/[boardId]/BoardBody.tsxindex 1728a08db..647158728 100644--- a/src/app/(main)/boards/[boardId]/BoardBody.tsx+++ b/src/app/(main)/boards/[boardId]/BoardBody.tsx@@ -1,3 +1,69 @@+import { Button, Column, Icon, Row } from '@umami/react-zen';+import { produce } from 'immer';+import { v4 as uuid } from 'uuid';+import { useBoard } from '@/components/hooks';+import { Plus } from '@/components/icons';+export function BoardBody() {- return <h1>i am bored.</h1>;+ const { board, updateBoard, saveBoard, isPending } = useBoard();++ console.log({ board });++ const handleAddRow = () => {+ updateBoard({+ parameters: produce(board.parameters, draft => {+ if (!draft.rows) {+ draft.rows = [];+ }+ draft.rows.push({ id: uuid(), components: [] });+ }),+ });+ };++ return (+ <Column>+ {board?.parameters?.rows?.map((row, rowIndex) => {+ return <BoardRow key={row.id} rowIndex={rowIndex} components={row.components} />;+ })}+ <Row>+ <Button variant="outline" onPress={handleAddRow}>+ <Icon>+ <Plus />+ </Icon>+ </Button>+ </Row>+ </Column>+ );+}++function BoardComponent() {+ return <Column>hi</Column>;+}++function BoardRow({ rowIndex, components }: { rowIndex: number; components: any[] }) {+ const { board, updateBoard } = useBoard();++ const handleAddComponent = () => {+ updateBoard({+ parameters: produce(board.parameters, draft => {+ if (!draft.rows[rowIndex]) {+ draft.rows[rowIndex] = { id: uuid(), components: [] };+ }+ draft.rows[rowIndex].components.push({ id: uuid(), type: 'text', value: '' });+ }),+ });+ };++ return (+ <Row>+ {components?.map(component => {+ return <BoardComponent key={component.id} />;+ })}+ <Button variant="outline" onPress={handleAddComponent}>+ <Icon>+ <Plus />+ </Icon>+ </Button>+ </Row>+ );}diff --git a/src/app/(main)/boards/[boardId]/BoardHeader.tsx b/src/app/(main)/boards/[boardId]/BoardHeader.tsxindex a86ddf581..18492e04a 100644--- a/src/app/(main)/boards/[boardId]/BoardHeader.tsx+++ b/src/app/(main)/boards/[boardId]/BoardHeader.tsx@@ -1,47 +1,21 @@-import { Column, Grid, Heading, LoadingButton, Row, TextField, useToast } from '@umami/react-zen';-import { useState } from 'react';-import { useApi, useBoard, useMessages, useModified, useNavigation } from '@/components/hooks';+import { Column, Grid, Heading, LoadingButton, Row, TextField } from '@umami/react-zen';+import { useBoard, useMessages } from '@/components/hooks';export function BoardHeader() {- const board = useBoard();- const { formatMessage, labels, messages } = useMessages();- const { post, useMutation } = useApi();- const { touch } = useModified();- const { router, renderUrl } = useNavigation();- const { toast } = useToast();+ const { board, updateBoard, saveBoard, isPending } = useBoard();+ const { formatMessage, labels } = useMessages();const defaultName = formatMessage(labels.untitled);- const [name, setName] = useState(board?.name ?? '');- const [description, setDescription] = useState(board?.description ?? '');-- const { mutateAsync, isPending } = useMutation({- mutationFn: (data: { name: string; description: string }) => {- if (board) {- return post(`/boards/${board.id}`, data);- }- return post('/boards', { ...data, type: 'dashboard', slug: '' });- },- });-const handleNameChange = (value: string) => {- setName(value);+ updateBoard({ name: value });};const handleDescriptionChange = (value: string) => {- setDescription(value);+ updateBoard({ description: value });};- const handleSave = async () => {- const result = await mutateAsync({ name: name || defaultName, description });-- toast(formatMessage(messages.saved));- touch('boards');-- if (board) {- touch(`board:${board.id}`);- } else if (result?.id) {- router.push(renderUrl(`/boards/${result.id}`));- }+ const handleSave = () => {+ saveBoard();};return (@@ -57,26 +31,26 @@ export function BoardHeader() {<TextFieldvariant="quiet"name="name"- value={name}+ value={board?.name ?? ''}placeholder={defaultName}onChange={handleNameChange}autoComplete="off"style={{ fontSize: '2rem', fontWeight: 700, width: '100%' }}>- <Heading size="4">{name}</Heading>+ <Heading size="4">{board?.name}</Heading></TextField></Row><Row><TextFieldvariant="quiet"name="description"- value={description}+ value={board?.description ?? ''}placeholder={`+ ${formatMessage(labels.addDescription)}`}autoComplete="off"onChange={handleDescriptionChange}style={{ width: '100%' }}>- {description}+ {board?.description}</TextField></Row></Column>diff --git a/src/components/hooks/context/useBoard.ts b/src/components/hooks/context/useBoard.tsindex 0281dd8d3..cb8b28d8a 100644--- a/src/components/hooks/context/useBoard.ts+++ b/src/components/hooks/context/useBoard.ts@@ -1,6 +1,6 @@import { useContext } from 'react';-import { BoardContext } from '@/app/(main)/boards/BoardProvider';+import { BoardContext, type BoardContextValue } from '@/app/(main)/boards/BoardProvider';-export function useBoard() {+export function useBoard(): BoardContextValue {return useContext(BoardContext);}diff --git a/src/lib/types.ts b/src/lib/types.tsindex 9c0619794..458f899dc 100644--- a/src/lib/types.ts+++ b/src/lib/types.ts@@ -141,3 +141,7 @@ export interface ApiError extends Error {code?: string;message: string;}++export interface BoardData {+ rows: { id: string; name: string; value: number }[];+}