External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

refactor encodeNoneDefaultQueryString

Browse Source
This commit is contained in:
Keith Grant
2019-09-19 11:51:51 -07:00
parent 508535be66
commit 1f149bb086
1 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
awx/ui_next/src/util/qs.js
View File

@@ -52,7 +52,7 @@ function stringToObject(config, qs) {
params[key] = mergeParam(params[key], value); params[key] = mergeParam(params[key], value);
}); });
return params; return params;
}; }
export { stringToObject as _stringToObject }; export { stringToObject as _stringToObject };
/** /**
@@ -120,28 +120,10 @@ function encodeValue(key, value) {
export const encodeNonDefaultQueryString = (config, params) => { export const encodeNonDefaultQueryString = (config, params) => {
if (!params) return ''; if (!params) return '';
const namespacedParams = namespaceParams(config.namespace, params); const paramsWithoutDefaults = removeParams({}, params, config.defaultParams);
const namespacedDefaults = namespaceParams( return encodeQueryString(
config.namespace, namespaceParams(config.namespace, paramsWithoutDefaults)
config.defaultParams
); );
const namespacedDefaultKeys = Object.keys(namespacedDefaults);
const namespacedParamsWithoutDefaultsKeys = Object.keys(
namespacedParams
).filter(
key =>
namespacedDefaultKeys.indexOf(key) === -1 ||
!paramValueIsEqual(namespacedParams[key], namespacedDefaults[key])
);
return namespacedParamsWithoutDefaultsKeys
.sort()
.filter(key => namespacedParams[key] !== null)
.map(key => {
return [key, namespacedParams[key]];
})
.map(([key, value]) => encodeValue(key, value))
.join('&');
}; };
/** /**
@@ -161,27 +143,6 @@ const namespaceParams = (namespace, params) => {
return namespaced; return namespaced;
}; };
/**
* helper function to check the value of a param is equal to another
* @param {string or number or array} param value one
* @param {string or number or array} params value two
* @return {boolean} true if values are equal
*/
const paramValueIsEqual = (one, two) => {
let isEqual = false;
if (Array.isArray(one) && Array.isArray(two)) {
isEqual = one.filter(val => two.indexOf(val) > -1).length === one.length;
} else if (
(typeof one === 'string' && typeof two === 'string') ||
(typeof one === 'number' && typeof two === 'number')
) {
isEqual = one === two;
}
return isEqual;
};
/** /**
* Removes params from the search string and returns the updated list of params * Removes params from the search string and returns the updated list of params
* @param {object} qs config object (used for getting defaults, current query params etc.) * @param {object} qs config object (used for getting defaults, current query params etc.)