diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/monitoring/utils.js | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/monitoring/utils.js')
-rw-r--r-- | app/assets/javascripts/monitoring/utils.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js index 1f028ffbcad..95d544bd6d4 100644 --- a/app/assets/javascripts/monitoring/utils.js +++ b/app/assets/javascripts/monitoring/utils.js @@ -151,7 +151,7 @@ export const removePrefixFromLabel = label => /** * Convert parsed template variables to an object - * with just keys and values. Prepare the promVariables + * with just keys and values. Prepare the variables * to be added to the URL. Keys of the object will * have a prefix so that these params can be * differentiated from other URL params. @@ -183,15 +183,15 @@ export const getPromCustomVariablesFromUrl = (search = window.location.search) = }; /** - * Update the URL with promVariables. This usually get triggered when + * Update the URL with variables. This usually get triggered when * the user interacts with the dynamic input elements in the monitoring * dashboard header. * - * @param {Object} promVariables user defined variables + * @param {Object} variables user defined variables */ -export const setPromCustomVariablesFromUrl = promVariables => { +export const setCustomVariablesFromUrl = variables => { // prep the variables to append to URL - const parsedVariables = convertVariablesForURL(promVariables); + const parsedVariables = convertVariablesForURL(variables); // update the URL updateHistory({ url: mergeUrlParams(parsedVariables, window.location.href), @@ -262,7 +262,7 @@ export const expandedPanelPayloadFromUrl = (dashboard, search = window.location. * If no group/panel is set, the dashboard URL is returned. * * @param {?String} dashboard - Dashboard path, used as identifier for a dashboard - * @param {?Object} promVariables - Custom variables that came from the URL + * @param {?Object} variables - Custom variables that came from the URL * @param {?String} group - Group Identifier * @param {?Object} panel - Panel object from the dashboard * @param {?String} url - Base URL including current search params @@ -270,14 +270,14 @@ export const expandedPanelPayloadFromUrl = (dashboard, search = window.location. */ export const panelToUrl = ( dashboard = null, - promVariables, + variables, group, panel, url = window.location.href, ) => { const params = { dashboard, - ...promVariables, + ...variables, }; if (group && panel) { |