perf: reduce widget render overhead
This commit is contained in:
1 parent
63dca7d1b6
commit
b2fbd10965
10 files changed
+133
-113
No files matched your search
@@ -39,12 +39,21 @@ interface ItemProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const SectionContentItem = ({ item, integrations }: ItemProps) => {
|
export const SectionContentItem = ({ item, integrations }: ItemProps) => {
|
||||||
const minWidth = useMinSize(item, "x");
|
if (item.type === "section") return <ContainerSectionContentItem item={item} />;
|
||||||
const minHeight = useMinSize(item, "y");
|
|
||||||
return (
|
return (
|
||||||
<FixedGridItem key={item.id} item={item} minWidth={minWidth} minHeight={minHeight}>
|
<FixedGridItem item={item}>
|
||||||
{item.type === "item" && item.kind !== "app" && <WidgetHoverOverlay item={item} integrations={integrations} />}
|
{item.kind !== "app" && <WidgetHoverOverlay item={item} integrations={integrations} />}
|
||||||
{item.type === "item" ? <BoardItemContent item={item} /> : <BoardContainerSection section={item} />}
|
<BoardItemContent item={item} />
|
||||||
|
</FixedGridItem>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const ContainerSectionContentItem = ({ item }: { item: ContainerSectionItem }) => {
|
||||||
|
const { minWidth, minHeight } = useMinSize(item);
|
||||||
|
return (
|
||||||
|
<FixedGridItem item={item} minWidth={minWidth} minHeight={minHeight}>
|
||||||
|
<BoardContainerSection section={item} />
|
||||||
</FixedGridItem>
|
</FixedGridItem>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -52,14 +61,18 @@ export const SectionContentItem = ({ item, integrations }: ItemProps) => {
|
|||||||
/**
|
/**
|
||||||
* Calculates a container's minimum width or height from its direct content.
|
* Calculates a container's minimum width or height from its direct content.
|
||||||
*/
|
*/
|
||||||
export const useMinSize = (item: ContainerSectionItem | SectionItem, direction: "x" | "y") => {
|
export const useMinSize = (item: ContainerSectionItem) => {
|
||||||
const { items, innerSections } = useSectionItems(item.id);
|
const { items, innerSections } = useSectionItems(item.id);
|
||||||
if (item.type === "item") return undefined;
|
return {
|
||||||
|
minWidth: Math.max(
|
||||||
const size = direction === "x" ? "width" : "height";
|
1,
|
||||||
return Math.max(
|
...items.map((child) => child.xOffset + child.width),
|
||||||
1,
|
...innerSections.map((child) => child.xOffset + child.width),
|
||||||
...items.map((childItem) => childItem[`${direction}Offset`] + childItem[size]),
|
),
|
||||||
...innerSections.map((childSection) => childSection[`${direction}Offset`] + childSection[size]),
|
minHeight: Math.max(
|
||||||
);
|
1,
|
||||||
|
...items.map((child) => child.yOffset + child.height),
|
||||||
|
...innerSections.map((child) => child.yOffset + child.height),
|
||||||
|
),
|
||||||
|
};
|
||||||
};
|
};
|
||||||
@@ -34,8 +34,6 @@ import {
|
|||||||
IconTriangleFilled,
|
IconTriangleFilled,
|
||||||
IconZoomScan,
|
IconZoomScan,
|
||||||
} from "@tabler/icons-react";
|
} from "@tabler/icons-react";
|
||||||
import { escapeForRegEx } from "@tiptap/react";
|
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
import { clientApi } from "@homarr/api/client";
|
||||||
import { useSession } from "@homarr/auth/client";
|
import { useSession } from "@homarr/auth/client";
|
||||||
import { createId } from "@homarr/common";
|
import { createId } from "@homarr/common";
|
||||||
@@ -63,6 +61,8 @@ interface FormValidation {
|
|||||||
errors: FormErrors;
|
errors: FormErrors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const escapeForRegEx = (value: string) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||||
|
|
||||||
export const WidgetMultiReleasesRepositoriesInput = ({
|
export const WidgetMultiReleasesRepositoriesInput = ({
|
||||||
property,
|
property,
|
||||||
kind,
|
kind,
|
||||||
|
|||||||
@@ -59,17 +59,9 @@ export default function AppWidget({ options, isEditMode, height, width }: Widget
|
|||||||
return (
|
return (
|
||||||
<Box h="100%" w="100%" pos="relative">
|
<Box h="100%" w="100%" pos="relative">
|
||||||
<AppLink href={href} openInNewTab={options.openInNewTab} enabled={Boolean(href) && !isEditMode}>
|
<AppLink href={href} openInNewTab={options.openInNewTab} enabled={Boolean(href) && !isEditMode}>
|
||||||
<Tooltip.Floating
|
<AppDescriptionTooltip
|
||||||
label={app.description?.split("\n").map((line, index) => (
|
description={app.description}
|
||||||
<Fragment key={index}>
|
enabled={options.descriptionDisplayMode === "tooltip" && Boolean(app.description) && !isEditMode}
|
||||||
{line}
|
|
||||||
<br />
|
|
||||||
</Fragment>
|
|
||||||
))}
|
|
||||||
position="right-start"
|
|
||||||
multiline
|
|
||||||
disabled={options.descriptionDisplayMode !== "tooltip" || !app.description || isEditMode}
|
|
||||||
styles={{ tooltip: { maxWidth: 300 } }}
|
|
||||||
>
|
>
|
||||||
<Flex
|
<Flex
|
||||||
p={isTiny ? 4 : "sm"}
|
p={isTiny ? 4 : "sm"}
|
||||||
@@ -123,7 +115,7 @@ export default function AppWidget({ options, isEditMode, height, width }: Widget
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Flex>
|
</Flex>
|
||||||
</Tooltip.Floating>
|
</AppDescriptionTooltip>
|
||||||
{options.pingEnabled &&
|
{options.pingEnabled &&
|
||||||
!settings.forceDisableStatus &&
|
!settings.forceDisableStatus &&
|
||||||
!board.disableStatus &&
|
!board.disableStatus &&
|
||||||
@@ -148,6 +140,29 @@ interface AppLinkProps {
|
|||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const AppDescriptionTooltip = ({
|
||||||
|
description,
|
||||||
|
enabled,
|
||||||
|
children,
|
||||||
|
}: PropsWithChildren<{ description?: string | null; enabled: boolean }>) =>
|
||||||
|
enabled ? (
|
||||||
|
<Tooltip.Floating
|
||||||
|
label={description?.split("\n").map((line, index) => (
|
||||||
|
<Fragment key={index}>
|
||||||
|
{line}
|
||||||
|
<br />
|
||||||
|
</Fragment>
|
||||||
|
))}
|
||||||
|
position="right-start"
|
||||||
|
multiline
|
||||||
|
styles={{ tooltip: { maxWidth: 300 } }}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</Tooltip.Floating>
|
||||||
|
) : (
|
||||||
|
children
|
||||||
|
);
|
||||||
|
|
||||||
const AppLink = ({ href, openInNewTab, enabled, children }: PropsWithChildren<AppLinkProps>) =>
|
const AppLink = ({ href, openInNewTab, enabled, children }: PropsWithChildren<AppLinkProps>) =>
|
||||||
enabled ? (
|
enabled ? (
|
||||||
<UnstyledButton
|
<UnstyledButton
|
||||||
|
|||||||
@@ -45,8 +45,6 @@ export function InstanceCard({ instance, options, isTiny, isAdvanced, widgetKey,
|
|||||||
|
|
||||||
const baseUrl = getSafeApplicationUrl(instance.integrationUrl)?.replace(/\/+$/, "") ?? "";
|
const baseUrl = getSafeApplicationUrl(instance.integrationUrl)?.replace(/\/+$/, "") ?? "";
|
||||||
const displayUrl = baseUrl ? baseUrl.replace(/^https?:\/\//, "") : "—";
|
const displayUrl = baseUrl ? baseUrl.replace(/^https?:\/\//, "") : "—";
|
||||||
const relativeTime = useTimeAgo(instance.updatedAt);
|
|
||||||
|
|
||||||
const onlineServers = instance.instanceInfo.servers.filter(isCoolifyServerOnline).length;
|
const onlineServers = instance.instanceInfo.servers.filter(isCoolifyServerOnline).length;
|
||||||
const runningApps = instance.instanceInfo.applications.filter(
|
const runningApps = instance.instanceInfo.applications.filter(
|
||||||
(a) => parseStatus(a.status ?? "") === "running",
|
(a) => parseStatus(a.status ?? "") === "running",
|
||||||
@@ -140,6 +138,7 @@ export function InstanceCard({ instance, options, isTiny, isAdvanced, widgetKey,
|
|||||||
variant="filled"
|
variant="filled"
|
||||||
chevronPosition="right"
|
chevronPosition="right"
|
||||||
multiple
|
multiple
|
||||||
|
keepMounted={false}
|
||||||
value={isAdvanced ? advancedOpenSections : openSections}
|
value={isAdvanced ? advancedOpenSections : openSections}
|
||||||
onChange={isAdvanced ? setAdvancedOpenSections : setOpenSections}
|
onChange={isAdvanced ? setAdvancedOpenSections : setOpenSections}
|
||||||
>
|
>
|
||||||
@@ -168,19 +167,27 @@ export function InstanceCard({ instance, options, isTiny, isAdvanced, widgetKey,
|
|||||||
</Accordion>
|
</Accordion>
|
||||||
|
|
||||||
{!hideFooter && (
|
{!hideFooter && (
|
||||||
<Group
|
<InstanceFooter version={instance.instanceInfo.version} updatedAt={instance.updatedAt} />
|
||||||
justify="space-between"
|
|
||||||
p={4}
|
|
||||||
style={{ borderTop: "1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4))" }}
|
|
||||||
>
|
|
||||||
<Text size="10px" c="dimmed">
|
|
||||||
v{instance.instanceInfo.version}
|
|
||||||
</Text>
|
|
||||||
<Text size="10px" c="dimmed">
|
|
||||||
{t("footer.updated", { when: relativeTime })}
|
|
||||||
</Text>
|
|
||||||
</Group>
|
|
||||||
)}
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const InstanceFooter = ({ version, updatedAt }: { version: string; updatedAt: Date }) => {
|
||||||
|
const t = useScopedI18n("widget.coolify");
|
||||||
|
const relativeTime = useTimeAgo(updatedAt, 60_000);
|
||||||
|
return (
|
||||||
|
<Group
|
||||||
|
justify="space-between"
|
||||||
|
p={4}
|
||||||
|
style={{ borderTop: "1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4))" }}
|
||||||
|
>
|
||||||
|
<Text size="10px" c="dimmed">
|
||||||
|
v{version}
|
||||||
|
</Text>
|
||||||
|
<Text size="10px" c="dimmed">
|
||||||
|
{t("footer.updated", { when: relativeTime })}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -50,8 +50,6 @@ export function SingleInstanceLayout({
|
|||||||
|
|
||||||
const baseUrl = getSafeApplicationUrl(instance.integrationUrl)?.replace(/\/+$/, "") ?? "";
|
const baseUrl = getSafeApplicationUrl(instance.integrationUrl)?.replace(/\/+$/, "") ?? "";
|
||||||
const displayUrl = baseUrl ? baseUrl.replace(/^https?:\/\//, "") : "—";
|
const displayUrl = baseUrl ? baseUrl.replace(/^https?:\/\//, "") : "—";
|
||||||
const relativeTime = useTimeAgo(instance.updatedAt);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollArea h="100%">
|
<ScrollArea h="100%">
|
||||||
<Stack gap={0}>
|
<Stack gap={0}>
|
||||||
@@ -87,6 +85,7 @@ export function SingleInstanceLayout({
|
|||||||
variant="contained"
|
variant="contained"
|
||||||
chevronPosition="right"
|
chevronPosition="right"
|
||||||
multiple
|
multiple
|
||||||
|
keepMounted={false}
|
||||||
value={isAdvanced ? advancedOpenSections : openSections}
|
value={isAdvanced ? advancedOpenSections : openSections}
|
||||||
onChange={isAdvanced ? setAdvancedOpenSections : setOpenSections}
|
onChange={isAdvanced ? setAdvancedOpenSections : setOpenSections}
|
||||||
>
|
>
|
||||||
@@ -115,23 +114,31 @@ export function SingleInstanceLayout({
|
|||||||
</Accordion>
|
</Accordion>
|
||||||
|
|
||||||
{!hideFooter && (
|
{!hideFooter && (
|
||||||
<Group
|
<InstanceFooter version={instance.instanceInfo.version} updatedAt={instance.updatedAt} />
|
||||||
justify="space-between"
|
|
||||||
p={4}
|
|
||||||
style={{ borderTop: "1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4))" }}
|
|
||||||
>
|
|
||||||
<Group gap={2}>
|
|
||||||
<Image src={COOLIFY_ICON_URL} alt="Coolify" w={16} h={16} />
|
|
||||||
<Text size="xs" c="dimmed">
|
|
||||||
v{instance.instanceInfo.version}
|
|
||||||
</Text>
|
|
||||||
</Group>
|
|
||||||
<Text size="xs" c="dimmed">
|
|
||||||
{t("footer.updated", { when: relativeTime })}
|
|
||||||
</Text>
|
|
||||||
</Group>
|
|
||||||
)}
|
)}
|
||||||
</Stack>
|
</Stack>
|
||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const InstanceFooter = ({ version, updatedAt }: { version: string; updatedAt: Date }) => {
|
||||||
|
const t = useScopedI18n("widget.coolify");
|
||||||
|
const relativeTime = useTimeAgo(updatedAt, 60_000);
|
||||||
|
return (
|
||||||
|
<Group
|
||||||
|
justify="space-between"
|
||||||
|
p={4}
|
||||||
|
style={{ borderTop: "1px solid light-dark(var(--mantine-color-gray-3), var(--mantine-color-dark-4))" }}
|
||||||
|
>
|
||||||
|
<Group gap={2}>
|
||||||
|
<Image src={COOLIFY_ICON_URL} alt="Coolify" w={16} h={16} />
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
v{version}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
<Text size="xs" c="dimmed">
|
||||||
|
{t("footer.updated", { when: relativeTime })}
|
||||||
|
</Text>
|
||||||
|
</Group>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -168,6 +168,7 @@ export default function MediaMissingWidget({
|
|||||||
return (
|
return (
|
||||||
<Tabs
|
<Tabs
|
||||||
value={activeTab}
|
value={activeTab}
|
||||||
|
keepMounted={false}
|
||||||
onChange={(value) => {
|
onChange={(value) => {
|
||||||
if (value === "missing" || value === "queued") setSelectedTab(value);
|
if (value === "missing" || value === "queued") setSelectedTab(value);
|
||||||
}}
|
}}
|
||||||
@@ -193,12 +194,12 @@ export default function MediaMissingWidget({
|
|||||||
|
|
||||||
{showMissing && (
|
{showMissing && (
|
||||||
<Tabs.Panel value="missing" flex={1} style={{ overflow: "hidden" }}>
|
<Tabs.Panel value="missing" flex={1} style={{ overflow: "hidden" }}>
|
||||||
{renderPanel(missing, t("empty.missing"))}
|
{activeTab === "missing" && renderPanel(missing, t("empty.missing"))}
|
||||||
</Tabs.Panel>
|
</Tabs.Panel>
|
||||||
)}
|
)}
|
||||||
{showQueued && (
|
{showQueued && (
|
||||||
<Tabs.Panel value="queued" flex={1} style={{ overflow: "hidden" }}>
|
<Tabs.Panel value="queued" flex={1} style={{ overflow: "hidden" }}>
|
||||||
{renderPanel(queued, t("empty.queued"))}
|
{activeTab === "queued" && renderPanel(queued, t("empty.queued"))}
|
||||||
</Tabs.Panel>
|
</Tabs.Panel>
|
||||||
)}
|
)}
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
|||||||
@@ -874,27 +874,30 @@ function TaskListToggle() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function ListIndentIncrease() {
|
function useActiveListItemType() {
|
||||||
const { editor } = useRichTextEditorContext();
|
const { editor } = useRichTextEditorContext();
|
||||||
const [itemType, setItemType] = useState("listItem");
|
const [itemType, setItemType] = useState("listItem");
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!editor) return;
|
||||||
|
const updateItemType = () => setItemType(editor.isActive("taskItem") ? "taskItem" : "listItem");
|
||||||
|
updateItemType();
|
||||||
|
editor.on("selectionUpdate", updateItemType);
|
||||||
|
return () => {
|
||||||
|
editor.off("selectionUpdate", updateItemType);
|
||||||
|
};
|
||||||
|
}, [editor]);
|
||||||
|
|
||||||
|
return { editor, itemType };
|
||||||
|
}
|
||||||
|
|
||||||
|
function ListIndentIncrease() {
|
||||||
|
const { editor, itemType } = useActiveListItemType();
|
||||||
const tControls = useScopedI18n("widget.notebook.controls");
|
const tControls = useScopedI18n("widget.notebook.controls");
|
||||||
const handleIncreaseIndent = useCallback(() => {
|
const handleIncreaseIndent = useCallback(() => {
|
||||||
editor?.chain().focus().sinkListItem(itemType).run();
|
editor?.chain().focus().sinkListItem(itemType).run();
|
||||||
}, [editor, itemType]);
|
}, [editor, itemType]);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!editor) return;
|
|
||||||
|
|
||||||
const handleSelectionUpdate = ({ editor: updatedEditor }: { editor: Editor }) => {
|
|
||||||
setItemType(updatedEditor.isActive("taskItem") ? "taskItem" : "listItem");
|
|
||||||
};
|
|
||||||
|
|
||||||
editor.on("selectionUpdate", handleSelectionUpdate);
|
|
||||||
return () => {
|
|
||||||
editor.off("selectionUpdate", handleSelectionUpdate);
|
|
||||||
};
|
|
||||||
}, [editor]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<RichTextEditor.Control
|
<RichTextEditor.Control
|
||||||
title={tControls("increaseIndent")}
|
title={tControls("increaseIndent")}
|
||||||
@@ -907,27 +910,13 @@ function ListIndentIncrease() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function ListIndentDecrease() {
|
function ListIndentDecrease() {
|
||||||
const { editor } = useRichTextEditorContext();
|
const { editor, itemType } = useActiveListItemType();
|
||||||
const [itemType, setItemType] = useState("listItem");
|
|
||||||
const tControls = useScopedI18n("widget.notebook.controls");
|
const tControls = useScopedI18n("widget.notebook.controls");
|
||||||
|
|
||||||
const handleDecreaseIndent = useCallback(() => {
|
const handleDecreaseIndent = useCallback(() => {
|
||||||
editor?.chain().focus().liftListItem(itemType).run();
|
editor?.chain().focus().liftListItem(itemType).run();
|
||||||
}, [editor, itemType]);
|
}, [editor, itemType]);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!editor) return;
|
|
||||||
|
|
||||||
const handleSelectionUpdate = ({ editor: updatedEditor }: { editor: Editor }) => {
|
|
||||||
setItemType(updatedEditor.isActive("taskItem") ? "taskItem" : "listItem");
|
|
||||||
};
|
|
||||||
|
|
||||||
editor.on("selectionUpdate", handleSelectionUpdate);
|
|
||||||
return () => {
|
|
||||||
editor.off("selectionUpdate", handleSelectionUpdate);
|
|
||||||
};
|
|
||||||
}, [editor]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<RichTextEditor.Control
|
<RichTextEditor.Control
|
||||||
title={tControls("decreaseIndent")}
|
title={tControls("decreaseIndent")}
|
||||||
|
|||||||
@@ -131,11 +131,12 @@ export default function ReleasesWidget({ options, itemId, width, displayMode }:
|
|||||||
const isInitialLoading = queryResults.some(isInitialWidgetQueryPending);
|
const isInitialLoading = queryResults.some(isInitialWidgetQueryPending);
|
||||||
|
|
||||||
const repositories = useMemo(() => {
|
const repositories = useMemo(() => {
|
||||||
|
const resultById = new Map(results.flat().map((result) => [result.id, result]));
|
||||||
const formattedResults = normalizedRepositories
|
const formattedResults = normalizedRepositories
|
||||||
.map((repository) => {
|
.map((repository) => {
|
||||||
if (!repository.provider) return { ...repository, error: { code: "noProviderSelected" } };
|
if (!repository.provider) return { ...repository, error: { code: "noProviderSelected" } };
|
||||||
|
|
||||||
const repositoryResult = results.flat().find(({ id }) => id === repository.id);
|
const repositoryResult = resultById.get(repository.id);
|
||||||
if (!repositoryResult) return { ...repository, error: { code: "noProviderResponse" } };
|
if (!repositoryResult) return { ...repository, error: { code: "noProviderResponse" } };
|
||||||
if (!repositoryResult.success) return { ...repository, error: repositoryResult.error };
|
if (!repositoryResult.success) return { ...repository, error: repositoryResult.error };
|
||||||
|
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ export function UmamiContent({
|
|||||||
{ integrationId: integrationIds[0] ?? "", websiteId, timeFrame, eventNames: [...eventNames].toSorted() },
|
{ integrationId: integrationIds[0] ?? "", websiteId, timeFrame, eventNames: [...eventNames].toSorted() },
|
||||||
{ enabled: viewMode === "events" && eventNames.length > 0, ...umamiQueryOptions },
|
{ enabled: viewMode === "events" && eventNames.length > 0, ...umamiQueryOptions },
|
||||||
);
|
);
|
||||||
const multiEventSeries = multiEventQuery.data;
|
const multiEventSeries = getUsableWidgetQueryData(multiEventQuery);
|
||||||
|
|
||||||
const multiEventTotal = multiEventSeries
|
const multiEventTotal = multiEventSeries
|
||||||
? multiEventSeries.flatMap(({ dataPoints }) => dataPoints).reduce((sum, { y }) => sum + y, 0)
|
? multiEventSeries.flatMap(({ dataPoints }) => dataPoints).reduce((sum, { y }) => sum + y, 0)
|
||||||
@@ -106,10 +106,9 @@ export function UmamiContent({
|
|||||||
const selectedView =
|
const selectedView =
|
||||||
viewMode === "events" ? (
|
viewMode === "events" ? (
|
||||||
<UmamiEventsContent
|
<UmamiEventsContent
|
||||||
integrationIds={integrationIds}
|
series={multiEventSeries ?? []}
|
||||||
websiteId={websiteId}
|
|
||||||
timeFrame={timeFrame}
|
timeFrame={timeFrame}
|
||||||
eventNames={eventNames}
|
hasSelectedEvents={eventNames.length > 0}
|
||||||
chartType={chartType}
|
chartType={chartType}
|
||||||
showXAxis={showXAxis}
|
showXAxis={showXAxis}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -3,27 +3,23 @@
|
|||||||
import { BarChart, LineChart } from "@mantine/charts";
|
import { BarChart, LineChart } from "@mantine/charts";
|
||||||
import { Box, Group, Stack, Text } from "@mantine/core";
|
import { Box, Group, Stack, Text } from "@mantine/core";
|
||||||
|
|
||||||
import { clientApi } from "@homarr/api/client";
|
|
||||||
import type { UmamiEventSeries } from "@homarr/integrations/types";
|
import type { UmamiEventSeries } from "@homarr/integrations/types";
|
||||||
import { useCurrentIntlLocale, useScopedI18n } from "@homarr/translation/client";
|
import { useCurrentIntlLocale, useScopedI18n } from "@homarr/translation/client";
|
||||||
|
|
||||||
import { EVENT_COLORS, formatXLabel, umamiQueryOptions } from "./umami-utils";
|
import { EVENT_COLORS, formatXLabel } from "./umami-utils";
|
||||||
import { getUsableWidgetQueryData } from "../common/query-state";
|
|
||||||
|
|
||||||
interface UmamiEventsContentProps {
|
interface UmamiEventsContentProps {
|
||||||
integrationIds: string[];
|
series: UmamiEventSeries[];
|
||||||
websiteId: string;
|
|
||||||
timeFrame: string;
|
timeFrame: string;
|
||||||
eventNames: string[];
|
hasSelectedEvents: boolean;
|
||||||
chartType: string;
|
chartType: string;
|
||||||
showXAxis: boolean;
|
showXAxis: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function UmamiEventsContent({
|
export function UmamiEventsContent({
|
||||||
integrationIds,
|
series,
|
||||||
websiteId,
|
|
||||||
timeFrame,
|
timeFrame,
|
||||||
eventNames,
|
hasSelectedEvents,
|
||||||
chartType,
|
chartType,
|
||||||
showXAxis,
|
showXAxis,
|
||||||
}: UmamiEventsContentProps) {
|
}: UmamiEventsContentProps) {
|
||||||
@@ -31,15 +27,7 @@ export function UmamiEventsContent({
|
|||||||
const locale = useCurrentIntlLocale();
|
const locale = useCurrentIntlLocale();
|
||||||
const tickColor = "var(--mantine-color-dimmed)";
|
const tickColor = "var(--mantine-color-dimmed)";
|
||||||
|
|
||||||
const series =
|
if (!hasSelectedEvents) {
|
||||||
getUsableWidgetQueryData(
|
|
||||||
clientApi.widget.umami.getMultiEventTimeSeries.useQuery(
|
|
||||||
{ integrationId: integrationIds[0] ?? "", websiteId, timeFrame, eventNames: [...eventNames].toSorted() },
|
|
||||||
umamiQueryOptions,
|
|
||||||
),
|
|
||||||
) ?? [];
|
|
||||||
|
|
||||||
if (eventNames.length === 0) {
|
|
||||||
return (
|
return (
|
||||||
<Stack align="center" justify="center" h="100%">
|
<Stack align="center" justify="center" h="100%">
|
||||||
<Text c="dimmed" size="sm">
|
<Text c="dimmed" size="sm">
|
||||||
|
|||||||
Reference in new issue
Block a user