Navbar AI chats followup (#18336)

Addresses review comments from
[PR#18161](https://github.com/twentyhq/twenty/pull/18161)
This commit is contained in:
Abdul Rahman
2026-03-04 20:45:43 +05:30
committed by GitHub
parent aeedcf3353
commit c94657dc0a
16 changed files with 397 additions and 72 deletions
@@ -1,6 +1,14 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { SortDirection } from '@ptc-org/nestjs-query-core';
import {
NestjsQueryGraphQLModule,
PagingStrategies,
} from '@ptc-org/nestjs-query-graphql';
import { NestjsQueryTypeOrmModule } from '@ptc-org/nestjs-query-typeorm';
import { PermissionFlagType } from 'twenty-shared/constants';
import { TokenModule } from 'src/engine/core-modules/auth/token/token.module';
import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
import { WorkspaceDomainsModule } from 'src/engine/core-modules/domain/workspace-domains/workspace-domains.module';
@@ -8,14 +16,17 @@ import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { FileUploadModule } from 'src/engine/core-modules/file/file-upload/file-upload.module';
import { FileModule } from 'src/engine/core-modules/file/file.module';
import { SkillModule } from 'src/engine/metadata-modules/skill/skill.module';
import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
import { ToolProviderModule } from 'src/engine/core-modules/tool-provider/tool-provider.module';
import { UserWorkspaceEntity } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
import { UserWorkspaceModule } from 'src/engine/core-modules/user-workspace/user-workspace.module';
import { FeatureFlagGuard } from 'src/engine/guards/feature-flag.guard';
import { SettingsPermissionGuard } from 'src/engine/guards/settings-permission.guard';
import { WorkspaceAuthGuard } from 'src/engine/guards/workspace-auth.guard';
import { AiAgentExecutionModule } from 'src/engine/metadata-modules/ai/ai-agent-execution/ai-agent-execution.module';
import { AiBillingModule } from 'src/engine/metadata-modules/ai/ai-billing/ai-billing.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { SkillModule } from 'src/engine/metadata-modules/skill/skill.module';
import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@@ -23,6 +34,7 @@ import { DashboardToolsModule } from 'src/modules/dashboard/tools/dashboard-tool
import { WorkflowToolsModule } from 'src/modules/workflow/workflow-tools/workflow-tools.module';
import { AgentChatController } from './controllers/agent-chat.controller';
import { AgentChatThreadDTO } from './dtos/agent-chat-thread.dto';
import { AgentChatThreadEntity } from './entities/agent-chat-thread.entity';
import { AgentChatResolver } from './resolvers/agent-chat.resolver';
import { AgentChatStreamingService } from './services/agent-chat-streaming.service';
@@ -38,6 +50,35 @@ import { SystemPromptBuilderService } from './services/system-prompt-builder.ser
FileEntity,
UserWorkspaceEntity,
]),
NestjsQueryGraphQLModule.forFeature({
imports: [
NestjsQueryTypeOrmModule.forFeature([AgentChatThreadEntity]),
FeatureFlagModule,
PermissionsModule,
],
resolvers: [
{
EntityClass: AgentChatThreadEntity,
DTOClass: AgentChatThreadDTO,
pagingStrategy: PagingStrategies.CURSOR,
read: {
defaultSort: [
{ field: 'updatedAt', direction: SortDirection.DESC },
],
one: { disabled: true },
many: { name: 'chatThreads' },
},
create: { disabled: true },
update: { disabled: true },
delete: { disabled: true },
guards: [
WorkspaceAuthGuard,
FeatureFlagGuard,
SettingsPermissionGuard(PermissionFlagType.AI),
],
},
],
}),
AiAgentExecutionModule,
BillingModule,
ThrottlerModule,
@@ -1,10 +1,32 @@
import { Field, Float, Int, ObjectType } from '@nestjs/graphql';
import { UnauthorizedException } from '@nestjs/common';
import { Field, Float, HideField, Int, ObjectType } from '@nestjs/graphql';
import {
Authorize,
FilterableField,
IDField,
} from '@ptc-org/nestjs-query-graphql';
import { isDefined } from 'twenty-shared/utils';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { type AuthenticatedRequest } from 'src/engine/api/rest/types/authenticated-request';
@ObjectType('AgentChatThread')
@Authorize({
authorize: (context: { req?: AuthenticatedRequest }) => {
const userWorkspaceId = context?.req?.userWorkspaceId;
if (!isDefined(userWorkspaceId)) {
throw new UnauthorizedException(
'userWorkspaceId is required to query chat threads',
);
}
return { userWorkspaceId: { eq: userWorkspaceId } };
},
})
export class AgentChatThreadDTO {
@Field(() => UUIDScalarType)
@IDField(() => UUIDScalarType)
id: string;
@Field({ nullable: true })
@@ -33,6 +55,10 @@ export class AgentChatThreadDTO {
@Field()
createdAt: Date;
@FilterableField()
@Field()
updatedAt: Date;
@HideField()
userWorkspaceId: string;
}
@@ -11,12 +11,12 @@ import {
import { PermissionFlagType } from 'twenty-shared/constants';
import { FeatureFlagKey } from 'twenty-shared/types';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';
import { toDisplayCredits } from 'src/engine/core-modules/billing/utils/to-display-credits.util';
import { type WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
import { AuthUserWorkspaceId } from 'src/engine/decorators/auth/auth-user-workspace-id.decorator';
import { AuthWorkspace } from 'src/engine/decorators/auth/auth-workspace.decorator';
import { MetadataResolver } from 'src/engine/api/graphql/graphql-config/decorators/metadata-resolver.decorator';
import {
FeatureFlagGuard,
RequireFeatureFlag,
@@ -42,12 +42,6 @@ export class AgentChatResolver {
private readonly systemPromptBuilderService: SystemPromptBuilderService,
) {}
@Query(() => [AgentChatThreadDTO])
@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
async chatThreads(@AuthUserWorkspaceId() userWorkspaceId: string) {
return this.agentChatService.getThreadsForUser(userWorkspaceId);
}
@Query(() => AgentChatThreadDTO)
@RequireFeatureFlag(FeatureFlagKey.IS_AI_ENABLED)
async chatThread(
@@ -43,15 +43,6 @@ export class AgentChatService {
return this.threadRepository.save(thread);
}
async getThreadsForUser(userWorkspaceId: string) {
return this.threadRepository.find({
where: {
userWorkspaceId,
},
order: { createdAt: 'DESC' },
});
}
async getThreadById(threadId: string, userWorkspaceId: string) {
const thread = await this.threadRepository.findOne({
where: {