use URL, take out baseRoute

Author: kevinlog

x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_intra_app_state.tsx

@@ -27,12 +27,12 @@ export const IntraAppStateProvider = memo<{
   children: React.ReactNode;
 }>(({ kibanaScopedHistory, children }) => {
   const internalAppToAppState = useMemo<IntraAppState>(() => {
-    const intraAppState = kibanaScopedHistory.location.state as AnyIntraAppRouteState;
     return {
-      forRoute: intraAppState && intraAppState.baseRoute ? intraAppState.baseRoute : '',
-      routeState: intraAppState,
+      forRoute: new URL(`${kibanaScopedHistory.location.hash.substr(1)}`, 'http://localhost')
+        .pathname,
+      routeState: kibanaScopedHistory.location.state as AnyIntraAppRouteState,
     };
-  }, [kibanaScopedHistory.location.state]);
+  }, [kibanaScopedHistory.location.state, kibanaScopedHistory.location.hash]);
   return (
     <IntraAppStateContext.Provider value={internalAppToAppState}>
       {children}

x-pack/plugins/ingest_manager/public/applications/ingest_manager/types/intra_app_route_state.ts

@@ -19,8 +19,6 @@ export interface CreateDatasourceRouteState {
   onCancelNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
   /** Url to be used on cancel links */
   onCancelUrl?: string;
-  /** The base route */
-  baseRoute?: string;
 }
 
 /**
@@ -29,8 +27,6 @@ export interface CreateDatasourceRouteState {
 export interface AgentConfigDetailsDeployAgentAction {
   /** On done, navigate to the given app */
   onDoneNavigateTo?: Parameters<ApplicationStart['navigateToApp']>;
-  /** The base route */
-  baseRoute?: string;
 }
 
 /**

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx

@@ -134,9 +134,6 @@ export const HostList = () => {
           'securitySolution:management',
           { path: getEndpointListPath({ name: 'endpointList' }) },
         ],
-        baseRoute: `/integrations${
-          endpointPackageVersion ? `/endpoint-${endpointPackageVersion}/add-datasource` : ''
-        }`,
       },
     }
   );
@@ -150,7 +147,6 @@ export const HostList = () => {
         'securitySolution:management',
         { path: getEndpointListPath({ name: 'endpointList' }) },
       ],
-      baseRoute: `/configs/${selectedPolicyId}`,
     },
   });
 

x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx

@@ -156,9 +156,6 @@ export const PolicyList = React.memo(() => {
         onCancelNavigateTo: ['securitySolution:management', { path: getPoliciesPath() }],
         onCancelUrl: formatUrl(getPoliciesPath()),
         onSaveNavigateTo: ['securitySolution:management', { path: getPoliciesPath() }],
-        baseRoute: `/integrations${
-          endpointPackageVersion ? `/endpoint-${endpointPackageVersion}/add-datasource` : ''
-        }`,
       },
     }
   );