feat: add dashboard websiteEvent item
This commit is contained in:
parent
e0d83e52ba
commit
9b7adb5504
@ -1,4 +1,4 @@
|
|||||||
import { Button, Dropdown, Space } from 'antd';
|
import { Button, Dropdown, MenuProps, Space } from 'antd';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { trpc } from '../../api/trpc';
|
import { trpc } from '../../api/trpc';
|
||||||
import { useCurrentWorkspaceId } from '../../store/user';
|
import { useCurrentWorkspaceId } from '../../store/user';
|
||||||
@ -12,23 +12,18 @@ export const DashboardItemAddButton: React.FC = React.memo(() => {
|
|||||||
});
|
});
|
||||||
const { addItem } = useDashboardStore();
|
const { addItem } = useDashboardStore();
|
||||||
|
|
||||||
return (
|
const menu: MenuProps = {
|
||||||
<div>
|
|
||||||
<Dropdown
|
|
||||||
trigger={['click']}
|
|
||||||
disabled={isLoading}
|
|
||||||
menu={{
|
|
||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
key: 'website',
|
key: 'website',
|
||||||
label: 'website',
|
label: 'Website',
|
||||||
children: websites.map((website) => ({
|
children: websites.map((website) => ({
|
||||||
key: `website#${website.id}`,
|
key: `website#${website.id}`,
|
||||||
label: website.name,
|
label: website.name,
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
key: `website#${website.id}#overview`,
|
key: `website#${website.id}#overview`,
|
||||||
label: 'overview',
|
label: 'Overview',
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
addItem(
|
addItem(
|
||||||
'websiteOverview',
|
'websiteOverview',
|
||||||
@ -37,12 +32,22 @@ export const DashboardItemAddButton: React.FC = React.memo(() => {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: `website#${website.id}#event`,
|
||||||
|
label: 'Events',
|
||||||
|
onClick: () => {
|
||||||
|
addItem('websiteEvent', website.id, `${website.name}'s Event`);
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
})),
|
})),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
}}
|
};
|
||||||
>
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Dropdown trigger={['click']} disabled={isLoading} menu={menu}>
|
||||||
<Button type="primary" size="large" className="w-32">
|
<Button type="primary" size="large" className="w-32">
|
||||||
<Space>
|
<Space>
|
||||||
<span>Add</span>
|
<span>Add</span>
|
||||||
|
22
src/client/components/dashboard/items/WebsiteEventItem.tsx
Normal file
22
src/client/components/dashboard/items/WebsiteEventItem.tsx
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { MetricsTable } from '../../website/MetricsTable';
|
||||||
|
import { useGlobalRangeDate } from '../../../hooks/useGlobalRangeDate';
|
||||||
|
|
||||||
|
export const WebsiteEventItem: React.FC<{
|
||||||
|
websiteId: string;
|
||||||
|
}> = React.memo((props) => {
|
||||||
|
const { startDate, endDate } = useGlobalRangeDate();
|
||||||
|
const startAt = startDate.valueOf();
|
||||||
|
const endAt = endDate.valueOf();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MetricsTable
|
||||||
|
websiteId={props.websiteId}
|
||||||
|
type="event"
|
||||||
|
title={['Events', 'Actions']}
|
||||||
|
startAt={startAt}
|
||||||
|
endAt={endAt}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
WebsiteEventItem.displayName = 'WebsiteEventItem';
|
@ -6,6 +6,7 @@ import { Button, Card } from 'antd';
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { DeleteOutlined } from '@ant-design/icons';
|
import { DeleteOutlined } from '@ant-design/icons';
|
||||||
import { useEvent } from '../../../hooks/useEvent';
|
import { useEvent } from '../../../hooks/useEvent';
|
||||||
|
import { WebsiteEventItem } from './WebsiteEventItem';
|
||||||
|
|
||||||
interface DashboardGridItemProps {
|
interface DashboardGridItemProps {
|
||||||
item: DashboardItem;
|
item: DashboardItem;
|
||||||
@ -18,6 +19,8 @@ export const DashboardGridItem: React.FC<DashboardGridItemProps> = React.memo(
|
|||||||
const inner = useMemo(() => {
|
const inner = useMemo(() => {
|
||||||
if (type === 'websiteOverview') {
|
if (type === 'websiteOverview') {
|
||||||
return <WebsiteOverviewItem websiteId={id} />;
|
return <WebsiteOverviewItem websiteId={id} />;
|
||||||
|
} else if (type === 'websiteEvent') {
|
||||||
|
return <WebsiteEventItem websiteId={id} />;
|
||||||
} else {
|
} else {
|
||||||
return <NotFoundTip />;
|
return <NotFoundTip />;
|
||||||
}
|
}
|
||||||
@ -35,6 +38,8 @@ export const DashboardGridItem: React.FC<DashboardGridItemProps> = React.memo(
|
|||||||
<Card
|
<Card
|
||||||
className="h-full w-full overflow-auto"
|
className="h-full w-full overflow-auto"
|
||||||
title={title}
|
title={title}
|
||||||
|
headStyle={{ padding: 10 }}
|
||||||
|
bodyStyle={{ padding: 10 }}
|
||||||
extra={
|
extra={
|
||||||
isEditMode && (
|
isEditMode && (
|
||||||
<Button
|
<Button
|
||||||
|
@ -24,7 +24,7 @@ interface MetricsTableProps {
|
|||||||
endAt: number;
|
endAt: number;
|
||||||
}
|
}
|
||||||
export const MetricsTable: React.FC<MetricsTableProps> = React.memo((props) => {
|
export const MetricsTable: React.FC<MetricsTableProps> = React.memo((props) => {
|
||||||
const workspaceId = useCurrentWorkspaceId()!;
|
const workspaceId = useCurrentWorkspaceId();
|
||||||
const { websiteId, title, type, startAt, endAt } = props;
|
const { websiteId, title, type, startAt, endAt } = props;
|
||||||
|
|
||||||
const { isLoading, data: metrics = [] } = trpc.website.metrics.useQuery({
|
const { isLoading, data: metrics = [] } = trpc.website.metrics.useQuery({
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { create } from 'zustand';
|
import { create } from 'zustand';
|
||||||
import { Layouts, Layout } from 'react-grid-layout';
|
import { Layouts, Layout } from 'react-grid-layout';
|
||||||
import { mapValues, without } from 'lodash';
|
import { mapValues } from 'lodash';
|
||||||
import { v1 as uuid } from 'uuid';
|
import { v1 as uuid } from 'uuid';
|
||||||
|
|
||||||
export type DashboardItemType =
|
export type DashboardItemType =
|
||||||
@ -74,10 +74,10 @@ export const useDashboardStore = create<DashboardState>((set, get) => ({
|
|||||||
|
|
||||||
export const defaultItemLayout: Record<DashboardItemType, Omit<Layout, 'i'>> = {
|
export const defaultItemLayout: Record<DashboardItemType, Omit<Layout, 'i'>> = {
|
||||||
websiteOverview: { x: Infinity, y: Infinity, w: 4, h: 12 },
|
websiteOverview: { x: Infinity, y: Infinity, w: 4, h: 12 },
|
||||||
websiteEvent: { x: 0, y: 0, w: 4, h: 2 },
|
websiteEvent: { x: Infinity, y: Infinity, w: 2, h: 5 },
|
||||||
monitorHealthBar: { x: 0, y: 0, w: 4, h: 2 },
|
monitorHealthBar: { x: Infinity, y: Infinity, w: 4, h: 2 },
|
||||||
monitorStatus: { x: 0, y: 0, w: 4, h: 2 },
|
monitorStatus: { x: Infinity, y: Infinity, w: 4, h: 2 },
|
||||||
monitorChart: { x: 0, y: 0, w: 4, h: 2 },
|
monitorChart: { x: Infinity, y: Infinity, w: 4, h: 2 },
|
||||||
monitorEvent: { x: 0, y: 0, w: 4, h: 2 },
|
monitorEvent: { x: Infinity, y: Infinity, w: 4, h: 2 },
|
||||||
serverStatus: { x: 0, y: 0, w: 4, h: 2 },
|
serverStatus: { x: Infinity, y: Infinity, w: 4, h: 2 },
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user