From deae2879f18914f65aea631c3ceca034ed60e81f Mon Sep 17 00:00:00 2001
From: Enrico Ros <enrico.ros@gmail.com>
Date: Tue, 12 Mar 2024 01:59:42 -0700
Subject: [PATCH] Beam: improve hooks

---
 src/apps/beam/AppBeam.tsx    | 3 ++-
 src/apps/chat/AppChat.tsx    | 3 ++-
 src/common/beam/BeamRay.tsx  | 3 ++-
 src/common/beam/BeamView.tsx | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/apps/beam/AppBeam.tsx b/src/apps/beam/AppBeam.tsx
index ce83074e2..82c80eb2b 100644
--- a/src/apps/beam/AppBeam.tsx
+++ b/src/apps/beam/AppBeam.tsx
@@ -4,8 +4,9 @@ import { Box, Button, Typography } from '@mui/joy';
 
 import { useModelsStore } from '~/modules/llms/store-llms';
 
+import { BeamStoreApi, useBeamStore } from '~/common/beam/store-beam.hooks';
 import { BeamView } from '~/common/beam/BeamView';
-import { BeamStoreApi, createBeamStore, useBeamStore } from '~/common/beam/store-beam';
+import { createBeamStore } from '~/common/beam/store-beam';
 import { createDConversation, createDMessage, DConversation, DMessage } from '~/common/state/store-chats';
 import { useIsMobile } from '~/common/components/useMatchMedia';
 import { usePluggableOptimaLayout } from '~/common/layout/optima/useOptimaLayout';
diff --git a/src/apps/chat/AppChat.tsx b/src/apps/chat/AppChat.tsx
index b527936d2..ce968af80 100644
--- a/src/apps/chat/AppChat.tsx
+++ b/src/apps/chat/AppChat.tsx
@@ -14,12 +14,14 @@ import { useCapabilityTextToImage } from '~/modules/t2i/t2i.client';
 import { BeamView } from '~/common/beam/BeamView';
 import { Brand } from '~/common/app.config';
 import { ConfirmationModal } from '~/common/components/ConfirmationModal';
+import { ConversationsManager } from '~/common/chats/ConversationsManager';
 import { GlobalShortcutItem, ShortcutKeyName, useGlobalShortcuts } from '~/common/components/useGlobalShortcut';
 import { PanelResizeInset } from '~/common/components/panes/GoodPanelResizeHandler';
 import { addSnackbar, removeSnackbar } from '~/common/components/useSnackbarsStore';
 import { createDMessage, DConversationId, DMessage, getConversation, getConversationSystemPurposeId, useConversation } from '~/common/state/store-chats';
 import { getUXLabsHighPerformance, useUXLabsStore } from '~/common/state/store-ux-labs';
 import { themeBgAppChatComposer } from '~/common/app.theme';
+import { useAreBeamsOpen } from '~/common/beam/store-beam.hooks';
 import { useFolderStore } from '~/common/state/store-folders';
 import { useIsMobile } from '~/common/components/useMatchMedia';
 import { useOptimaLayout, usePluggableOptimaLayout } from '~/common/layout/optima/useOptimaLayout';
@@ -32,7 +34,6 @@ import { ChatMessageList } from './components/ChatMessageList';
 import { ChatPageMenuItems } from './components/ChatPageMenuItems';
 import { ChatTitle } from './components/ChatTitle';
 import { Composer } from './components/composer/Composer';
-import { ConversationsManager } from '~/common/chats/ConversationsManager';
 import { ScrollToBottom } from './components/scroll-to-bottom/ScrollToBottom';
 import { ScrollToBottomButton } from './components/scroll-to-bottom/ScrollToBottomButton';
 import { getInstantAppChatPanesCount, usePanesManager } from './components/panes/usePanesManager';
diff --git a/src/common/beam/BeamRay.tsx b/src/common/beam/BeamRay.tsx
index 9bbe2bee4..47df3f086 100644
--- a/src/common/beam/BeamRay.tsx
+++ b/src/common/beam/BeamRay.tsx
@@ -18,7 +18,8 @@ import type { DLLMId } from '~/modules/llms/store-llms';
 import { GoodTooltip } from '~/common/components/GoodTooltip';
 import { useLLMSelect } from '~/common/components/forms/useLLMSelect';
 
-import { BeamStoreApi, rayIsError, rayIsScattering, rayIsSelectable, rayIsUserSelected, useBeamStore } from './store-beam';
+import { BeamStoreApi, useBeamStore } from './store-beam.hooks';
+import { rayIsError, rayIsScattering, rayIsSelectable, rayIsUserSelected } from './store-beam';
 
 
 // component configuration
diff --git a/src/common/beam/BeamView.tsx b/src/common/beam/BeamView.tsx
index 97c6ba3d1..5ac463dbc 100644
--- a/src/common/beam/BeamView.tsx
+++ b/src/common/beam/BeamView.tsx
@@ -13,7 +13,7 @@ import { useLLMSelect } from '~/common/components/forms/useLLMSelect';
 import { BeamGatherControls } from './BeamGatherControls';
 import { BeamRay, RayCard } from './BeamRay';
 import { BeamScatterControls } from './BeamScatterControls';
-import { BeamStoreApi, useBeamStore } from './store-beam';
+import { BeamStoreApi, useBeamStore } from './store-beam.hooks';
 
 
 // component configuration