Update

NOTICE.txt

@@ -218,28 +218,3 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
----
-This product includes code that was extracted from angular@1.3.
-Original license:
-The MIT License
-
-Copyright (c) 2010-2014 Google, Inc. http://angularjs.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-

src/plugins/kibana_utils/common/url/encode_uri_query.ts

@@ -56,5 +56,8 @@ export const encodeQuery = (
     }
   });
 
-export const makeUrlFromQuery = (query: ParsedUrlQuery | {}) =>
+export const stringifyWithEncoding = (query: ParsedUrlQuery | {}) =>
   stringify(query, undefined, undefined, { encodeURIComponent: encodeUriQuery });
+
+export const stringifyWithoutEncoding = (query: ParsedUrlQuery | {}) =>
+  stringify(query, undefined, undefined, { encodeURIComponent: (c: unknown) => c });

src/plugins/kibana_utils/common/url/index.ts

@@ -17,10 +17,16 @@
  * under the License.
  */
 
-import { encodeUriQuery, encodeQuery, makeUrlFromQuery } from './encode_uri_query';
+import {
+  encodeUriQuery,
+  encodeQuery,
+  stringifyWithEncoding,
+  stringifyWithoutEncoding,
+} from './encode_uri_query';
 
 export const url = {
   encodeQuery,
   encodeUriQuery,
-  makeUrlFromQuery,
+  stringifyWithEncoding,
+  stringifyWithoutEncoding,
 };

src/plugins/kibana_utils/public/history/remove_query_param.ts

@@ -28,7 +28,7 @@ export function removeQueryParam(history: History, param: string, replace: boole
 
   delete query[param];
 
-  const newSearch = url.makeUrlFromQuery(query);
+  const newSearch = url.stringifyWithEncoding(query);
   const newLocation: Location<any> = {
     ...oldLocation,
     search: newSearch,

src/plugins/kibana_utils/public/state_management/url/format.ts

@@ -29,7 +29,7 @@ export function replaceUrlHashQuery(
   const url = parseUrl(rawUrl);
   const hash = parseUrlHash(rawUrl);
   const newQuery = queryReplacer(hash?.query || {});
-  const searchQueryString = urlUtils.makeUrlFromQuery(newQuery);
+  const searchQueryString = urlUtils.stringifyWithEncoding(newQuery);
 
   if ((!hash || !hash.search) && !searchQueryString) return rawUrl; // nothing to change. return original url
   return formatUrl({

src/plugins/kibana_utils/public/state_management/url/kbn_url_storage.ts

@@ -243,11 +243,11 @@ export function getRelativeToHistoryPath(absoluteUrl: string, history: History):
 
   return formatUrl({
     pathname: stripBasename(parsedUrl.pathname),
-    search: urlUtils.makeUrlFromQuery(parsedUrl.query),
+    search: urlUtils.stringifyWithEncoding(parsedUrl.query),
     hash: parsedHash
       ? formatUrl({
           pathname: parsedHash.pathname,
-          search: urlUtils.makeUrlFromQuery(parsedHash.query),
+          search: urlUtils.stringifyWithEncoding(parsedHash.query),
         })
       : parsedUrl.hash,
   });

x-pack/legacy/plugins/apm/public/components/shared/Links/url_helpers.ts

@@ -18,9 +18,7 @@ export function fromQuery(query: Record<string, any>) {
     encodeURIComponent(value).replace(/%3A/g, ':')
   );
 
-  return stringify(encodedQuery, undefined, undefined, {
-    encodeURIComponent: (c: unknown) => c
-  });
+  return url.stringifyWithEncoding(encodedQuery);
 }
 
 export type APMQueryParams = {

x-pack/legacy/plugins/ml/public/application/util/url_state.ts

@@ -84,7 +84,7 @@ export const useUrlState = (accessor: string): UrlState => {
       }
 
       try {
-        const oldLocationSearch = url.makeUrlFromQuery(parsedQueryString);
+        const oldLocationSearch = url.stringifyWithoutEncoding(parsedQueryString);
 
         Object.keys(urlState).forEach(a => {
           if (isRisonSerializationRequired(a)) {
@@ -93,11 +93,11 @@ export const useUrlState = (accessor: string): UrlState => {
             parsedQueryString[a] = urlState[a];
           }
         });
-        const newLocationSearch = url.makeUrlFromQuery(parsedQueryString);
+        const newLocationSearch = url.stringifyWithoutEncoding(parsedQueryString);
 
         if (oldLocationSearch !== newLocationSearch) {
           history.push({
-            search: url.makeUrlFromQuery(parsedQueryString),
+            search: url.stringifyWithEncoding(parsedQueryString),
           });
         }
       } catch (error) {

x-pack/legacy/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 as string);
         }
-        const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
+        const reEncoded = urlUtils.stringifyWithoutEncoding(queryStringDecoded);
         return <Redirect to={`/${SiemPageName.hosts}?${reEncoded}`} />;
       }}
     />
@@ -55,7 +55,7 @@ export const MlHostConditionalContainer = React.memo<MlHostConditionalProps>(({
           queryStringDecoded.query = replaceKQLParts(queryStringDecoded.query);
         }
         if (emptyEntity(hostName)) {
-          const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
+          const reEncoded = urlUtils.stringifyWithoutEncoding(queryStringDecoded);
 
           return (
             <Redirect to={`/${SiemPageName.hosts}/${HostsTableType.anomalies}?${reEncoded}`} />
@@ -67,13 +67,13 @@ export const MlHostConditionalContainer = React.memo<MlHostConditionalProps>(({
             hosts,
             queryStringDecoded.query || ''
           );
-          const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+          const reEncoded = urlUtils.stringifyWithoutEncoding(queryStringDecoded);
 
           return (
             <Redirect to={`/${SiemPageName.hosts}/${HostsTableType.anomalies}?${reEncoded}`} />
           );
         } else {
-          const reEncoded = stringify(urlUtils.encodeQuery(queryStringDecoded));
+          const reEncoded = urlUtils.stringifyWithoutEncoding(queryStringDecoded);
 
           return (
             <Redirect

x-pack/legacy/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx

@@ -37,7 +37,7 @@ export const MlNetworkConditionalContainer = React.memo<MlNetworkConditionalProp
           queryStringDecoded.query = replaceKQLParts(queryStringDecoded.query);
         }
 
-        const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
+        const reEncoded = urlUtils.stringifyWithEncoding(queryStringDecoded);
 
         return <Redirect to={`/${SiemPageName.network}?${reEncoded}`} />;
       }}
@@ -57,7 +57,7 @@ export const MlNetworkConditionalContainer = React.memo<MlNetworkConditionalProp
         }
 
         if (emptyEntity(ip)) {
-          const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
+          const reEncoded = urlUtils.stringifyWithEncoding(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 = urlUtils.makeUrlFromQuery(queryStringDecoded);
+          const reEncoded = urlUtils.stringifyWithEncoding(queryStringDecoded);
           return <Redirect to={`/${SiemPageName.network}?${reEncoded}`} />;
         } else {
-          const reEncoded = urlUtils.makeUrlFromQuery(queryStringDecoded);
+          const reEncoded = urlUtils.stringifyWithEncoding(queryStringDecoded);
           return <Redirect to={`/${SiemPageName.network}/ip/${ip}?${reEncoded}`} />;
         }
       }}

x-pack/legacy/plugins/siem/public/components/url_state/helpers.ts

@@ -57,15 +57,15 @@ export const replaceStateKeyInQueryString = <T>(stateKey: string, urlState: T) =
   if (urlState == null || (typeof urlState === 'string' && urlState === '')) {
     delete previousQueryValues[stateKey];
 
-    return url.makeUrlFromQuery(previousQueryValues);
+    return url.stringifyWithEncoding(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 url.makeUrlFromQuery({
+  return url.stringifyWithEncoding({
     ...previousQueryValues,
     [stateKey]: encodedUrlState,
   });

x-pack/plugins/infra/public/components/logging/log_analysis_results/analyze_in_ml_button.tsx

@@ -61,7 +61,7 @@ const getOverallAnomalyExplorerLink = (pathname: string, jobId: string, timeRang
     },
   });
 
-  const hash = `/explorer?${urlUtils.makeUrlFromQuery({ _g })}`;
+  const hash = `/explorer?${urlUtils.stringifyWithEncoding({ _g })}`;
 
   return url.format({
     pathname,
@@ -94,7 +94,7 @@ const getPartitionSpecificSingleMetricViewerLink = (
     },
   });
 
-  const hash = `/timeseriesexplorer?${urlUtils.makeUrlFromQuery({ _g, _a })}`;
+  const hash = `/timeseriesexplorer?${urlUtils.stringifyWithEncoding({ _g, _a })}`;
 
   return url.format({
     pathname,

x-pack/plugins/infra/public/utils/url_state.tsx

@@ -159,7 +159,7 @@ export const replaceStateKeyInQueryString = <UrlState extends any>(
   const encodedUrlState =
     typeof urlState !== 'undefined' ? encodeRisonUrlState(urlState) : undefined;
 
-  return url.makeUrlFromQuery({
+  return url.stringifyWithEncoding({
     ...previousQueryValues,
     [stateKey]: encodedUrlState,
   });

x-pack/plugins/infra/public/utils/use_url_state.ts

@@ -115,7 +115,7 @@ export const replaceStateKeyInQueryString = <UrlState extends any>(
   const encodedUrlState =
     typeof urlState !== 'undefined' ? encodeRisonUrlState(urlState) : undefined;
 
-  return url.makeUrlFromQuery({
+  return url.stringifyWithEncoding({
     ...previousQueryValues,
     [stateKey]: encodedUrlState,
   });