Quick fix device type meta data manager missing

* because it was part of the wrong sub folder and therefore was excluded * correct typing on device layout extension data property
susch19 · May 19, 2024 · 108281c · 108281c
1 parent 8b45324
commit 108281c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/AppBroker.Core/DynamicUI/DeviceLayout.cs b/AppBroker.Core/DynamicUI/DeviceLayout.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace AppBroker.Core.DynamicUI;
 
@@ -10,6 +11,6 @@ public record DeviceLayout(
     long[]? Ids, 
     DashboardDeviceLayout? DashboardDeviceLayout, 
     DetailDeviceLayout? DetailDeviceLayout, 
-    [property:Newtonsoft.Json.JsonExtensionData]IDictionary<string, string> AdditionalData,
+    [property:Newtonsoft.Json.JsonExtensionData]IDictionary<string, JToken> AdditionalData,
     int Version = 1, 
     bool ShowOnlyInDeveloperMode = false ); 
diff --git a/AppBrokerASP/InstanceContainer.cs b/AppBrokerASP/InstanceContainer.cs
@@ -5,6 +5,7 @@
 
 using AppBrokerASP.Configuration;
 using AppBrokerASP.Histories;
+using AppBrokerASP.Manager;
 using AppBrokerASP.State;
 
 namespace AppBrokerASP;
@@ -37,7 +38,7 @@ public InstanceContainer()
         var localDeviceManager = new DeviceManager();
         DeviceManager = localDeviceManager;
         localDeviceManager.LoadDevices();
-        //DeviceTypeMetaDataManager = new DeviceTypeMetaDataManager(localDeviceManager);
+        DeviceTypeMetaDataManager = new DeviceTypeMetaDataManager(localDeviceManager);
     }
 
 

diff --git a/...ASP/Devices/Elsa/DevicePropertyService.cs → ...rASP/Manager/DeviceTypeMetaDataManager.cs b/...ASP/Devices/Elsa/DevicePropertyService.cs → ...rASP/Manager/DeviceTypeMetaDataManager.cs
@@ -1,12 +1,11 @@
-using AppBroker.Core;
-using AppBroker.Core.Devices;
+using AppBroker.Core.Devices;
 using AppBroker.Core.Managers;
-
+using AppBroker.Core;
+using System.Reflection;
 using NLog;
 
-using System.Reflection;
+namespace AppBrokerASP.Manager;
 
-namespace AppBrokerASP.Devices.Elsa;
 
 public class DeviceTypeMetaDataManager : IDeviceTypeMetaDataManager
 {
@@ -27,13 +26,11 @@ public class DeviceTypeMetaDataManager : IDeviceTypeMetaDataManager
     private readonly HashSet<PropertyInfo> properties;
     private readonly HashSet<Type> deviceTypes;
 
-    private readonly IDeviceManager manager;
     private readonly NLog.ILogger logger;
 
     public DeviceTypeMetaDataManager(DeviceManager manager)
     {
         var stringArrWithEmpty = new[] { "" };
-        this.manager = manager;
         logger = LogManager.GetCurrentClassLogger();
         deviceTypes = Assembly
             .GetExecutingAssembly()