Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

restore org selector loaders (#43782)

Francesco Sansalvadore8fd868bc6eec
diff --git a/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx b/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx
index 3f372fcf57a..7588622b55a 100644
--- a/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx
+++ b/apps/studio/components/layouts/AppLayout/BranchDropdown.tsx
@@ -4,7 +4,7 @@ import type { Branch } from 'data/branches/branches-query'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { useState } from 'react'
import { useAppStateSnapshot } from 'state/app-state'
-import { GenericSkeletonLoader } from 'ui-patterns'
+import { ShimmeringLoader } from 'ui-patterns'
import { AppLayoutDropdownError, AppLayoutDropdownWithPopover } from './AppLayoutDropdown'
import { BranchBadge } from './BranchBadge'
@@ -75,7 +75,7 @@ export const BranchDropdown = ({
/>
)
- if (isLoading) return <GenericSkeletonLoader className="p-2" />
+ if (isLoading) return <ShimmeringLoader className="p-2 md:w-[90px]" />
if (isError) return <AppLayoutDropdownError message="Failed to load branches" />
diff --git a/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsx b/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsx
index 2207ce84136..a9d65e9f879 100644
--- a/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsx
+++ b/apps/studio/components/layouts/AppLayout/OrganizationDropdown.tsx
@@ -6,7 +6,7 @@ import { Boxes } from 'lucide-react'
import { useRouter } from 'next/router'
import { useState } from 'react'
import { Badge, cn } from 'ui'
-import { GenericSkeletonLoader } from 'ui-patterns'
+import { GenericSkeletonLoader, ShimmeringLoader } from 'ui-patterns'
import { AppLayoutDropdownError, AppLayoutDropdownWithPopover } from './AppLayoutDropdown'
import { OrganizationDropdownCommandContent } from './OrganizationDropdownCommandContent'
@@ -40,7 +40,8 @@ export const OrganizationDropdown = ({
const [open, setOpen] = useState(false)
const close = useEmbeddedCloseHandler(embedded, onClose, setOpen)
- if (isLoadingOrganizations && !embedded) return <GenericSkeletonLoader className="p-2 w-[90px]" />
+ if (isLoadingOrganizations && !embedded)
+ return <ShimmeringLoader className="p-2 md:mr-2 w-[90px]" />
if (isError) return <AppLayoutDropdownError message="Failed to load organizations" />
diff --git a/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx b/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx
index a2bc4ecc492..c6f595d1296 100644
--- a/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx
+++ b/apps/studio/components/layouts/AppLayout/ProjectDropdown.tsx
@@ -11,7 +11,7 @@ import { useRouter } from 'next/router'
import { useState } from 'react'
import type { ComponentProps } from 'react'
import { Button, CommandGroup_Shadcn_, CommandItem_Shadcn_ } from 'ui'
-import { GenericSkeletonLoader } from 'ui-patterns'
+import { ShimmeringLoader } from 'ui-patterns'
import { AppLayoutDropdownTriggerButton } from './AppLayoutDropdown'
import { sanitizeRoute } from './ProjectDropdown.utils'
@@ -141,7 +141,7 @@ export const ProjectDropdown = ({
const close = useEmbeddedCloseHandler(embedded, onClose, setOpen)
if (isLoadingProject || (isBranch && isLoadingParentProject) || !selectedProject) {
- if (!embedded) return <GenericSkeletonLoader className="p-2" />
+ if (!embedded) return <ShimmeringLoader className="p-2 md:mr-2 md:w-[90px]" />
}
const handleSetOpen = embedded ? (_value: boolean) => onClose?.() : setOpen
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/MobileNavigationBar.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/MobileNavigationBar.tsx
index fde2b02f5df..e9c4b5fbe4c 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/MobileNavigationBar.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/MobileNavigationBar.tsx
@@ -5,6 +5,7 @@ import { LocalDropdown } from 'components/interfaces/LocalDropdown'
import { SidebarContent } from 'components/interfaces/Sidebar'
import { UserDropdown } from 'components/interfaces/UserDropdown'
import FloatingMobileToolbar from 'components/layouts/Navigation/FloatingMobileToolbar/FloatingMobileToolbar'
+import { useOrganizationsQuery } from 'data/organizations/organizations-query'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { IS_PLATFORM } from 'lib/constants'
import { ChevronLeft, Menu, Search } from 'lucide-react'
@@ -32,8 +33,9 @@ const MobileNavigationBar = ({
const showFloatingMobileToolbar = useIsFloatingMobileToolbarEnabled()
const { ref: projectRef, slug } = useParams()
const { data: selectedOrganization } = useSelectedOrganizationQuery()
+ const { isPending: isLoadingOrganizations } = useOrganizationsQuery()
const isProjectScope = !!projectRef
- const showOrgSelection = slug || (selectedOrganization && projectRef)
+ const showOrgSelection = slug || isLoadingOrganizations || (selectedOrganization && projectRef)
const { openMenu } = useMobileSheet()
return (
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
index 0cb34459ad7..cf068b9c981 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
@@ -52,13 +52,7 @@ export function OrgSelector() {
const isMobile = useBreakpoint('md')
- if (isLoadingOrganizations) {
- return (
- <div className="px-2 py-2">
- <ShimmeringLoader className="w-full py-3" />
- </div>
- )
- }
+ if (isLoadingOrganizations) return <ShimmeringLoader className="ml-1 w-[120px]" />
const triggerButton = (
<SidebarMenuButton
@@ -91,7 +85,9 @@ export function OrgSelector() {
return (
<>
<SidebarMenu className="flex-shrink">
- <SidebarMenuItem>{triggerButton}</SidebarMenuItem>
+ <SidebarMenuItem>
+ {isLoadingOrganizations ? <ShimmeringLoader className="p-2 w-[90px]" /> : triggerButton}
+ </SidebarMenuItem>
</SidebarMenu>
<OrgSelectorSheet
open={open}
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx
index 9e87eb3a214..d76c26adfc3 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/ProjectBranchSelector.tsx
@@ -58,15 +58,8 @@ export function ProjectBranchSelector() {
const isMobile = useBreakpoint('md')
- if (isLoadingProject || !displayProject) {
- return (
- <SidebarMenu>
- <SidebarMenuItem>
- <ShimmeringLoader className="w-full py-3" />
- </SidebarMenuItem>
- </SidebarMenu>
- )
- }
+ if (isLoadingProject || !displayProject)
+ return <ShimmeringLoader className="w-[120px] ml-1 md:py-3" />
if (!IS_PLATFORM) {
return (