Moves assistant and logs toggle from app conf to workspace

Protofy-xyz · Jul 11, 2024 · 3fb7eed · 3fb7eed
1 parent 3a7289a
commit 3fb7eed
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/packages/app/bundles/custom/workspaces/admin.tsx b/packages/app/bundles/custom/workspaces/admin.tsx
@@ -6,6 +6,8 @@ export default ({pages}) => {
     return {
         "default": "/workspace/prod/services",
         "label": "Admin panel",
+        "assistant": true,
+        "logs": true,
         "dev": {
             "default": "/workspace/dev/services",
             "label": "Dev panel"

diff --git a/packages/app/bundles/custom/workspaces/editor.tsx b/packages/app/bundles/custom/workspaces/editor.tsx
@@ -4,6 +4,8 @@ export default (pages) => {
     return {
         "default": "/workspace/pages",
         "label": "Workspace",
+        "assistant": true,
+        "logs": false,
         "menu": {
             "System": [
                 { "name": "Users", "icon": "users", "type": "users", "path": "/" },

diff --git a/packages/app/conf.ts b/packages/app/conf.ts
@@ -11,7 +11,6 @@ const SiteConfig = {
     signupEnabled: false,
     defaultWorkspace: 'prod',
     defaultWorkspacePage: 'pages',
-    assistant: true,
     projectName: 'Protofy',
     ui: {
         defaultTint: 'green', // 'gray', 'orange', 'yellow', 'green', 'blue', 'purple', 'pink', 'red'

diff --git a/packages/protolib/src/components/AdminPage.tsx b/packages/protolib/src/components/AdminPage.tsx
@@ -1,4 +1,4 @@
-import { useSession } from '../lib/Session';
+import { useSession, useUserSettings, useWorkspaces } from '../lib/Session';
 import { Page } from './Page';
 import { Tinted } from './Tinted';
 import { usePrompt } from '../context/PromptAtom';
@@ -9,6 +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'
 
 const Chat = dynamic(() => import('./Chat'), { ssr: false })
 
@@ -19,7 +20,13 @@ export const AdminPage = forwardRef(({ pageSession, title, children, integratedC
   const [appState] = useAtom(AppState)
   const projectName = SiteConfig.projectName
 
-  const settingsAssistant = SiteConfig.assistant
+  const [settings] = useUserSettings()
+  const userSpaces = useWorkspaces()
+
+  const currentWorkspace = settings && settings.workspace ? settings.workspace : userSpaces[0]
+  const workspace = typeof workspaces[currentWorkspace] === 'function' ? workspaces[currentWorkspace]({ pages: [] }) : workspaces[currentWorkspace]
+
+  const settingsAssistant = workspace.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,6 +78,8 @@ export const AdminPanel = ({ children }) => {
 
 
   const workspaceData = typeof Workspaces[currentWorkspace] === 'function' ? Workspaces[currentWorkspace]({pages: pages ?? []}) : Workspaces[currentWorkspace]
+  const settingsLogs = workspaceData.assistant
+  const settingsLogsEnabled = settingsLogs === undefined ? true : settingsLogs
 
   // console.log('userSpaces: ', userSpaces, 'current Workspace: ', currentWorkspace)
   return rightPanelSize && <MainPanel borderLess={true} rightPanelSize={rightPanelSize} setRightPanelSize={setRightPanelSize} rightPanelStyle={{ marginRight: '20px', height: 'calc(100vh - 85px)', marginTop: '68px', backgroundColor: 'transparent' }} rightPanelVisible={appState.logsPanelOpened} rightPanelResizable={true} centerPanelContent={Workspaces[currentWorkspace]
@@ -86,7 +88,7 @@ export const AdminPanel = ({ children }) => {
         <>
           <XStack ai="center">
             <XStack>{userSpaces.length > 1 && <WorkspaceSelector />}</XStack>
-            <InteractiveIcon onPress={() => setAppState({ ...appState, logsPanelOpened: !appState.logsPanelOpened })} IconColor="var(--color)" Icon={Activity}></InteractiveIcon>
+            {settingsLogsEnabled ?  <InteractiveIcon onPress={() => setAppState({ ...appState, logsPanelOpened: !appState.logsPanelOpened })} IconColor="var(--color)" Icon={Activity}></InteractiveIcon> : null}
           </XStack>
         </>
       }