fix: testrepoconnect v2 w admin route (#795)

Co-authored-by: Ferruh <63190600+ferruhcihan@users.noreply.github.com>

Author: dennisvankekem

src/pages/catalogs/platform/create-edit/CatalogsCreateEditPage.tsx

@@ -12,7 +12,7 @@ import {
   useDeleteAplCatalogMutation,
   useEditAplCatalogMutation,
   useGetAplCatalogQuery,
-  useTestRepoConnectQuery,
+  useGetTestRepoConnectPlatformQuery,
 } from 'redux/otomiApi'
 import { FormProvider, Resolver, useForm } from 'react-hook-form'
 import { yupResolver } from '@hookform/resolvers/yup'
@@ -51,7 +51,7 @@ export default function CatalogsCreateEditPage({
     isFetching: isFetchingCatalog,
     isError: isCatalogError,
   } = useGetAplCatalogQuery({ catalogId }, { skip: !catalogId })
-  const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useTestRepoConnectQuery(
+  const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useGetTestRepoConnectPlatformQuery(
     { url: testConnectUrl },
     { skip: !testConnectUrl },
   )

src/pages/code-repositories/create-edit/CodeRepositoriesCreateEditPage.tsx

@@ -18,7 +18,7 @@ import {
   useGetAplSealedSecretsQuery,
   useGetInternalRepoUrlsQuery,
   useGetTeamAplCodeReposQuery,
-  useTestRepoConnectQuery,
+  useGetTestRepoConnectQuery,
 } from 'redux/otomiApi'
 import { useTranslation } from 'react-i18next'
 import FormRow from 'components/forms/FormRow'
@@ -108,8 +108,8 @@ export default function CodeRepositoriesCreateEditPage({
     refetch: refetchRepoUrls,
   } = useGetInternalRepoUrlsQuery({ teamId }, { skip: !gitProvider || !appsEnabled?.gitea })
 
-  const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useTestRepoConnectQuery(
-    { url: testConnectUrl, teamId, secret: secretName },
+  const { data: testRepoConnect, isFetching: isFetchingTestRepoConnect } = useGetTestRepoConnectQuery(
+    { url: testConnectUrl, teamId, secretName },
     { skip: !testConnectUrl },
   )
 

src/redux/otomiApi.ts

@@ -521,10 +521,16 @@ const injectedRtkApi = api.injectEndpoints({
     getRepoBranches: build.query<GetRepoBranchesApiResponse, GetRepoBranchesApiArg>({
       query: (queryArg) => ({ url: `/v2/teams/${queryArg.teamId}/coderepos/${queryArg.codeRepositoryName}/branches` }),
     }),
-    testRepoConnect: build.query<TestRepoConnectApiResponse, TestRepoConnectApiArg>({
+    getTestRepoConnectPlatform: build.query<GetTestRepoConnectPlatformApiResponse, GetTestRepoConnectPlatformApiArg>({
       query: (queryArg) => ({
-        url: `/v1/testRepoConnect`,
-        params: { url: queryArg.url, teamId: queryArg.teamId, secret: queryArg.secret },
+        url: `/v2/testRepoConnectPlatform`,
+        params: { url: queryArg.url, secret: queryArg.secret },
+      }),
+    }),
+    getTestRepoConnect: build.query<GetTestRepoConnectApiResponse, GetTestRepoConnectApiArg>({
+      query: (queryArg) => ({
+        url: `/v2/teams/${queryArg.teamId}/coderepos/testRepoConnect`,
+        params: { url: queryArg.url, secretName: queryArg.secretName },
       }),
     }),
     getInternalRepoUrls: build.query<GetInternalRepoUrlsApiResponse, GetInternalRepoUrlsApiArg>({
@@ -6288,18 +6294,24 @@ export type GetRepoBranchesApiArg = {
   /** Name of the code repository */
   codeRepositoryName: string
 }
-export type TestRepoConnectApiResponse = /** status 200 The request is successful. */ {
+export type GetTestRepoConnectPlatformApiResponse = /** status 200 The request is successful. */ {
   url?: string
   status?: 'unknown' | 'success' | 'failed'
 }
-export type TestRepoConnectApiArg = {
-  /** URL of the repository */
-  url?: string
-  /** Id of the team */
-  teamId?: string
-  /** Name of the secret for private repositories */
+export type GetTestRepoConnectPlatformApiArg = {
+  url: string
   secret?: string
 }
+export type GetTestRepoConnectApiResponse = /** status 200 The request is successful. */ {
+  url?: string
+  status?: 'unknown' | 'success' | 'failed'
+}
+export type GetTestRepoConnectApiArg = {
+  /** ID of team */
+  teamId: string
+  url: string
+  secretName?: string
+}
 export type GetInternalRepoUrlsApiResponse = /** status 200 Successfully obtained internal repo urls */ string[]
 export type GetInternalRepoUrlsApiArg = {
   /** ID of team */
@@ -7022,7 +7034,8 @@ export const {
   useGetApiDocQuery,
   useGetSettingsInfoQuery,
   useGetRepoBranchesQuery,
-  useTestRepoConnectQuery,
+  useGetTestRepoConnectPlatformQuery,
+  useGetTestRepoConnectQuery,
   useGetInternalRepoUrlsQuery,
   useCreateObjWizardMutation,
   useGetSettingsQuery,