From 10081fefb9074b9a1257a4a8573e47e1f68f2386 Mon Sep 17 00:00:00 2001
From: chcurran <chcurran@amazon.com>
Date: Fri, 11 Jun 2021 16:28:34 -0700
Subject: [PATCH 1/3] Remove unwanted entries from node palette

---
 .../Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl | 2 ++
 .../Editor/View/Widgets/NodePalette/NodePaletteModel.cpp     | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
index 9bda5cdcce..ebe7d27a8e 100644
--- a/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
+++ b/Code/Framework/AzCore/AzCore/RTTI/AzStdOnDemandReflection.inl
@@ -406,6 +406,7 @@ namespace AZ
                 AZStd::vector<AZ::BehaviorParameter> eventParamsTypes{ AZStd::initializer_list<AZ::BehaviorParameter>{
                     CreateBehaviorEventParameter<decay_array<T>>()... } };
                 behaviorContext->Class<AZ::Event<T...>>()
+                    ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::ListOnly)
                     ->Attribute(AZ::Script::Attributes::EventHandlerCreationFunction, createHandlerHolder)
                     ->Attribute(AZ::Script::Attributes::EventParameterTypes, eventParamsTypes)
                     ->Method("HasHandlerConnected", &AZ::Event<T...>::HasHandlerConnected)
@@ -413,6 +414,7 @@ namespace AZ
 
                 behaviorContext->Class<AZ::EventHandler<T...>>()
                     ->Method("Disconnect", &AZ::EventHandler<T...>::Disconnect)
+                        ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::ListOnly)
                     ;
             }
         }
diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
index a5c0287cfd..94f0dd974e 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
+++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
@@ -475,6 +475,11 @@ namespace
                 continue;
             }
 
+            if (auto excludeFromPointer = AZ::FindAttribute(AZ::ScriptCanvasAttributes::Internal::ImplementedAsNodeGeneric, behaviorClass->m_attributes))
+            {
+                continue;
+            }
+
             if (auto excludeFromPointer = AZ::FindAttribute(AZ::Script::Attributes::ExcludeFrom, behaviorClass->m_attributes))
             {
                 AZ::Script::Attributes::ExcludeFlags excludeFlags{};

From 2fd985f162792474f9fcf04d1a3ecd9b0e625ec6 Mon Sep 17 00:00:00 2001
From: chcurran <chcurran@amazon.com>
Date: Tue, 15 Jun 2021 12:13:25 -0700
Subject: [PATCH 2/3] Fix for unconverted once nodes

---
 .../Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp | 6 ++++++
 .../Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp  | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
index bc07d16a7e..356ee22ba3 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/AbstractCodeModel.cpp
@@ -3764,6 +3764,12 @@ namespace ScriptCanvas
                 nextSlot = onceResetSlot;
             }
 
+            if (!nextSlot)
+            {
+                AddError(ID.m_node->GetEntityId(), once, "Once node missing next slot, likely needs replacement");
+                return;
+            }
+
             ParseExecutionTreeBody(nextParse, *nextSlot);
             nextParse->MarkDebugEmptyStatement();
         }
diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
index 131209a521..0c92876e2c 100644
--- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
+++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
@@ -928,6 +928,7 @@ namespace ScriptCanvas
         {
             return execution->GetId().m_node
                 && IsOnce(*execution->GetId().m_node)
+                && execution->GetId().m_slot
                 && execution->GetId().m_slot->GetType() == CombinedSlotType::ExecutionIn;
         }
 
@@ -938,7 +939,7 @@ namespace ScriptCanvas
 
         bool IsOnceReset(const Node& node, const Slot* slot)
         {
-            return slot = OnceProperty::GetResetSlot(&node);
+            return slot == OnceProperty::GetResetSlot(&node);
         }
 
         bool IsOperatorArithmetic(const ExecutionTreeConstPtr& execution)

From 94edb18ed099c8625b449105f5ece7c15b67ec42 Mon Sep 17 00:00:00 2001
From: chcurran <chcurran@amazon.com>
Date: Tue, 15 Jun 2021 13:36:03 -0700
Subject: [PATCH 3/3] disabled upgrade menu until we can stabilize the tool
 (LYN-3799)

---
 Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
index 3b3043a4a0..c055f9f3ca 100644
--- a/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
+++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui
@@ -133,12 +133,12 @@
     <addaction name="action_PresetsEditor"/>
     <addaction name="separator"/>
    </widget>
-   <widget class="QMenu" name="menuUtilities">
+   <!-- Disabled until tool is stabilized <widget class="QMenu" name="menuUtilities">
     <property name="title">
      <string>&amp;Utilities</string>
     </property>
     <addaction name="action_UpgradeTool"/>
-   </widget>
+   </widget> -->
    <widget class="QMenu" name="menuSettings_2">
     <property name="title">
      <string>&amp;Preferences</string>