LKE-8090 fix(queryParsing): use URLSearchParams to get url query params #38

Author: aminerhanemi

public/js/main.js

@@ -111,57 +111,56 @@ async function runQueryByID(query) {
  * set queryParams as a json object containing the query parameters
  */
 function parseQueryParams() {
-    const url = location.search;
-    const query = url.substr(1);
-    const result = {global: {}, templateFields: {}};
-    query.split('&').forEach((param) => {
-        const item = param.split('=');
-        const parameter = getParameter(item);
-        if (parameter) {
-            if (parameter.type === 'global') {
-                result.global[decodeURIComponent(parameter.key)] = parameter.value;
-            } else if (parameter.type === 'templateField') {
-                result.templateFields[decodeURIComponent(parameter.key)] = parameter.value;
-            }
-        }
-    });
-    queryParams = result;
+  const result = {global: {}, templateFields: {}};
+  const parameters = new URLSearchParams(location.search);
+  parameters.forEach((value, key) => {
+    const parameter = getParameter(value, key);
+    if (parameter) {
+      if (parameter.type === 'global') {
+        result.global[decodeURIComponent(parameter.key)] = parameter.value;
+      } else if (parameter.type === 'templateField') {
+        result.templateFields[decodeURIComponent(parameter.key)] = parameter.value;
+      }
+    }
+  });
+  queryParams = result;
 }
 
 /**
  * check if the query-param  is allowed
- * @param item
- */
-function getParameter(item) {
-    const allowedParams = {
-        oneOf: [
-            'sourceKey',
-            'limit',
-            'queryId',
-            'queryName'
-        ],
-        startWith: [
-            'param_number_',
-            'param_ids_',
-            'param_string_'
-        ]
-    };
-    const decodedValue = decodeURIComponent(item[1]);
-    if (allowedParams.oneOf.includes(item[0])) {
-        return {key: item[0], value: decodedValue, type: 'global'};
-    } else {
-        const prefix = allowedParams.startWith.find((prefix) => item[0].startsWith(prefix));
-        switch (prefix) {
-            case  'param_number_':
-                return {key: item[0].replace('param_number_', ''), value: +decodedValue, type: 'templateField'};
-            case  'param_ids_':
-                return {key: item[0].replace('param_ids_', ''), value: decodedValue, type: 'templateField'};
-            case  'param_string_':
-                return {key: item[0].replace('param_string_', ''), value: decodedValue, type: 'templateField'};
-            default:
-                return false;
-        }
+ * @param value
+ * @param key
+ */
+function getParameter(value, key) {
+  const allowedParams = {
+    oneOf: [
+      'sourceKey',
+      'limit',
+      'queryId',
+      'queryName'
+    ],
+    startWith: [
+      'param_number_',
+      'param_ids_',
+      'param_string_'
+    ]
+  };
+  const decodedValue = decodeURIComponent(value);
+  if (allowedParams.oneOf.includes(key)) {
+    return {key: key, value: decodedValue, type: 'global'};
+  } else {
+    const prefix = allowedParams.startWith.find((prefix) => key.startsWith(prefix));
+    switch (prefix) {
+      case  'param_number_':
+        return {key: key.replace('param_number_', ''), value: +decodedValue, type: 'templateField'};
+      case  'param_ids_':
+        return {key: key.replace('param_ids_', ''), value: decodedValue, type: 'templateField'};
+      case  'param_string_':
+        return {key: key.replace('param_string_', ''), value: decodedValue, type: 'templateField'};
+      default:
+        return false;
     }
+  }
 }
 
 /**