Merge pull request #10 from RoelantVos/InvalidJsonFileIssue

Improved handling of incompatible Json content.

Author: RoelantVos

Virtual_Data_Warehouse_Library/EnvironmentConfiguration.cs

@@ -49,6 +49,18 @@
         <assemblyIdentity name="System.Data.SqlClient" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.6.1.2" newVersion="4.6.1.2" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.ProtectedData" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.22.0.0" newVersion="4.22.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Virtual_Data_Warehouse_Library/Virtual_Data_Warehouse_Library.csproj

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -311,7 +311,7 @@ public CustomTabPage(string classification, string notes, Dictionary<string, VDW
             SetItemList(itemList);
 
             // Report back to the user if there is not metadata available
-            if (itemList.Count == 0)
+            if (itemList == null || itemList.Count == 0)
             {
                 _localRichTextBox.Text =
                     $"There was no metadata available to display {_inputNiceName} content. Please check the associated metadata schema (are there any {_inputNiceName} records available?) or the database connection.\r\n\r\n";
@@ -359,11 +359,14 @@ public void SetItemList(Dictionary<string, VDW_DataObjectMappingList> itemList)
             _localCheckedListBox.Items.Clear();
 
             // Add items to the Checked List Box, if it satisfies the filter criterion
-            foreach (string item in itemList.Keys)
+            if (itemList != null && itemList.Count > 0)
             {
-                if (item.Contains(_localTextBoxFilter.Text))
+                foreach (string item in itemList.Keys)
                 {
-                    _localCheckedListBox.Items.Add(item);
+                    if (item.Contains(_localTextBoxFilter.Text))
+                    {
+                        _localCheckedListBox.Items.Add(item);
+                    }
                 }
             }
 

Virtual_EDW/App.config

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Windows.Forms;
 using TEAM;
 
@@ -49,6 +50,9 @@ internal static class GlobalParameters
             public static string JsonConnectionFileName { get; } = "TEAM_connections";
             public static string JsonEnvironmentFileName { get; } = "TEAM_environments";
             public static string JsonExtension { get; } = ".json";
+
+            public static string JsonSchemaForDataWarehouseAutomationFileName { get; } = "interfaceDataWarehouseAutomationMetadata.json";
+            //public static string DataWarehouseSchemaDefinition { get; } = File.ReadAllText(Application.StartupPath + @"\Schema\" + JsonSchemaForDataWarehouseAutomationFileName);
         }
 
 
@@ -67,7 +71,6 @@ internal static class VdwConfigurationSettings
             public static string VdwExamplesPath { get; set; } = Application.StartupPath + @"\Examples\";
 
 
-
             // Parameters that can be changed at runtime
             public static string hashingStartSnippet { get; set; }
             public static string hashingEndSnippet { get; set; }