From 908296793ac351d5ef81777860a90a70d93aa24c Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Tue, 7 Dec 2021 10:51:39 -0700
Subject: [PATCH] fix(essentials): Removes enabled property from Environment
 config. Adds StringEnumConverter to enum properties

---
 PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs    | 3 ++-
 .../Room/Types/EssentialsHuddleSpaceRoom.cs                 | 6 +++---
 PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs | 6 +++---
 .../VideoCodec/Interfaces/IHasCodecLayouts.cs               | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs b/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
index 9824ec67..8898351a 100644
--- a/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
+++ b/PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
@@ -240,7 +240,8 @@ namespace PepperDash.Essentials.Room.Config
 
 	public class EssentialsEnvironmentPropertiesConfig
 	{
-		public bool Enabled { get; set; }
+        //[JsonProperty("enabled")]
+        //public bool Enabled { get; set; }
 
         [JsonProperty("deviceKeys")]
         public List<string> DeviceKeys { get; set; }
diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
index 5dbe7600..d1ba6946 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
@@ -213,14 +213,14 @@ namespace PepperDash.Essentials
         {
             if (PropertiesConfig.Environment != null)
             {
-                if (PropertiesConfig.Environment.Enabled)
-                {
+                //if (PropertiesConfig.Environment.Enabled)
+                //{
                     foreach (var d in PropertiesConfig.Environment.DeviceKeys)
                     {
                         var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
                         EnvironmentalControlDevices.Add(envDevice);
                     }
-                }
+                //}
             }
         }
 
diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
index 884ed9a0..85748e26 100644
--- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -350,14 +350,14 @@ namespace PepperDash.Essentials
         {
             if (PropertiesConfig.Environment != null)
             {
-                if (PropertiesConfig.Environment.Enabled)
-                {
+                //if (PropertiesConfig.Environment.Enabled)
+                //{
                     foreach (var d in PropertiesConfig.Environment.DeviceKeys)
                     {
                         var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
                         EnvironmentalControlDevices.Add(envDevice);
                     }
-                }
+                //}
             }
         }
 
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs
index ef0bf2bd..f50eb76e 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs	
@@ -7,6 +7,7 @@ using Crestron.SimplSharp;
 using PepperDash.Essentials.Core;
 
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
@@ -47,8 +48,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
     public class LayoutInfoChangedEventArgs : EventArgs
     {
+        [JsonConverter(typeof(StringEnumConverter))]
         [JsonProperty("availableLayouts", NullValueHandling = NullValueHandling.Ignore)]
         public ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; set; }
+        [JsonConverter(typeof(StringEnumConverter))]
         [JsonProperty("currentSelectedLayout", NullValueHandling = NullValueHandling.Ignore)]
         public ZoomRoom.zConfiguration.eLayoutStyle CurrentSelectedLayout { get; set; }
         [JsonProperty("canSwapContentWithThumbnail", NullValueHandling = NullValueHandling.Ignore)]