Merge branch 'main' into mg/OPS-2983

Author: MarceloRGonc

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/react-ui/src/app/routes/openops-tables/index.tsx

@@ -2,30 +2,16 @@ import { t } from 'i18next';
 import { useLocation } from 'react-router-dom';
 
 import { flagsHooks } from '@/app/common/hooks/flags-hooks';
-import { platformHooks } from '@/app/common/hooks/platform-hooks';
-import { projectHooks } from '@/app/common/hooks/project-hooks';
 import { useDefaultSidebarState } from '@/app/common/hooks/use-default-sidebar-state';
 import { useCandu } from '@/app/features/extensions/candu/use-candu';
 import { FlagId } from '@openops/shared';
 
 const OpenOpsTablesPage = () => {
   useDefaultSidebarState('minimized');
   const { isCanduEnabled, canduClientToken, canduUserId } = useCandu();
-  const { project } = projectHooks.useCurrentProject();
-  const { platform: organization } = platformHooks.useCurrentPlatform();
-
-  // TODO: Remove type assertion and remove organization?.tablesWorkspaceId fallback once Phase 1 is complete
-  const workspaceId =
-    (project as any)?.tablesWorkspaceId ?? organization?.tablesWorkspaceId;
-
-  const parentDataObj = {
-    userId: canduUserId ?? undefined,
-    canduClientToken: canduClientToken ?? undefined,
-    ...(isCanduEnabled && { isCanduEnabled: true }),
-    ...(workspaceId !== undefined && { workspaceId }),
-  };
-
-  const parentData = encodeURIComponent(JSON.stringify(parentDataObj));
+  const parentData = encodeURIComponent(
+    JSON.stringify({ isCanduEnabled, userId: canduUserId, canduClientToken }),
+  );
 
   const location = useLocation();
   const params = new URLSearchParams(location.search);

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;
@@ -13,26 +15,20 @@ export type DatabaseToken = {
   };
 };
 
-export type CreateDatabaseTokenParams = {
-  name: string;
-  workspaceId: number;
-  systemToken: string;
-};
-
 export async function createDatabaseToken(
-  params: CreateDatabaseTokenParams,
+  workspaceId: number,
+  token: string,
 ): Promise<DatabaseToken> {
   const payload = {
-    name: params.name,
-    workspace: params.workspaceId,
+    name: 'OpenOps Token',
+    workspace: workspaceId,
   };
 
-  const headers = createAxiosHeaders(params.systemToken);
-  const response = await makeOpenOpsTablesPost<DatabaseToken>(
+  const headers = createAxiosHeaders(token);
+
+  return makeOpenOpsTablesPost<DatabaseToken>(
     'api/database/tokens/',
     payload,
     headers,
   );
-
-  return response;
 }

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

@@ -1,26 +1,29 @@
 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';
 
-describe('createDatabaseToken', () => {
+describe('createProjectDatabaseToken', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   it('should return the created token on successful creation', async () => {
-    const params = {
-      name: 'Test Token',
-      workspaceId: 1,
-      systemToken: 'test_system_token',
-    };
+    const token = 'test_system_token';
+    const workspaceId = 1;
+
+    const mockHeaders = new AxiosHeaders({
+      'Content-Type': 'application/json',
+      Authorization: `JWT ${token}`,
+    });
     const mockTokenResponse = {
       id: 1,
-      name: 'Test Token',
+      name: 'Project_test-project-123',
       workspace: 1,
       key: 'test_database_token_key',
       permissions: {
@@ -31,23 +34,23 @@ describe('createDatabaseToken', () => {
       },
     };
 
+    openopsCommonMock.createAxiosHeaders.mockReturnValue(mockHeaders);
     openopsCommonMock.makeOpenOpsTablesPost.mockResolvedValue(
       mockTokenResponse,
     );
 
-    const result = await createDatabaseToken(params);
+    const result = await createDatabaseToken(workspaceId, token);
 
     expect(result).toEqual(mockTokenResponse);
+    expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledTimes(1);
+    expect(openopsCommonMock.createAxiosHeaders).toHaveBeenCalledWith(token);
     expect(openopsCommonMock.makeOpenOpsTablesPost).toHaveBeenCalledWith(
       'api/database/tokens/',
       {
-        name: params.name,
-        workspace: params.workspaceId,
+        name: 'OpenOps Token',
+        workspace: workspaceId,
       },
-      new AxiosHeaders({
-        'Content-Type': 'application/json',
-        Authorization: `JWT ${params.systemToken}`,
-      }),
+      mockHeaders,
     );
   });
 });