aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/api
diff options
context:
space:
mode:
authorWouter Admiraal <wouter.admiraal@sonarsource.com>2021-08-19 12:49:11 +0200
committersonartech <sonartech@sonarsource.com>2021-08-20 20:03:09 +0000
commit6f17541395dcedb52fe54e7755be95f2e5941086 (patch)
treece3d742aee2af87e018c193c97eea5e7fc81a4e5 /server/sonar-web/src/main/js/api
parent4ce76b5cde3ee915a6c45bfa452e0c7c61c642a5 (diff)
downloadsonarqube-6f17541395dcedb52fe54e7755be95f2e5941086.tar.gz
sonarqube-6f17541395dcedb52fe54e7755be95f2e5941086.zip
SONAR-15297 Move all code from sonar-ui-common back to respective sonar-web folders
Diffstat (limited to 'server/sonar-web/src/main/js/api')
-rw-r--r--server/sonar-web/src/main/js/api/alm-integrations.ts2
-rw-r--r--server/sonar-web/src/main/js/api/alm-settings.ts9
-rw-r--r--server/sonar-web/src/main/js/api/application.ts2
-rw-r--r--server/sonar-web/src/main/js/api/auth.ts2
-rw-r--r--server/sonar-web/src/main/js/api/branches.ts2
-rw-r--r--server/sonar-web/src/main/js/api/ce.ts2
-rw-r--r--server/sonar-web/src/main/js/api/component-report.ts2
-rw-r--r--server/sonar-web/src/main/js/api/components.ts2
-rw-r--r--server/sonar-web/src/main/js/api/favorites.ts2
-rw-r--r--server/sonar-web/src/main/js/api/issue-filters.ts2
-rw-r--r--server/sonar-web/src/main/js/api/issues.ts2
-rw-r--r--server/sonar-web/src/main/js/api/l10n.ts2
-rw-r--r--server/sonar-web/src/main/js/api/languages.ts2
-rw-r--r--server/sonar-web/src/main/js/api/marketplace.ts2
-rw-r--r--server/sonar-web/src/main/js/api/measures.ts2
-rw-r--r--server/sonar-web/src/main/js/api/metrics.ts2
-rw-r--r--server/sonar-web/src/main/js/api/nav.ts2
-rw-r--r--server/sonar-web/src/main/js/api/newCodePeriod.ts2
-rw-r--r--server/sonar-web/src/main/js/api/notifications.ts2
-rw-r--r--server/sonar-web/src/main/js/api/permissions.ts2
-rw-r--r--server/sonar-web/src/main/js/api/plugins.ts4
-rw-r--r--server/sonar-web/src/main/js/api/projectActivity.ts2
-rw-r--r--server/sonar-web/src/main/js/api/projectLinks.ts2
-rw-r--r--server/sonar-web/src/main/js/api/quality-gates.ts2
-rw-r--r--server/sonar-web/src/main/js/api/quality-profiles.ts4
-rw-r--r--server/sonar-web/src/main/js/api/rules.ts2
-rw-r--r--server/sonar-web/src/main/js/api/security-hotspots.ts2
-rw-r--r--server/sonar-web/src/main/js/api/settings.ts2
-rw-r--r--server/sonar-web/src/main/js/api/static.ts2
-rw-r--r--server/sonar-web/src/main/js/api/system.ts7
-rw-r--r--server/sonar-web/src/main/js/api/time-machine.ts2
-rw-r--r--server/sonar-web/src/main/js/api/user-tokens.ts2
-rw-r--r--server/sonar-web/src/main/js/api/user_groups.ts2
-rw-r--r--server/sonar-web/src/main/js/api/users.ts2
-rw-r--r--server/sonar-web/src/main/js/api/web-api.ts2
-rw-r--r--server/sonar-web/src/main/js/api/webhooks.ts2
36 files changed, 38 insertions, 50 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 7af1a28cd5f..d2849f70b8a 100644
--- a/server/sonar-web/src/main/js/api/alm-integrations.ts
+++ b/server/sonar-web/src/main/js/api/alm-integrations.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { get, getJSON, parseError, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { get, getJSON, parseError, post, postJSON } from '../helpers/request';
import {
AzureProject,
AzureRepository,
diff --git a/server/sonar-web/src/main/js/api/alm-settings.ts b/server/sonar-web/src/main/js/api/alm-settings.ts
index 8e1751e5f49..e1ca7062e85 100644
--- a/server/sonar-web/src/main/js/api/alm-settings.ts
+++ b/server/sonar-web/src/main/js/api/alm-settings.ts
@@ -18,14 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import {
- get,
- getJSON,
- HttpStatus,
- parseError,
- parseJSON,
- post
-} from '../sonar-ui-common/helpers/request';
+import { get, getJSON, HttpStatus, parseError, parseJSON, post } from '../helpers/request';
import {
AlmSettingsBindingDefinitions,
AlmSettingsInstance,
diff --git a/server/sonar-web/src/main/js/api/application.ts b/server/sonar-web/src/main/js/api/application.ts
index 0eeb3a569f1..42518728ba0 100644
--- a/server/sonar-web/src/main/js/api/application.ts
+++ b/server/sonar-web/src/main/js/api/application.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
import { Application, ApplicationPeriod, ApplicationProject } from '../types/application';
import { Visibility } from '../types/component';
diff --git a/server/sonar-web/src/main/js/api/auth.ts b/server/sonar-web/src/main/js/api/auth.ts
index f012a7bd381..8783eec3c3e 100644
--- a/server/sonar-web/src/main/js/api/auth.ts
+++ b/server/sonar-web/src/main/js/api/auth.ts
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { request } from '../sonar-ui-common/helpers/request';
+import { request } from '../helpers/request';
export function login(login: string, password: string): Promise<Response> {
return request('/api/authentication/login')
diff --git a/server/sonar-web/src/main/js/api/branches.ts b/server/sonar-web/src/main/js/api/branches.ts
index 6068b643b60..119933c0dcc 100644
--- a/server/sonar-web/src/main/js/api/branches.ts
+++ b/server/sonar-web/src/main/js/api/branches.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post } from '../sonar-ui-common/helpers/request';
+import { getJSON, post } from '../helpers/request';
import { Branch, PullRequest } from '../types/branch-like';
export function getBranches(project: string): Promise<Branch[]> {
diff --git a/server/sonar-web/src/main/js/api/ce.ts b/server/sonar-web/src/main/js/api/ce.ts
index d4f3d15774a..7b612e2317f 100644
--- a/server/sonar-web/src/main/js/api/ce.ts
+++ b/server/sonar-web/src/main/js/api/ce.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, RequestData } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, RequestData } from '../helpers/request';
import { IndexationStatus } from '../types/indexation';
import { Task, TaskWarning } from '../types/tasks';
diff --git a/server/sonar-web/src/main/js/api/component-report.ts b/server/sonar-web/src/main/js/api/component-report.ts
index 1904c834053..1892928e607 100644
--- a/server/sonar-web/src/main/js/api/component-report.ts
+++ b/server/sonar-web/src/main/js/api/component-report.ts
@@ -18,8 +18,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
+import { getJSON, post } from '../helpers/request';
import { getBaseUrl } from '../helpers/system';
-import { getJSON, post } from '../sonar-ui-common/helpers/request';
import { ComponentReportStatus } from '../types/component-report';
export function getReportStatus(
diff --git a/server/sonar-web/src/main/js/api/components.ts b/server/sonar-web/src/main/js/api/components.ts
index ec2f147b5af..6d719bceaeb 100644
--- a/server/sonar-web/src/main/js/api/components.ts
+++ b/server/sonar-web/src/main/js/api/components.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON, RequestData } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
import { ComponentQualifier, TreeComponent, TreeComponentWithPath } from '../types/component';
diff --git a/server/sonar-web/src/main/js/api/favorites.ts b/server/sonar-web/src/main/js/api/favorites.ts
index e26c51f1814..71c2e509107 100644
--- a/server/sonar-web/src/main/js/api/favorites.ts
+++ b/server/sonar-web/src/main/js/api/favorites.ts
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { getJSON, post } from '../sonar-ui-common/helpers/request';
+import { getJSON, post } from '../helpers/request';
export function getFavorites(): Promise<any> {
return getJSON('/api/favorites/search');
diff --git a/server/sonar-web/src/main/js/api/issue-filters.ts b/server/sonar-web/src/main/js/api/issue-filters.ts
index 8795a2b1900..5ea1c882502 100644
--- a/server/sonar-web/src/main/js/api/issue-filters.ts
+++ b/server/sonar-web/src/main/js/api/issue-filters.ts
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { post } from '../sonar-ui-common/helpers/request';
+import { post } from '../helpers/request';
export function toggleIssueFilter(id: string): Promise<void> {
return post('/issues/toggle_fav', { id });
diff --git a/server/sonar-web/src/main/js/api/issues.ts b/server/sonar-web/src/main/js/api/issues.ts
index 9b6f002166d..b590509351d 100644
--- a/server/sonar-web/src/main/js/api/issues.ts
+++ b/server/sonar-web/src/main/js/api/issues.ts
@@ -19,7 +19,7 @@
*/
import throwGlobalError from '../app/utils/throwGlobalError';
import getCoverageStatus from '../components/SourceViewer/helpers/getCoverageStatus';
-import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON, RequestData } from '../helpers/request';
import { IssueResponse, RawIssuesResponse } from '../types/issues';
type FacetName =
diff --git a/server/sonar-web/src/main/js/api/l10n.ts b/server/sonar-web/src/main/js/api/l10n.ts
index 579af9e9f82..4440711bd7d 100644
--- a/server/sonar-web/src/main/js/api/l10n.ts
+++ b/server/sonar-web/src/main/js/api/l10n.ts
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
import { L10nBundleRequestParams, L10nBundleRequestResponse } from '../types/l10n';
export function fetchL10nBundle(
diff --git a/server/sonar-web/src/main/js/api/languages.ts b/server/sonar-web/src/main/js/api/languages.ts
index 595254caee7..603acf899ca 100644
--- a/server/sonar-web/src/main/js/api/languages.ts
+++ b/server/sonar-web/src/main/js/api/languages.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
export function getLanguages(): Promise<T.Language[]> {
return getJSON('/api/languages/list').then(r => r.languages, throwGlobalError);
diff --git a/server/sonar-web/src/main/js/api/marketplace.ts b/server/sonar-web/src/main/js/api/marketplace.ts
index bbc418631d7..5300259fc5f 100644
--- a/server/sonar-web/src/main/js/api/marketplace.ts
+++ b/server/sonar-web/src/main/js/api/marketplace.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
export interface License {
contactEmail: string;
diff --git a/server/sonar-web/src/main/js/api/measures.ts b/server/sonar-web/src/main/js/api/measures.ts
index 77f6c9e820d..482af37a61b 100644
--- a/server/sonar-web/src/main/js/api/measures.ts
+++ b/server/sonar-web/src/main/js/api/measures.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
import {
MeasuresAndMetaWithMetrics,
diff --git a/server/sonar-web/src/main/js/api/metrics.ts b/server/sonar-web/src/main/js/api/metrics.ts
index bb59e319c18..b6230b51b7e 100644
--- a/server/sonar-web/src/main/js/api/metrics.ts
+++ b/server/sonar-web/src/main/js/api/metrics.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
export interface MetricsResponse {
metrics: T.Metric[];
diff --git a/server/sonar-web/src/main/js/api/nav.ts b/server/sonar-web/src/main/js/api/nav.ts
index b73f58f6ac1..8b89c9f4f89 100644
--- a/server/sonar-web/src/main/js/api/nav.ts
+++ b/server/sonar-web/src/main/js/api/nav.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
type NavComponent = T.Omit<T.Component, 'alm' | 'qualifier' | 'leakPeriodDate' | 'path' | 'tags'>;
diff --git a/server/sonar-web/src/main/js/api/newCodePeriod.ts b/server/sonar-web/src/main/js/api/newCodePeriod.ts
index 04363c339ee..60048a6fe0b 100644
--- a/server/sonar-web/src/main/js/api/newCodePeriod.ts
+++ b/server/sonar-web/src/main/js/api/newCodePeriod.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post } from '../sonar-ui-common/helpers/request';
+import { getJSON, post } from '../helpers/request';
export function getNewCodePeriod(data?: {
project?: string;
diff --git a/server/sonar-web/src/main/js/api/notifications.ts b/server/sonar-web/src/main/js/api/notifications.ts
index 0f314c75250..f6c3111c6a2 100644
--- a/server/sonar-web/src/main/js/api/notifications.ts
+++ b/server/sonar-web/src/main/js/api/notifications.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post } from '../sonar-ui-common/helpers/request';
+import { getJSON, post } from '../helpers/request';
export function getNotifications(): Promise<{
channels: string[];
diff --git a/server/sonar-web/src/main/js/api/permissions.ts b/server/sonar-web/src/main/js/api/permissions.ts
index a3f1eb716b8..f2a726ee1cc 100644
--- a/server/sonar-web/src/main/js/api/permissions.ts
+++ b/server/sonar-web/src/main/js/api/permissions.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON, RequestData } from '../helpers/request';
import { BaseSearchProjectsParameters } from './components';
const PAGE_SIZE = 100;
diff --git a/server/sonar-web/src/main/js/api/plugins.ts b/server/sonar-web/src/main/js/api/plugins.ts
index 20bf5f1df19..4702a2c03ed 100644
--- a/server/sonar-web/src/main/js/api/plugins.ts
+++ b/server/sonar-web/src/main/js/api/plugins.ts
@@ -19,8 +19,8 @@
*/
import { findLastIndex } from 'lodash';
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post } from '../sonar-ui-common/helpers/request';
-import { isDefined } from '../sonar-ui-common/helpers/types';
+import { getJSON, post } from '../helpers/request';
+import { isDefined } from '../helpers/types';
import {
AvailablePlugin,
InstalledPlugin,
diff --git a/server/sonar-web/src/main/js/api/projectActivity.ts b/server/sonar-web/src/main/js/api/projectActivity.ts
index ae1c60fde51..4d12622b743 100644
--- a/server/sonar-web/src/main/js/api/projectActivity.ts
+++ b/server/sonar-web/src/main/js/api/projectActivity.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON, RequestData } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
export function getProjectActivity(
diff --git a/server/sonar-web/src/main/js/api/projectLinks.ts b/server/sonar-web/src/main/js/api/projectLinks.ts
index 59db323b7cd..a77b313f144 100644
--- a/server/sonar-web/src/main/js/api/projectLinks.ts
+++ b/server/sonar-web/src/main/js/api/projectLinks.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
export function getProjectLinks(projectKey: string): Promise<T.ProjectLink[]> {
return getJSON('/api/project_links/search', { projectKey }).then(r => r.links, throwGlobalError);
diff --git a/server/sonar-web/src/main/js/api/quality-gates.ts b/server/sonar-web/src/main/js/api/quality-gates.ts
index 09d54d0d3b1..9c33f6b60e0 100644
--- a/server/sonar-web/src/main/js/api/quality-gates.ts
+++ b/server/sonar-web/src/main/js/api/quality-gates.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
import { QualityGateApplicationStatus, QualityGateProjectStatus } from '../types/quality-gates';
diff --git a/server/sonar-web/src/main/js/api/quality-profiles.ts b/server/sonar-web/src/main/js/api/quality-profiles.ts
index 008aab45ba8..551eb65e5c6 100644
--- a/server/sonar-web/src/main/js/api/quality-profiles.ts
+++ b/server/sonar-web/src/main/js/api/quality-profiles.ts
@@ -20,8 +20,8 @@
import { map } from 'lodash';
import throwGlobalError from '../app/utils/throwGlobalError';
import { Exporter, ProfileChangelogEvent } from '../apps/quality-profiles/types';
-import { csvEscape } from '../sonar-ui-common/helpers/csv';
-import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request';
+import { csvEscape } from '../helpers/csv';
+import { getJSON, post, postJSON, RequestData } from '../helpers/request';
export interface ProfileActions {
associateProjects?: boolean;
diff --git a/server/sonar-web/src/main/js/api/rules.ts b/server/sonar-web/src/main/js/api/rules.ts
index 4fd9b34b2e1..f5b966fc2eb 100644
--- a/server/sonar-web/src/main/js/api/rules.ts
+++ b/server/sonar-web/src/main/js/api/rules.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
import { GetRulesAppResponse, SearchRulesResponse } from '../types/coding-rules';
export function getRulesApp(): Promise<GetRulesAppResponse> {
diff --git a/server/sonar-web/src/main/js/api/security-hotspots.ts b/server/sonar-web/src/main/js/api/security-hotspots.ts
index de4135d802f..ed6094e24f0 100644
--- a/server/sonar-web/src/main/js/api/security-hotspots.ts
+++ b/server/sonar-web/src/main/js/api/security-hotspots.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post } from '../sonar-ui-common/helpers/request';
+import { getJSON, post } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
import {
Hotspot,
diff --git a/server/sonar-web/src/main/js/api/settings.ts b/server/sonar-web/src/main/js/api/settings.ts
index a4ca10a5fc7..f4069b816ae 100644
--- a/server/sonar-web/src/main/js/api/settings.ts
+++ b/server/sonar-web/src/main/js/api/settings.ts
@@ -20,7 +20,7 @@
import { omitBy } from 'lodash';
import throwGlobalError from '../app/utils/throwGlobalError';
import { isCategoryDefinition } from '../apps/settings/utils';
-import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON, RequestData } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
import { SettingCategoryDefinition, SettingDefinition, SettingValue } from '../types/settings';
diff --git a/server/sonar-web/src/main/js/api/static.ts b/server/sonar-web/src/main/js/api/static.ts
index 8377e101d58..26c2b958c37 100644
--- a/server/sonar-web/src/main/js/api/static.ts
+++ b/server/sonar-web/src/main/js/api/static.ts
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-import { checkStatus, request } from '../sonar-ui-common/helpers/request';
+import { checkStatus, request } from '../helpers/request';
export function getPluginStaticFileContent(pluginKey: string, staticFilePath: string) {
return request(`/static/${pluginKey}/${staticFilePath}`)
diff --git a/server/sonar-web/src/main/js/api/system.ts b/server/sonar-web/src/main/js/api/system.ts
index fad5ff026dd..9adf55ea9dc 100644
--- a/server/sonar-web/src/main/js/api/system.ts
+++ b/server/sonar-web/src/main/js/api/system.ts
@@ -18,12 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import {
- getJSON,
- post,
- postJSON,
- requestTryAndRepeatUntil
-} from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON, requestTryAndRepeatUntil } from '../helpers/request';
import { SystemUpgrade } from '../types/system';
export function setLogLevel(level: string): Promise<void | Response> {
diff --git a/server/sonar-web/src/main/js/api/time-machine.ts b/server/sonar-web/src/main/js/api/time-machine.ts
index 0128a2e7e41..5ea6da6053f 100644
--- a/server/sonar-web/src/main/js/api/time-machine.ts
+++ b/server/sonar-web/src/main/js/api/time-machine.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
import { BranchParameters } from '../types/branch-like';
interface TimeMachineResponse {
diff --git a/server/sonar-web/src/main/js/api/user-tokens.ts b/server/sonar-web/src/main/js/api/user-tokens.ts
index 76dec9b30c3..da711f55914 100644
--- a/server/sonar-web/src/main/js/api/user-tokens.ts
+++ b/server/sonar-web/src/main/js/api/user-tokens.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
/** List tokens for given user login */
export function getTokens(login: string): Promise<T.UserToken[]> {
diff --git a/server/sonar-web/src/main/js/api/user_groups.ts b/server/sonar-web/src/main/js/api/user_groups.ts
index ea9326c6790..bbb8e95a5f8 100644
--- a/server/sonar-web/src/main/js/api/user_groups.ts
+++ b/server/sonar-web/src/main/js/api/user_groups.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
export function searchUsersGroups(data: {
f?: string;
diff --git a/server/sonar-web/src/main/js/api/users.ts b/server/sonar-web/src/main/js/api/users.ts
index a405707aaf9..9d8282ba5be 100644
--- a/server/sonar-web/src/main/js/api/users.ts
+++ b/server/sonar-web/src/main/js/api/users.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
export function getCurrentUser(): Promise<T.CurrentUser> {
return getJSON('/api/users/current');
diff --git a/server/sonar-web/src/main/js/api/web-api.ts b/server/sonar-web/src/main/js/api/web-api.ts
index d55049e0cd4..c5bd4d8a535 100644
--- a/server/sonar-web/src/main/js/api/web-api.ts
+++ b/server/sonar-web/src/main/js/api/web-api.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON } from '../helpers/request';
interface RawDomain {
actions: T.WebApi.Action[];
diff --git a/server/sonar-web/src/main/js/api/webhooks.ts b/server/sonar-web/src/main/js/api/webhooks.ts
index 8b000a8b2a5..0cb8b283a77 100644
--- a/server/sonar-web/src/main/js/api/webhooks.ts
+++ b/server/sonar-web/src/main/js/api/webhooks.ts
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import throwGlobalError from '../app/utils/throwGlobalError';
-import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request';
+import { getJSON, post, postJSON } from '../helpers/request';
export function createWebhook(data: {
name: string;