Update more encoding uses

elastic · Mar 4, 2020 · 945990e · 945990e
1 parent f574dd3
commit 945990e
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 35 deletions.
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.ts
@@ -18,7 +18,6 @@
  */
 
 import { format as formatUrl } from 'url';
-// import { stringify } from 'querystring';
 import { createBrowserHistory, History } from 'history';
 import { decodeState, encodeState } from '../state_encoder';
 import { getCurrentUrl, parseUrl, parseUrlHash } from './parse';

diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts b/x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { parse, stringify } from 'querystring';
+import { parse } from 'querystring';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LocalUIFilterName } from '../../../../../../../plugins/apm/server/lib/ui_filters/local_ui_filters/config';
 import { url } from '../../../../../../../../src/plugins/kibana_utils/public';
@@ -18,7 +18,7 @@ export function fromQuery(query: Record<string, any>) {
     encodeURIComponent(value).replace(/%3A/g, ':')
   );
 
-  return stringify(encodedQuery);
+  return url.makeUrlFromQuery(encodedQuery);
 }
 
 export type APMQueryParams = {

diff --git a/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/routing.js b/x-pack/legacy/plugins/cross_cluster_replication/public/app/services/routing.js
@@ -24,8 +24,8 @@ const queryParamsFromObject = (params, encodeParams = false) => {
 
   const paramStr = stringify(
     params,
-    '&',
-    '=',
+    undefined,
+    undefined,
     encodeParams
       ? {}
       : {

diff --git a/...s/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx b/...s/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx
@@ -34,7 +34,7 @@ export const analyticsJobExplorationRoute: MlRoute = {
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
   const { context } = useResolver('', undefined, deps.config, basicResolvers(deps));
-  const { _g }: Record<string, any> = parse(location.search);
+  const { _g }: Record<string, any> = parse(location.search.substring(1));
 
   let globalState: any = null;
   try {

diff --git a/x-pack/legacy/plugins/ml/public/application/util/url_state.ts b/x-pack/legacy/plugins/ml/public/application/util/url_state.ts
@@ -9,6 +9,7 @@ import { useCallback } from 'react';
 import { isEqual } from 'lodash';
 import { decode, encode } from 'rison-node';
 import { useHistory, useLocation } from 'react-router-dom';
+import { url } from '../../../../../../../src/plugins/kibana_utils/common/url';
 
 import { Dictionary } from '../../../common/types/common';
 
@@ -83,7 +84,7 @@ export const useUrlState = (accessor: string): UrlState => {
       }
 
       try {
-        const oldLocationSearch = stringify(parsedQueryString);
+        const oldLocationSearch = url.makeUrlFromQuery(parsedQueryString);
 
         Object.keys(urlState).forEach(a => {
           if (isRisonSerializationRequired(a)) {
@@ -92,7 +93,7 @@ export const useUrlState = (accessor: string): UrlState => {
             parsedQueryString[a] = urlState[a];
           }
         });
-        const newLocationSearch = stringify(parsedQueryString);
+        const newLocationSearch = url.makeUrlFromQuery(parsedQueryString);
 
         if (oldLocationSearch !== newLocationSearch) {
           history.push({

diff --git a/...acy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx b/...acy/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx
@@ -37,7 +37,7 @@ export const MlHostConditionalContainer = React.memo<MlHostConditionalProps>(({
         if (queryStringDecoded.query != null) {
           queryStringDecoded.query = replaceKQLParts(queryStringDecoded.query);
         }
-        const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+        const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
         return <Redirect to={`/${SiemPageName.hosts}?${reEncoded}`} />;
       }}
     />
@@ -49,15 +49,13 @@ export const MlHostConditionalContainer = React.memo<MlHostConditionalProps>(({
           params: { hostName },
         },
       }) => {
-        const queryStringDecoded = parse(location.search.substring(1), {
-          sort: false,
-        }) as Required<QueryStringType>;
+        const queryStringDecoded = parse(location.search.substring(1)) as Required<QueryStringType>;
 
         if (queryStringDecoded.query != null) {
           queryStringDecoded.query = replaceKQLParts(queryStringDecoded.query);
         }
         if (emptyEntity(hostName)) {
-          const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+          const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
 
           return (
             <Redirect to={`/${SiemPageName.hosts}/${HostsTableType.anomalies}?${reEncoded}`} />

diff --git a/.../plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx b/.../plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx
@@ -5,7 +5,7 @@
  */
 
 // eslint-disable-next-line import/no-nodejs-modules
-import { parse, stringify } from 'querystring';
+import { parse } from 'querystring';
 import React from 'react';
 
 import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom';
@@ -37,7 +37,7 @@ export const MlNetworkConditionalContainer = React.memo<MlNetworkConditionalProp
           queryStringDecoded.query = replaceKQLParts(queryStringDecoded.query);
         }
 
-        const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+        const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
 
         return <Redirect to={`/${SiemPageName.network}?${reEncoded}`} />;
       }}
@@ -57,7 +57,7 @@ export const MlNetworkConditionalContainer = React.memo<MlNetworkConditionalProp
         }
 
         if (emptyEntity(ip)) {
-          const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+          const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
 
           return <Redirect to={`/${SiemPageName.network}?${reEncoded}`} />;
         } else if (multipleEntities(ip)) {
@@ -67,10 +67,10 @@ export const MlNetworkConditionalContainer = React.memo<MlNetworkConditionalProp
             ips,
             queryStringDecoded.query || ''
           );
-          const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+          const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
           return <Redirect to={`/${SiemPageName.network}?${reEncoded}`} />;
         } else {
-          const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+          const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
           return <Redirect to={`/${SiemPageName.network}/ip/${ip}?${reEncoded}`} />;
         }
       }}

diff --git a/x-pack/legacy/plugins/siem/public/components/url_state/helpers.ts b/x-pack/legacy/plugins/siem/public/components/url_state/helpers.ts
@@ -57,21 +57,18 @@ export const replaceStateKeyInQueryString = <T>(stateKey: string, urlState: T) =
   if (urlState == null || (typeof urlState === 'string' && urlState === '')) {
     delete previousQueryValues[stateKey];
 
-    return stringify(url.encodeQuery(previousQueryValues));
+    return url.makeUrlFromQuery(previousQueryValues);
   }
 
   // ಠ_ಠ Code was copied from x-pack/legacy/plugins/infra/public/utils/url_state.tsx ಠ_ಠ
   // Remove this if these utilities are promoted to kibana core
   const encodedUrlState =
     typeof urlState !== 'undefined' ? encodeRisonUrlState(urlState) : undefined;
 
-  return stringify(
-    url.encodeQuery({
-      ...previousQueryValues,
-      [stateKey]: encodedUrlState,
-    }),
-    { sort: false, encode: false }
-  );
+  return url.makeUrlFromQuery({
+    ...previousQueryValues,
+    [stateKey]: encodedUrlState,
+  });
 };
 
 export const replaceQueryStringInLocation = (

diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx
@@ -9,7 +9,6 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { encode } from 'rison-node';
 import url from 'url';
-import { stringify } from 'querystring';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { TimeRange } from '../../../../common/http_api/shared/time_range';
 import { url as urlUtils } from '../../../../../../../src/plugins/kibana_utils/public';
@@ -62,7 +61,7 @@ const getOverallAnomalyExplorerLink = (pathname: string, jobId: string, timeRang
     },
   });
 
-  const hash = `/explorer?${stringify(urlUtils.encodeQuery({ _g }))}`;
+  const hash = `/explorer?${urlUtils.makeUrlFromQuery({ _g })}`;
 
   return url.format({
     pathname,
@@ -95,7 +94,7 @@ const getPartitionSpecificSingleMetricViewerLink = (
     },
   });
 
-  const hash = `/timeseriesexplorer?${stringify(urlUtils.encodeQuery({ _g, _a }))}`;
+  const hash = `/timeseriesexplorer?${urlUtils.makeUrlFromQuery({ _g, _a })}`;
 
   return url.format({
     pathname,

diff --git a/x-pack/plugins/infra/public/utils/url_state.tsx b/x-pack/plugins/infra/public/utils/url_state.tsx
@@ -159,12 +159,10 @@ export const replaceStateKeyInQueryString = <UrlState extends any>(
   const encodedUrlState =
     typeof urlState !== 'undefined' ? encodeRisonUrlState(urlState) : undefined;
 
-  return stringify(
-    url.encodeQuery({
-      ...previousQueryValues,
-      [stateKey]: encodedUrlState,
-    })
-  );
+  return url.makeUrlFromQuery({
+    ...previousQueryValues,
+    [stateKey]: encodedUrlState,
+  });
 };
 
 const replaceQueryStringInLocation = (location: Location, queryString: string): Location => {