diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss
index af9c675f23..7f48637cc8 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/Menu.qss
@@ -49,7 +49,7 @@ QMenu::right-arrow
QMenu::icon
{
- right: 8px;
+ right: 20px;
}
QMenu::indicator:checked
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/Notifications/link.svg b/Code/Framework/AzQtComponents/AzQtComponents/Images/Notifications/link.svg
new file mode 100644
index 0000000000..dfd21d157f
--- /dev/null
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/Notifications/link.svg
@@ -0,0 +1,4 @@
+
diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
index dbbf0e78e2..7b0c6530ab 100644
--- a/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
+++ b/Code/Framework/AzQtComponents/AzQtComponents/Images/resources.qrc
@@ -13,5 +13,6 @@
Notifications/checkmark.svg
Notifications/download.svg
+ Notifications/link.svg
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h b/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h
index 721cd6dd6a..98467727ea 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/AWSCoreEditorManager.h
@@ -18,7 +18,7 @@ namespace AWSCore
class AWSCoreEditorManager
{
public:
- static constexpr const char CLOUD_SERVICES_MENU_TEXT[] = "&Cloud services";
+ static constexpr const char AWS_MENU_TEXT[] = "&AWS";
AWSCoreEditorManager();
virtual ~AWSCoreEditorManager();
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
new file mode 100644
index 0000000000..46acfbd4a3
--- /dev/null
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
@@ -0,0 +1,53 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+namespace AWSCore
+{
+ static constexpr const char NewToAWSUrl[] = "https://docs.o3de.org/docs/user-guide/gems/reference/aws/";
+
+ static constexpr const char AWSAndScriptCanvasUrl[] = "https://docs.o3de.org/docs/user-guide/components/reference/aws/";
+ static constexpr const char AWSAndComponentsUrl[] = "https://docs.o3de.org/docs/user-guide/components/reference/aws/";
+ static constexpr const char CallAWSResourcesUrl[] = "https://docs.o3de.org/docs/user-guide/components/reference/aws/";
+
+ static constexpr const char AWSCredentialConfigurationUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-core/configuring-credentials/";
+
+ static constexpr const char AWSClientAuthGemOverviewUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+ static constexpr const char AWSClientAuthCDKAndResourcesUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+ static constexpr const char AWSClientAuthScriptCanvasAndLuaUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+ static constexpr const char AWSClientAuth3rdPartyAuthProviderUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+ static constexpr const char AWSClientAuthCustomAuthProviderUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+ static constexpr const char AWSClientAuthPlatformSpecificUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+ static constexpr const char AWSClientAuthAPIReferenceUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-client-auth/";
+
+ static constexpr const char AWSMetricsGemOverviewUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+ static constexpr const char AWSMetricsSetupGemUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+ static constexpr const char AWSMetricsScriptingUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+ static constexpr const char AWSMetricsAPIReferenceUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+ static constexpr const char AWSMetricsAdvancedTopicsUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+ static constexpr const char AWSMetricsSettingsUrl[] =
+ "https://docs.o3de.org/docs/user-guide/gems/reference/aws/aws-metrics/";
+} // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
new file mode 100644
index 0000000000..a9a8198e52
--- /dev/null
+++ b/Gems/AWSCore/Code/Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
@@ -0,0 +1,44 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#pragma once
+
+namespace AWSCore
+{
+ static constexpr const char NewToAWSActionText[] = "Getting started with AWS?";
+
+ static constexpr const char AWSAndO3DEGlobalDocsText[] = "AWS & O3DE global docs";
+ static constexpr const char AWSAndScriptCanvasActionText[] = "AWS && ScriptCanvas";
+ static constexpr const char AWSAndComponentsActionText[] = "AWS & Components";
+ static constexpr const char CallAWSResourcesActionText[] = "Call AWS resources";
+
+ static constexpr const char AWSCredentialConfigurationActionText[] = "AWS credential configuration";
+
+ static constexpr const char AWSResourceMappingToolActionText[] = "AWS Resource Mapping Tool...";
+
+ static constexpr const char AWSClientAuthActionText[] = "Client Auth";
+ static constexpr const char AWSClientAuthGemOverviewActionText[] = "Gem Overview";
+ static constexpr const char AWSClientAuthCDKAndResourcesActionText[] = "CDK Application and Resource Mappings";
+ static constexpr const char AWSClientAuthScriptCanvasAndLuaActionText[] = "Script Canvas and Lua";
+ static constexpr const char AWSClientAuth3rdPartyAuthProviderActionText[] = "3rd Party developer Authentication Provider support";
+ static constexpr const char AWSClientAuthCustomAuthProviderActionText[] = "Custom developer Authentication Provider support";
+ static constexpr const char AWSClientAuthPlatformSpecificActionText[] = "Platform specific Callouts";
+ static constexpr const char AWSClientAuthAPIReferenceActionText[] = "API Reference";
+
+ static constexpr const char AWSMetricsActionText[] = "Metrics";
+ static constexpr const char AWSMetricsGemOverviewActionText[] = "Metrics Overview";
+ static constexpr const char AWSMetricsSetupGemActionText[] = "Setup Metrics Gem";
+ static constexpr const char AWSMetricsScriptingActionText[] = "Scripting with AWS Metrics";
+ static constexpr const char AWSMetricsAPIReferenceActionText[] = "C++ API with AWS Metrics Gem";
+ static constexpr const char AWSMetricsAdvancedTopicsActionText[] = "Advanced topics";
+ static constexpr const char AWSMetricsSettingsActionText[] = "Metrics Settings";
+} // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
index 19f241e368..c892f86b66 100644
--- a/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
+++ b/Gems/AWSCore/Code/Include/Private/Editor/UI/AWSCoreEditorMenu.h
@@ -35,29 +35,23 @@ namespace AWSCore
static constexpr const char AWSResourceMappingToolIsRunningText[] = "Resource Mapping Tool is running...";
static constexpr const char AWSResourceMappingToolLogWarningText[] =
"Failed to launch Resource Mapping Tool, please check logs for details.";
- static constexpr const char AWSResourceMappingToolActionText[] = "AWS Resource Mapping Tool...";
- static constexpr const char CredentialConfigurationActionText[] = "Credential Configuration";
- static constexpr const char CredentialConfigurationUrl[] = "https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html";
- static constexpr const char NewToAWSActionText[] = "New to AWS?";
- static constexpr const char NewToAWSUrl[] = "https://o3deorg.netlify.app/docs/user-guide/gems/reference/aws";
- static constexpr const char AWSAndScriptCanvasActionText[] = "AWS && ScriptCanvas";
- static constexpr const char AWSAndScriptCanvasUrl[] = "https://o3deorg.netlify.app/docs/user-guide/gems/reference/aws";
- static constexpr const char AWSClientAuthActionText[] = "Client Auth";
- static constexpr const char AWSMetricsActionText[] = "Metrics";
AWSCoreEditorMenu(const QString& text);
~AWSCoreEditorMenu();
private:
+ QAction* AddExternalLinkAction(const AZStd::string& name, const AZStd::string& url, const AZStd::string& icon = "");
+
void InitializeResourceMappingToolAction();
void InitializeAWSDocActions();
+ void InitializeAWSGlobalDocsSubMenu();
void InitializeAWSFeatureGemActions();
// AWSCoreEditorRequestBus interface implementation
void SetAWSClientAuthEnabled() override;
void SetAWSMetricsEnabled() override;
- void SetAWSFeatureActionsEnabled(const AZStd::string actionText);
+ QMenu* SetAWSFeatureSubMenu(const AZStd::string& menuText);
// To improve experience, use process watcher to keep track of ongoing tool process
AZStd::unique_ptr m_resourceMappingToolWatcher;
diff --git a/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp b/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp
index 1e3e44255a..89956d61b8 100644
--- a/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/AWSCoreEditorManager.cpp
@@ -16,7 +16,7 @@
namespace AWSCore
{
AWSCoreEditorManager::AWSCoreEditorManager()
- : m_awsCoreEditorMenu(new AWSCoreEditorMenu(CLOUD_SERVICES_MENU_TEXT))
+ : m_awsCoreEditorMenu(new AWSCoreEditorMenu(AWS_MENU_TEXT))
{
}
diff --git a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
index 754cc32751..c319788547 100644
--- a/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
@@ -13,10 +13,13 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
+#include
#include
#include
@@ -36,8 +39,8 @@ namespace AWSCore
: QMenu(text)
, m_resourceMappingToolWatcher(nullptr)
{
- InitializeResourceMappingToolAction();
InitializeAWSDocActions();
+ InitializeResourceMappingToolAction();
this->addSeparator();
InitializeAWSFeatureGemActions();
@@ -58,6 +61,21 @@ namespace AWSCore
this->clear();
}
+ QAction* AWSCoreEditorMenu::AddExternalLinkAction(
+ const AZStd::string& name, const AZStd::string& url, const AZStd::string& icon)
+ {
+ QAction* linkAction = new QAction(QObject::tr(name.c_str()));
+ QObject::connect(linkAction, &QAction::triggered, this,
+ [url]() {
+ QDesktopServices::openUrl(QUrl(url.c_str()));
+ });
+ if (!icon.empty())
+ {
+ linkAction->setIcon(QIcon(icon.c_str()));
+ }
+ return linkAction;
+ }
+
void AWSCoreEditorMenu::InitializeResourceMappingToolAction()
{
#ifdef AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED
@@ -103,21 +121,21 @@ namespace AWSCore
void AWSCoreEditorMenu::InitializeAWSDocActions()
{
- QAction* credentialConfiguration = new QAction(QObject::tr(CredentialConfigurationActionText));
- QObject::connect(credentialConfiguration, &QAction::triggered, this, []() {
- QDesktopServices::openUrl(QUrl(CredentialConfigurationUrl));
- });
- this->addAction(credentialConfiguration);
+ this->addAction(AddExternalLinkAction(NewToAWSActionText, NewToAWSUrl, ":/Notifications/link.svg"));
- QAction* newToAWS = new QAction(QObject::tr(NewToAWSActionText));
- QObject::connect(newToAWS, &QAction::triggered, this, []() {
- QDesktopServices::openUrl(QUrl(NewToAWSUrl)); });
- this->addAction(newToAWS);
+ InitializeAWSGlobalDocsSubMenu();
- QAction* awsAndScriptCanvas = new QAction(QObject::tr(AWSAndScriptCanvasActionText));
- QObject::connect(awsAndScriptCanvas, &QAction::triggered, this, []() {
- QDesktopServices::openUrl(QUrl(AWSAndScriptCanvasUrl)); });
- this->addAction(awsAndScriptCanvas);
+ this->addAction(AddExternalLinkAction(
+ AWSCredentialConfigurationActionText, AWSCredentialConfigurationUrl, ":/Notifications/link.svg"));
+ }
+
+ void AWSCoreEditorMenu::InitializeAWSGlobalDocsSubMenu()
+ {
+ QMenu* globalDocsMenu = this->addMenu(QObject::tr(AWSAndO3DEGlobalDocsText));
+
+ globalDocsMenu->addAction(AddExternalLinkAction(AWSAndScriptCanvasActionText, AWSAndScriptCanvasUrl, ":/Notifications/link.svg"));
+ globalDocsMenu->addAction(AddExternalLinkAction(AWSAndComponentsActionText, AWSAndComponentsUrl, ":/Notifications/link.svg"));
+ globalDocsMenu->addAction(AddExternalLinkAction(CallAWSResourcesActionText, CallAWSResourcesUrl, ":/Notifications/link.svg"));
}
void AWSCoreEditorMenu::InitializeAWSFeatureGemActions()
@@ -135,25 +153,67 @@ namespace AWSCore
void AWSCoreEditorMenu::SetAWSClientAuthEnabled()
{
- SetAWSFeatureActionsEnabled(AWSClientAuthActionText);
+ // TODO: instead of creating submenu in core editor, aws feature gem should return submenu component directly
+ QMenu* subMenu = SetAWSFeatureSubMenu(AWSClientAuthActionText);
+
+ subMenu->addAction(AddExternalLinkAction(
+ AWSClientAuthGemOverviewActionText, AWSClientAuthGemOverviewUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSClientAuthCDKAndResourcesActionText, AWSClientAuthCDKAndResourcesUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSClientAuthScriptCanvasAndLuaActionText, AWSClientAuthScriptCanvasAndLuaUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSClientAuth3rdPartyAuthProviderActionText, AWSClientAuth3rdPartyAuthProviderUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSClientAuthCustomAuthProviderActionText, AWSClientAuthCustomAuthProviderUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSClientAuthPlatformSpecificActionText, AWSClientAuthPlatformSpecificUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSClientAuthAPIReferenceActionText, AWSClientAuthAPIReferenceUrl, ":/Notifications/link.svg"));
}
void AWSCoreEditorMenu::SetAWSMetricsEnabled()
{
- SetAWSFeatureActionsEnabled(AWSMetricsActionText);
+ // TODO: instead of creating submenu in core editor, aws feature gem should return submenu component directly
+ QMenu* subMenu = SetAWSFeatureSubMenu(AWSMetricsActionText);
+
+ subMenu->addAction(AddExternalLinkAction(
+ AWSMetricsGemOverviewActionText, AWSMetricsGemOverviewUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSMetricsSetupGemActionText, AWSMetricsSetupGemUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSMetricsScriptingActionText, AWSMetricsScriptingUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSMetricsAPIReferenceActionText, AWSMetricsAPIReferenceUrl, ":/Notifications/link.svg"));
+ subMenu->addAction(AddExternalLinkAction(
+ AWSMetricsAdvancedTopicsActionText, AWSMetricsAdvancedTopicsUrl, ":/Notifications/link.svg"));
+
+ AZStd::string priorAlias = AZ::IO::FileIOBase::GetInstance()->GetAlias("@devroot@");
+ AZStd::string configFilePath = priorAlias + "\\Gems\\AWSMetrics\\Code\\" + AZ::SettingsRegistryInterface::RegistryFolder;
+ AzFramework::StringFunc::Path::Normalize(configFilePath);
+
+ QAction* settingsAction = new QAction(QObject::tr(AWSMetricsSettingsActionText));
+ QObject::connect(settingsAction, &QAction::triggered, this,
+ [configFilePath](){
+ QDesktopServices::openUrl(QUrl::fromLocalFile(configFilePath.c_str()));
+ });
+ subMenu->addAction(settingsAction);
}
- void AWSCoreEditorMenu::SetAWSFeatureActionsEnabled(const AZStd::string actionText)
+ QMenu* AWSCoreEditorMenu::SetAWSFeatureSubMenu(const AZStd::string& menuText)
{
auto actionList = this->actions();
for (QList::iterator itr = actionList.begin(); itr != actionList.end(); itr++)
{
- if (QString::compare((*itr)->text(), actionText.c_str()) == 0)
+ if (QString::compare((*itr)->text(), menuText.c_str()) == 0)
{
- (*itr)->setIcon(QIcon(QString(":/Notifications/checkmark.svg")));
- (*itr)->setEnabled(true);
- break;
+ QMenu* subMenu = new QMenu(QObject::tr(menuText.c_str()));
+ subMenu->setIcon(QIcon(QString(":/Notifications/checkmark.svg")));
+ this->insertMenu(*itr, subMenu);
+ this->removeAction(*itr);
+ return subMenu;
}
}
+ return nullptr;
}
} // namespace AWSCore
diff --git a/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp b/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp
index e9c249f1c8..ff78d8e252 100644
--- a/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp
+++ b/Gems/AWSCore/Code/Tests/AWSCoreEditorSystemComponentTest.cpp
@@ -85,7 +85,7 @@ TEST_F(AWSCoreEditorSystemComponentTest, NotifyMainWindowInitialized_HaveDummyMe
testMenuBar->addMenu("dummy menu");
AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::NotifyMainWindowInitialized, &testMainWindow);
EXPECT_TRUE(testMenuBar->actions().size() == 2);
- EXPECT_TRUE(QString::compare(testMenuBar->actions()[1]->text(), AWSCoreEditorManager::CLOUD_SERVICES_MENU_TEXT) == 0);
+ EXPECT_TRUE(QString::compare(testMenuBar->actions()[1]->text(), AWSCoreEditorManager::AWS_MENU_TEXT) == 0);
}
TEST_F(AWSCoreEditorSystemComponentTest, NotifyMainWindowInitialized_HaveHelpMenuInMenuBar_ExpectedMenuGetsAddedAtFront)
@@ -95,5 +95,5 @@ TEST_F(AWSCoreEditorSystemComponentTest, NotifyMainWindowInitialized_HaveHelpMen
testMenuBar->addMenu(AWSCoreEditorSystemComponent::EDITOR_HELP_MENU_TEXT);
AzToolsFramework::EditorEvents::Bus::Broadcast(&AzToolsFramework::EditorEvents::NotifyMainWindowInitialized, &testMainWindow);
EXPECT_TRUE(testMenuBar->actions().size() == 2);
- EXPECT_TRUE(QString::compare(testMenuBar->actions()[0]->text(), AWSCoreEditorManager::CLOUD_SERVICES_MENU_TEXT) == 0);
+ EXPECT_TRUE(QString::compare(testMenuBar->actions()[0]->text(), AWSCoreEditorManager::AWS_MENU_TEXT) == 0);
}
diff --git a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
index 7a578d2bbe..bde2a43993 100644
--- a/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
+++ b/Gems/AWSCore/Code/Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
@@ -14,6 +14,7 @@
#include
#include
+#include
#include
#include
#include
@@ -35,6 +36,7 @@ class AWSCoreEditorMenuTest
{
AWSCoreEditorUIFixture::SetUp();
AWSCoreFixture::SetUp();
+ m_localFileIO->SetAlias("@devroot@", "dummy engine root");
}
void TearDown() override
@@ -77,12 +79,12 @@ TEST_F(AWSCoreEditorMenuTest, AWSCoreEditorMenu_BroadcastFeatureGemsAreEnabled_C
QList actualActions = testMenu.actions();
for (QList::iterator itr = actualActions.begin(); itr != actualActions.end(); itr++)
{
- if (QString::compare((*itr)->text(), AWSCoreEditorMenu::AWSClientAuthActionText) == 0)
+ if (QString::compare((*itr)->text(), AWSClientAuthActionText) == 0)
{
EXPECT_TRUE((*itr)->isEnabled());
}
- if (QString::compare((*itr)->text(), AWSCoreEditorMenu::AWSMetricsActionText) == 0)
+ if (QString::compare((*itr)->text(), AWSMetricsActionText) == 0)
{
EXPECT_TRUE((*itr)->isEnabled());
}
diff --git a/Gems/AWSCore/Code/awscore_editor_files.cmake b/Gems/AWSCore/Code/awscore_editor_files.cmake
index 652f0455e1..13bfbb6102 100644
--- a/Gems/AWSCore/Code/awscore_editor_files.cmake
+++ b/Gems/AWSCore/Code/awscore_editor_files.cmake
@@ -12,6 +12,8 @@
set(FILES
Include/Private/AWSCoreEditorSystemComponent.h
Include/Private/Editor/AWSCoreEditorManager.h
+ Include/Private/Editor/Constants/AWSCoreEditorMenuLinks.h
+ Include/Private/Editor/Constants/AWSCoreEditorMenuNames.h
Include/Private/Editor/UI/AWSCoreEditorMenu.h
Include/Private/Editor/UI/AWSCoreResourceMappingToolAction.h
Source/AWSCoreEditorSystemComponent.cpp