Apply reviewer suggestions

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp

@@ -78,7 +78,7 @@ namespace ScriptCanvasEditor
                     if (!tabDataVariant.value<GraphTabMetadata>().m_canvasWidget)
                     {
                         CanvasWidget* canvasWidget = new CanvasWidget(tabDataVariant.value<GraphTabMetadata>().m_assetId, this);
-                        canvasWidget->SetDefaultBorderColor(ScriptCanvasAssetDescription().GetDisplayColorImpl());
+                        canvasWidget->SetDefaultBorderColor(ScriptCanvasEditor::SourceDescription::GetDisplayColor());
                         GraphTabMetadata replacement = tabDataVariant.value<GraphTabMetadata>();
                         replacement.m_canvasWidget = canvasWidget;
                         tabDataVariant.setValue(replacement);
@@ -147,11 +147,11 @@ namespace ScriptCanvasEditor
         {
             if (!SelectTab(assetId))
             {
-                QIcon tabIcon = QIcon(ScriptCanvasAssetDescription().GetIconPathImpl());
+                QIcon tabIcon = QIcon(ScriptCanvasEditor::SourceDescription::GetIconPath());
                 tabIndex = qobject_cast<AzQtComponents::TabWidget*>(parent())->insertTab(tabIndex, new QWidget(), tabIcon, "");
                 GraphTabMetadata metaData;
                 CanvasWidget* canvasWidget = new CanvasWidget(assetId, this);
-                canvasWidget->SetDefaultBorderColor(ScriptCanvasAssetDescription().GetDisplayColorImpl());
+                canvasWidget->SetDefaultBorderColor(SourceDescription::GetDisplayColor());
                 metaData.m_canvasWidget = canvasWidget;
                 metaData.m_assetId = assetId;
                 metaData.m_fileState = fileState;

Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h

@@ -17,7 +17,6 @@
 #include <AzCore/Asset/AssetCommon.h>
 
 #include <ScriptCanvas/Core/Core.h>
-#include <Editor/Assets/ScriptCanvasAssetTracker.h>
 #include <ScriptCanvas/Bus/RequestBus.h>
 
 #endif

Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp

@@ -9,11 +9,9 @@
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
-
-#include <Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.h>
-
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
 #include <AzToolsFramework/AssetBrowser/Entries/ProductAssetBrowserEntry.h>
+#include <Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.h>
+#include <ScriptCanvas/Asset/RuntimeAsset.h>
 
 namespace ScriptCanvasEditor
 {
@@ -355,7 +353,7 @@ namespace ScriptCanvasEditor
         m_assetModel = new AzToolsFramework::AssetBrowser::AssetBrowserFilterModel();
 
         AzToolsFramework::AssetBrowser::AssetGroupFilter* assetFilter = new AzToolsFramework::AssetBrowser::AssetGroupFilter();
-        assetFilter->SetAssetGroup(ScriptCanvasEditor::ScriptCanvasAsset::Description::GetGroup(azrtti_typeid<ScriptCanvasAsset>()));
+        assetFilter->SetAssetGroup(ScriptCanvasEditor::SourceDescription::GetGroup());
 
         assetFilter->SetFilterPropagation(AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter::PropagateDirection::Down);
 
@@ -530,7 +528,7 @@ namespace ScriptCanvasEditor
             {
                 const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* productEntry = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>(entry);
 
-                if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasAsset>())
+                if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>())
                 {
                     auto mapIter = m_graphTreeItemMapping.find(productEntry->GetAssetId());
 
@@ -556,7 +554,7 @@ namespace ScriptCanvasEditor
         {
             const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* productEntry = static_cast<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>(entry);
 
-            if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvasEditor::ScriptCanvasAsset>())
+            if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>())
             {
                 OnEntityGraphRegistered(AZ::NamedEntityId(), ScriptCanvas::GraphIdentifier(productEntry->GetAssetId(), k_dynamicallySpawnedControllerId));
             }

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.h

@@ -17,7 +17,7 @@
 #include <ScriptCanvas/Bus/NodeIdPair.h>
 #include <ScriptCanvas/Bus/RequestBus.h>
 #include <Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.h>
-
+#include <ScriptCanvas/Core/SubgraphInterface.h>
 #include <ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
 
 namespace AZ

Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp

@@ -16,7 +16,6 @@
 
 #include <Editor/View/Widgets/NodePalette/NodePaletteModel.h>
 
-#include <Editor/Assets/ScriptCanvasAssetHelpers.h>
 #include <Editor/Include/ScriptCanvas/Bus/RequestBus.h>
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 #include <Editor/Nodes/NodeUtils.h>

Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp

@@ -462,31 +462,32 @@ namespace ScriptCanvasEditor
                         return;
                     }
 
+
                     AZStd::string rootPath, absolutePath;
                     AZ::Data::AssetInfo assetInfo = AssetHelpers::GetAssetInfo(assetId, rootPath);
                     AzFramework::StringFunc::Path::Join(rootPath.c_str(), assetInfo.m_relativePath.c_str(), absolutePath);
-
+ 
                     AZStd::string normPath = absolutePath;
                     AzFramework::StringFunc::Path::Normalize(normPath);
-
+ 
                     AZStd::string watchFolder;
                     bool sourceInfoFound{};
                     AzToolsFramework::AssetSystemRequestBus::BroadcastResult(sourceInfoFound, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, normPath.c_str(), assetInfo, watchFolder);
-
+ 
                     if (!sourceInfoFound)
                     {
                         return;
                     }
-
+ 
                     CreateFunctionPaletteItem(asset, assetInfo);
-
+ 
                     treePaletteIter = m_globalFunctionTreeItems.find(asset->GetId());
-
+ 
                     if (treePaletteIter != m_globalFunctionTreeItems.end())
                     {
                         treePaletteIter->second->ClearError();
                     }
-
+ 
                     m_monitoredAssets.emplace(asset->GetId(), asset);
                 }
                 else 

Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp

@@ -10,11 +10,10 @@
 
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 
-#include <Editor/Assets/ScriptCanvasAssetTrackerBus.h>
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 #include <Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.h>
 
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+
 #include <ScriptCanvas/Components/EditorGraph.h>
 
 namespace ScriptCanvasEditor
@@ -136,8 +135,6 @@ namespace ScriptCanvasEditor
 
     void ScriptCanvasAssetNodeUsageTreeItem::SetAssetId(const AZ::Data::AssetId& assetId, AZ::Data::AssetType assetType)
     {
-        // If we are setting up a new assetId, we wantt o register for the bus.
-        // Otherwise we just want to reload the asset to scrape some data from it.
         if (m_assetId != assetId)
         {
             if (AZ::Data::AssetBus::Handler::BusIsConnected())
@@ -151,9 +148,6 @@ namespace ScriptCanvasEditor
         }
 
         m_assetType = assetType;
-
-        auto onAssetReady = [](ScriptCanvasMemoryAsset&) {};
-        AssetTrackerRequestBus::Broadcast(&AssetTrackerRequests::Load, m_assetId, m_assetType, onAssetReady);
     }
 
     const AZ::Data::AssetId& ScriptCanvasAssetNodeUsageTreeItem::GetAssetId() const
@@ -188,6 +182,7 @@ namespace ScriptCanvasEditor
         return nodeIter->second;
     }
 
+    /*
     void ScriptCanvasAssetNodeUsageTreeItem::OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset)
     {
         ProcessAsset(asset);
@@ -206,7 +201,8 @@ namespace ScriptCanvasEditor
         ProcessAsset(asset);
     }
 
-    void ScriptCanvasAssetNodeUsageTreeItem::ProcessAsset(const AZ::Data::Asset<ScriptCanvas::ScriptCanvasAssetBase>& scriptCanvasAsset)
+    // #sc_editor_asset_redux fix graph use statistics
+    void ScriptCanvasAssetNodeUsageTreeItem::ProcessAsset(const AZ::Data::Asset<LegacyScriptCanvasBaseAsset>& scriptCanvasAsset)
     {
         if (scriptCanvasAsset.IsReady())
         {
@@ -228,6 +224,7 @@ namespace ScriptCanvasEditor
             }
         }
     }
+    */
 
     ///////////////////////////////////////////
     // ScriptCanvasAssetNodeUsageTreeItemRoot

Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.h

@@ -15,7 +15,7 @@
 #include <GraphCanvas/Widgets/NodePalette/TreeItems/IconDecoratedNodePaletteTreeItem.h>
 
 #include <Editor/View/Widgets/NodePalette/NodePaletteModel.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+
 #include <ScriptCanvas/Components/EditorUtils.h>
 
 namespace ScriptCanvasEditor
@@ -94,15 +94,16 @@ namespace ScriptCanvasEditor
         void SetActiveNodeType(const ScriptCanvas::NodeTypeIdentifier& nodeTypeIdentifier);
         int GetNodeCount() const;
 
+    private:
+
         // AZ::Data::AssetBus::Handler
+        /*
         void OnAssetReady(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
         void OnAssetSaved(AZ::Data::Asset<AZ::Data::AssetData> asset, bool isSuccessful) override;
         void OnAssetReloaded(AZ::Data::Asset<AZ::Data::AssetData> asset) override;
+        */
         ////
-
-    private:
-
-        void ProcessAsset(const AZ::Data::Asset<ScriptCanvas::ScriptCanvasAssetBase>& scriptCanvasAsset);
+        // void ProcessAsset(const AZ::Data::Asset<LegacyScriptCanvasBaseAsset>& scriptCanvasAsset);
 
         QString m_name;
         QIcon   m_icon;

Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp

@@ -15,7 +15,7 @@
 
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+
 #include <ScriptCanvas/Bus/RequestBus.h>
 
 namespace
@@ -176,14 +176,15 @@ namespace ScriptCanvasEditor
     {
     }
 
-    void StatisticsDialog::OnCatalogAssetChanged(const AZ::Data::AssetId& assetId)
+    void StatisticsDialog::OnCatalogAssetChanged(const AZ::Data::AssetId& /*assetId*/)
     {
-        AZ::Data::AssetInfo assetInfo;
-        AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
-        if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
-        {
-            m_scriptCanvasAssetTreeRoot->RegisterAsset(assetId, assetInfo.m_assetType);
-        }
+        // #sc_editor_asset_redux cut or update
+//         AZ::Data::AssetInfo assetInfo;
+//         AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
+//         if (assetInfo.m_assetType == azrtti_typeid<OldAssetType())
+//         {
+//             m_scriptCanvasAssetTreeRoot->RegisterAsset(assetId, assetInfo.m_assetType);
+//         }
     }
     
     void StatisticsDialog::OnCatalogAssetAdded(const AZ::Data::AssetId& assetId)
@@ -191,14 +192,16 @@ namespace ScriptCanvasEditor
         OnCatalogAssetChanged(assetId);
     }
     
-    void StatisticsDialog::OnCatalogAssetRemoved(const AZ::Data::AssetId& assetId, const AZ::Data::AssetInfo& /*assetInfo*/)
+    void StatisticsDialog::OnCatalogAssetRemoved(const AZ::Data::AssetId& /*assetId*/, const AZ::Data::AssetInfo& /*assetInfo*/)
     {
-        AZ::Data::AssetInfo assetInfo;
-        AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
-        if (assetInfo.m_assetType == azrtti_typeid<ScriptCanvasAsset>())
-        {
-            m_scriptCanvasAssetTreeRoot->RemoveAsset(assetId);
-        }
+        // #sc_editor_asset_redux cut or update
+
+//         AZ::Data::AssetInfo assetInfo;
+//         AZ::Data::AssetCatalogRequestBus::BroadcastResult(assetInfo, &AZ::Data::AssetCatalogRequestBus::Events::GetAssetInfoById, assetId);
+//         if (assetInfo.m_assetType == azrtti_typeid<OldAssetType>())
+//         {
+//             m_scriptCanvasAssetTreeRoot->RemoveAsset(assetId);
+//         }
     }
 
     void StatisticsDialog::OnAssetModelRepopulated()
@@ -432,22 +435,23 @@ namespace ScriptCanvasEditor
         }
     }
 
-    void StatisticsDialog::ProcessAsset(const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry)
+    void StatisticsDialog::ProcessAsset([[maybe_unused]] const AzToolsFramework::AssetBrowser::AssetBrowserEntry* entry)
     {
-        if (entry)
-        {
-            if (entry->GetEntryType() == AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Product)
-            {
-                const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* productEntry = static_cast<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>(entry);
-
-                if (productEntry->GetAssetType() == azrtti_typeid<ScriptCanvasAsset>())
-                {
-                    const AZ::Data::AssetId& assetId = productEntry->GetAssetId();
-
-                    m_scriptCanvasAssetTreeRoot->RegisterAsset(assetId, productEntry->GetAssetType());
-                }
-            }
-        }
+           // #sc_editor_asset_redux cut or update
+//         if (entry)
+//         {
+//             if (entry->GetEntryType() == AzToolsFramework::AssetBrowser::AssetBrowserEntry::AssetEntryType::Product)
+//             {
+//                 const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry* productEntry = static_cast<const AzToolsFramework::AssetBrowser::ProductAssetBrowserEntry*>(entry);
+// 
+//                 if (productEntry->GetAssetType() == azrtti_typeid<OldAssetType>())
+//                 {
+//                     const AZ::Data::AssetId& assetId = productEntry->GetAssetId();
+// 
+//                     m_scriptCanvasAssetTreeRoot->RegisterAsset(assetId, productEntry->GetAssetType());
+//                 }
+//             }
+//         }
     }
 
 #include <Editor/View/Widgets/StatisticsDialog/moc_ScriptCanvasStatisticsDialog.cpp>

Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp

@@ -26,7 +26,7 @@
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/IO/FileIO.h>
 #include <AzCore/Asset/AssetManager.h>
-
+#include <Editor/Assets/ScriptCanvasAssetHelpers.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 
 #include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
@@ -35,7 +35,6 @@
 #include <Editor/QtMetaTypes.h>
 #include <Editor/Settings.h>
 
-#include <Editor/Assets/ScriptCanvasAssetHelpers.h>
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 #include <Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
 #include <Editor/Model/UnitTestBrowserFilterModel.h>
@@ -47,13 +46,12 @@
 
 #include <Data/Data.h>
 
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
+
 #include <ScriptCanvas/Bus/ScriptCanvasExecutionBus.h>
 #include <ScriptCanvas/Bus/UnitTestVerificationBus.h>
 #include <ScriptCanvas/Data/DataRegistry.h>
 #include <ScriptCanvas/GraphCanvas/NodeDescriptorBus.h>
-
+#include <ScriptCanvas/Components/EditorUtils.h>
 #include <LyViewPaneNames.h>
 
 namespace ScriptCanvasEditor
@@ -522,16 +520,9 @@ namespace ScriptCanvasEditor
                         continue;
                     }
 
-                    AZ::Data::AssetInfo assetInfo;
-                    if (AssetHelpers::GetAssetInfo(sourceBrowserEntry->GetFullPath(), assetInfo))
-                    {
-                        auto asset = AZ::Data::AssetManager::Instance().GetAsset(assetInfo.m_assetId, azrtti_typeid<ScriptCanvasAsset>(), AZ::Data::AssetLoadBehavior::PreLoad);
-                        asset.BlockUntilLoadComplete();
-                        if (asset.IsReady())
-                        {
-                            RunTestGraph(asset, mode);
-                        }
-                    }
+                    ScriptCanvasEditor::SourceHandle source(nullptr, scriptUuid, "");
+                    ScriptCanvasEditor::CompleteDescriptionInPlace(source);
+                    RunTestGraph(source, mode);
                 }
             }           
         }
@@ -580,19 +571,19 @@ namespace ScriptCanvasEditor
         m_testMetrics[interpretedMode].Clear();
     }
 
-    void UnitTestDockWidget::RunTestGraph(AZ::Data::Asset<AZ::Data::AssetData> asset, ScriptCanvas::ExecutionMode mode)
+    void UnitTestDockWidget::RunTestGraph(SourceHandle asset, ScriptCanvas::ExecutionMode mode)
     {
         Reporter reporter;
-        UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestStart, asset.GetId().m_guid);
+        UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestStart, asset.Id());
 
         ScriptCanvasExecutionBus::BroadcastResult(reporter, &ScriptCanvasExecutionRequests::RunAssetGraph, asset, mode);
 
         UnitTestResult testResult;
 
         UnitTestVerificationBus::BroadcastResult(testResult, &UnitTestVerificationRequests::Verify, reporter);
-        UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestResult, asset.GetId().m_guid, testResult);
+        UnitTestWidgetNotificationBus::Broadcast(&UnitTestWidgetNotifications::OnTestResult, asset.Id(), testResult);
 
-        m_pendingTests.Add(asset.GetId(), mode);
+        m_pendingTests.Add(asset, mode);
 
         ++m_testMetrics[static_cast<int>(mode)].m_graphsTested;
 
@@ -612,7 +603,7 @@ namespace ScriptCanvasEditor
             ++m_testMetrics[static_cast<int>(mode)].m_compilationFailures;
         }
 
-        m_pendingTests.Complete(asset.GetId(), mode);
+        m_pendingTests.Complete(asset, mode);
     }
 
     void UnitTestDockWidget::OnSystemTick()
@@ -623,14 +614,14 @@ namespace ScriptCanvasEditor
         }
     }
 
-    void UnitTestDockWidget::PendingTests::Add(AZ::Data::AssetId assetId, ExecutionMode mode)
+    void UnitTestDockWidget::PendingTests::Add(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode)
     {
         m_pendingTests.push_back(AZStd::make_pair(assetId, mode));
     }
 
-    void UnitTestDockWidget::PendingTests::Complete(AZ::Data::AssetId assetId, ExecutionMode mode)
+    void UnitTestDockWidget::PendingTests::Complete(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode)
     {
-        AZStd::erase_if(m_pendingTests, [assetId, mode](const AZStd::pair<AZ::Data::AssetId, ExecutionMode>& pending)
+        AZStd::erase_if(m_pendingTests, [assetId, mode](const AZStd::pair<ScriptCanvasEditor::SourceHandle, ExecutionMode>& pending)
             {
                 return (assetId == pending.first && mode == pending.second);
             });

Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.h

@@ -162,7 +162,7 @@ namespace ScriptCanvasEditor
         void OpenTestResults(AZ::Uuid sourceUuid, AZStd::string_view sourceDisplayName);
         void RunTests(const AZStd::vector<AZ::Uuid>& scriptUuids);
 
-        void RunTestGraph(AZ::Data::Asset<AZ::Data::AssetData>, ScriptCanvas::ExecutionMode);
+        void RunTestGraph(SourceHandle sourceHandle, ScriptCanvas::ExecutionMode);
 
         void OnTestsComplete();
 
@@ -184,15 +184,15 @@ namespace ScriptCanvasEditor
         {
         public:
 
-            void Add(AZ::Data::AssetId assetId, ExecutionMode mode);
+            void Add(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode);
 
-            void Complete(AZ::Data::AssetId assetId, ExecutionMode mode);
+            void Complete(ScriptCanvasEditor::SourceHandle assetId, ExecutionMode mode);
 
             bool IsFinished() const;
 
         private:
 
-            AZStd::vector<AZStd::pair<AZ::Data::AssetId, ExecutionMode>> m_pendingTests;
+            AZStd::vector<AZStd::pair<SourceHandle, ExecutionMode>> m_pendingTests;
         };
 
         PendingTests m_pendingTests;

Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp

@@ -33,7 +33,7 @@
 #include <Editor/QtMetaTypes.h>
 
 #include <ScriptCanvas/Data/DataRegistry.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+
 
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Asset/AssetManager.h>

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp

@@ -716,7 +716,6 @@ namespace ScriptCanvasEditor
     void GraphVariablesModel::SetActiveScene(const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
     {
         ScriptCanvas::GraphVariableManagerNotificationBus::Handler::BusDisconnect();
-        m_assetType = azrtti_typeid<ScriptCanvasAsset>();
         m_scriptCanvasId = scriptCanvasId;
 
         if (m_scriptCanvasId.IsValid())
@@ -919,11 +918,6 @@ namespace ScriptCanvasEditor
         return -1;
     }
 
-    bool GraphVariablesModel::IsFunction()const
-    {
-        return m_assetType == azrtti_typeid<ScriptCanvas::SubgraphInterfaceAsset>();
-    }
-
     ////////////////////////////////////////////
     // GraphVariablesModelSortFilterProxyModel
     ////////////////////////////////////////////

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.h

@@ -106,8 +106,6 @@ namespace ScriptCanvasEditor
 
         void PopulateSceneVariables();
 
-        AZ::Data::AssetType m_assetType;
-
         AZStd::vector<ScriptCanvas::GraphScopedVariableId> m_variableIds;
         ScriptCanvas::ScriptCanvasId m_scriptCanvasId;
     };

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp

@@ -37,7 +37,6 @@
 
 #include <Data/Data.h>
 
-#include <Editor/Assets/ScriptCanvasAssetTrackerBus.h>
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 #include <Editor/QtMetaTypes.h>
 #include <Editor/Settings.h>

Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp

@@ -37,7 +37,6 @@
 
 #include <Data/Data.h>
 
-#include <Editor/Assets/ScriptCanvasAssetTrackerBus.h>
 #include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
 #include <Editor/QtMetaTypes.h>
 #include <Editor/Settings.h>

Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp

@@ -96,8 +96,7 @@
 
 #include <ScriptCanvas/Core/ScriptCanvasBus.h>
 #include <ScriptCanvas/Core/Graph.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
+
 #include <ScriptCanvas/Libraries/Core/FunctionDefinitionNode.h>
 
 #include <GraphCanvas/GraphCanvasBus.h>
@@ -145,12 +144,9 @@
 ////
 
 #include <Editor/Assets/ScriptCanvasAssetHelpers.h>
-#include <Editor/Assets/ScriptCanvasAssetTracker.h>
-#include <Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h>
-
 #include <ScriptCanvas/Asset/AssetDescription.h>
 #include <ScriptCanvas/Components/EditorScriptCanvasComponent.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+
 
 #include <Editor/QtMetaTypes.h>
 #include <GraphCanvas/Components/SceneBus.h>
@@ -358,21 +354,6 @@ namespace ScriptCanvasEditor
         }
     }
 
-    void Workspace::OnAssetReady(const ScriptCanvasMemoryAsset::pointer memoryAsset)
-    {
-        // open the file in the main window
-//         const ScriptCanvasEditor::SourceHandle& fileAssetId = memoryAsset->GetFileAssetId();
-// 
-//         if (AssetTrackerNotificationBus::MultiHandler::BusIsConnectedId(fileAssetId))
-//         {
-//             AssetTrackerNotificationBus::MultiHandler::BusDisconnect(fileAssetId);
-// 
-//             m_mainWindow->OpenScriptCanvasAsset(*memoryAsset);
-// 
-//             SignalAssetComplete(fileAssetId);
-//         }
-    }
-
     void Workspace::SignalAssetComplete(const ScriptCanvasEditor::SourceHandle& /*fileAssetId*/)
     {
         // When we are done loading all assets we can safely set the focus to the recorded asset
@@ -453,7 +434,7 @@ namespace ScriptCanvasEditor
             m_scriptCanvasAssetModel = new ScriptCanvasAssetBrowserModel(this);
 
             AzToolsFramework::AssetBrowser::AssetGroupFilter* scriptCanvasAssetFilter = new AzToolsFramework::AssetBrowser::AssetGroupFilter();
-            scriptCanvasAssetFilter->SetAssetGroup(ScriptCanvasAsset::Description::GetGroup(azrtti_typeid<ScriptCanvasAsset>()));
+            scriptCanvasAssetFilter->SetAssetGroup(ScriptCanvas::SubgraphInterfaceAssetDescription().GetGroupImpl());
             scriptCanvasAssetFilter->SetFilterPropagation(AzToolsFramework::AssetBrowser::AssetBrowserEntryFilter::PropagateDirection::Down);
 
             m_scriptCanvasAssetModel->setSourceModel(assetBrowserModel);
@@ -791,11 +772,7 @@ namespace ScriptCanvasEditor
 
         // View menu
         connect(ui->action_ViewNodePalette, &QAction::triggered, this, &MainWindow::OnViewNodePalette);
-
-        // Disabling the Minimap since it does not play nicely with the Qt caching solution
-        // And causing some weird visual issues.
         connect(ui->action_ViewMiniMap, &QAction::triggered, this, &MainWindow::OnViewMiniMap);
-        ui->action_ViewMiniMap->setVisible(false);
 
         connect(ui->action_ViewProperties, &QAction::triggered, this, &MainWindow::OnViewProperties);
         connect(ui->action_ViewBookmarks, &QAction::triggered, this, &MainWindow::OnBookmarks);
@@ -1501,17 +1478,17 @@ namespace ScriptCanvasEditor
 
         for (;;)
         {
-            ScriptCanvasAssetDescription description;
-            AZStd::string newAssetName = AZStd::string::format(description.GetAssetNamePatternImpl(), ++scriptCanvasEditorDefaultNewNameCount);
+            AZStd::string newAssetName = AZStd::string::format(SourceDescription::GetAssetNamePattern()
+                , ++scriptCanvasEditorDefaultNewNameCount);
             
             AZStd::array<char, AZ::IO::MaxPathLength> assetRootArray;
-            if (!AZ::IO::FileIOBase::GetInstance()->ResolvePath(description.GetSuggestedSavePathImpl()
+            if (!AZ::IO::FileIOBase::GetInstance()->ResolvePath(SourceDescription::GetSuggestedSavePath()
                 , assetRootArray.data(), assetRootArray.size()))
             {
                 AZ_ErrorOnce("Script Canvas", false, "Unable to resolve @projectroot@ path");
             }
 
-            AzFramework::StringFunc::Path::Join(assetRootArray.data(), (newAssetName + description.GetExtensionImpl()).data(), assetPath);
+            AzFramework::StringFunc::Path::Join(assetRootArray.data(), (newAssetName + SourceDescription::GetFileExtension()).data(), assetPath);
             AZ::Data::AssetInfo assetInfo;
 
             if (!AssetHelpers::GetAssetInfo(assetPath, assetInfo))
@@ -1639,7 +1616,6 @@ namespace ScriptCanvasEditor
         }
 
         PrepareAssetForSave(inMemoryAssetId);
-        ScriptCanvasAssetDescription assetDescription;
 
         AZStd::string suggestedFilename;
         AZStd::string suggestedFileFilter;
@@ -1648,16 +1624,16 @@ namespace ScriptCanvasEditor
         if (save == Save::InPlace)
         {
             isValidFileName = true;
-            suggestedFileFilter = ScriptCanvasAssetDescription().GetExtensionImpl();
+            suggestedFileFilter = SourceDescription::GetFileExtension();
             suggestedFilename = inMemoryAssetId.Path().c_str();
         }
         else
         {
-            suggestedFileFilter = ScriptCanvasAssetDescription().GetExtensionImpl();
+            suggestedFileFilter = SourceDescription::GetFileExtension();
 
             if (inMemoryAssetId.Path().empty())
             {
-                suggestedFilename = ScriptCanvasAssetDescription().GetSuggestedSavePathImpl();
+                suggestedFilename = SourceDescription::GetSuggestedSavePath();
             }
             else
             {
@@ -1679,9 +1655,9 @@ namespace ScriptCanvasEditor
             {
                 AZStd::string filePath = selectedFile.toUtf8().data();
 
-                if (!AZ::StringFunc::EndsWith(filePath, assetDescription.GetExtensionImpl(), false))
+                if (!AZ::StringFunc::EndsWith(filePath, SourceDescription::GetFileExtension(), false))
                 {
-                    filePath += assetDescription.GetExtensionImpl();
+                    filePath += SourceDescription::GetFileExtension();
                 }
 
                 AZStd::string fileName;
@@ -1713,9 +1689,9 @@ namespace ScriptCanvasEditor
             AZStd::string internalStringFile = selectedFile.toUtf8().data();
 
 
-            if (!AZ::StringFunc::EndsWith(internalStringFile, assetDescription.GetExtensionImpl(), false))
+            if (!AZ::StringFunc::EndsWith(internalStringFile, SourceDescription::GetFileExtension(), false))
             {
-                internalStringFile += assetDescription.GetExtensionImpl();
+                internalStringFile += SourceDescription::GetFileExtension();
             }
 
             if (!AssetHelpers::IsValidSourceFile(internalStringFile, GetActiveScriptCanvasId()))
@@ -2758,14 +2734,12 @@ namespace ScriptCanvasEditor
             m_logPanel->hide();
         }
 
-        /* Disable Mini-map until we fix rendering performance
         if (m_minimap)
         {
             addDockWidget(Qt::LeftDockWidgetArea, m_minimap);
             m_minimap->setFloating(false);
-            m_minimap->hide();
+            m_minimap->show();
         }
-        */
 
         if (m_nodePalette)
         {
@@ -2809,14 +2783,12 @@ namespace ScriptCanvasEditor
             m_bookmarkDockWidget->hide();
         }
 
-        /* Disable mini-map until we fix rendering performance
         if (m_minimap)
         {
             addDockWidget(Qt::RightDockWidgetArea, m_minimap);
             m_minimap->setFloating(false);
-            m_minimap->hide();
+            m_minimap->show();
         }
-        */
 
         resizeDocks(
         { m_nodePalette, m_propertyGrid },
@@ -3513,19 +3485,23 @@ namespace ScriptCanvasEditor
         return findChild<QObject*>(elementName);
     }
 
-    AZ::EntityId MainWindow::FindEditorNodeIdByAssetNodeId(const ScriptCanvasEditor::SourceHandle& assetId, AZ::EntityId assetNodeId) const
+    AZ::EntityId MainWindow::FindEditorNodeIdByAssetNodeId([[maybe_unused]] const ScriptCanvasEditor::SourceHandle& assetId
+        , [[maybe_unused]] AZ::EntityId assetNodeId) const
     {
-        AZ::EntityId editorEntityId;
-        AssetTrackerRequestBus::BroadcastResult
-            ( editorEntityId, &AssetTrackerRequests::GetEditorEntityIdFromSceneEntityId, assetId.Id(), assetNodeId);
+        AZ::EntityId editorEntityId{};
+//         AssetTrackerRequestBus::BroadcastResult
+//             ( editorEntityId, &AssetTrackerRequests::GetEditorEntityIdFromSceneEntityId, assetId.Id(), assetNodeId);
+        // #sc_editor_asset_redux fix logger
         return editorEntityId;
     }
 
-    AZ::EntityId MainWindow::FindAssetNodeIdByEditorNodeId(const ScriptCanvasEditor::SourceHandle& assetId, AZ::EntityId editorNodeId) const
+    AZ::EntityId MainWindow::FindAssetNodeIdByEditorNodeId([[maybe_unused]] const ScriptCanvasEditor::SourceHandle& assetId
+        , [[maybe_unused]] AZ::EntityId editorNodeId) const
     {
-        AZ::EntityId sceneEntityId;
-        AssetTrackerRequestBus::BroadcastResult
-            ( sceneEntityId, &AssetTrackerRequests::GetSceneEntityIdFromEditorEntityId, assetId.Id(), editorNodeId);
+        AZ::EntityId sceneEntityId{};
+        // AssetTrackerRequestBus::BroadcastResult
+        // ( sceneEntityId, &AssetTrackerRequests::GetSceneEntityIdFromEditorEntityId, assetId.Id(), editorNodeId);
+        // #sc_editor_asset_redux fix logger
         return sceneEntityId;
     }
 

Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h

@@ -43,11 +43,11 @@
 #include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
 #include <ScriptCanvas/Core/ScriptCanvasBus.h>
 #include <ScriptCanvas/Debugger/ClientTransceiver.h>
-#include <Editor/Assets/ScriptCanvasAssetHolder.h>
 #include <Editor/Undo/ScriptCanvasGraphCommand.h>
 #include <Editor/Utilities/RecentFiles.h>
 #include <Editor/View/Dialogs/SettingsDialog.h>
 #include <Editor/View/Widgets/NodePalette/NodePaletteModel.h>
+#include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 
 #include <Editor/View/Widgets/AssetGraphSceneDataBus.h>
 
@@ -56,13 +56,9 @@
 
 #if SCRIPTCANVAS_EDITOR
 #include <Include/EditorCoreAPI.h>
-#endif
+#endif//#if SCRIPTCANVAS_EDITOR
 
-#include <Editor/Assets/ScriptCanvasAssetTrackerBus.h>
-#include <Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h>
-
-#include <ScriptCanvas/Asset/ScriptCanvasAssetBase.h>
-#endif
+#endif//#if !defined(Q_MOC_RUN)
 
 namespace GraphCanvas
 {
@@ -90,7 +86,6 @@ namespace AzQtComponents
 class QDir;
 class QFile;
 class QProgressDialog;
-namespace ScriptCanvas { class ScriptCanvasAssetBase; }
 
 namespace ScriptCanvasEditor
 {
@@ -155,7 +150,6 @@ namespace ScriptCanvasEditor
 
     //! Manages the Save/Restore operations of the user's last opened and focused graphs
     class Workspace
-        : AssetTrackerNotificationBus::MultiHandler
     {
     public:
 
@@ -174,7 +168,6 @@ namespace ScriptCanvasEditor
 
     private:
 
-        void OnAssetReady(const ScriptCanvasMemoryAsset::pointer asset) override;
         void SignalAssetComplete(const ScriptCanvasEditor::SourceHandle& fileAssetId);
 
         ScriptCanvasEditor::SourceHandle GetSourceAssetId(const ScriptCanvasEditor::SourceHandle& memoryAssetId) const;
@@ -329,7 +322,6 @@ namespace ScriptCanvasEditor
         bool OnFileSaveAs();
         bool OnFileSaveCaller(){return OnFileSave();};
         bool OnFileSaveAsCaller(){return OnFileSaveAs();};        
-        bool SaveAssetImpl_OLD(const ScriptCanvasEditor::SourceHandle& assetId, const Callbacks::OnSave& saveCB);
         enum class Save
         {
             InPlace,
@@ -438,7 +430,6 @@ namespace ScriptCanvasEditor
 
         AZ::Outcome<int, AZStd::string> CreateScriptCanvasAsset(AZStd::string_view assetPath, int tabIndex = -1);
         
-        //! Removes the assetId -> ScriptCanvasAsset mapping and disconnects from the asset tracker
         void RemoveScriptCanvasAsset(const ScriptCanvasEditor::SourceHandle& assetId);
         void OnChangeActiveGraphTab(ScriptCanvasEditor::SourceHandle) override;
 

Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Controller.cpp

@@ -29,7 +29,6 @@
 #include <Editor/Settings.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/Controller.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/LogTraits.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Bus/EditorScriptCanvasBus.h>
 #include <ScriptCanvas/Components/EditorGraph.h>
 

Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp

@@ -16,7 +16,6 @@
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/SourceControl/SourceControlAPI.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/FileSaver.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAssetHandler.h>
 #include <ScriptCanvas/Assets/ScriptCanvasFileHandling.h>
 
 namespace ScriptCanvasEditor

Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Model.cpp

@@ -8,11 +8,10 @@
 
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <CryCommon/CrySystemBus.h>
-#include <Editor/Assets/ScriptCanvasAssetHelpers.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/Model.h>
 #include <IConsole.h>
 #include <ISystem.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+
 
 namespace ModifierCpp
 {

Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Modifier.cpp

@@ -10,7 +10,7 @@
 #include <Editor/View/Windows/Tools/UpgradeTool/LogTraits.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/Modifier.h>
 #include <ScriptCanvas/Asset/RuntimeAsset.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
+
 #include <ScriptCanvas/Assets/ScriptCanvasFileHandling.h>
 #include <ScriptCanvas/Core/Graph.h>
 

Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp

@@ -6,13 +6,13 @@
  *
  */
 
+#include <AzFramework/StringFunc/StringFunc.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserBus.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserEntry.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.h>
 #include <AzToolsFramework/AssetBrowser/AssetBrowserModel.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/LogTraits.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/Scanner.h>
-#include <ScriptCanvas/Assets/ScriptCanvasAsset.h>
 #include <ScriptCanvas/Assets/ScriptCanvasFileHandling.h>
 
 namespace ScannerCpp

Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp

@@ -24,7 +24,6 @@
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/SourceControl/SourceControlAPI.h>
-#include <Editor/Assets/ScriptCanvasAssetHelpers.h>
 #include <Editor/Settings.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/ModelTraits.h>
 #include <Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.h>

Gems/ScriptCanvas/Code/Editor/View/Windows/mainwindow.ui

@@ -529,7 +529,10 @@
    <property name="text">
     <string>Test Manager</string>
    </property>
-   <property name="shortcut">
+    <property name="enabled">
+      <bool>false</bool>
+    </property>
+    <property name="shortcut">
     <string>Ctrl+Shift+T</string>
    </property>
    <property name="autoRepeat">