From b0d65f1d73a00075331801dfcccf265b989961e9 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Fri, 2 Oct 2020 15:46:37 +0300
Subject: [PATCH] [Discover] "View surrounding documents" encodes spaces in
 filters

Closes: #72958
---
 .../angular/doc_table/components/table_row.ts | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
index e7fafde2e68d..dbbd22b5cb7d 100644
--- a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
@@ -18,6 +18,7 @@
  */
 
 import { find, template } from 'lodash';
+import { stringify } from 'query-string';
 import $ from 'jquery';
 import rison from 'rison-node';
 import '../../doc_viewer';
@@ -49,7 +50,7 @@ interface LazyScope extends ng.IScope {
   [key: string]: any;
 }
 
-export function createTableRowDirective($compile: ng.ICompileService, $httpParamSerializer: any) {
+export function createTableRowDirective($compile: ng.ICompileService) {
   const cellTemplate = template(noWhiteSpace(cellTemplateHtml));
   const truncateByHeightTemplate = template(noWhiteSpace(truncateByHeightTemplateHtml));
 
@@ -114,26 +115,25 @@ export function createTableRowDirective($compile: ng.ICompileService, $httpParam
       };
 
       $scope.getContextAppHref = () => {
-        const path = `#/context/${encodeURIComponent($scope.indexPattern.id)}/${encodeURIComponent(
-          $scope.row._id
-        )}`;
         const globalFilters: any = getServices().filterManager.getGlobalFilters();
         const appFilters: any = getServices().filterManager.getAppFilters();
-        const hash = $httpParamSerializer({
-          _g: encodeURI(
-            rison.encode({
+
+        const hash = stringify(
+          {
+            _g: rison.encode({
               filters: globalFilters || [],
-            })
-          ),
-          _a: encodeURI(
-            rison.encode({
+            }),
+            _a: rison.encode({
               columns: $scope.columns,
               filters: (appFilters || []).map(esFilters.disableFilter),
-            })
-          ),
-        });
+            }),
+          },
+          { encode: false }
+        );
 
-        return `${path}?${hash}`;
+        return `#/context/${encodeURIComponent($scope.indexPattern.id)}/${encodeURIComponent(
+          $scope.row._id
+        )}?${hash}`;
       };
 
       // create a tr element that lists the value for each *column*