Fixed up types ++ Added cancel on click handler to datasource page la…

…yout
elastic · Jun 12, 2020 · b67c048 · b67c048
1 parent 91bda2e
commit b67c048
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/...k/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_intra_app_state.tsx b/...k/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_intra_app_state.tsx
@@ -13,9 +13,6 @@ interface IntraAppState<S extends AnyIntraAppRouteState = AnyIntraAppRouteState>
   forRoute: string;
   routeState?: S;
 }
-type UseIntraAppStateHook = <S extends AnyIntraAppRouteState = AnyIntraAppRouteState>() =>
-  | IntraAppState<S>['routeState']
-  | undefined;
 
 const IntraAppStateContext = React.createContext<IntraAppState>({ forRoute: '' });
 const wasHandled = new WeakSet<IntraAppState>();
@@ -47,7 +44,9 @@ export const IntraAppStateProvider = memo<{
  * This state can be used by other Kibana Apps to influence certain behaviours in Ingest, for example,
  * redirecting back to an given Application after a craete action.
  */
-export const useIntraAppState: UseIntraAppStateHook = () => {
+export function useIntraAppState<S = AnyIntraAppRouteState>():
+  | IntraAppState<S>['routeState']
+  | undefined {
   const location = useLocation();
   const intraAppState = useContext(IntraAppStateContext);
   if (!intraAppState) {
@@ -60,7 +59,7 @@ export const useIntraAppState: UseIntraAppStateHook = () => {
     // consistently either.
     if (location.pathname === intraAppState.forRoute && !wasHandled.has(intraAppState)) {
       wasHandled.add(intraAppState);
-      return intraAppState.routeState;
+      return intraAppState.routeState as S;
     }
   }, [intraAppState, location.pathname]);
-};
+}
diff --git a/...cations/ingest_manager/sections/agent_config/create_datasource_page/components/layout.tsx b/...cations/ingest_manager/sections/agent_config/create_datasource_page/components/layout.tsx
@@ -23,13 +23,21 @@ import { CreateDatasourceFrom } from '../types';
 export const CreateDatasourcePageLayout: React.FunctionComponent<{
   from: CreateDatasourceFrom;
   cancelUrl: string;
+  cancelOnClick?: React.ReactEventHandler;
   agentConfig?: AgentConfig;
   packageInfo?: PackageInfo;
-}> = ({ from, cancelUrl, agentConfig, packageInfo, children }) => {
+}> = ({ from, cancelUrl, cancelOnClick, agentConfig, packageInfo, children }) => {
   const leftColumn = (
     <EuiFlexGroup direction="column" gutterSize="s" alignItems="flexStart">
       <EuiFlexItem>
-        <EuiButtonEmpty size="xs" iconType="arrowLeft" flush="left" href={cancelUrl}>
+        {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
+        <EuiButtonEmpty
+          size="xs"
+          iconType="arrowLeft"
+          flush="left"
+          href={cancelUrl}
+          onClick={cancelOnClick}
+        >
           <FormattedMessage
             id="xpack.ingestManager.createDatasource.cancelLinkText"
             defaultMessage="Cancel"

diff --git a/...public/applications/ingest_manager/sections/agent_config/create_datasource_page/index.tsx b/...public/applications/ingest_manager/sections/agent_config/create_datasource_page/index.tsx
@@ -255,6 +255,7 @@ export const CreateDatasourcePage: React.FunctionComponent = () => {
   const layoutProps = {
     from,
     cancelUrl,
+    cancelOnClick: cancelClickHandler,
     agentConfig,
     packageInfo,
   };