diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /app/assets/javascripts/api | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/assets/javascripts/api')
-rw-r--r-- | app/assets/javascripts/api/analytics_api.js | 32 | ||||
-rw-r--r-- | app/assets/javascripts/api/groups_api.js | 14 | ||||
-rw-r--r-- | app/assets/javascripts/api/markdown_api.js | 11 |
3 files changed, 55 insertions, 2 deletions
diff --git a/app/assets/javascripts/api/analytics_api.js b/app/assets/javascripts/api/analytics_api.js new file mode 100644 index 00000000000..58494c5a2b8 --- /dev/null +++ b/app/assets/javascripts/api/analytics_api.js @@ -0,0 +1,32 @@ +import axios from '~/lib/utils/axios_utils'; +import { buildApiUrl } from './api_utils'; + +const PROJECT_VSA_PATH_BASE = '/:project_path/-/analytics/value_stream_analytics/value_streams'; +const PROJECT_VSA_STAGES_PATH = `${PROJECT_VSA_PATH_BASE}/:value_stream_id/stages`; + +const buildProjectValueStreamPath = (projectPath, valueStreamId = null) => { + if (valueStreamId) { + return buildApiUrl(PROJECT_VSA_STAGES_PATH) + .replace(':project_path', projectPath) + .replace(':value_stream_id', valueStreamId); + } + return buildApiUrl(PROJECT_VSA_PATH_BASE).replace(':project_path', projectPath); +}; + +export const getProjectValueStreams = (projectPath) => { + const url = buildProjectValueStreamPath(projectPath); + return axios.get(url); +}; + +export const getProjectValueStreamStages = (projectPath, valueStreamId) => { + const url = buildProjectValueStreamPath(projectPath, valueStreamId); + return axios.get(url); +}; + +// NOTE: legacy VSA request use a different path +// the `requestPath` provides a full url for the request +export const getProjectValueStreamStageData = ({ requestPath, stageId, params }) => + axios.get(`${requestPath}/events/${stageId}`, { params }); + +export const getProjectValueStreamMetrics = (requestPath, params) => + axios.get(requestPath, { params }); diff --git a/app/assets/javascripts/api/groups_api.js b/app/assets/javascripts/api/groups_api.js index d4ba46656e6..d6c9e1d42cc 100644 --- a/app/assets/javascripts/api/groups_api.js +++ b/app/assets/javascripts/api/groups_api.js @@ -3,9 +3,9 @@ import { buildApiUrl } from './api_utils'; import { DEFAULT_PER_PAGE } from './constants'; const GROUPS_PATH = '/api/:version/groups.json'; +const DESCENDANT_GROUPS_PATH = '/api/:version/groups/:id/descendant_groups'; -export function getGroups(query, options, callback = () => {}) { - const url = buildApiUrl(GROUPS_PATH); +const axiosGet = (url, query, options, callback) => { return axios .get(url, { params: { @@ -19,4 +19,14 @@ export function getGroups(query, options, callback = () => {}) { return data; }); +}; + +export function getGroups(query, options, callback = () => {}) { + const url = buildApiUrl(GROUPS_PATH); + return axiosGet(url, query, options, callback); +} + +export function getDescendentGroups(parentGroupId, query, options, callback = () => {}) { + const url = buildApiUrl(DESCENDANT_GROUPS_PATH.replace(':id', parentGroupId)); + return axiosGet(url, query, options, callback); } diff --git a/app/assets/javascripts/api/markdown_api.js b/app/assets/javascripts/api/markdown_api.js new file mode 100644 index 00000000000..5c9c1713bd8 --- /dev/null +++ b/app/assets/javascripts/api/markdown_api.js @@ -0,0 +1,11 @@ +import axios from '../lib/utils/axios_utils'; +import { buildApiUrl } from './api_utils'; + +const MARKDOWN_PATH = '/api/:version/markdown'; + +export function getMarkdown(options) { + const url = buildApiUrl(MARKDOWN_PATH); + return axios.post(url, { + ...options, + }); +} |