fixed typo affecting create new use case, fixed cleanup dashboard container, removed lastContainerId

Author: ThomThomson

src/plugins/dashboard/public/application/dashboard_app.tsx

@@ -68,7 +68,6 @@ export function DashboardApp({
   } = useKibana<DashboardAppServices>().services;
 
   const [lastReloadTime, setLastReloadTime] = useState(0);
-  const [lastContainerId, setLastContainerId] = useState<number>();
   const [indexPatterns, setIndexPatterns] = useState<IndexPattern[]>([]);
 
   const savedDashboard = useSavedDashboard(savedDashboardId, history);
@@ -124,14 +123,9 @@ export function DashboardApp({
 
   // Manage dashboard container subscriptions
   useEffect(() => {
-    if (
-      !dashboardStateManager ||
-      !dashboardContainer ||
-      lastContainerId === dashboardContainer.runtimeId
-    ) {
+    if (!dashboardStateManager || !dashboardContainer) {
       return;
     }
-    setLastContainerId(dashboardContainer.runtimeId);
     const timeFilter = data.query.timefilter.timefilter;
     const subscriptions = new Subscription();
 
@@ -178,7 +172,6 @@ export function DashboardApp({
     core.http,
     uiSettings,
     data.query,
-    lastContainerId,
     dashboardContainer,
     data.search.session,
     indexPatternService,

src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts

@@ -113,8 +113,8 @@ export const useDashboardContainer = (
         );
       }
       setDashboardContainer(newContainer);
-      return () => setDashboardContainer(null);
     })();
+    return () => setDashboardContainer(null);
   }, [
     dashboardCapabilities,
     dashboardStateManager,

src/plugins/dashboard/public/application/hooks/use_saved_dashboard.ts

@@ -39,10 +39,6 @@ export const useSavedDashboard = (savedDashboardId: string | undefined, history:
 
   useEffect(() => {
     (async function loadSavedDashboard() {
-      if (!savedDashboardId) {
-        return;
-      }
-
       if (savedDashboardId === 'create') {
         history.replace({
           ...history.location, // preserve query,
@@ -58,16 +54,19 @@ export const useSavedDashboard = (savedDashboardId: string | undefined, history:
       try {
         const dashboard = (await savedDashboards.get(savedDashboardId)) as DashboardSavedObject;
         const { title, getFullPath } = dashboard;
+        if (savedDashboardId) {
+          recentlyAccessedPaths.add(getFullPath(), title, savedDashboardId);
+        }
 
         docTitle.change(title);
-        recentlyAccessedPaths.add(getFullPath(), title, savedDashboardId);
         setSavedDashboard(dashboard);
       } catch (error) {
         // E.g. a corrupt or deleted dashboard
         showDangerToast(error.message);
         history.push(DashboardConstants.LANDING_PAGE_PATH);
       }
     })();
+    return () => setSavedDashboard(null);
   }, [
     docTitle,
     history,