feat(chat): allow settings in Isolated view (Issue #2807) (#2809)

epam · Dec 12, 2024 · beb4d0e · beb4d0e
1 parent f04ee77
commit beb4d0e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/apps/chat-e2e/src/tests/isolatedView.test.ts b/apps/chat-e2e/src/tests/isolatedView.test.ts
@@ -68,7 +68,7 @@ dialTest(
         await chatBar.waitForState({ state: 'hidden' });
         await promptBar.waitForState({ state: 'hidden' });
         await chatHeader.openConversationSettings.waitForState({
-          state: 'hidden',
+          state: 'visible',
         });
       },
     );

diff --git a/apps/chat/src/components/Chat/ChatHeader/Header.tsx b/apps/chat/src/components/Chat/ChatHeader/Header.tsx
@@ -92,7 +92,6 @@ export const ChatHeader = ({
   const isSelectMode = useAppSelector(
     ConversationsSelectors.selectIsSelectMode,
   );
-  const isIsolatedView = useAppSelector(SettingsSelectors.selectIsIsolatedView);
   const isChatbarEnabled = useAppSelector((state) =>
     SettingsSelectors.isFeatureEnabled(state, Feature.ConversationsSection),
   );
@@ -120,10 +119,7 @@ export const ChatHeader = ({
   );
 
   const isContextMenuVisible =
-    !isIsolatedView &&
-    isChatbarEnabled &&
-    !isSelectMode &&
-    !isTopContextMenuHidden;
+    isChatbarEnabled && !isSelectMode && !isTopContextMenuHidden;
 
   const selectedAddons = useMemo(
     () => getSelectedAddons(conversation.selectedAddons, addonsMap, model),
@@ -223,13 +219,13 @@ export const ChatHeader = ({
                   <button
                     className={classNames(
                       isMessageStreaming &&
-                        !isIsolatedView &&
+                        !isChangeAgentDisallowed &&
                         'cursor-not-allowed',
                     )}
                     disabled={
-                      isIsolatedView ||
                       isMessageStreaming ||
-                      isChangeAgentDisallowed
+                      isChangeAgentDisallowed ||
+                      isExternal
                     }
                     onClick={() => onModelClick(conversation.id)}
                   >

diff --git a/apps/chat/src/components/Chat/EmptyChatDescription.tsx b/apps/chat/src/components/Chat/EmptyChatDescription.tsx
@@ -50,7 +50,6 @@ const EmptyChatDescriptionView = ({
     ModelsSelectors.selectInstalledModelIds,
   );
   const models = useAppSelector(ModelsSelectors.selectModels);
-  const isIsolatedView = useAppSelector(SettingsSelectors.selectIsIsolatedView);
   const isEmptyChatChangeAgentHidden = useAppSelector((state) =>
     SettingsSelectors.isFeatureEnabled(state, Feature.HideEmptyChatChangeAgent),
   );
@@ -159,15 +158,17 @@ const EmptyChatDescriptionView = ({
           )}
         </div>
       </div>
-      {!isExternal && !isIsolatedView && !isEmptyChatChangeAgentHidden && (
+      {!isExternal && (
         <div className="flex gap-3 divide-x divide-primary leading-4">
-          <button
-            className="text-left text-accent-primary"
-            data-qa="change-agent"
-            onClick={handleOpenChangeModel}
-          >
-            {t('Change agent')}
-          </button>
+          {!isEmptyChatChangeAgentHidden && (
+            <button
+              className="text-left text-accent-primary"
+              data-qa="change-agent"
+              onClick={handleOpenChangeModel}
+            >
+              {t('Change agent')}
+            </button>
+          )}
           {!conversation.replay?.replayAsIs &&
             !conversation.playback?.isPlayback &&
             isEmptyChatSettingsEnabled && (

diff --git a/apps/chat/src/utils/server/get-common-page-props.ts b/apps/chat/src/utils/server/get-common-page-props.ts
@@ -32,13 +32,18 @@ import packageJSON from '../../../../../package.json';
 import { Feature } from '@epam/ai-dial-shared';
 import { URL, URLSearchParams } from 'url';
 
-const hiddenFeaturesForIsolatedView = new Set([
+const disabledFeaturesForIsolatedView = new Set([
   Feature.ConversationsSection,
   Feature.PromptsSection,
-  Feature.EmptyChatSettings,
-  Feature.TopChatModelSettings,
 ]);
 
+const hiddenFeaturesForIsolatedView = [
+  Feature.HideNewConversation,
+  Feature.HideEmptyChatChangeAgent,
+  Feature.DisallowChangeAgent,
+  Feature.HideTopContextMenu,
+];
+
 export const getCommonPageProps: GetServerSideProps = async ({
   locale,
   req,
@@ -104,12 +109,12 @@ export const getCommonPageProps: GetServerSideProps = async ({
     )
       .filter((feature) =>
         params?.has(ISOLATED_MODEL_QUERY_PARAM)
-          ? !hiddenFeaturesForIsolatedView.has(feature)
+          ? !disabledFeaturesForIsolatedView.has(feature)
           : true,
       )
       .concat(
         params?.has(ISOLATED_MODEL_QUERY_PARAM)
-          ? Feature.HideNewConversation
+          ? hiddenFeaturesForIsolatedView
           : [],
       ),
     publicationFilters: (