Skip to content

The open alternative to Salesforce, designed for AI.

Fix AI permission gating: use Ask AI for chat UI, AI Settings for admin endpoints (#21030)

Félix Malfait865ca697ca69
diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx
index ba802de9ecf..faec0f4a98f 100644
--- a/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx
@@ -31,9 +31,7 @@ import {
export const AgentChatThreadInitializationEffect = () => {
const client = useApolloClient();
const { replaceDraft, applyChanges } = useUpdateMetadataStoreDraft();
- const hasAiSettingsPermission = useHasPermissionFlag(
- PermissionFlagType.AI_SETTINGS,
- );
+ const hasAiPermission = useHasPermissionFlag(PermissionFlagType.AI);
const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);
const setCurrentAiChatThread = useSetAtomState(currentAiChatThreadState);
@@ -58,7 +56,7 @@ export const AgentChatThreadInitializationEffect = () => {
useAtomState(hasInitializedAgentChatThreadsState);
useEffect(() => {
- if (storeEntry.status !== 'empty' || !hasAiSettingsPermission) {
+ if (storeEntry.status !== 'empty' || !hasAiPermission) {
return;
}
@@ -75,19 +73,13 @@ export const AgentChatThreadInitializationEffect = () => {
replaceDraft('agentChatThreads', result.data.chatThreads);
applyChanges();
});
- }, [
- storeEntry.status,
- hasAiSettingsPermission,
- client,
- replaceDraft,
- applyChanges,
- ]);
+ }, [storeEntry.status, hasAiPermission, client, replaceDraft, applyChanges]);
useEffect(() => {
setAgentChatThreadsLoading(
- storeEntry.status === 'empty' && hasAiSettingsPermission,
+ storeEntry.status === 'empty' && hasAiPermission,
);
- }, [storeEntry.status, hasAiSettingsPermission, setAgentChatThreadsLoading]);
+ }, [storeEntry.status, hasAiPermission, setAgentChatThreadsLoading]);
useEffect(() => {
if (
@@ -97,7 +89,7 @@ export const AgentChatThreadInitializationEffect = () => {
return;
}
- if (storeEntry.status === 'empty' && hasAiSettingsPermission) {
+ if (storeEntry.status === 'empty' && hasAiPermission) {
return;
}
@@ -152,7 +144,7 @@ export const AgentChatThreadInitializationEffect = () => {
}, [
agentChatVisibleThreads,
currentAiChatThread,
- hasAiSettingsPermission,
+ hasAiPermission,
hasInitializedAgentChatThreads,
setHasInitializedAgentChatThreads,
storeEntry.status,
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsx
index a24046f696c..cdaa5077fcd 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawer.tsx
@@ -16,12 +16,10 @@ export const MainNavigationDrawer = ({ className }: { className?: string }) => {
navigationDrawerActiveTabState,
);
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
- const hasAiSettingsPermission = useHasPermissionFlag(
- PermissionFlagType.AI_SETTINGS,
- );
+ const hasAiPermission = useHasPermissionFlag(PermissionFlagType.AI);
const showAiChatContent =
- hasAiSettingsPermission &&
+ hasAiPermission &&
navigationDrawerActiveTab === NAVIGATION_DRAWER_TABS.AI_CHAT_HISTORY;
return (
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
index 42303c14595..e1b7e8e929a 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerTabsRow.tsx
@@ -144,13 +144,11 @@ export const MainNavigationDrawerTabsRow = () => {
const setIsNavigationDrawerExpanded = useSetAtomState(
isNavigationDrawerExpandedState,
);
- const hasAiSettingsPermission = useHasPermissionFlag(
- PermissionFlagType.AI_SETTINGS,
- );
+ const hasAiPermission = useHasPermissionFlag(PermissionFlagType.AI);
const isExpanded = isNavigationDrawerExpanded || isMobile;
- if (!hasAiSettingsPermission) {
+ if (!hasAiPermission) {
return null;
}
diff --git a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
index 6e8e349d3ff..45390d56510 100644
--- a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
@@ -41,9 +41,7 @@ export const MobileNavigationBar = () => {
const { switchToNewChat } = useSwitchToNewAiChat();
const { alphaSortedActiveNonSystemObjectMetadataItems } =
useFilteredObjectMetadataItems();
- const hasAiSettingsPermission = useHasPermissionFlag(
- PermissionFlagType.AI_SETTINGS,
- );
+ const hasAiPermission = useHasPermissionFlag(PermissionFlagType.AI);
const setContextStoreCurrentObjectMetadataItemId = useSetAtomComponentState(
contextStoreCurrentObjectMetadataItemIdComponentState,
@@ -100,7 +98,7 @@ export const MobileNavigationBar = () => {
openRecordsSearchPage();
},
},
- ...(hasAiSettingsPermission
+ ...(hasAiPermission
? [
{
name: 'newAiChat' as const,
diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
index f9a4d18d3f6..1b76543df63 100644
--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-monitor/resolvers/agent-turn.resolver.ts
@@ -24,7 +24,10 @@ import { AgentService } from 'src/engine/metadata-modules/ai/ai-agent/agent.serv
import { AgentChatThreadEntity } from 'src/engine/metadata-modules/ai/ai-chat/entities/agent-chat-thread.entity';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
-@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@UseGuards(
+ WorkspaceAuthGuard,
+ SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),
+)
@MetadataResolver()
export class AgentTurnResolver {
private readonly logger = new Logger(AgentTurnResolver.name);
diff --git a/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts
index dc8117fb61b..bd071afa6d8 100644
--- a/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/skill/skill.resolver.ts
@@ -16,7 +16,10 @@ import { SkillGraphqlApiExceptionInterceptor } from 'src/engine/metadata-modules
import { SkillService } from 'src/engine/metadata-modules/skill/skill.service';
import { WorkspaceMigrationGraphqlApiExceptionInterceptor } from 'src/engine/workspace-manager/workspace-migration/interceptors/workspace-migration-graphql-api-exception.interceptor';
-@UseGuards(WorkspaceAuthGuard, SettingsPermissionGuard(PermissionFlagType.AI))
+@UseGuards(
+ WorkspaceAuthGuard,
+ SettingsPermissionGuard(PermissionFlagType.AI_SETTINGS),
+)
@UseInterceptors(
WorkspaceMigrationGraphqlApiExceptionInterceptor,
SkillGraphqlApiExceptionInterceptor,