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 default row/column for new boards and prevent removing last column.
Mike Cao6367d94552e0
diff --git a/src/app/(main)/boards/BoardProvider.tsx b/src/app/(main)/boards/BoardProvider.tsxindex 1d1331669..5dc52d629 100644--- a/src/app/(main)/boards/BoardProvider.tsx+++ b/src/app/(main)/boards/BoardProvider.tsx@@ -1,6 +1,7 @@'use client';import { Loading, useToast } from '@umami/react-zen';import { createContext, type ReactNode, useCallback, useEffect, useRef, useState } from 'react';+import { v4 as uuid } from 'uuid';import { useApi, useMessages, useModified, useNavigation } from '@/components/hooks';import { useBoardQuery } from '@/components/hooks/queries/useBoardQuery';import type { Board, BoardParameters } from '@/lib/types';@@ -17,11 +18,13 @@ export interface BoardContextValue {export const BoardContext = createContext<BoardContextValue>(null);-const defaultBoard: Partial<Board> = {+const createDefaultBoard = (): Partial<Board> => ({name: '',description: '',- parameters: { rows: [] },-};+ parameters: {+ rows: [{ id: uuid(), columns: [{ id: uuid(), component: null }] }],+ },+});export function BoardProvider({ boardId, children }: { boardId?: string; children: ReactNode }) {const { data, isFetching, isLoading } = useBoardQuery(boardId);@@ -31,7 +34,7 @@ export function BoardProvider({ boardId, children }: { boardId?: string; childreconst { formatMessage, labels, messages } = useMessages();const { router, renderUrl } = useNavigation();- const [board, setBoard] = useState<Partial<Board>>(data ?? defaultBoard);+ const [board, setBoard] = useState<Partial<Board>>(data ?? createDefaultBoard());const layoutGetterRef = useRef<LayoutGetter | null>(null);const registerLayoutGetter = useCallback((getter: LayoutGetter) => {diff --git a/src/app/(main)/boards/[boardId]/BoardBody.tsx b/src/app/(main)/boards/[boardId]/BoardBody.tsxindex c85fbbac5..03034fbd6 100644--- a/src/app/(main)/boards/[boardId]/BoardBody.tsx+++ b/src/app/(main)/boards/[boardId]/BoardBody.tsx@@ -221,7 +221,11 @@ function BoardRow({{columns?.map((column, index) => (<Fragment key={column.id}><Panel id={column.id} minSize={MIN_COLUMN_WIDTH} defaultSize={column.size}>- <BoardColumn {...column} onRemove={handleRemoveColumn} />+ <BoardColumn+ {...column}+ onRemove={handleRemoveColumn}+ canRemove={columns?.length > 1}+ /></Panel>{index < columns?.length - 1 && <Separator />}</Fragment>@@ -276,10 +280,12 @@ function BoardColumn({id,component,onRemove,+ canRemove = true,}: {id: string;component?: ReactElement;onRemove?: (id: string) => void;+ canRemove?: boolean;}) {const handleAddComponent = () => {};@@ -294,16 +300,18 @@ function BoardColumn({backgroundColor="3"position="relative">- <Box position="absolute" top="10px" right="20px" zIndex={100}>- <TooltipTrigger delay={0}>- <Button variant="quiet" onPress={() => onRemove?.(id)}>- <Icon size="sm">- <X />- </Icon>- </Button>- <Tooltip>Remove column</Tooltip>- </TooltipTrigger>- </Box>+ {canRemove && (+ <Box position="absolute" top="10px" right="20px" zIndex={100}>+ <TooltipTrigger delay={0}>+ <Button variant="quiet" onPress={() => onRemove?.(id)}>+ <Icon size="sm">+ <X />+ </Icon>+ </Button>+ <Tooltip>Remove column</Tooltip>+ </TooltipTrigger>+ </Box>+ )}<Button variant="outline" onPress={handleAddComponent}><Icon><Plus />