From 2da3ab42fdc8c5b9a6c2fd6e5e8669d80ca4361a Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Tue, 23 Nov 2021 08:50:41 -0800 Subject: [PATCH] Renamed 'key' to 'base' to avoid future problems with secrets patterns, cleanup and improvements Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../Nodes/General/GeneralNodeTitleComponent.h | 1 - Gems/GraphCanvas/Code/Source/GraphCanvas.cpp | 1 - .../Source/Translation/TranslationAsset.h | 14 +-- .../Translation/TranslationSerializer.cpp | 28 ++--- .../Translation/TranslationSerializer.h | 13 ++ .../Code/Source/Widgets/GraphCanvasLabel.h | 1 - .../GraphCanvas/Components/Nodes/NodeBus.h | 1 - .../Components/Nodes/NodeTitleBus.h | 1 - .../GraphCanvas/Components/Slots/SlotBus.h | 1 - .../GraphCanvas/Types/TranslationTypes.h | 116 ------------------ .../Code/graphcanvas_staticlib_files.cmake | 3 +- .../Classes/MaterialComponentConfig.names | 8 +- .../AuthenticationProviderRequestBus.names | 2 +- .../Code/Editor/Nodes/NodeDisplayUtils.cpp | 4 +- .../Editor/Translation/TranslationHelper.h | 1 - .../DataTypePalette/DataTypePaletteModel.cpp | 1 - .../UnitTestPanel/UnitTestTreeView.cpp | 1 - .../VariablePaletteTableView.cpp | 1 - .../Code/Tools/TranslationGeneration.cpp | 19 +-- ...rReferenceExample.ScriptCanvasNodeable.xml | 20 ++- .../Code/Source/ScriptCanvasTestBus.cpp | 9 +- 21 files changed, 74 insertions(+), 172 deletions(-) delete mode 100644 Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h index 84963c7997..ce8ea4c8a9 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.h @@ -19,7 +19,6 @@ #include #include #include -#include #include namespace GraphCanvas diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp index 8b5b166bb2..dfcb106777 100644 --- a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp +++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp @@ -58,7 +58,6 @@ #include #include -#include #include #include diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h index 653aac3afc..b31bf25851 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationAsset.h @@ -59,14 +59,14 @@ namespace GraphCanvas //! //! Requirements: //! - Must have a top level array called "entries" - //! - Must provide a "key" element for any entry added + //! - Must provide a "base" element for any entry added //! //! Example: //! //! { //! "entries": [ //! { - //! "key": "Globals", + //! "base": "Globals", //! "details": { //! "name": "My Name", //! "tooltip": "My Tooltip" @@ -90,21 +90,21 @@ namespace GraphCanvas //! Globals.details.somearray.0.name //! Globals.details.somearray.1.name //! - //! There is one important aspect however, if an element in an array has a "key" value, the value of this key + //! There is one important aspect however, if an element in an array has a "base" value, the value of this key //! will replace the index. This is useful when the index and/or ordering of an entry is not relevant or may //! change. //! //! "somearray": [ { //! "name": "First one" - //! "key": "a_key" + //! "base": "a_key" //! }, { //! "name": "Second one", - //! "key": "b_key" + //! "base": "b_key" //! } ] //! - //! Globals.details.somearray.0.key == "a_key" + //! Globals.details.somearray.0.base == "a_key" //! Globals.details.somearray.0.name == "First one" - //! Globals.details.somearray.1.key == "b_key" + //! Globals.details.somearray.1.base == "b_key" //! Globals.details.somearray.1.name == "Second one" //! class TranslationAssetHandler diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp index bb42f77c49..1f76b53b27 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp @@ -11,17 +11,6 @@ namespace GraphCanvas { - namespace Schema - { - namespace Field - { - static constexpr char key[] = "key"; - static constexpr char context[] = "context"; - static constexpr char variant[] = "variant"; - static constexpr char entries[] = "entries"; - } - } - AZ_CLASS_ALLOCATOR_IMPL(TranslationFormatSerializer, AZ::SystemAllocator, 0); void AddEntryToDatabase(const AZStd::string& baseKey, const AZStd::string& name, const rapidjson::Value& it, TranslationFormat* translationFormat) @@ -76,11 +65,15 @@ namespace GraphCanvas const rapidjson::Value& array = it; for (rapidjson::SizeType i = 0; i < array.Size(); ++i) { - // so, here, I need to go in and if there is a "key" member within the object, then I need to use that, - // if there isn't, I can use the %d + // if there is a "base" member within the object, then use it, otherwise use the index if (array[i].IsObject()) { - if (array[i].HasMember(Schema::Field::key)) + if (array[i].HasMember(Schema::Field::deprecated_key)) + { + AZStd::string innerKey = array[i].FindMember(Schema::Field::deprecated_key)->value.GetString(); + itemKey.append(AZStd::string::format(".%s", innerKey.c_str())); + } + else if (array[i].HasMember(Schema::Field::key)) { AZStd::string innerKey = array[i].FindMember(Schema::Field::key)->value.GetString(); itemKey.append(AZStd::string::format(".%s", innerKey.c_str())); @@ -133,7 +126,12 @@ namespace GraphCanvas AZStd::string keyStr; rapidjson::Value::ConstMemberIterator keyValue; - if (entry.HasMember(Schema::Field::key)) + if (entry.HasMember(Schema::Field::deprecated_key)) + { + keyValue = entry.FindMember(Schema::Field::deprecated_key); + keyStr = keyValue->value.GetString(); + } + else if (entry.HasMember(Schema::Field::key)) { keyValue = entry.FindMember(Schema::Field::key); keyStr = keyValue->value.GetString(); diff --git a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h index fa7e6e64e1..605e06a76b 100644 --- a/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h +++ b/Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.h @@ -23,4 +23,17 @@ namespace GraphCanvas AZ::JsonSerializationResult::Result Store(rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, const AZ::Uuid& valueTypeId, AZ::JsonSerializerContext& context) override; }; + + namespace Schema + { + namespace Field + { + // Moved away from "key" due to some strict filtering on secrets + static constexpr char deprecated_key[] = "key"; + static constexpr char key[] = "base"; + static constexpr char context[] = "context"; + static constexpr char variant[] = "variant"; + static constexpr char entries[] = "entries"; + } + } } diff --git a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h index 4e52218721..3fbd934909 100644 --- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h +++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.h @@ -16,7 +16,6 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") AZ_POP_DISABLE_WARNING #include -#include namespace GraphCanvas { diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h index 513400b470..d5b8a7ff57 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeBus.h @@ -15,7 +15,6 @@ #include #include #include -#include #include diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h index 88846739d0..6470ebfbd1 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Nodes/NodeTitleBus.h @@ -11,7 +11,6 @@ #include #include -#include #include #include diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h index a3f8bfb757..8df36232fe 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/SlotBus.h @@ -16,7 +16,6 @@ #include #include -#include class QGraphicsLayoutItem; diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h deleted file mode 100644 index 7205be7c00..0000000000 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Types/TranslationTypes.h +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. - * For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include - -#include - -namespace GraphCanvas -{ - struct TranslationKeyedString - { - public: - AZ_TYPE_INFO(TranslationKeyedString, "{B796685C-0335-4E74-9EF8-A1933E8B2142}"); - AZ_CLASS_ALLOCATOR(TranslationKeyedString, AZ::SystemAllocator, 0); - - static void Reflect(AZ::ReflectContext* context) - { - AZ::SerializeContext* serializeContext = azrtti_cast(context); - if (!serializeContext) - { - return; - } - - serializeContext->Class() - ->Version(1) - ->Field("Fallback", &TranslationKeyedString::m_fallback) - ->Field("Context", &TranslationKeyedString::m_context) - ->Field("Key", &TranslationKeyedString::m_key) - ; - } - - TranslationKeyedString() - : m_dirtyText(true) - { - } - - ~TranslationKeyedString() = default; - - TranslationKeyedString(const AZStd::string& fallback, const AZStd::string& context = AZStd::string(), const AZStd::string& key = AZStd::string()) - : m_fallback(fallback) - , m_context(context) - , m_key(key) - , m_dirtyText(true) - { - } - - const AZStd::string GetDisplayString() const - { - if (m_dirtyText) - { - const_cast(this)->TranslateString(); - } - - return m_display; - } - - void TranslateString() - { - m_display = m_fallback; - - if (!m_context.empty() && !m_key.empty()) - { - AZStd::string translatedText = QCoreApplication::translate(m_context.c_str(), m_key.c_str()).toUtf8().data(); - - if (translatedText != m_key) - { - m_display = translatedText; - } - } - - m_dirtyText = false; - } - - bool empty() const - { - return m_fallback.empty() && (m_context.empty() || m_key.empty()); - } - - bool operator==(const TranslationKeyedString& other) const - { - return m_fallback == other.m_fallback - && m_context == other.m_context - && m_key == other.m_key - ; - } - - void Clear() - { - m_key.clear(); - m_context.clear(); - m_fallback.clear(); - } - - void SetFallback(const AZStd::string& fallback) - { - m_fallback = fallback; - m_dirtyText = true; - } - - AZStd::string m_context; - AZStd::string m_key; - AZStd::string m_display; - - private: - AZStd::string m_fallback; - - bool m_dirtyText; - }; -} diff --git a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake index b62ff303a6..455b5673d3 100644 --- a/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake +++ b/Gems/GraphCanvas/Code/graphcanvas_staticlib_files.cmake @@ -102,8 +102,7 @@ set(FILES StaticLib/GraphCanvas/Types/GraphCanvasGraphData.h StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.cpp StaticLib/GraphCanvas/Types/GraphCanvasGraphSerialization.h - StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h - StaticLib/GraphCanvas/Types/TranslationTypes.h + StaticLib/GraphCanvas/Types/SceneMemberComponentSaveData.h StaticLib/GraphCanvas/Types/Types.h StaticLib/GraphCanvas/Types/QtMetaTypes.h StaticLib/GraphCanvas/Widgets/Resources/default_style.json diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names index c5b1138e12..27edc76275 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MaterialComponentConfig.names @@ -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" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names index 237d70340b..b9b48b88f6 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AuthenticationProviderRequestBus.names @@ -1,7 +1,7 @@ { "entries": [ { - "key": "AuthenticationProviderRequestBus", + "base": "AuthenticationProviderRequestBus", "context": "EBusSender", "variant": "", "details": { diff --git a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp index cba39afe81..26caa5fc2f 100644 --- a/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp @@ -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 diff --git a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h index 189b665647..bd37ab0e2f 100644 --- a/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h +++ b/Gems/ScriptCanvas/Code/Editor/Translation/TranslationHelper.h @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp index 490fc1eb94..a31444921b 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp index 00ce022cb5..2e9c5d1852 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp @@ -19,7 +19,6 @@ #include -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp index 56b0cb3e55..6fdf154d69 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp @@ -18,7 +18,6 @@ #include -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp index fdaca020b4..4fcc904752 100644 --- a/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp +++ b/Gems/ScriptCanvas/Code/Tools/TranslationGeneration.cpp @@ -33,6 +33,7 @@ #include #include +#include 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()) diff --git a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml index 0be3c8c81a..a2a89509e6 100644 --- a/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml +++ b/Gems/ScriptCanvasTesting/Code/Source/Nodes/Nodeables/ValuePointerReferenceExample.ScriptCanvasNodeable.xml @@ -1,13 +1,22 @@ + + + @@ -24,9 +33,10 @@ PreferredClassName="Branch Input Type Example" Base="ScriptCanvas::Nodeable" Icon="Icons/ScriptCanvas/Placeholder.png" - Category="Tests" + Category="Examples" GeneratePropertyFriend="True" Namespace="None" + EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All" Description="Example of branch passing as input by value, pointer and reference."> @@ -46,9 +56,10 @@ PreferredClassName="Input Type Example" Base="ScriptCanvas::Nodeable" Icon="Icons/ScriptCanvas/Placeholder.png" - Category="Tests" + Category="Examples" GeneratePropertyFriend="True" Namespace="None" + EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All" Description="Example of passing as input by value, pointer and reference."> @@ -65,9 +76,10 @@ PreferredClassName="Property Example" Base="ScriptCanvas::Nodeable" Icon="Icons/ScriptCanvas/Placeholder.png" - Category="Tests" + Category="Examples" GeneratePropertyFriend="True" Namespace="None" + EditAttributes="AZ::Script::Attributes::ExcludeFrom@AZ::Script::Attributes::ExcludeFlags::All" Description="Example of using properties."> diff --git a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp index 0a0f71bead..c983717a0d 100644 --- a/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp +++ b/Gems/ScriptCanvasTesting/Code/Source/ScriptCanvasTestBus.cpp @@ -26,9 +26,12 @@ namespace ScriptCanvasTesting if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) { - behaviorContext->EnumProperty<(AZ::u32)TestEnum::Alpha>("ALPHA"); - behaviorContext->EnumProperty<(AZ::u32)TestEnum::Bravo>("BRAVO"); - behaviorContext->EnumProperty<(AZ::u32)TestEnum::Charlie>("CHARLIE"); + behaviorContext->EnumProperty<(AZ::u32)TestEnum::Alpha>("ALPHA") + ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All); + behaviorContext->EnumProperty<(AZ::u32)TestEnum::Bravo>("BRAVO") + ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All); + behaviorContext->EnumProperty<(AZ::u32)TestEnum::Charlie>("CHARLIE") + ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::All); } }