diff --git a/pmm-app/src/pmm-qan/panel/components/Details/Metrics/Metrics.service.ts b/pmm-app/src/pmm-qan/panel/components/Details/Metrics/Metrics.service.ts index 911bfc1f69..7f1b6da853 100644 --- a/pmm-app/src/pmm-qan/panel/components/Details/Metrics/Metrics.service.ts +++ b/pmm-app/src/pmm-qan/panel/components/Details/Metrics/Metrics.service.ts @@ -1,4 +1,4 @@ -import { apiRequestQAN } from 'shared/components/helpers/api'; +import { apiRequest } from 'shared/components/helpers/api'; import { getLabelQueryParams } from 'pmm-qan/panel/QueryAnalytics.tools'; import { HistogramRequest, HistogramResponse } from './Metrics.types'; @@ -15,7 +15,7 @@ export const getMetrics = async ({ totals, }; - return apiRequestQAN.post(':getMetrics', body); + return apiRequest.post('/v1/qan:getMetrics', body); }; export const getHistogram = async ({ @@ -28,7 +28,7 @@ export const getHistogram = async ({ period_start_to: to, }; - return apiRequestQAN.post(':getHistogram', body); + return apiRequest.post('/v1/qan:getHistogram', body); }; export default { diff --git a/pmm-app/src/pmm-qan/panel/components/Details/database-models/mongodb/service.ts b/pmm-app/src/pmm-qan/panel/components/Details/database-models/mongodb/service.ts index e88e70f593..e5ff2d592c 100644 --- a/pmm-app/src/pmm-qan/panel/components/Details/database-models/mongodb/service.ts +++ b/pmm-app/src/pmm-qan/panel/components/Details/database-models/mongodb/service.ts @@ -1,9 +1,9 @@ -import { apiRequestActions } from 'shared/components/helpers/api'; +import { apiRequest } from 'shared/components/helpers/api'; export default { getTraditionalExplainJSONMongo(body) { const requestBody = { mongodb_explain: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, }; diff --git a/pmm-app/src/pmm-qan/panel/components/Details/database-models/mysql/service.ts b/pmm-app/src/pmm-qan/panel/components/Details/database-models/mysql/service.ts index 081cdd739f..d7787241ff 100644 --- a/pmm-app/src/pmm-qan/panel/components/Details/database-models/mysql/service.ts +++ b/pmm-app/src/pmm-qan/panel/components/Details/database-models/mysql/service.ts @@ -1,33 +1,33 @@ -import { apiRequestActions } from 'shared/components/helpers/api'; +import { apiRequest } from 'shared/components/helpers/api'; export default { getShowCreateTableMySQL(body) { const requestBody = { mysql_show_create_table: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, getMysqlTableStatus(body) { const requestBody = { mysql_show_table_status: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, getMysqlIndex(body) { const requestBody = { mysql_show_index: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, getTraditionalExplainJSONMysql(body) { const requestBody = { mysql_explain_traditional_json: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, getTraditionalExplainMysql(body) { const requestBody = { mysql_explain_json: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, }; diff --git a/pmm-app/src/pmm-qan/panel/components/Details/database-models/postgresql/service.ts b/pmm-app/src/pmm-qan/panel/components/Details/database-models/postgresql/service.ts index 8b4d27c324..43559f8201 100644 --- a/pmm-app/src/pmm-qan/panel/components/Details/database-models/postgresql/service.ts +++ b/pmm-app/src/pmm-qan/panel/components/Details/database-models/postgresql/service.ts @@ -1,14 +1,14 @@ -import { apiRequestActions } from 'shared/components/helpers/api'; +import { apiRequest } from 'shared/components/helpers/api'; export default { getPostgreSQLIndex(body) { const requestBody = { postgres_show_index: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, getShowCreateTablePostgreSQL(body) { const requestBody = { postgres_show_create_table: body }; - return apiRequestActions.post(':startServiceAction', requestBody); + return apiRequest.post('/v1/actions:startServiceAction', requestBody); }, }; diff --git a/pmm-app/src/shared/components/Actions/Actions.service.ts b/pmm-app/src/shared/components/Actions/Actions.service.ts index 8b0f54a101..d6054df6e4 100644 --- a/pmm-app/src/shared/components/Actions/Actions.service.ts +++ b/pmm-app/src/shared/components/Actions/Actions.service.ts @@ -1,8 +1,8 @@ -import { apiRequestActions } from '../helpers/api'; +import { apiRequest } from '../helpers/api'; import { ActionRequest, ActionResponse } from './Actions.types'; export const ActionsService = { getActionResult(body: ActionRequest): Promise { - return apiRequestActions.get(`/${body.action_id}`); + return apiRequest.get(`/v1/actions/${body.action_id}`); }, }; diff --git a/pmm-app/src/shared/components/helpers/api.ts b/pmm-app/src/shared/components/helpers/api.ts index a14068debd..f4d7fafd4c 100644 --- a/pmm-app/src/shared/components/helpers/api.ts +++ b/pmm-app/src/shared/components/helpers/api.ts @@ -64,4 +64,3 @@ export const apiRequestQAN = new ApiRequest({ baseURL: '/v1/qan' }); export const apiRequestManagement = new ApiRequest({ baseURL: '/v1/management' }); export const apiRequestInventory = new ApiRequest({ baseURL: '/v1/inventory' }); export const apiRequestSettings = new ApiRequest({ baseURL: '/v1/Settings' }); -export const apiRequestActions = new ApiRequest({ baseURL: '/v1/actions' });