@red-hat-developer-hub/backstage-plugin-intelligent-assistant 5.0.2 → 5.1.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @red-hat-developer-hub/backstage-plugin-intelligent-assistant
 
+## 5.1.0
+
+### Minor Changes
+
+- c37b5f1: Gate Intelligent Assistant UI by consolidated RBAC permissions (`intelligent-assistant.chat`, `intelligent-assistant.notebooks`, `intelligent-assistant.mcp.tools`, `intelligent-assistant.skills`). Features are hidden when access is denied instead of showing permission-denied screens or read-only MCP mode.
+
+### Patch Changes
+
+- a9d54a1: Add createExtensionTester coverage for the NFS extensions and modules
+  - @red-hat-developer-hub/backstage-plugin-intelligent-assistant-common@5.1.0
+
 ## 5.0.2
 
 ### Patch Changes

package/dist/alpha.d.ts

@@ -117,11 +117,6 @@ declare const intelligentAssistantTranslationRef: _backstage_frontend_plugin_api
     readonly 'conversation.rename.confirm.title': string;
     readonly 'conversation.rename.confirm.action': string;
     readonly 'conversation.rename.placeholder': string;
-    readonly 'permission.required.title': string;
-    readonly 'permission.required.description': string;
-    readonly 'permission.subject.plugin': string;
-    readonly 'permission.subject.notebooks': string;
-    readonly 'permission.notebooks.goBack': string;
     readonly 'lcore.notConfigured.title': string;
     readonly 'lcore.notConfigured.description': string;
     readonly 'lcore.notConfigured.developerLightspeedDocs': string;
@@ -193,7 +188,6 @@ declare const intelligentAssistantTranslationRef: _backstage_frontend_plugin_api
     readonly 'modal.title.preview': string;
     readonly 'modal.title.edit': string;
     readonly 'icon.lightspeed.alt': string;
-    readonly 'icon.permissionRequired.alt': string;
     readonly 'message.options.label': string;
     readonly 'file.upload.error.alreadyExists': string;
     readonly 'file.upload.error.multipleFiles': string;
@@ -229,7 +223,6 @@ declare const intelligentAssistantTranslationRef: _backstage_frontend_plugin_api
     readonly 'mcp.settings.title': string;
     readonly 'mcp.settings.selectedCount': string;
     readonly 'mcp.settings.closeAriaLabel': string;
-    readonly 'mcp.settings.readOnlyAccess': string;
     readonly 'mcp.settings.tableAriaLabel': string;
     readonly 'mcp.settings.enabled': string;
     readonly 'mcp.settings.name': string;

package/dist/components/LightSpeedChat.esm.js

@@ -2,7 +2,6 @@ import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useState, useEffect, useRef, useLayoutEffect, useCallback, useMemo } from 'react';
 import { useNavigate, useMatch, useLocation } from 'react-router-dom';
 import { useApi, configApiRef } from '@backstage/core-plugin-api';
-import Button$1 from '@mui/material/Button';
 import { styled } from '@mui/material/styles';
 import Tab from '@mui/material/Tab';
 import Tabs from '@mui/material/Tabs';
@@ -20,8 +19,9 @@ import { useConversations } from '../hooks/useConversations.esm.js';
 import { useDeleteNotebook } from '../hooks/notebooks/useDeleteNotebook.esm.js';
 import { useIsMobile } from '../hooks/useIsMobile.esm.js';
 import { useLastOpenedConversation } from '../hooks/useLastOpenedConversation.esm.js';
-import { useLightspeedDeletePermission } from '../hooks/useLightspeedDeletePermission.esm.js';
-import { useLightspeedNotebooksPermission } from '../hooks/notebooks/useLightspeedNotebooksPermission.esm.js';
+import { useIaChatPermission } from '../hooks/useIaChatPermission.esm.js';
+import { useIaMcpToolsPermission } from '../hooks/useIaMcpToolsPermission.esm.js';
+import { useIaNotebooksPermission } from '../hooks/useIaNotebooksPermission.esm.js';
 import '@backstage/plugin-permission-react';
 import '@red-hat-developer-hub/backstage-plugin-intelligent-assistant-common';
 import { useTranslation } from '../hooks/useTranslation.esm.js';
@@ -36,7 +36,6 @@ import { useStopConversation } from '../hooks/useStopConversation.esm.js';
 import { useCreateNotebook } from '../hooks/notebooks/useCreateNotebook.esm.js';
 import { useNotebookDocuments } from '../hooks/notebooks/useNotebookDocuments.esm.js';
 import { useLightspeedDrawerContext } from '../hooks/useLightspeedDrawerContext.esm.js';
-import { useLightspeedUpdatePermission } from '../hooks/useLightspeedUpdatePermission.esm.js';
 import { useWelcomePrompts } from '../hooks/useWelcomePrompts.esm.js';
 import { getAttachments } from '../utils/attachment-utils.esm.js';
 import { extractPageContext } from '../utils/dom-extractor.esm.js';
@@ -56,7 +55,6 @@ import { NotebooksTab } from './notebooks/NotebooksTab.esm.js';
 import { useNotebookStreamStore } from './notebooks/NotebookStreamProvider.esm.js';
 import { NotebookView } from './notebooks/NotebookView.esm.js';
 import { SidebarCollapseIcon, SidebarExpandIcon } from './notebooks/SidebarCollapseIcon.esm.js';
-import PermissionRequiredState from './PermissionRequiredState.esm.js';
 import { RenameConversationModal } from './RenameConversationModal.esm.js';
 import { ToastAlertGroup } from './ToastAlertGroup.esm.js';
 
@@ -425,7 +423,6 @@ const LightspeedChat = ({
   const isOnNotebookRoute = Boolean(
     notebooksRouteMatch || notebookViewRouteMatch
   );
-  const shouldShowTabs = notebooksEnabled || isOnNotebookRoute;
   const {
     displayMode,
     setDisplayMode,
@@ -458,13 +455,21 @@ const LightspeedChat = ({
     }
     return 0;
   });
-  const {
-    allowed: hasNotebooksAccess,
-    loading: notebooksPermissionLoading,
-    iaNotebooksPermissionName
-  } = useLightspeedNotebooksPermission();
+  const { allowed: hasChatAccess, loading: chatPermissionLoading } = useIaChatPermission();
+  const chatPermissionResolved = !chatPermissionLoading && hasChatAccess;
+  const { allowed: hasNotebooksAccess, loading: notebooksPermissionLoading } = useIaNotebooksPermission();
   const notebooksPermissionResolved = !notebooksPermissionLoading && hasNotebooksAccess;
-  const { data: notebookConversationIdsArray = [] } = useNotebookConversationIds();
+  const canShowNotebooks = notebooksPermissionResolved && (notebooksEnabled || isOnNotebookRoute);
+  const hasChatTab = chatPermissionResolved;
+  const hasNotebooksTab = canShowNotebooks;
+  const hasBothTabs = hasChatTab && hasNotebooksTab;
+  const shouldShowTabs = hasBothTabs;
+  const selectedTabIndex = hasBothTabs ? activeTab : 0;
+  const { allowed: hasMcpToolsAccess, loading: mcpToolsPermissionLoading } = useIaMcpToolsPermission();
+  const mcpToolsPermissionResolved = !mcpToolsPermissionLoading && hasMcpToolsAccess;
+  const { data: notebookConversationIdsArray = [] } = useNotebookConversationIds(
+    chatPermissionResolved || notebooksPermissionResolved
+  );
   const { data: notebooks = [], refetch: refetchNotebooks } = useNotebookSessions(notebooksPermissionResolved);
   const hasNotebooks = notebooks.length > 0;
   const [openNotebookMenuId, setOpenNotebookMenuId] = useState(
@@ -518,31 +523,79 @@ const LightspeedChat = ({
   const [hasChatContentOverflow, setHasChatContentOverflow] = useState(false);
   const wasStoppedByUserRef = useRef(false);
   const { isReady, lastOpenedId, setLastOpenedId, clearLastOpenedId } = useLastOpenedConversation(user);
-  const showChatPanel = activeTab === 0;
-  const showNotebooksPanel = (notebooksEnabled || isOnNotebookRoute) && activeTab !== 0;
+  const showChatPanel = hasChatTab && (activeTab === 0 || !hasNotebooksTab);
+  const showNotebooksPanel = hasNotebooksTab && (activeTab === 1 || !hasChatTab);
   const [isChatHistoryDrawerOpen, setIsChatHistoryDrawerOpen] = useState(!isMobile && isFullscreenMode);
   useLayoutEffect(() => {
-    if (!isFullscreenMode) {
+    if (!isFullscreenMode || chatPermissionLoading || notebooksPermissionLoading) {
       return;
     }
     if (isNotebooksFullscreenPath) {
+      if (canShowNotebooks) {
+        setActiveTab(1);
+        setShellViewTab(1);
+      } else if (chatPermissionResolved) {
+        navigate(
+          routeConversationId ? `${LIGHTSPEED_PATH}/conversation/${routeConversationId}` : LIGHTSPEED_PATH,
+          { replace: true }
+        );
+        setActiveTab(0);
+        setShellViewTab(0);
+      }
+      return;
+    }
+    const isBaseLightspeedChatRoute = location.pathname === LIGHTSPEED_PATH || location.pathname === `${LIGHTSPEED_PATH}/`;
+    const isConversationRoute = location.pathname.startsWith(
+      `${LIGHTSPEED_PATH}/conversation/`
+    );
+    if (!chatPermissionResolved && canShowNotebooks && (isBaseLightspeedChatRoute || isConversationRoute)) {
+      navigate(
+        activeNotebookId ? `${LIGHTSPEED_PATH}/notebooks/${activeNotebookId}` : `${LIGHTSPEED_PATH}/notebooks`,
+        { replace: true }
+      );
       setActiveTab(1);
       setShellViewTab(1);
       return;
     }
-    const isBaseLightspeedChatRoute = location.pathname === LIGHTSPEED_PATH || location.pathname === `${LIGHTSPEED_PATH}/`;
-    if (shellViewTab === 1 && isBaseLightspeedChatRoute) {
+    if (shellViewTab === 1 && isBaseLightspeedChatRoute && canShowNotebooks) {
       navigate(`${LIGHTSPEED_PATH}/notebooks`, { replace: true });
       return;
     }
-    setActiveTab(0);
-    setShellViewTab(0);
+    if (chatPermissionResolved) {
+      setActiveTab(0);
+      setShellViewTab(0);
+    }
   }, [
     isFullscreenMode,
     isNotebooksFullscreenPath,
     shellViewTab,
     location.pathname,
     navigate,
+    setShellViewTab,
+    chatPermissionLoading,
+    notebooksPermissionLoading,
+    chatPermissionResolved,
+    canShowNotebooks,
+    activeNotebookId,
+    routeConversationId
+  ]);
+  useEffect(() => {
+    if (chatPermissionLoading || notebooksPermissionLoading) {
+      return;
+    }
+    if (!chatPermissionResolved && canShowNotebooks && activeTab === 0) {
+      setActiveTab(1);
+      setShellViewTab(1);
+    } else if (chatPermissionResolved && !canShowNotebooks && activeTab !== 0) {
+      setActiveTab(0);
+      setShellViewTab(0);
+    }
+  }, [
+    chatPermissionLoading,
+    notebooksPermissionLoading,
+    chatPermissionResolved,
+    canShowNotebooks,
+    activeTab,
     setShellViewTab
   ]);
   const maybeAutoDeleteScratchNotebook = useCallback(() => {
@@ -565,13 +618,19 @@ const LightspeedChat = ({
     deleteNotebook
   ]);
   const handleNotebookTabSelect = (_event, nextTab) => {
-    if (nextTab === 0) {
+    let logicalTab = 0;
+    if (hasBothTabs) {
+      logicalTab = nextTab;
+    } else if (hasNotebooksTab) {
+      logicalTab = 1;
+    }
+    if (logicalTab === 0) {
       maybeAutoDeleteScratchNotebook();
     }
-    setActiveTab(nextTab);
-    setShellViewTab(nextTab);
+    setActiveTab(logicalTab);
+    setShellViewTab(logicalTab);
     if (isFullscreenMode) {
-      if (nextTab === 1) {
+      if (logicalTab === 1) {
         navigate(
           activeNotebookId ? `${LIGHTSPEED_PATH}/notebooks/${activeNotebookId}` : `${LIGHTSPEED_PATH}/notebooks`
         );
@@ -581,7 +640,7 @@ const LightspeedChat = ({
         );
       }
     }
-    if (nextTab === 1 && notebooksPermissionResolved) {
+    if (logicalTab === 1 && notebooksPermissionResolved) {
       refetchNotebooks();
     }
   };
@@ -678,6 +737,11 @@ const LightspeedChat = ({
       setChatHeaderBgColor(computedBg);
     }
   }, [displayMode, isMcpSettingsOpen]);
+  useEffect(() => {
+    if (!mcpToolsPermissionResolved && isMcpSettingsOpen) {
+      setIsMcpSettingsOpen(false);
+    }
+  }, [mcpToolsPermissionResolved, isMcpSettingsOpen]);
   const {
     isPinningChatsEnabled,
     pinnedChats,
@@ -738,10 +802,8 @@ const LightspeedChat = ({
     data: conversations = [],
     isLoading,
     isRefetching
-  } = useConversations();
-  const { allowed: hasDeleteAccess } = useLightspeedDeletePermission();
-  const { allowed: hasUpdateAccess } = useLightspeedUpdatePermission();
-  const samplePrompts = useWelcomePrompts();
+  } = useConversations(chatPermissionResolved);
+  const samplePrompts = useWelcomePrompts(chatPermissionResolved);
   useEffect(() => {
     if (!user || !isReady) return;
     const onOverlayLikeSurface = isFullscreenMode || !routeConversationId;
@@ -939,7 +1001,6 @@ const LightspeedChat = ({
           /* @__PURE__ */ jsx(
             DropdownItem,
             {
-              isDisabled: !hasUpdateAccess,
               icon: /* @__PURE__ */ jsx(PenIcon, {}),
               onClick: () => openChatRenameModal(conversationSummary.conversation_id),
               children: t("conversation.rename")
@@ -963,7 +1024,6 @@ const LightspeedChat = ({
           /* @__PURE__ */ jsx(
             DropdownItem,
             {
-              isDisabled: !hasDeleteAccess,
               icon: /* @__PURE__ */ jsx(TrashIcon, {}),
               onClick: () => openDeleteModal(conversationSummary.conversation_id),
               children: t("conversation.delete")
@@ -972,15 +1032,7 @@ const LightspeedChat = ({
         ] })
       };
     },
-    [
-      pinnedChats,
-      hasDeleteAccess,
-      isPinningChatsEnabled,
-      hasUpdateAccess,
-      t,
-      pinChat,
-      unpinChat
-    ]
+    [pinnedChats, isPinningChatsEnabled, t, pinChat, unpinChat]
   );
   const notebookConversationIds = useMemo(
     () => new Set(notebookConversationIdsArray),
@@ -1477,7 +1529,7 @@ const LightspeedChat = ({
     }
   );
   const mainPanelContent = (() => {
-    if (!isMcpSettingsOpen) {
+    if (!isMcpSettingsOpen || !mcpToolsPermissionResolved) {
       return /* @__PURE__ */ jsx(Fragment, { children: chatMainContent });
     }
     if (isFullscreenMode) {
@@ -1640,6 +1692,7 @@ const LightspeedChat = ({
                 isPinningChatsEnabled,
                 hideModelSelector: true,
                 showChatTabOptions: !showNotebooksPanel,
+                showMcpSettings: mcpToolsPermissionResolved,
                 setDisplayMode: setDisplayModeFromHeader,
                 displayMode,
                 onPinnedChatsToggle: handlePinningChatsToggle,
@@ -1647,11 +1700,11 @@ const LightspeedChat = ({
               }
             )
           ] }),
-          (isFullscreenMode || shouldShowTabs) && /* @__PURE__ */ jsx(HeaderDivider, {}),
+          /* @__PURE__ */ jsx(HeaderDivider, { "data-testid": "lightspeed-header-divider" }),
           shouldShowTabs && /* @__PURE__ */ jsxs(
             Tabs,
             {
-              value: activeTab,
+              value: selectedTabIndex,
               onChange: handleNotebookTabSelect,
               "aria-label": t("tabs.ariaLabel"),
               variant: "standard",
@@ -1693,7 +1746,7 @@ const LightspeedChat = ({
                 }
               }),
               children: [
-                /* @__PURE__ */ jsx(
+                hasChatTab && /* @__PURE__ */ jsx(
                   Tab,
                   {
                     disableRipple: true,
@@ -1701,7 +1754,7 @@ const LightspeedChat = ({
                     "aria-label": t("tabs.chat")
                   }
                 ),
-                /* @__PURE__ */ jsx(
+                hasNotebooksTab && /* @__PURE__ */ jsx(
                   Tab,
                   {
                     disableRipple: true,
@@ -1729,7 +1782,7 @@ const LightspeedChat = ({
             }
           ),
           /* @__PURE__ */ jsxs(ChatMain, { children: [
-            showChatPanel && /* @__PURE__ */ jsx(
+            showChatPanel && chatPermissionResolved && /* @__PURE__ */ jsx(
               ConditionalWrapper,
               {
                 condition: isFullscreenMode,
@@ -1805,7 +1858,7 @@ const LightspeedChat = ({
                 )
               }
             ),
-            showNotebooksPanel && !notebooksPermissionLoading && hasNotebooksAccess && activeNotebook && /* @__PURE__ */ jsx(
+            showNotebooksPanel && canShowNotebooks && activeNotebook && /* @__PURE__ */ jsx(
               NotebookView,
               {
                 sessionId: activeNotebook.session_id,
@@ -1829,7 +1882,7 @@ const LightspeedChat = ({
                 onUploadsInProgressChange: setNotebookUploadsInProgress
               }
             ),
-            showNotebooksPanel && !notebooksPermissionLoading && hasNotebooksAccess && !activeNotebook && /* @__PURE__ */ jsx(
+            showNotebooksPanel && canShowNotebooks && !activeNotebook && /* @__PURE__ */ jsx(
               "div",
               {
                 style: {
@@ -1864,26 +1917,6 @@ const LightspeedChat = ({
                   }
                 )
               }
-            ),
-            showNotebooksPanel && !notebooksPermissionLoading && !hasNotebooksAccess && /* @__PURE__ */ jsx(
-              PermissionRequiredState,
-              {
-                subject: t("permission.subject.notebooks"),
-                permissions: [iaNotebooksPermissionName],
-                action: /* @__PURE__ */ jsx(
-                  Button$1,
-                  {
-                    variant: "outlined",
-                    color: "primary",
-                    style: { borderRadius: "20px" },
-                    onClick: () => {
-                      setActiveTab(0);
-                      setShellViewTab(0);
-                    },
-                    children: t("permission.notebooks.goBack")
-                  }
-                )
-              }
             )
           ] })
         ]