Skip to content

armgit / umami

Public Imported from GitHub
0

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.

Merge branch 'dev' into feat/datagrid-view-toggle

Mike Caobe1161b32ea6
diff --cc src/components/common/DataGrid.tsx
index 7d790c050,19f167da9..95de94981
--- a/src/components/common/DataGrid.tsx
+++ b/src/components/common/DataGrid.tsx
@@@ -55,25 -41,9 +55,25 @@@ export function DataGrid(
const { data, error, isLoading, isFetching } = query;
const { router, updateParams, query: queryParams } = useNavigation();
const [search, setSearch] = useState(queryParams?.search || data?.search || '');
- const showPager = allowPaging && data && data.count > data.pageSize;
+ const showPager = allowPaging && data && data.count > 0;
const { isMobile } = useMobile();
- const displayMode = isMobile ? 'cards' : undefined;
+ const [userDisplayMode, setUserDisplayMode] = useState<DisplayMode | null>(() => {
+ // localStorage can hold anything (extensions, manual edits, schema drift),
+ // so accept only the two values we know how to render and otherwise fall
+ // back to the useMobile-driven default.
+ const stored = getItem(DISPLAY_MODE_STORAGE_KEY);
+ return stored === 'table' || stored === 'cards' ? stored : null;
+ });
+
+ // Effective mode: explicit user choice wins, otherwise fall back to the
+ // mobile-driven default (cards on small viewports, table elsewhere).
+ const displayMode: DisplayMode | undefined = userDisplayMode ?? (isMobile ? 'cards' : undefined);
+
+ const handleToggleDisplayMode = () => {
+ const next: DisplayMode = displayMode === 'cards' ? 'table' : 'cards';
+ setItem(DISPLAY_MODE_STORAGE_KEY, next);
+ setUserDisplayMode(next);
+ };
const handleSearch = (value: string) => {
if (value !== search) {
@@@ -91,61 -61,54 +91,69 @@@
const child = data ? (typeof children === 'function' ? children(data) : children) : null;
+ const viewToggleButton = (
+ <TooltipTrigger delay={0}>
+ <Button variant="zero" onPress={handleToggleDisplayMode}>
+ <Icon>{displayMode === 'cards' ? <Table2 /> : <LayoutGrid />}</Icon>
+ </Button>
+ <Tooltip>
+ <Text>{displayMode === 'cards' ? 'Switch to table view' : 'Switch to card view'}</Text>
+ </Tooltip>
+ </TooltipTrigger>
+ );
+
return (
- <Column gap="4" minHeight="300px" justifyContent="space-between">
- <Column gap="4">
+ <Column gap="4" minHeight="300px">
+ <Row alignItems="center" wrap="wrap" gap>
{allowSearch && (
- <Row alignItems="center" justifyContent="space-between" wrap="wrap" gap>
- <SearchField
- value={search}
- onSearch={handleSearch}
- delay={searchDelay || DEFAULT_SEARCH_DELAY}
- autoFocus={autoFocus}
- placeholder={t(labels.search)}
- />
- {renderActions?.()}
- </Row>
+ <SearchField
+ value={search}
+ onSearch={handleSearch}
+ delay={searchDelay || DEFAULT_SEARCH_DELAY}
+ autoFocus={autoFocus}
+ placeholder={t(labels.search)}
+ />
)}
- <LoadingPanel
- data={data?.data}
- isLoading={isLoading}
- isFetching={isFetching}
- error={error}
- renderEmpty={renderEmpty}
- >
- {data && (
+ <Row alignItems="center" gap style={{ marginLeft: 'auto' }}>
+ {renderActions?.()}
+ {viewToggleButton}
+ </Row>
+ </Row>
+ <LoadingPanel
+ data={data?.data}
+ isLoading={isLoading}
+ isFetching={isFetching}
+ error={error}
+ renderEmpty={renderEmpty}
+ >
+ {data && (
- <>
+ <div
+ style={{
+ display: 'grid',
+ gridTemplateColumns: 'minmax(0, 1fr)',
+ overflowX: 'auto',
+ }}
+ >
+ <Column>
{isValidElement(child)
? cloneElement(child as ReactElement<any>, { displayMode })
: child}
+ </Column>
- {showPager && (
- <Row marginTop="6">
- <Pager
- page={data.page}
- pageSize={data.pageSize}
- count={data.count}
- onPageChange={handlePageChange}
- />
- </Row>
- )}
- </>
- )}
- </LoadingPanel>
+ </div>
+ )}
+ </LoadingPanel>
+ </Column>
+ {showPager && (
+ <Row marginTop="4">
+ <Pager
+ page={data.page}
+ pageSize={data.pageSize}
+ count={data.count}
+ isCapped={data.isCapped}
+ onPageChange={handlePageChange}
+ />
+ </Row>
+ )}
</Column>
);
}