birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed 'key' to 'base' to avoid future problems with secrets patterns, cleanup and improvements

Browse Source 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
This commit is contained in:
lsemp3d
2021-11-23 08:50:41 -08:00
parent 9e6e83ff7f
commit 2da3ab42fd
21 changed files with 74 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names
+4 -4
View File
@@ -12,7 +12,7 @@
{
"key": "Getmaterials",
"details": {
"name": "Getmaterials"
"name": "Get Materials"
},
"params": [
{
@@ -27,7 +27,7 @@
{
"typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
"details": {
"name": ""
"name": "Material Assignment Map"
}
}
]
@@ -35,7 +35,7 @@
{
"key": "Setmaterials",
"details": {
"name": "Setmaterials"
"name": "Set Materials"
},
"params": [
{
@@ -48,7 +48,7 @@
{
"typeid": "{50F6716F-698B-5A6C-AACD-940597FDEC24}",
"details": {
"name": ""
"name": "Material Assignment Map"
}
}
]
Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names
+1 -1
View File
@@ -1,7 +1,7 @@
{
"entries": [
{
"key": "AuthenticationProviderRequestBus",
"base": "AuthenticationProviderRequestBus",
"context": "EBusSender",
"variant": "",
"details": {
Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
+2 -2
View File
@@ -335,7 +335,7 @@ namespace ScriptCanvasEditor::Nodes
AZStd::string updatedMethodName = methodName;
if (isAccessor)
{
if (methodNode->GetMethodType() == ScriptCanvas::MethodType::Getter)
if (methodNode->GetMethodType() == ScriptCanvas::MethodType::Getter || methodNode->GetMethodType() == ScriptCanvas::MethodType::Free)
{
updatedMethodName = "Get";
}
@@ -351,7 +351,7 @@ namespace ScriptCanvasEditor::Nodes
if (methodDetails.m_subtitle.empty())
{
methodDetails.m_subtitle = details.m_name;
methodDetails.m_subtitle = details.m_category;
}
// Add to the tooltip the C++ class for reference
Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h
-1
View File
@@ -14,7 +14,6 @@
#include <AzCore/std/string/conversions.h>
#include <ScriptCanvas/Core/Slot.h>
#include <GraphCanvas/Types/TranslationTypes.h>
#include <Source/Translation/TranslationBus.h>
#include <AzFramework/Gem/GemInfo.h>
#include <AzCore/Settings/SettingsRegistry.h>
Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp
-1
View File
@@ -16,7 +16,6 @@
#include <AzCore/Serialization/Utils.h>
#include <AzCore/UserSettings/UserSettings.h>
#include <GraphCanvas/Types/TranslationTypes.h>
#include <GraphCanvas/Components/SceneBus.h>
#include <GraphCanvas/Components/StyleBus.h>
Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp
-1
View File
@@ -19,7 +19,6 @@
#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
#include <GraphCanvas/Types/TranslationTypes.h>
#include <GraphCanvas/Components/SceneBus.h>
#include <GraphCanvas/Components/StyleBus.h>
Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp
-1
View File
@@ -18,7 +18,6 @@
#include <AzToolsFramework/ToolsComponents/EditorComponentBase.h>
#include <GraphCanvas/Types/TranslationTypes.h>
#include <GraphCanvas/Components/SceneBus.h>
#include <GraphCanvas/Components/StyleBus.h>
Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp
+11 -8
View File
@@ -33,6 +33,7 @@
#include <AzFramework/StringFunc/StringFunc.h>
#include <AzQtComponents/Utilities/DesktopUtilities.h>
#include <Source/Translation/TranslationSerializer.h>
namespace ScriptCanvasEditorTools
{
@@ -848,8 +849,9 @@ namespace ScriptCanvasEditorTools
Helpers::GetTypeNameAndDescription(parameter->m_typeId, argumentName, argumentDescription);
const AZStd::string* argName = behaviorMethod->GetArgumentName(argIndex);
argument.m_typeId = argumentKey;
argument.m_details.m_name = behaviorMethod->GetArgumentName(argIndex) ? *behaviorMethod->GetArgumentName(argIndex) : argumentName;
argument.m_details.m_name = argName ? *argName : argumentName;
argument.m_details.m_category = "";
argument.m_details.m_tooltip = argumentDescription;
@@ -871,8 +873,9 @@ namespace ScriptCanvasEditorTools
Helpers::GetTypeNameAndDescription(resultParameter->m_typeId, resultName, resultDescription);
const AZStd::string* resName = behaviorMethod->GetArgumentName(0);
result.m_typeId = resultKey;
result.m_details.m_name = behaviorMethod->GetArgumentName(0) ? *behaviorMethod->GetArgumentName(0) : resultName;
result.m_details.m_name = resName ? *resName : resultName;
result.m_details.m_tooltip = resultDescription;
SplitCamelCase(result.m_details.m_name);
@@ -1093,13 +1096,13 @@ namespace ScriptCanvasEditorTools
rapidjson_ly::Value value(rapidjson_ly::kStringType);
value.SetString(entrySource.m_key.c_str(), document.GetAllocator());
entry.AddMember("key", value, document.GetAllocator());
entry.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator());
value.SetString(entrySource.m_context.c_str(), document.GetAllocator());
entry.AddMember("context", value, document.GetAllocator());
entry.AddMember(GraphCanvas::Schema::Field::context, value, document.GetAllocator());
value.SetString(entrySource.m_variant.c_str(), document.GetAllocator());
entry.AddMember("variant", value, document.GetAllocator());
entry.AddMember(GraphCanvas::Schema::Field::variant, value, document.GetAllocator());
rapidjson_ly::Value details(rapidjson_ly::kObjectType);
value.SetString(entrySource.m_details.m_name.c_str(), document.GetAllocator());
@@ -1120,12 +1123,12 @@ namespace ScriptCanvasEditorTools
rapidjson_ly::Value theMethod(rapidjson_ly::kObjectType);
value.SetString(methodSource.m_key.c_str(), document.GetAllocator());
theMethod.AddMember("key", value, document.GetAllocator());
theMethod.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator());
if (!methodSource.m_context.empty())
{
value.SetString(methodSource.m_context.c_str(), document.GetAllocator());
theMethod.AddMember("context", value, document.GetAllocator());
theMethod.AddMember(GraphCanvas::Schema::Field::context, value, document.GetAllocator());
}
if (!methodSource.m_entry.m_name.empty())
@@ -1233,7 +1236,7 @@ namespace ScriptCanvasEditorTools
rapidjson_ly::Value theSlot(rapidjson_ly::kObjectType);
value.SetString(slotSource.m_key.c_str(), document.GetAllocator());
theSlot.AddMember("key", value, document.GetAllocator());
theSlot.AddMember(GraphCanvas::Schema::Field::key, value, document.GetAllocator());
rapidjson_ly::Value sloDetails(rapidjson_ly::kObjectType);
if (!slotSource.m_details.m_name.empty())