[Fleet] Fix routing issues with getPath and history.push (#101658)

* Fix getPath usage in Fleet app * Fix pathname in failing test
elastic · Jun 9, 2021 · 58eb0d4 · 58eb0d4
1 parent 520d1e8
commit 58eb0d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx b/...plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
@@ -109,9 +109,7 @@ describe('when on integration detail', () => {
           pagePathGetters.integration_details_custom({ pkgkey: 'nginx-0.3.7' })[1]
         );
       });
-      expect(testRenderer.history.location.pathname).toEqual(
-        '/app/integrations/detail/nginx-0.3.7/overview'
-      );
+      expect(testRenderer.history.location.pathname).toEqual('/detail/nginx-0.3.7/overview');
     });
   });
 

diff --git a/x-pack/plugins/fleet/public/hooks/use_link.ts b/x-pack/plugins/fleet/public/hooks/use_link.ts
@@ -21,9 +21,7 @@ export const useLink = () => {
   const core = useStartServices();
   return {
     getPath: (page: StaticPage | DynamicPage, values: DynamicPagePathValues = {}): string => {
-      const [basePath, path] = getSeparatePaths(page, values);
-
-      return `${basePath}${path}`;
+      return getSeparatePaths(page, values)[1];
     },
     getAssetsPath: (path: string) =>
       core.http.basePath.prepend(`/plugins/${PLUGIN_ID}/assets/${path}`),