tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

js: Teach the url parsing a final lesson about query strings 

`utils.parseParams()` now returns an array instead of an object.
This may require some changes in modules using this directly or
by `utils.parseUrl().params`

refs #4056
This commit is contained in:
Johannes Meyer 2020-01-16 13:45:10 +01:00
parent 0355b20da0
commit 8bc84a5f9e
3 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/js/icinga/behavior/actiontable.js
View File

@ -161,8 +161,11 @@
var keys = this.getMultiselectionKeys();
for (var i = 0; i < keys.length; i++) {
var key = keys[i];
if (params[key] || params[key] === null) {
tuple[key] = params[key];
for (var j = 0; j < params.length; j++) {
if (params[j].key === key && (params[j].value || params[j].value === null)) {
tuple[key] = params[j].value;
break;
}
}
}
return tuple;

2
public/js/icinga/loader.js
View File

@ -738,7 +738,7 @@
if (referrer.method === 'POST') {
var newUrl = this.icinga.utils.parseUrl(req.url);
var currentUrl = this.icinga.utils.parseUrl(req.$target.data('icingaUrl'));
if (newUrl.path === currentUrl.path && this.icinga.utils.objectsEqual(newUrl.params, currentUrl.params)) {
if (newUrl.path === currentUrl.path && this.icinga.utils.arraysEqual(newUrl.params, currentUrl.params)) {
autoSubmit = true;
}
}

111
public/js/icinga/utils.js
View File

@ -131,26 +131,27 @@
result = parts.path,
newparams = parts.params;
// We overwrite existing params
$.each(params, function (key, value) {
// We overwrite existing params
newparams[encodeURIComponent(key)] = typeof value === 'string'
? encodeURIComponent(value)
: null;
key = encodeURIComponent(key);
value = typeof value !== 'string' || !! value ? encodeURIComponent(value) : null;
var found = false;
for (var i = 0; i < newparams.length; i++) {
if (newparams[i].key === key) {
newparams[i].value = value;
found = true;
break;
}
}
if (! found) {
newparams.push({ key: key, value: value });
}
});
if (Object.keys(newparams).length) {
var queryString = '?';
$.each(newparams, function (key, value) {
if (queryString !== '?') {
queryString += '&';
}
queryString += key;
if (value !== null) {
queryString += '=' + value;
}
});
result += queryString;
if (newparams.length) {
result += '?' + this.buildQuery(newparams);
}
if (parts.hash.length) {
@ -166,23 +167,19 @@
result = parts.path,
newparams = parts.params;
$.each(params, function (idx, key) {
delete newparams[encodeURIComponent(key)];
$.each(params, function (_, key) {
key = encodeURIComponent(key);
for (var i = 0; i < newparams.length; i++) {
if (typeof newparams[i].key === key) {
delete newparams[i];
return;
}
}
});
if (Object.keys(newparams).length) {
var queryString = '?';
$.each(newparams, function (key, value) {
if (queryString !== '?') {
queryString += '&';
}
queryString += key;
if (value !== null) {
queryString += '=' + value;
}
});
result += queryString;
if (newparams.length) {
result += '?' + this.buildQuery(newparams);
}
if (parts.hash.length) {
@ -192,15 +189,37 @@
return result;
},
/**
* Return a query string for the given params
*
* @param {Array} params
* @return {string}
*/
buildQuery: function (params) {
var query = '';
for (var i = 0; i < params.length; i++) {
if (!! query) {
query += '&';
}
query += params[i].key;
if (params[i].value !== null) {
query += '=' + params[i].value;
}
}
return query;
},
/**
* Parse url params
*/
parseParams: function (a) {
var params = {},
var params = [],
segment = a.search.replace(/^\?/,'').split('&'),
len = segment.length,
i = 0,
s,
key,
value,
equalPos;
@ -219,7 +238,7 @@
value = null;
}
params[key] = value;
params.push({ key: key, value: value });
}
return params;
@ -416,6 +435,28 @@
});
},
arraysEqual: function (array1, array2) {
if (array1.length !== array2.length) {
return false;
}
var value1, value2;
for (var i = 0; i < array1.length; i++) {
value1 = array1[i];
value2 = array2[i];
if (typeof value1 === 'object') {
if (typeof value2 !== 'object' || ! this.objectsEqual(value1, value2)) {
return false;
}
} else if (value1 !== value2) {
return false;
}
}
return true;
},
/**
* Cleanup
*/