Fixes to correctly filter for nested services/data providers in the n…

…ew configuraitons inspector (#470)

* Recursively look for generic type arguments on a profile to filter for ServiceConstraint

* Fix BaseExtensionService profile type expected in constructor

* Update XRTK-Core/Packages/com.xrtk.core/Inspectors/Profiles/MixedRealityServiceProviderProfileInspector.cs

Co-Authored-By: Stephen Hodgson <StephenHodgson@users.noreply.github.com>

* Update XRTK-Core/Packages/com.xrtk.core/Extensions/TypeExtensions.cs

Co-Authored-By: Stephen Hodgson <StephenHodgson@users.noreply.github.com>

* Update XRTK-Core/Packages/com.xrtk.core/Definitions/BaseMixedRealityExtensionServiceProfile.cs

Co-Authored-By: Stephen Hodgson <StephenHodgson@users.noreply.github.com>

* Fix class doc

* Fix missing using

* Fix base extension service profile generic type

* Make ServiceConstraint protected to allow for custom override

* Update Tests

* Fix interface base type

Co-authored-by: Stephen Hodgson <StephenHodgson@users.noreply.github.com>

Definitions/BaseMixedRealityExtensionServiceProfile.cs

@@ -0,0 +1,12 @@
+// Copyright (c) XRTK. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using XRTK.Interfaces;
+
+namespace XRTK.Definitions
+{
+    public abstract class BaseMixedRealityExtensionServiceProfile : BaseMixedRealityServiceProfile<IMixedRealityService>
+    {
+
+    }
+}

Extensions/TypeExtensions.cs

@@ -0,0 +1,39 @@
+// Copyright (c) XRTK. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using UnityEngine;
+
+namespace XRTK.Extensions
+{
+    /// <summary>
+    /// Extension methods for <see cref="Type"/> instances.
+    /// </summary>
+    public static class TypeExtensions
+    {
+        /// <summary>
+        /// Recursively looks for generic type arguments in type hierarchy, starting with the
+        /// root type provided. If no generic type arguments are found on a type, it's base
+        /// type is checked.
+        /// </summary>
+        /// <param name="root">Root type to start looking for generic type arguments at.</param>
+        /// <param name="maxRecursionDepth">The maximum recursion depth until execution gets canceled even if no results found.</param>
+        /// <returns>Found gneneric type arguments array or null, if none found.</returns>
+        public static Type[] FindTopmostGenericTypeArguments(this Type root, int maxRecursionDepth = 5)
+        {
+            Type[] genericTypeArgs = root?.GenericTypeArguments;
+            if (genericTypeArgs != null && genericTypeArgs.Length > 0)
+            {
+                return genericTypeArgs;
+            }
+
+            if (maxRecursionDepth > 0 && root != null)
+            {
+                return FindTopmostGenericTypeArguments(root.BaseType, --maxRecursionDepth);
+            }
+
+            Debug.LogError($"{nameof(FindTopmostGenericTypeArguments)} - Maximum recursion depth reached without finding generic type arguments.");
+            return null;
+        }
+    }
+}

Inspectors/Profiles/MixedRealityServiceProviderProfileInspector.cs

@@ -9,6 +9,7 @@
 using XRTK.Definitions;
 using XRTK.Inspectors.PropertyDrawers;
 using XRTK.Services;
+using XRTK.Extensions;
 
 namespace XRTK.Inspectors.Profiles
 {
@@ -20,7 +21,12 @@ public class MixedRealityServiceProfileInspector : BaseMixedRealityProfileInspec
 
         private SerializedProperty configurations;
 
-        protected Type ServiceConstraint { get; private set; } = null;
+        /// <summary>
+        /// Gets the service constraint used to filter options listed in the
+        /// <see cref="configurations"/> instance type dropdown. Set after
+        /// <see cref="OnEnable"/> was called to override.
+        /// </summary>
+        protected Type ServiceConstraint { get; set; } = null;
 
         protected override void OnEnable()
         {
@@ -30,7 +36,7 @@ protected override void OnEnable()
 
             Debug.Assert(configurations != null);
             var baseType = ThisProfile.GetType().BaseType;
-            var genericTypeArgs = baseType?.GenericTypeArguments;
+            var genericTypeArgs = baseType?.FindTopmostGenericTypeArguments();
 
             Debug.Assert(genericTypeArgs != null);
 
@@ -152,4 +158,4 @@ private void OnConfigurationOptionRemoved(ReorderableList list)
             }
         }
     }
-}
+}

Services/BaseExtensionService.cs

@@ -20,6 +20,6 @@ public abstract class BaseExtensionService : BaseServiceWithConstructor, IMixedR
         /// <param name="name"></param>
         /// <param name="priority"></param>
         /// <param name="profile"></param>
-        public BaseExtensionService(string name, uint priority, MixedRealityRegisteredServiceProvidersProfile profile) : base(name, priority) { }
+        public BaseExtensionService(string name, uint priority, BaseMixedRealityExtensionServiceProfile profile) : base(name, priority) { }
     }
 }