[Discover] Context - Fix bug when document id contains a slash (#77435)

elastic · Sep 24, 2020 · 8ad53d5 · 8ad53d5
1 parent 9ca2238
commit 8ad53d5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/plugins/discover/public/application/angular/context.js b/src/plugins/discover/public/application/angular/context.js
@@ -45,26 +45,18 @@ const k7Breadcrumbs = ($route) => {
 };
 
 getAngularModule().config(($routeProvider) => {
-  $routeProvider
-    // deprecated route, kept for compatibility
-    // should be removed in the future
-    .when('/context/:indexPatternId/:type/:id*', {
-      redirectTo: '/context/:indexPatternId/:id',
-    })
-    .when('/context/:indexPatternId/:id*', {
-      controller: ContextAppRouteController,
-      k7Breadcrumbs,
-      controllerAs: 'contextAppRoute',
-      resolve: {
-        indexPattern: ($route, Promise) => {
-          const indexPattern = getServices().indexPatterns.get(
-            $route.current.params.indexPatternId
-          );
-          return Promise.props({ ip: indexPattern });
-        },
+  $routeProvider.when('/context/:indexPatternId/:id*', {
+    controller: ContextAppRouteController,
+    k7Breadcrumbs,
+    controllerAs: 'contextAppRoute',
+    resolve: {
+      indexPattern: ($route, Promise) => {
+        const indexPattern = getServices().indexPatterns.get($route.current.params.indexPatternId);
+        return Promise.props({ ip: indexPattern });
       },
-      template: contextAppRouteTemplate,
-    });
+    },
+    template: contextAppRouteTemplate,
+  });
 });
 
 function ContextAppRouteController($routeParams, $scope, $route) {

diff --git a/src/plugins/discover/public/plugin.ts b/src/plugins/discover/public/plugin.ts
@@ -277,6 +277,14 @@ export class DiscoverPlugin
       return `#${path}`;
     });
     plugins.urlForwarding.forwardApp('context', 'discover', (path) => {
+      const urlParts = path.split('/');
+      // take care of urls containing legacy url, those split in the following way
+      // ["", "context", indexPatternId, _type, id + params]
+      if (urlParts[4]) {
+        // remove _type part
+        const newPath = [...urlParts.slice(0, 3), ...urlParts.slice(4)].join('/');
+        return `#${newPath}`;
+      }
       return `#${path}`;
     });
     plugins.urlForwarding.forwardApp('discover', 'discover', (path) => {