Merge branch 'development' into Prefabs/ProcessStackAddPrefabBug

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/Views/AssetBrowserTableView.cpp

@@ -144,7 +144,10 @@ namespace AzToolsFramework
         {
             emit ClearStringFilter();
             emit ClearTypeFilter();
-            m_sourceFilterModel->FilterUpdatedSlotImmediate();
+            if (m_sourceFilterModel)
+            {
+                m_sourceFilterModel->FilterUpdatedSlotImmediate();
+            }
         }
 
         void AssetBrowserTableView::Update()

Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp

@@ -2666,19 +2666,15 @@ namespace AzToolsFramework
                     if (!isPathSafeForAssets)
                     {
                         // Put an error in the console, so the log files have info about this error, or the user can look up the error after dismissing it.
-                        AZStd::string errorMessage = "You can save slices only to your game project folder or the Gems folder. Update the location and try again.\n\n"
-                            "You can also review and update your save locations in the AssetProcessorPlatformConfig.ini file.";
+                        AZStd::string errorMessage = "You can save slices only to your game project folder or the Gems folder. Update the location and try again.\n\n";
                         AZ_Error("Slice", false, errorMessage.c_str());
 
-                        QString learnMoreLink(QObject::tr(""));
-                        QString learnMoreDescription(QObject::tr(" <a href='%1'>Learn more</a>").arg(learnMoreLink));
-
                         // Display a pop-up, the logs are easy to miss. This will make sure a user who encounters this error immediately knows their slice save has failed.
                         QMessageBox msgBox(activeWindow);
                         msgBox.setIcon(QMessageBox::Icon::Warning);
                         msgBox.setTextFormat(Qt::RichText);
                         msgBox.setWindowTitle(QObject::tr("Invalid save location"));
-                        msgBox.setText(QString("%1 %2").arg(QObject::tr(errorMessage.c_str())).arg(learnMoreDescription));
+                        msgBox.setText(QString("%1").arg(QObject::tr(errorMessage.c_str())));
                         msgBox.setStandardButtons(QMessageBox::Cancel | QMessageBox::Retry);
                         msgBox.setDefaultButton(QMessageBox::Retry);
                         const int response = msgBox.exec();
@@ -2689,7 +2685,16 @@ namespace AzToolsFramework
                             // so set the suggested save path to a known valid location.
                             if (assetSafeFolders.size() > 0)
                             {
-                                retrySavePath = assetSafeFolders[0];
+                                QStringList strList = slicePath.split("/");
+                                if (strList.size() > 0)
+                                {
+                                    retrySavePath = assetSafeFolders[0] + ("/" + strList[strList.size() - 1]).toUtf8().data();
+                                }
+                                else
+                                {
+                                    retrySavePath = assetSafeFolders[0];
+                                }
+
                             }
                             return SliceSaveResult::Retry;
                         case QMessageBox::Cancel:

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp

@@ -840,8 +840,6 @@ namespace AzToolsFramework
                     richLabel->setTextFormat(Qt::RichText);
                 }
 
-                richLabel->setText(data);
-
                 richLabel->setGeometry(options.rect);
                 richLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
                 richLabel->setPalette(options.palette);

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp

@@ -1117,6 +1117,8 @@ namespace AzToolsFramework
 
         m_listModel->SearchStringChanged(filterString);
         m_proxyModel->UpdateFilter();
+
+        m_gui->m_objectTree->expandAll();
     }
 
     void EntityOutlinerWidget::OnFilterChanged(const AzQtComponents::SearchTypeFilterList& activeTypeFilters)

Code/Framework/AzToolsFramework/Tests/UI/AssetBrowserTests.cpp

@@ -74,10 +74,6 @@ namespace UnitTest
         AZStd::unique_ptr<AzToolsFramework::AssetBrowser::AssetBrowserFilterModel> m_filterModel;
         AZStd::unique_ptr<AzToolsFramework::AssetBrowser::AssetBrowserTableModel> m_tableModel;
 
-        AZStd::unique_ptr<QAbstractItemModelTester> m_modelTesterAssetBrowser;
-        AZStd::unique_ptr<QAbstractItemModelTester> m_modelTesterFilterModel;
-        AZStd::unique_ptr<QAbstractItemModelTester> m_modelTesterTableModel;
-
         QVector<int> m_folderIds = { 13, 14, 15 };
         QVector<int> m_sourceIDs = { 1, 2, 3, 4, 5 };
         QVector<int> m_productIDs = { 1, 2, 3, 4, 5 };
@@ -96,9 +92,6 @@ namespace UnitTest
         m_filterModel->setSourceModel(m_assetBrowserComponent->GetAssetBrowserModel());
         m_tableModel->setSourceModel(m_filterModel.get());
 
-        m_modelTesterAssetBrowser = AZStd::make_unique<QAbstractItemModelTester>(m_assetBrowserComponent->GetAssetBrowserModel());
-        m_modelTesterFilterModel = AZStd::make_unique<QAbstractItemModelTester>(m_filterModel.get());
-        m_modelTesterTableModel = AZStd::make_unique<QAbstractItemModelTester>(m_tableModel.get());
         m_searchWidget = AZStd::make_unique<AzToolsFramework::AssetBrowser::SearchWidget>();
 
         // Setup String filters
@@ -110,10 +103,6 @@ namespace UnitTest
 
     void AssetBrowserTest::TearDownEditorFixtureImpl()
     {
-        m_modelTesterAssetBrowser.reset();
-        m_modelTesterFilterModel.reset();
-        m_modelTesterTableModel.reset();
-
         m_tableModel.reset();
         m_filterModel.reset();
         m_assetBrowserComponent->Deactivate();