Fixing global commands provider hierarchy

Author: openint-bot

apps/web/app/(v1)/GlobalCommandBarProvider.tsx

@@ -72,7 +72,6 @@ export function useCommandDefinitionMap() {
   const allCommands: CommandDefinitionMap = {
     ...navCommands,
     ...orgCommands,
-    // Add any other global commands here
     ...useConnectionCommands(),
   }
   return allCommands

apps/web/app/(v1)/console/(authenticated)/layout.tsx

@@ -4,25 +4,28 @@ import {AppLayout} from '@openint/ui-v1'
 import {OrganizationSwitcher, UserButton} from '@/lib-client/auth.client'
 import {currentViewer} from '@/lib-server/auth.server'
 import {GlobalCommandBarProvider} from '../../GlobalCommandBarProvider'
+import {ClientApp} from './client'
 
 export default async function AuthenticatedLayout({
   children,
 }: {
   children: React.ReactNode
 }) {
-  const {viewer} = await currentViewer()
+  const {viewer, token = ''} = await currentViewer()
   console.log('AuthenticatedLayout viewer', viewer)
   if (viewer.role !== 'user') {
     return redirect('/console/sign-in')
   }
 
   return (
-    <GlobalCommandBarProvider>
-      <AppLayout
-        organizationSwitcher={<OrganizationSwitcher />}
-        userButton={<UserButton showName />}>
-        {children}
-      </AppLayout>
-    </GlobalCommandBarProvider>
+    <ClientApp token={token}>
+      <GlobalCommandBarProvider>
+        <AppLayout
+          organizationSwitcher={<OrganizationSwitcher />}
+          userButton={<UserButton showName />}>
+          {children}
+        </AppLayout>
+      </GlobalCommandBarProvider>
+    </ClientApp>
   )
 }

apps/web/app/(v1)/console/(authenticated)/page.tsx

@@ -80,22 +80,19 @@ export default async function Page(props: PageProps) {
       <pre>
         <code>{JSON.stringify(viewer, null, 2)}</code>
       </pre>
-      <ClientApp token={token}>
-        <h1>AddConnection</h1>
-        <Suspense fallback={<Fallback />}>
-          <AddConnection
-            initialData={withRandomDelay(api.listConnectorConfigs())}
-          />
-        </Suspense>
-
-        <h1>ConnectionList</h1>
-
-        <Suspense fallback={<Fallback />}>
-          <ConnectionList
-            initialData={withRandomDelay(api.listConnections())}
-          />
-        </Suspense>
-      </ClientApp>
+
+      <h1>AddConnection</h1>
+      <Suspense fallback={<Fallback />}>
+        <AddConnection
+          initialData={withRandomDelay(api.listConnectorConfigs())}
+        />
+      </Suspense>
+
+      <h1>ConnectionList</h1>
+
+      <Suspense fallback={<Fallback />}>
+        <ConnectionList initialData={withRandomDelay(api.listConnections())} />
+      </Suspense>
 
       <hr />
       <hr />