create-mercato-app 0.5.1-develop.3043.1a796c3920 → 0.5.1-develop.3045.b4b3320cc2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mercato-app",
-  "version": "0.5.1-develop.3043.1a796c3920",
+  "version": "0.5.1-develop.3045.b4b3320cc2",
   "type": "module",
   "description": "Create a new Open Mercato application",
   "main": "./dist/index.js",

package/template/src/app/(backend)/backend/layout.tsx

@@ -10,7 +10,6 @@ import { APP_VERSION } from '@open-mercato/shared/lib/version'
 import { parseBooleanWithDefault } from '@open-mercato/shared/lib/boolean'
 import { PageInjectionBoundary } from '@open-mercato/ui/backend/injection/PageInjectionBoundary'
 import { DemoFeedbackWidget } from '@/components/DemoFeedbackWidget'
-import OrganizationSwitcher from '@/components/OrganizationSwitcher'
 import { BackendHeaderChrome } from '@/components/BackendHeaderChrome'
 
 registerBackendRouteManifests(backendRoutes)
@@ -113,7 +112,6 @@ export default async function BackendLayout({
             organizationId={auth?.orgId ?? null}
           />
         )}
-        mobileSidebarSlot={<OrganizationSwitcher compact />}
         adminNavApi="/api/auth/admin/nav"
         version={APP_VERSION}
         settingsPathPrefixes={collectStaticSettingsPathPrefixes()}

package/template/src/components/BackendHeaderChrome.tsx

@@ -93,9 +93,7 @@ export function BackendHeaderChrome({
           missingConfigMessage={missingConfigMessage}
         />
       ) : null}
-      <div className="hidden lg:contents">
-        {isReady ? <LazyOrganizationSwitcher /> : null}
-      </div>
+      {isReady ? <LazyOrganizationSwitcher /> : null}
       {showIntegrationsButton ? <IntegrationsButton /> : null}
       <SettingsButton />
       <ProfileDropdown email={email} />

package/template/src/components/__tests__/BackendHeaderChrome.test.tsx

@@ -0,0 +1,66 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import '@testing-library/jest-dom'
+import { render, screen } from '@testing-library/react'
+import { BackendHeaderChrome } from '../BackendHeaderChrome'
+
+jest.mock('next/dynamic', () => (loader: () => Promise<unknown>) => {
+  const source = loader.toString()
+  const isOrganizationSwitcher = source.includes('OrganizationSwitcher')
+  const Lazy = () =>
+    isOrganizationSwitcher ? (
+      <div data-testid="lazy-organization-switcher" />
+    ) : (
+      <div data-testid="lazy-other" />
+    )
+  return Lazy
+})
+
+jest.mock('@open-mercato/ui/backend/BackendChromeProvider', () => ({
+  useBackendChrome: () => ({ payload: { groups: [], grantedFeatures: [] }, isReady: true }),
+}))
+
+jest.mock('@open-mercato/ui/backend/IntegrationsButton', () => ({
+  IntegrationsButton: () => <div data-testid="integrations-button" />,
+}))
+
+jest.mock('@open-mercato/ui/backend/ProfileDropdown', () => ({
+  ProfileDropdown: () => <div data-testid="profile-dropdown" />,
+}))
+
+jest.mock('@open-mercato/ui/backend/SettingsButton', () => ({
+  SettingsButton: () => <div data-testid="settings-button" />,
+}))
+
+jest.mock('@/components/AiAssistantShellIntegration', () => ({
+  AiAssistantShellIntegration: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+}))
+
+describe('BackendHeaderChrome', () => {
+  it('renders the organization switcher in the topbar without a viewport-gated wrapper', () => {
+    const { container } = render(
+      <BackendHeaderChrome
+        email="demo@example.com"
+        embeddingConfigured={false}
+        missingConfigMessage=""
+        tenantId={null}
+        organizationId={null}
+      />,
+    )
+
+    const switcher = screen.getByTestId('lazy-organization-switcher')
+    expect(switcher).toBeInTheDocument()
+
+    // Regression for issue #1795: the topbar OrganizationSwitcher must not be
+    // wrapped in a viewport-gated container that hides it at narrow widths.
+    // Previously `<div className="hidden lg:contents">` removed it below 1024px,
+    // which combined with `mobileSidebarSlot={<OrganizationSwitcher compact />}`
+    // caused the dropdown to reappear inside the mobile sidebar drawer.
+    const hiddenWrappers = container.querySelectorAll('.hidden')
+    for (const wrapper of Array.from(hiddenWrappers)) {
+      expect(wrapper.contains(switcher)).toBe(false)
+    }
+  })
+})