From a981fceaaf5c1ab9dd5103ce482b6cbcb536d4a8 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Mon, 26 Oct 2020 16:47:31 +0100
Subject: [PATCH] [7.x] [Trigger Actions UI] Properly unmount app (#81436)
 (#81615)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/application/boot.tsx               |  4 +++-
 .../triggers_actions_ui/public/plugin.ts      | 19 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/boot.tsx b/x-pack/plugins/triggers_actions_ui/public/application/boot.tsx
index c157f923e4447..80f9ac532d1c9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/boot.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/boot.tsx
@@ -28,5 +28,7 @@ export const boot = (bootDeps: BootDeps) => {
     </I18nContext>,
     element
   );
-  return () => unmountComponentAtNode(element);
+  return () => {
+    unmountComponentAtNode(element);
+  };
 };
diff --git a/x-pack/plugins/triggers_actions_ui/public/plugin.ts b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
index ef585eca1d67c..874a380f56b5f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
@@ -5,10 +5,10 @@
  */
 
 import {
-  CoreStart,
   CoreSetup,
-  PluginInitializerContext,
+  CoreStart,
   Plugin as CorePlugin,
+  PluginInitializerContext,
 } from 'src/core/public';
 
 import { i18n } from '@kbn/i18n';
@@ -17,10 +17,9 @@ import { registerBuiltInAlertTypes } from './application/components/builtin_aler
 import { ActionTypeModel, AlertTypeModel } from './types';
 import { TypeRegistry } from './application/type_registry';
 import {
-  ManagementSetup,
   ManagementAppMountParams,
+  ManagementSetup,
 } from '../../../../src/plugins/management/public';
-import { boot } from './application/boot';
 import { ChartsPluginStart } from '../../../../src/plugins/charts/public';
 import { PluginStartContract as AlertingStart } from '../../alerts/public';
 import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
@@ -63,11 +62,9 @@ export class Plugin
   private initializerContext: PluginInitializerContext;
 
   constructor(initializerContext: PluginInitializerContext) {
-    const actionTypeRegistry = new TypeRegistry<ActionTypeModel>();
-    this.actionTypeRegistry = actionTypeRegistry;
+    this.actionTypeRegistry = new TypeRegistry<ActionTypeModel>();
 
-    const alertTypeRegistry = new TypeRegistry<AlertTypeModel>();
-    this.alertTypeRegistry = alertTypeRegistry;
+    this.alertTypeRegistry = new TypeRegistry<AlertTypeModel>();
 
     this.initializerContext = initializerContext;
   }
@@ -88,7 +85,10 @@ export class Plugin
           PluginsStart,
           unknown
         ];
-        boot({
+
+        const { boot } = await import('./application/boot');
+
+        return boot({
           dataPlugin: pluginsStart.data,
           charts: pluginsStart.charts,
           alerts: pluginsStart.alerts,
@@ -107,7 +107,6 @@ export class Plugin
           actionTypeRegistry,
           alertTypeRegistry,
         });
-        return () => {};
       },
     });