support both v1 and v1alpha3 apis

Author: alenkacz

frontend/src/components/pages/mcp-servers/create/remote-mcp-create-page.tsx

@@ -307,7 +307,7 @@ export const RemoteMCPCreatePage: React.FC = () => {
     }
 
     const useMcpServiceAccount = isFeatureFlagEnabled('enableMcpServiceAccount');
-    let serviceAccountConfig;
+    let serviceAccountConfig: ReturnType<typeof create<typeof MCPServer_ServiceAccountSchema>> | undefined;
 
     // Create service account if feature flag is enabled
     if (useMcpServiceAccount) {

frontend/src/components/pages/mcp-servers/create/use-metadata-validation.ts

@@ -40,7 +40,6 @@ export function useMetadataValidation(form: UseFormReturn<FormValues>) {
   }, [
     formValues.displayName,
     formValues.resourcesTier,
-    formValues.serviceAccountName,
     form.formState.errors.displayName,
     form.formState.errors.description,
     form.formState.errors.resourcesTier,

frontend/src/components/pages/mcp-servers/details/remote-mcp-configuration-tab.tsx

@@ -40,12 +40,12 @@ import type { LintHint } from 'protogen/redpanda/api/common/v1/linthint_pb';
 import { Scope } from 'protogen/redpanda/api/dataplane/v1/secret_pb';
 import {
   LintMCPConfigRequestSchema,
-  type MCPServer_State,
-  MCPServer_Tool_ComponentType,
   UpdateMCPServerRequestSchema,
 } from 'protogen/redpanda/api/dataplane/v1alpha3/mcp_pb';
 import React, { useCallback, useEffect, useState } from 'react';
 import {
+  type MCPServer_State,
+  MCPServer_Tool_ComponentType,
   useGetMCPServerQuery,
   useLintMCPConfigMutation,
   useListMCPServerTools,

frontend/src/react-query/api/remote-mcp.tsx

@@ -9,45 +9,46 @@ import {
 } from '@tanstack/react-query';
 import { config, isFeatureFlagEnabled } from 'config';
 import {
-  type GetMCPServerRequest as GetMCPServerRequestV1,
   GetMCPServerRequestSchema as GetMCPServerRequestSchemaV1,
+  type GetMCPServerRequest as GetMCPServerRequestV1,
   type GetMCPServerResponse as GetMCPServerResponseV1,
-  type ListMCPServersRequest as ListMCPServersRequestV1,
   ListMCPServersRequest_FilterSchema as ListMCPServersRequest_FilterSchemaV1,
   ListMCPServersRequestSchema as ListMCPServersRequestSchemaV1,
+  type ListMCPServersRequest as ListMCPServersRequestV1,
   type ListMCPServersResponse as ListMCPServersResponseV1,
-  type MCPServer as MCPServerV1,
   MCPServer_State as MCPServer_StateV1,
   MCPServerService as MCPServerServiceV1,
+  type MCPServer as MCPServerV1,
 } from 'protogen/redpanda/api/dataplane/v1/mcp_pb';
 import {
   createMCPServer as createMCPServerV1,
   deleteMCPServer as deleteMCPServerV1,
-  getMCPServer as getMCPServerV1,
   getMCPServerServiceConfigSchema as getMCPServerServiceConfigSchemaV1,
+  getMCPServer as getMCPServerV1,
   lintMCPConfig as lintMCPConfigV1,
   listMCPServers as listMCPServersV1,
   startMCPServer as startMCPServerV1,
   stopMCPServer as stopMCPServerV1,
   updateMCPServer as updateMCPServerV1,
 } from 'protogen/redpanda/api/dataplane/v1/mcp-MCPServerService_connectquery';
 import {
-  type GetMCPServerRequest as GetMCPServerRequestV1Alpha3,
   GetMCPServerRequestSchema as GetMCPServerRequestSchemaV1Alpha3,
+  type GetMCPServerRequest as GetMCPServerRequestV1Alpha3,
   type GetMCPServerResponse as GetMCPServerResponseV1Alpha3,
-  type ListMCPServersRequest as ListMCPServersRequestV1Alpha3,
   ListMCPServersRequest_FilterSchema as ListMCPServersRequest_FilterSchemaV1Alpha3,
   ListMCPServersRequestSchema as ListMCPServersRequestSchemaV1Alpha3,
+  type ListMCPServersRequest as ListMCPServersRequestV1Alpha3,
   type ListMCPServersResponse as ListMCPServersResponseV1Alpha3,
-  type MCPServer as MCPServerV1Alpha3,
   MCPServer_State as MCPServer_StateV1Alpha3,
+  MCPServer_Tool_ComponentType as MCPServer_Tool_ComponentTypeV1Alpha3,
   MCPServerService as MCPServerServiceV1Alpha3,
+  type MCPServer as MCPServerV1Alpha3,
 } from 'protogen/redpanda/api/dataplane/v1alpha3/mcp_pb';
 import {
   createMCPServer as createMCPServerV1Alpha3,
   deleteMCPServer as deleteMCPServerV1Alpha3,
-  getMCPServer as getMCPServerV1Alpha3,
   getMCPServerServiceConfigSchema as getMCPServerServiceConfigSchemaV1Alpha3,
+  getMCPServer as getMCPServerV1Alpha3,
   lintMCPConfig as lintMCPConfigV1Alpha3,
   listMCPServers as listMCPServersV1Alpha3,
   startMCPServer as startMCPServerV1Alpha3,
@@ -67,26 +68,27 @@ export type ListMCPServersRequest = ListMCPServersRequestV1 | ListMCPServersRequ
 export type ListMCPServersResponse = ListMCPServersResponseV1 | ListMCPServersResponseV1Alpha3;
 export type MCPServer = MCPServerV1 | MCPServerV1Alpha3;
 
+// Export enums - default to v1alpha3 for backward compatibility
+export const MCPServer_State = MCPServer_StateV1Alpha3;
+export const MCPServer_Tool_ComponentType = MCPServer_Tool_ComponentTypeV1Alpha3;
+
 export const useListMCPServersQuery = (
   input?: MessageInit<ListMCPServersRequest>,
   options?: QueryOptions<GenMessage<ListMCPServersRequest>, ListMCPServersResponse>
 ) => {
   const useMcpV1 = isFeatureFlagEnabled('enableMcpServiceAccount');
 
-  const listMCPServersRequest = create(
-    useMcpV1 ? ListMCPServersRequestSchemaV1 : ListMCPServersRequestSchemaV1Alpha3,
-    {
-      pageToken: '',
-      pageSize: MCP_SERVER_MAX_PAGE_SIZE,
-      filter: input?.filter
-        ? create(useMcpV1 ? ListMCPServersRequest_FilterSchemaV1 : ListMCPServersRequest_FilterSchemaV1Alpha3, {
-            displayNameContains: input.filter.displayNameContains,
-            tags: input.filter.tags,
-            secretId: input.filter.secretId,
-          })
-        : undefined,
-    }
-  );
+  const listMCPServersRequest = create(useMcpV1 ? ListMCPServersRequestSchemaV1 : ListMCPServersRequestSchemaV1Alpha3, {
+    pageToken: '',
+    pageSize: MCP_SERVER_MAX_PAGE_SIZE,
+    filter: input?.filter
+      ? create(useMcpV1 ? ListMCPServersRequest_FilterSchemaV1 : ListMCPServersRequest_FilterSchemaV1Alpha3, {
+          displayNameContains: input.filter.displayNameContains,
+          tags: input.filter.tags,
+          secretId: input.filter.secretId,
+        })
+      : undefined,
+  });
 
   return useQuery(useMcpV1 ? listMCPServersV1 : listMCPServersV1Alpha3, listMCPServersRequest, {
     enabled: options?.enabled,
@@ -102,13 +104,13 @@ export const useGetMCPServerQuery = (
     id: input?.id,
   });
 
-  const MCPServer_State = useMcpV1 ? MCPServer_StateV1 : MCPServer_StateV1Alpha3;
+  const StateEnum = useMcpV1 ? MCPServer_StateV1 : MCPServer_StateV1Alpha3;
 
   return useQuery(useMcpV1 ? getMCPServerV1 : getMCPServerV1Alpha3, getMCPServerRequest, {
     enabled: options?.enabled,
     refetchInterval:
       options?.refetchInterval ??
-      ((query) => (query?.state?.data?.mcpServer?.state === MCPServer_State.STARTING ? 2 * 1000 : false)),
+      ((query) => (query?.state?.data?.mcpServer?.state === StateEnum.STARTING ? 2 * 1000 : false)),
     refetchIntervalInBackground: options?.refetchIntervalInBackground ?? false,
   });
 };
@@ -167,7 +169,7 @@ export const useUpdateMCPServerMutation = () => {
       });
       await queryClient.invalidateQueries({
         queryKey: createConnectQueryKey({
-          schema: MCPServerService.method.getMCPServer,
+          schema: (useMcpV1 ? MCPServerServiceV1 : MCPServerServiceV1Alpha3).method.getMCPServer,
           cardinality: 'finite',
         }),
         exact: false,
@@ -406,6 +408,8 @@ export type UseListMCPServerToolsParams = {
 
 export const useListMCPServerTools = ({ mcpServer }: UseListMCPServerToolsParams) => {
   const queryClient = useQueryClient();
+  const useMcpV1 = isFeatureFlagEnabled('enableMcpServiceAccount');
+  const StateEnum = useMcpV1 ? MCPServer_StateV1 : MCPServer_StateV1Alpha3;
 
   return useTanstackQuery({
     queryKey: ['mcp-server-tools', mcpServer?.url],
@@ -414,15 +418,17 @@ export const useListMCPServerTools = ({ mcpServer }: UseListMCPServerToolsParams
       if (mcpServer?.id) {
         await queryClient.refetchQueries({
           queryKey: createConnectQueryKey({
-            schema: MCPServerService.method.getMCPServer,
-            input: create(GetMCPServerRequestSchema, { id: mcpServer.id }),
+            schema: (useMcpV1 ? MCPServerServiceV1 : MCPServerServiceV1Alpha3).method.getMCPServer,
+            input: create(useMcpV1 ? GetMCPServerRequestSchemaV1 : GetMCPServerRequestSchemaV1Alpha3, {
+              id: mcpServer.id,
+            }),
             cardinality: 'finite',
           }),
         });
       }
 
       return listMCPServerTools(mcpServer?.url || '');
     },
-    enabled: !!mcpServer?.url && mcpServer?.state === MCPServer_State.RUNNING,
+    enabled: !!mcpServer?.url && mcpServer?.state === StateEnum.RUNNING,
   });
 };