adm updates

config/Services/Models/ConfigTypeList.cs

@@ -7,23 +7,23 @@ namespace Microsoft.Azure.IoTSolutions.UIConfig.Services.External
 {
     public class ConfigTypeList
     {
-        private HashSet<String> customConfigTypes = new HashSet<String>();
+        private HashSet<String> configTypes = new HashSet<String>();
 
         public string[] Items
         {
             get
             {
-                return customConfigTypes.ToArray<String>();
+                return configTypes.ToArray<String>();
             }
             set
             {
-                Array.ForEach<String>(value, (c => customConfigTypes.Add(c)));
+                Array.ForEach<String>(value, (c => configTypes.Add(c)));
             }
         }
 
         internal void add(string customConfig)
         {
-            customConfigTypes.Add(customConfig.Trim());
+            configTypes.Add(customConfig.Trim());
         }
 
     }

config/WebService.Test/Controllers/PackageControllerTest.cs

@@ -142,7 +142,7 @@ namespace WebService.Test.Controllers
                 var pkg = resultPackages.Items.ElementAt(i);
                 Assert.Equal(id + i, pkg.Id);
                 Assert.Equal(name + i, pkg.Name);
-                Assert.Equal(type + i, pkg.packageType);
+                Assert.Equal(type, pkg.packageType);
                 Assert.Equal(content + i, pkg.Content);
                 Assert.Equal(dateCreated, pkg.DateCreated);
             }

config/WebService/v1/Models/ConfigTypeListApiModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Azure.IoTSolutions.UIConfig.Services.External;
 using Microsoft.Azure.IoTSolutions.UIConfig.Services.Models;
@@ -13,13 +14,17 @@ namespace Microsoft.Azure.IoTSolutions.UIConfig.WebService.v1.Models
 
         public ConfigTypeListApiModel(ConfigTypeList configTypeList)
         {
+            List<String> configType = configTypeList.Items.ToList<String>();
 
             foreach (ConfigType type in Enum.GetValues(typeof(ConfigType)))
             {
-                configTypeList.Items.Prepend(type.ToString());
+                if (!type.Equals(ConfigType.Custom))
+                {
+                    configType.Insert(0, type.ToString());
+                }
             }
 
-            this.Items = configTypeList.Items;
+            this.Items = configType.ToArray<String>();
         }
 
     }

config/WebService/v1/Models/PackageListApiModel.cs

@@ -33,8 +33,8 @@ namespace Microsoft.Azure.IoTSolutions.UIConfig.WebService.v1.Models
                 this.Items = models.Select(m => new PackageApiModel(m)).Where(
                                 package => (
                                 package.ConfigType != null
-                                && package.packageType.ToString().ToLower().Equals(type)
-                                && package.ConfigType.ToString().ToLower().Equals(config)));
+                                && package.packageType.ToString().ToLower().Equals(type.ToLower())
+                                && package.ConfigType.ToString().ToLower().Equals(config.ToLower())));
             }
         }
     }