Integrating latest 47acbe8

Gems/GraphModel/Code/CMakeLists.txt

@@ -58,7 +58,7 @@ endif()
 if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     if(PAL_TRAIT_BUILD_HOST_TOOLS)
         ly_add_target(
-            NAME GraphModel.Editor.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+            NAME GraphModel.Editor.Tests MODULE
             NAMESPACE Gem
             FILES_CMAKE
                 graphmodel_tests_editor_files.cmake

Gems/GraphModel/Code/Include/GraphModel/Integration/GraphController.h

@@ -137,7 +137,7 @@ namespace GraphModelIntegration
 
         ////////////////////////////////////////////////////////////////////////////////////
         // GraphCanvas::SceneNotificationBus, connections
-        void OnNodeAdded(const AZ::EntityId& nodeUiId) override;
+        void OnNodeAdded(const AZ::EntityId& nodeUiId, bool isPaste) override;
         void OnNodeRemoved(const AZ::EntityId& nodeUiId) override;
         void PreOnNodeRemoved(const AZ::EntityId& nodeUiId) override;
         void OnConnectionRemoved(const AZ::EntityId& connectionUiId) override;
@@ -169,8 +169,8 @@ namespace GraphModelIntegration
         ////////////////////////////////////////////////////////////////////////////////////
         // GraphCanvas::GraphModelRequestBus, other
 
-        bool EnableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
-        bool DisableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
+        void EnableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
+        void DisableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds) override;
 
         AZStd::string GetDataTypeString(const AZ::Uuid& typeId);
 
@@ -196,7 +196,7 @@ namespace GraphModelIntegration
         // GraphCanvas::GraphModelRequestBus, node properties
 
         //! Creates a GraphCanvas::NodePropertyDisplay and a data interface for editing input values
-        GraphCanvas::NodePropertyDisplay* CreateDataSlotPropertyDisplay(const AZ::Uuid& dataTypeUuid, const GraphCanvas::NodeId& nodeUiId, const GraphCanvas::SlotId& slotUiId) const override;
+        GraphCanvas::NodePropertyDisplay* CreateDataSlotPropertyDisplay(const AZ::Uuid& dataType, const GraphCanvas::NodeId& nodeId, const GraphCanvas::SlotId& slotId) const override;
         GraphCanvas::NodePropertyDisplay* CreatePropertySlotPropertyDisplay(const AZ::Crc32& propertyId, const GraphCanvas::NodeId& nodeUiId, const GraphCanvas::SlotId& slotUiId) const override;
 
         //! Common implementation for CreateDataSlotPropertyDisplay and CreatePropertySlotPropertyDisplay

Gems/GraphModel/Code/Include/GraphModel/Integration/NodePalette/GraphCanvasNodePaletteItems.h

@@ -54,7 +54,7 @@ namespace GraphModelIntegration
             {
                 AZ::EntityId graphCanvasNodeId = graphCanvasNode->GetId();
 
-                GraphCanvas::SceneRequestBus::Event(graphCanvasSceneId, &GraphCanvas::SceneRequests::AddNode, graphCanvasNodeId, dropPosition);
+                GraphCanvas::SceneRequestBus::Event(graphCanvasSceneId, &GraphCanvas::SceneRequests::AddNode, graphCanvasNodeId, dropPosition, false);
                 GraphCanvas::SceneMemberUIRequestBus::Event(graphCanvasNodeId, &GraphCanvas::SceneMemberUIRequests::SetSelected, true);
 
                 AZ::EntityId gridId;

Gems/GraphModel/Code/Source/Integration/GraphController.cpp

@@ -479,7 +479,7 @@ namespace GraphModelIntegration
 
     void GraphController::AddNodeUiToScene(AZ::EntityId nodeUiId, const AZ::Vector2& scenePosition)
     {
-        GraphCanvas::SceneRequestBus::Event(GetGraphCanvasSceneId(), &GraphCanvas::SceneRequests::AddNode, nodeUiId, scenePosition);
+        GraphCanvas::SceneRequestBus::Event(GetGraphCanvasSceneId(), &GraphCanvas::SceneRequests::AddNode, nodeUiId, scenePosition, false);
         GraphCanvas::SceneMemberUIRequestBus::Event(nodeUiId, &GraphCanvas::SceneMemberUIRequests::SetSelected, true);
     }
 
@@ -850,7 +850,7 @@ namespace GraphModelIntegration
     }
 
 
-    void GraphController::OnNodeAdded(const AZ::EntityId& nodeUiId)
+    void GraphController::OnNodeAdded(const AZ::EntityId& nodeUiId, bool)
     {
         const GraphModel::NodePtr node = m_elementMap.Find<GraphModel::Node>(nodeUiId);
         if (node)
@@ -1318,17 +1318,15 @@ namespace GraphModelIntegration
     }
 
 
-    bool GraphController::EnableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds)
+    void GraphController::EnableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds)
     {
         AZ_UNUSED(nodeIds);
-        return true;
     }
 
 
-    bool GraphController::DisableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds)
+    void GraphController::DisableNodes(const AZStd::unordered_set<GraphCanvas::NodeId>& nodeIds)
     {
         AZ_UNUSED(nodeIds);
-        return true;
     }
 
 

Gems/GraphModel/Code/Tests/MockGraphCanvas.cpp

@@ -433,6 +433,10 @@ namespace MockGraphCanvasServices
     void MockNodeComponent::SignalConnectionMoveBegin([[maybe_unused]] const GraphCanvas::ConnectionId& connectionId)
     {
     }
+    
+    void MockNodeComponent::SignalNodeAboutToBeDeleted()
+    {
+    }
 
     // MockGraphCanvasSystemComponent
     void MockGraphCanvasSystemComponent::Reflect(AZ::ReflectContext* context)

Gems/GraphModel/Code/Tests/MockGraphCanvas.h

@@ -199,6 +199,7 @@ namespace MockGraphCanvasServices
         void HideUnusedSlots() override;
         bool HasHideableSlots() const override;
         void SignalConnectionMoveBegin(const GraphCanvas::ConnectionId& connectionId) override;
+        void SignalNodeAboutToBeDeleted() override;
 
     protected:
         /// This node's slots

Gems/GraphModel/gem.json

@@ -1,4 +1,5 @@
 {
+    "gem_name": "GraphModel",
     "GemFormatVersion": 4,
     "Uuid": "0844f64a3acf4f5abf3a535dc9b63bc9",
     "Name": "GraphModel",