Merge branch 'refs/heads/main' into fix/outlook-trigger-error

Author: Roman Snapko

packages/react-ui/src/app/features/ai/lib/assistant-ui-chat-hook.ts

@@ -232,6 +232,10 @@ export const useAssistantChat = ({
       toast(errorToast);
     },
     onFinish: async () => {
+      if (chatMode !== ChatMode.Agent) {
+        return;
+      }
+
       if (!chatId || hasAttemptedNameGenerationRef.current[chatId]) {
         return;
       }

packages/server/api/src/app/database/migrations/1763131154284-AddTablesTokenToProject.ts

@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddTablesTokenToProject1763131154284
+  implements MigrationInterface
+{
+  name = 'AddTablesTokenToProject1763131154284';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE "project"
+      ADD COLUMN IF NOT EXISTS "tablesToken" character varying NULL
+    `);
+  }
+
+  public async down(_: QueryRunner): Promise<void> {
+    throw new Error('Rollback not implemented');
+  }
+}

packages/server/api/src/app/database/postgres-connection.ts

@@ -37,6 +37,7 @@ import { AddContentTypeToFolder1757331587268 } from './migrations/1757331587268-
 import { MigrateAiConfigToAppConnection1759242268873 } from './migrations/1759242268873-MigrateAiConfigToAppConnection';
 import { AddTestRunActionLimitsToFlowVersion1760429290001 } from './migrations/1760429290001-AddTestRunActionLimitsToFlowVersion';
 import { MoveTablesWorkspaceIdFromOrganizationToProject1760500000000 } from './migrations/1760500000000-MoveTablesWorkspaceIdFromOrganizationToProject';
+import { AddTablesTokenToProject1763131154284 } from './migrations/1763131154284-AddTablesTokenToProject';
 
 const getSslConfig = (): boolean | TlsOptions => {
   const useSsl = system.get(AppSystemProp.POSTGRES_USE_SSL);
@@ -82,6 +83,7 @@ const getMigrations = (): (new () => MigrationInterface)[] => {
     MigrateAiConfigToAppConnection1759242268873,
     AddTestRunActionLimitsToFlowVersion1760429290001,
     MoveTablesWorkspaceIdFromOrganizationToProject1760500000000,
+    AddTablesTokenToProject1763131154284,
   ];
 };
 

packages/server/api/src/app/openops-tables/create-database-token.ts

@@ -1,5 +1,7 @@
 import { createAxiosHeaders, makeOpenOpsTablesPost } from '@openops/common';
 
+const TOKEN_NAME_PREFIX = 'Project_';
+
 export type DatabaseToken = {
   id: number;
   name: string;
@@ -14,25 +16,24 @@ export type DatabaseToken = {
 };
 
 export type CreateDatabaseTokenParams = {
-  name: string;
+  token: string;
+  projectId: string;
   workspaceId: number;
-  systemToken: string;
 };
 
-export async function createDatabaseToken(
+export async function createProjectDatabaseToken(
   params: CreateDatabaseTokenParams,
 ): Promise<DatabaseToken> {
   const payload = {
-    name: params.name,
+    name: `${TOKEN_NAME_PREFIX}${params.projectId}`,
     workspace: params.workspaceId,
   };
 
-  const headers = createAxiosHeaders(params.systemToken);
-  const response = await makeOpenOpsTablesPost<DatabaseToken>(
+  const headers = createAxiosHeaders(params.token);
+
+  return makeOpenOpsTablesPost<DatabaseToken>(
     'api/database/tokens/',
     payload,
     headers,
   );
-
-  return response;
 }

packages/server/api/src/app/openops-tables/index.ts

@@ -1,6 +1,6 @@
 import { addUserToWorkspace } from './add-user-workspace';
 import { createDatabase } from './create-database';
-import { createDatabaseToken } from './create-database-token';
+import { createProjectDatabaseToken } from './create-database-token';
 import { createMcpEndpoint } from './create-mcp-endpoint';
 import { createTable } from './create-table';
 import { createUser } from './create-user';
@@ -17,7 +17,7 @@ export const openopsTables = {
   addUserToWorkspace,
   listDatabases,
   createDatabase,
-  createDatabaseToken,
+  createProjectDatabaseToken,
   createTable,
   listWorkspaces,
   createWorkspace,

packages/server/api/test/unit/openops-tables/create-database-token.test.ts

@@ -1,26 +1,31 @@
 const openopsCommonMock = {
   ...jest.requireActual('@openops/common'),
   makeOpenOpsTablesPost: jest.fn(),
+  createAxiosHeaders: jest.fn(),
 };
 jest.mock('@openops/common', () => openopsCommonMock);
 
 import { AxiosHeaders } from 'axios';
-import { createDatabaseToken } from '../../../src/app/openops-tables/create-database-token';
+import { createProjectDatabaseToken } from '../../../src/app/openops-tables/create-database-token';
 
-describe('createDatabaseToken', () => {
+describe('createProjectDatabaseToken', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('should return the created token on successful creation', async () => {
     const params = {
-      name: 'Test Token',
+      token: 'test_system_token',
+      projectId: 'test-project-123',
       workspaceId: 1,
-      systemToken: 'test_system_token',
     };
+    const mockHeaders = new AxiosHeaders({
+      'Content-Type': 'application/json',
+      Authorization: `JWT ${params.token}`,
+    });
     const mockTokenResponse = {
       id: 1,
-      name: 'Test Token',
+      name: 'Project_test-project-123',
       workspace: 1,
       key: 'test_database_token_key',
       permissions: {
@@ -31,23 +36,25 @@ describe('createDatabaseToken', () => {
       },
     };
 
+    openopsCommonMock.createAxiosHeaders.mockReturnValue(mockHeaders);
     openopsCommonMock.makeOpenOpsTablesPost.mockResolvedValue(
       mockTokenResponse,
     );
 
-    const result = await createDatabaseToken(params);
+    const result = await createProjectDatabaseToken(params);
 
     expect(result).toEqual(mockTokenResponse);
+    expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledTimes(1);
+    expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledWith(
+      params.token,
+    );
     expect(openopsCommonMock.makeOpenOpsTablesPost).toHaveBeenCalledWith(
       'api/database/tokens/',
       {
-        name: params.name,
+        name: 'Project_test-project-123',
         workspace: params.workspaceId,
       },
-      new AxiosHeaders({
-        'Content-Type': 'application/json',
-        Authorization: `JWT ${params.systemToken}`,
-      }),
+      mockHeaders,
     );
   });
 });