Adds check to workspace data props access

Protofy-xyz · Jul 12, 2024 · c7065e9 · c7065e9
1 parent 1dbb6bb
commit c7065e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/protolib/src/components/AdminPage.tsx b/packages/protolib/src/components/AdminPage.tsx
@@ -9,7 +9,7 @@ import { forwardRef, useState } from 'react';
 import { AppState } from './AdminPanel'
 import { useAtom } from 'jotai';
 import { SiteConfig } from 'app/conf'
-import workspaces from 'app/bundles/workspaces'
+import Workspaces from 'app/bundles/workspaces'
 
 const Chat = dynamic(() => import('./Chat'), { ssr: false })
 
@@ -24,9 +24,9 @@ export const AdminPage = forwardRef(({ pageSession, title, children, integratedC
   const userSpaces = useWorkspaces()
 
   const currentWorkspace = settings && settings.workspace ? settings.workspace : userSpaces[0]
-  const workspace = typeof workspaces[currentWorkspace] === 'function' ? workspaces[currentWorkspace]({ pages: [] }) : workspaces[currentWorkspace]
+  const workspaceData = typeof Workspaces[currentWorkspace] === 'function' ? Workspaces[currentWorkspace]({ pages: [] }) : Workspaces[currentWorkspace]
 
-  const settingsAssistant = workspace.assistant
+  const settingsAssistant = workspaceData?.assistant
   const settingsAssistantEnabled = settingsAssistant === undefined ? true : settingsAssistant
 
   usePrompt(() => `The user is browsing an admin page in the admin panel. The title of the admin page is: "${title}"`)

diff --git a/packages/protolib/src/components/AdminPanel.tsx b/packages/protolib/src/components/AdminPanel.tsx
@@ -78,7 +78,7 @@ export const AdminPanel = ({ children }) => {
 
 
   const workspaceData = typeof Workspaces[currentWorkspace] === 'function' ? Workspaces[currentWorkspace]({ pages: pages ?? [] }) : Workspaces[currentWorkspace]
-  const settingsLogs = workspaceData.logs
+  const settingsLogs = workspaceData?.logs
   const settingsLogsEnabled = settingsLogs === undefined ? true : settingsLogs
 
   // console.log('userSpaces: ', userSpaces, 'current Workspace: ', currentWorkspace)