From 38fd92a15ad55851052c25552fce0691a583c1f1 Mon Sep 17 00:00:00 2001
From: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date: Tue, 3 Aug 2021 10:48:57 -0700
Subject: [PATCH] Always display all gems in Gem Catalog (#2341)

Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
---
 .../ProjectManager/Source/CreateProjectCtrl.cpp |  2 +-
 .../Source/GemCatalog/GemCatalogScreen.cpp      | 17 ++++-------------
 .../Source/GemCatalog/GemCatalogScreen.h        |  4 ++--
 .../ProjectManager/Source/UpdateProjectCtrl.cpp |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
index 20d564d8b0..f098518fd3 100644
--- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp
@@ -265,6 +265,6 @@ namespace O3DE::ProjectManager
     void CreateProjectCtrl::ReinitGemCatalogForSelectedTemplate()
     {
         const QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath();
-        m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template", /*isNewProject=*/true);
+        m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template");
     }
 } // namespace O3DE::ProjectManager
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index 53d772c217..863f611ec8 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -62,10 +62,10 @@ namespace O3DE::ProjectManager
         hLayout->addWidget(m_gemInspector);
     }
 
-    void GemCatalogScreen::ReinitForProject(const QString& projectPath, bool isNewProject)
+    void GemCatalogScreen::ReinitForProject(const QString& projectPath)
     {
         m_gemModel->clear();
-        FillModel(projectPath, isNewProject);
+        FillModel(projectPath);
 
         if (m_filterWidget)
         {
@@ -88,18 +88,9 @@ namespace O3DE::ProjectManager
             });
     }
 
-    void GemCatalogScreen::FillModel(const QString& projectPath, bool isNewProject)
+    void GemCatalogScreen::FillModel(const QString& projectPath)
     {
-        AZ::Outcome<QVector<GemInfo>, AZStd::string> allGemInfosResult;
-        if (isNewProject)
-        {
-            allGemInfosResult = PythonBindingsInterface::Get()->GetEngineGemInfos();
-        }
-        else
-        {
-            allGemInfosResult = PythonBindingsInterface::Get()->GetAllGemInfos(projectPath);
-        }
-
+        AZ::Outcome<QVector<GemInfo>, AZStd::string> allGemInfosResult = PythonBindingsInterface::Get()->GetAllGemInfos(projectPath);
         if (allGemInfosResult.IsSuccess())
         {
             // Add all available gems to the model.
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
index 204ad0e5c5..5b48b2f90e 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.h
@@ -28,13 +28,13 @@ namespace O3DE::ProjectManager
         ~GemCatalogScreen() = default;
         ProjectManagerScreen GetScreenEnum() override;
 
-        void ReinitForProject(const QString& projectPath, bool isNewProject);
+        void ReinitForProject(const QString& projectPath);
         bool EnableDisableGemsForProject(const QString& projectPath);
 
         GemModel* GetGemModel() const { return m_gemModel; }
 
     private:
-        void FillModel(const QString& projectPath, bool isNewProject);
+        void FillModel(const QString& projectPath);
 
         GemListView* m_gemListView = nullptr;
         GemInspector* m_gemInspector = nullptr;
diff --git a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
index 981a9352f7..6aba261cd2 100644
--- a/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
+++ b/Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
@@ -94,7 +94,7 @@ namespace O3DE::ProjectManager
         Update();
 
         // Gather the available gems that will be shown in the gem catalog.
-        m_gemCatalogScreen->ReinitForProject(m_projectInfo.m_path, /*isNewProject=*/false);
+        m_gemCatalogScreen->ReinitForProject(m_projectInfo.m_path);
     }
 
     void UpdateProjectCtrl::HandleGemsButton()