From 2185505302e7a80dbb0c441a44d7df487711b98e Mon Sep 17 00:00:00 2001
From: chcurran <82187351+carlitosan@users.noreply.github.com>
Date: Thu, 30 Sep 2021 14:59:11 -0700
Subject: [PATCH] Repair upgrade notification after bad automatic merge

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
---
 .../Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h     | 1 -
 .../Editor/View/Widgets/NodePalette/NodePaletteModel.h   | 4 ----
 .../View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp   | 9 ---------
 .../View/Widgets/ScriptCanvasNodePaletteDockWidget.h     | 1 -
 Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h  | 5 -----
 5 files changed, 20 deletions(-)

diff --git a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
index 02edce4974..7e7b600081 100644
--- a/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
+++ b/Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Bus/EditorScriptCanvasBus.h
@@ -223,7 +223,6 @@ namespace ScriptCanvasEditor
         static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
 
         virtual void OnUpgradeStart() {}
-        virtual void OnUpgradeComplete() {}
         virtual void OnUpgradeCancelled() {}
 
         virtual void OnGraphUpgradeComplete(AZ::Data::Asset<AZ::Data::AssetData>&, bool skipped = false) { (void)skipped; }
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
index f92ab5142e..28d627af01 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.h
@@ -104,10 +104,6 @@ namespace ScriptCanvasEditor
         {
             DisconnectLambdas();
         }
-        void OnUpgradeComplete() override
-        {
-            ConnectLambdas();
-        }
 
         // Asset Node Support
         void OnRowsInserted(const QModelIndex& parentIndex, int first, int last);
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
index b60b4f2924..9e51c1896f 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp
@@ -386,15 +386,6 @@ namespace ScriptCanvasEditor
             AzFramework::AssetCatalogEventBus::Handler::BusDisconnect();
         }
 
-        void ScriptCanvasRootPaletteTreeItem::OnUpgradeComplete()
-        {
-            ConnectLambdas();
-
-            AzFramework::AssetCatalogEventBus::Handler::BusConnect();
-
-            TraverseTree();
-        }
-
         void ScriptCanvasRootPaletteTreeItem::OnUpgradeCancelled()
         {
             if (!AzFramework::AssetCatalogEventBus::Handler::BusIsConnected())
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h
index 16beb5b79e..45645ceb33 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.h
@@ -92,7 +92,6 @@ namespace ScriptCanvasEditor
 
             // UpgradeNotifications::Bus
             void OnUpgradeStart() override;
-            void OnUpgradeComplete() override;
             void OnUpgradeCancelled() override;
             ////
 
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
index f8703cc5c5..244d9dcd72 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
@@ -117,11 +117,6 @@ namespace ScriptCanvasEditor
         {
             AzToolsFramework::AssetBrowser::AssetBrowserComponentNotificationBus::Handler::BusDisconnect();
         }
-        
-        void OnUpgradeComplete() override
-        {
-            AzToolsFramework::AssetBrowser::AssetBrowserComponentNotificationBus::Handler::BusConnect();
-        }
     };
 
     class OnSaveToast