diff --git a/apps/studio/components/interfaces/HomeNew/ActivityStats.tsx b/apps/studio/components/interfaces/HomeNew/ActivityStats.tsx index cf52d44918f..ea107cc7227 100644 --- a/apps/studio/components/interfaces/HomeNew/ActivityStats.tsx +++ b/apps/studio/components/interfaces/HomeNew/ActivityStats.tsx @@ -7,15 +7,19 @@ import { useMigrationsQuery } from 'data/database/migrations-query' import { useBackupsQuery } from 'data/database/backups-query' import { Skeleton } from 'ui' import { ServiceStatus } from './ServiceStatus' +import { GitBranch } from 'lucide-react' -export default function ActivityStats() { +export function ActivityStats() { const { data: project } = useSelectedProjectQuery() const { ref } = useParams() const { data: branchesData, isLoading: isLoadingBranches } = useBranchesQuery({ projectRef: project?.parent_project_ref ?? project?.ref, }) - const latestBranch = (branchesData ?? []) + const isDefaultProject = project?.parent_project_ref === undefined + const currentBranch = (branchesData ?? []).find((b) => b.project_ref === ref) + const latestNonDefaultBranch = (branchesData ?? []) + .filter((b) => !b.is_default) .slice() .sort( (a, b) => @@ -45,20 +49,6 @@ export default function ActivityStats() { - -

Last branch

-

- {isLoadingBranches ? ( - - ) : latestBranch?.created_at ? ( - dayjs(latestBranch.created_at).fromNow() - ) : latestBranch?.updated_at ? ( - dayjs(latestBranch.updated_at).fromNow() - ) : ( - 'No branches' - )} -

-

Last migration

@@ -85,7 +75,28 @@ export default function ActivityStats() { )}

+ +

+ {isDefaultProject ? 'Recent branch' : 'Branch Created'} +

+

+ {isLoadingBranches ? ( + + ) : isDefaultProject ? ( +

+ + {latestNonDefaultBranch?.name ?? 'No branches'} +
+ ) : currentBranch?.created_at ? ( + dayjs(currentBranch.created_at).fromNow() + ) : ( + 'Unknown' + )} +

+ ) } + +export default ActivityStats