SONAR-23268 Remove duplicate API function

4 files changed, 7 insertions, 35 deletions

diff --git a/server/sonar-web/src/main/js/api/alm-integrations.ts b/server/sonar-web/src/main/js/api/alm-integrations.ts
index 50d8e241f78..565de5b5659 100644
--- a/server/sonar-web/src/main/js/api/alm-integrations.ts
+++ b/server/sonar-web/src/main/js/api/alm-integrations.ts
@@ -115,7 +115,8 @@ export function getBitbucketServerProjects(
 
 export function getBitbucketServerRepositories(
   almSetting: string,
-  projectName: string,
+  projectName?: string,
+  repositoryName?: string,
   start?: number,
   pageSize?: number,
 ): Promise<{
@@ -127,6 +128,7 @@ export function getBitbucketServerRepositories(
     almSetting,
     pageSize,
     projectName,
+    repositoryName,
     start,
   });
 }
@@ -152,24 +154,6 @@ export function importBitbucketServerProject(data: {
   );
 }
 
-export function searchForBitbucketServerRepositories(
-  almSetting: string,
-  repositoryName: string,
-  start?: number,
-  pageSize?: number,
-): Promise<{
-  isLastPage: boolean;
-  nextPageStart: number;
-  repositories: BitbucketRepository[];
-}> {
-  return getJSON('/api/alm_integrations/search_bitbucketserver_repos', {
-    almSetting,
-    pageSize,
-    repositoryName,
-    start,
-  });
-}
-
 export function searchForBitbucketCloudRepositories(
   almSetting: string,
   repositoryName: string,
diff --git a/server/sonar-web/src/main/js/api/mocks/AlmIntegrationsServiceMock.ts b/server/sonar-web/src/main/js/api/mocks/AlmIntegrationsServiceMock.ts
index 752d8d3cb22..2c3848c4f4d 100644
--- a/server/sonar-web/src/main/js/api/mocks/AlmIntegrationsServiceMock.ts
+++ b/server/sonar-web/src/main/js/api/mocks/AlmIntegrationsServiceMock.ts
@@ -56,7 +56,6 @@ import {
   importGitlabProject,
   searchAzureRepositories,
   searchForBitbucketCloudRepositories,
-  searchForBitbucketServerRepositories,
   setAlmPersonalAccessToken,
   setupAzureProjectCreation,
   setupBitbucketCloudProjectCreation,
@@ -222,9 +221,6 @@ export default class AlmIntegrationsServiceMock {
     jest
       .mocked(setupBitbucketServerProjectCreation)
       .mockReturnValue(() => this.importBitbucketServerProject());
-    jest
-      .mocked(searchForBitbucketServerRepositories)
-      .mockImplementation(this.searchForBitbucketServerRepositories);
   }
 
   checkPersonalAccessTokenIsValid = (conf: string) => {
@@ -394,14 +390,6 @@ export default class AlmIntegrationsServiceMock {
     });
   };
 
-  searchForBitbucketServerRepositories = () => {
-    return Promise.resolve({
-      isLastPage: this.bitbucketReposIsLastPage,
-      nextPageStart: this.bitbucketRepositories.length - Number(this.bitbucketReposIsLastPage),
-      repositories: this.bitbucketRepositories,
-    });
-  };
-
   reset = () => {
     this.almInstancePATMap = cloneDeep(this.defaultAlmInstancePATMap);
     this.gitlabProjects = cloneDeep(this.defaultGitlabProjects);
diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreate.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreate.tsx
index 394d290ad1a..cf2eee4d40b 100644
--- a/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreate.tsx
+++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketServer/BitbucketProjectCreate.tsx
@@ -25,7 +25,6 @@ import { useLocation } from '~sonar-aligned/components/hoc/withRouter';
 import {
   getBitbucketServerProjects,
   getBitbucketServerRepositories,
-  searchForBitbucketServerRepositories,
 } from '../../../../api/alm-integrations';
 import { BitbucketProject, BitbucketRepository } from '../../../../types/alm-integration';
 import { AlmKeys } from '../../../../types/alm-settings';
@@ -180,7 +179,7 @@ export default function BitbucketProjectCreate({
       defaultRepositorySelect,
       fetchData,
       fetchSearchResults: (query: string, dopKey: string) =>
-        searchForBitbucketServerRepositories(dopKey, query),
+        getBitbucketServerRepositories(dopKey, undefined, query),
       getRepositoryKey: ({ slug }) => slug,
       isMonorepoSetup,
       selectedDopSetting,
diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/Bitbucket-it.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/Bitbucket-it.tsx
index 2bee7a314df..63ae76ba168 100644
--- a/server/sonar-web/src/main/js/apps/create/project/__tests__/Bitbucket-it.tsx
+++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/Bitbucket-it.tsx
@@ -22,7 +22,7 @@ import { screen, waitFor, within } from '@testing-library/react';
 
 import userEvent from '@testing-library/user-event';
 import { byLabelText, byRole, byText } from '~sonar-aligned/helpers/testSelector';
-import { searchForBitbucketServerRepositories } from '../../../../api/alm-integrations';
+import { getBitbucketServerRepositories } from '../../../../api/alm-integrations';
 import AlmIntegrationsServiceMock from '../../../../api/mocks/AlmIntegrationsServiceMock';
 import DopTranslationServiceMock from '../../../../api/mocks/DopTranslationServiceMock';
 import NewCodeDefinitionServiceMock from '../../../../api/mocks/NewCodeDefinitionServiceMock';
@@ -170,8 +170,9 @@ it('should show search filter when PAT is already set', async () => {
   await user.keyboard('search');
 
   await waitFor(() =>
-    expect(searchForBitbucketServerRepositories).toHaveBeenLastCalledWith(
+    expect(getBitbucketServerRepositories).toHaveBeenLastCalledWith(
       'conf-bitbucketserver-2',
+      undefined,
       'search',
     ),
   );