From d8acd6752ca69174a3bcdde9f95d7dbed9813e7e Mon Sep 17 00:00:00 2001 From: Jordi Enric <37541088+jordienr@users.noreply.github.com> Date: Thu, 17 Jul 2025 12:33:33 +0200 Subject: [PATCH 01/12] fix timestamp missing (#37242) fix --- apps/studio/components/ui/Charts/ComposedChart.utils.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/studio/components/ui/Charts/ComposedChart.utils.tsx b/apps/studio/components/ui/Charts/ComposedChart.utils.tsx index 09aaaef44a467..d7151ff115bc3 100644 --- a/apps/studio/components/ui/Charts/ComposedChart.utils.tsx +++ b/apps/studio/components/ui/Charts/ComposedChart.utils.tsx @@ -140,6 +140,7 @@ const CustomTooltip = ({ isActiveHoveredChart, }: TooltipProps) => { if (active && payload && payload.length) { + const timestamp = payload[0].payload.timestamp const maxValueAttribute = isMaxAttribute(attributes) const maxValueData = maxValueAttribute && payload?.find((p: any) => p.dataKey === maxValueAttribute.attribute) @@ -205,7 +206,7 @@ const CustomTooltip = ({ !isActiveHoveredChart && 'opacity-0' )} > -
{label}
+{dayjs(timestamp).format(DateTimeFormats.FULL_SECONDS)}
No merge requests
-+
Create your first merge request to merge changes back to the main branch
Create your first preview branch
-+
Preview branches are short-lived environments that let you safely experiment with changes to your database schema without affecting your main database.
diff --git a/apps/studio/components/interfaces/BranchManagement/Overview.tsx b/apps/studio/components/interfaces/BranchManagement/Overview.tsx index b348808d86454..eebf5b7963144 100644 --- a/apps/studio/components/interfaces/BranchManagement/Overview.tsx +++ b/apps/studio/components/interfaces/BranchManagement/Overview.tsx @@ -16,6 +16,7 @@ import { useState } from 'react' import { toast } from 'sonner' import { useParams } from 'common' +import { useIsBranching2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext' import { DropdownMenuItemTooltip } from 'components/ui/DropdownMenuItemTooltip' import { useBranchQuery } from 'data/branches/branch-query' import { useBranchResetMutation } from 'data/branches/branch-reset-mutation' @@ -23,7 +24,6 @@ import { useBranchUpdateMutation } from 'data/branches/branch-update-mutation' import type { Branch } from 'data/branches/branches-query' import { branchKeys } from 'data/branches/keys' import { useCheckPermissions } from 'hooks/misc/useCheckPermissions' -import { useIsBranching2Enabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext' import { Button, DropdownMenu, @@ -32,10 +32,10 @@ import { DropdownMenuTrigger, } from 'ui' import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal' +import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal' import { BranchLoader, BranchManagementSection, BranchRow, BranchRowLoader } from './BranchPanels' import { EditBranchModal } from './EditBranchModal' import { PreviewBranchesEmptyState } from './EmptyStates' -import TextConfirmModal from 'ui-patterns/Dialogs/TextConfirmModal' interface OverviewProps { isLoading: boolean @@ -99,7 +99,7 @@ export const Overview = ({ {isSuccess && persistentBranches.length === 0 && (No persistent branches
-+
Persistent branches are long-lived, cannot be reset, and are ideal for staging environments.
From a797ae2674e5e1c021a0ecbd26313495b6f0d5a2 Mon Sep 17 00:00:00 2001 From: Jonathan Summers-Muir_=G?>~LI0T(rTzWyX2J~YQJeGhr
zuvGe9E)e=B$-h-S`-pLtjx`A0u&G)lN#$_(A?;dzM;Y->hvO>h5tqqp;@1II0009m
zYYJGkw$#fnFJcNQVABKFPMcZ#Y;>RJOOOu^0KkzN0=w3Fy^Rozb2At52lb^Dn7(GZ
z0rEVVjKKngH!F!k^N=zx*X|deRDI1^QbttykcGZ2Zibx?=({dpOgDk#gVkfGUkrCZ
zaraKDy#1a)EmV4c?DSXpAe;86H}$aqN*Sf3YYC#=>YHDqoR!sgR1sfvecQ+8AJ{Hp
zdZtoxDJgSsxzWu}3A|wBsMihLI@?+PnW??%s<1Q000~goqW3G$iSA>vph8-atpY>y
zw%@3@Ohw91Wr#1&wR^=d9iD?PyDj*8a)|QF61=0p=|UlPD6GR~yDY}u;XVLRD*Fvi
zlKXPq;Q)HcwC&?(1WPZKvTv$>!{GQv2jhp*52c{KAIS3qD7&&~81+dhLnqzbn-@B+
zeL}ULXTEK50su}awlLe5h079oSKD+^NZh%mT0Ai?%8?;t_tWlhLO{5W5;v5hHeR%`
zmP+}A8IPH?ud p68_jHQ-FGUeYe4ee3CMF{UE3hUzGwnK0Yl9~NZ^6CzrN*UC
zsPfwb)ZCDe)}^!5(NZ$%ze_Dsmz7vPBM&Z>HZ-E)!FRqm?B6YiLj?p*%QsefJrsjPp~Zn^$5ELMH$nQrrwT(Rr0#?VbU$!!ytP6eZBte<
z9xYD>$3Eo#&Knxk(^pmq1Ok0!{!rMwwj1k|4GZmb$YYQ2g%-0CpO3y}*P$a7h-c;c
zK*}@vJq~laWY`@qI2__NC3rz};@vE Cj}N=lM_gyff3eVWAzQ*Oj!58@?Ya8-hh95>=%q7Bb-=viGolp>q@yQ50SiXBd?LI@v!O6J&Yy2W*%zckWW?Gq-
zX6ui*iJ87L@d`<7|9(r+iQ;i~);V0i>
S*QWtK~KfvM*>l9=Sh>5RwAu}u*+%QfwxUX!xWY$eUHVlzMHy1a-k)g4k1^m4SCtXprCzR;P?Ob9)SE*Z&
zc*|S>qJwbNHA;uUze|q(N@as**CzsdS7tD1t8hg+fToArjSF
1Kib9w@?G#a{O!8F~Zp^~4U2h*zb65-s^C!z!NNf}%;$Hbu1YchoEGErB*I
zCqpd=S2kYZW7#fj9+<%l(Cx;Q`R9^0^MtZLnf)RqP9%{Ya83<{`eIsVW0`8#UvXTe
zzBU*r0wZqQipK5Z-?ISbKX&r{obG>nS6I>H1IkDEj;DZ1-*j(eu>t}PSz4>nvOh0=
zP?wZifE4hw%8kidwk0WEd6PcY`oHylT)Wu#0mV*Xtb54vD+%;Bj