Added check for merging themes in to the DMA

Author: ArneMaes0

Low Code App Editor_1Tests/CompanionFiles/Themes_Merged.json

@@ -0,0 +1,74 @@
+{
+	"__type": "Skyline.DataMiner.Web.Common.v1.Dashboards.DMADashboardThemes",
+	"Themes": [
+		{
+			"__type": "Skyline.DataMiner.Web.Common.v1.Dashboards.DMADashboardTheme",
+			"ID": 1,
+			"IsDefault": false,
+			"IsCustom": false,
+			"ComponentBackgroundColor": "rgb(255,255,255)",
+			"ComponentThemes": [
+				{
+					"__type": "Skyline.DataMiner.Web.Common.v1.Dashboards.DMADashboardComponentTheme",
+					"Name": "Transparant",
+					"Inherit": null,
+					"BackgroundColor": "rgba(238,238,238,0)",
+					"FontColor": "#000000",
+					"MarginHorizontal": 5,
+					"Colors": [
+						"rgb(76,84,84)",
+						"rgb(255,113,91)",
+						"rgb(138,79,255)",
+						"rgb(30,168,150)",
+						"rgb(82,63,56)"
+					],
+					"MarginVertical": 5,
+					"PaddingHorizontal": 5,
+					"PaddingVertical": 5,
+					"BorderWidth": 1,
+					"BorderStyle": "none",
+					"BorderSide": 15,
+					"BorderRadius": 0,
+					"BorderColor": "#000000",
+					"TitleAlignment": "left",
+					"TitleFontSize": 16,
+					"TitleFontFamily": "inherit",
+					"TitleBold": false,
+					"TitleItalic": false,
+					"IncludeTitleBorder": false,
+					"ShadowColor": "#000000",
+					"ShadowStyle": 0
+				}
+			],
+			"Name": "Kata 19",
+			"Inherit": null,
+			"BackgroundColor": "rgb(240,240,240)",
+			"FontColor": "#000000",
+			"MarginHorizontal": 5,
+			"Colors": [
+				"rgb(76,84,84)",
+				"rgb(255,113,91)",
+				"rgb(138,79,255)",
+				"rgb(30,168,150)",
+				"rgb(82,63,56)"
+			],
+			"MarginVertical": 5,
+			"PaddingHorizontal": 5,
+			"PaddingVertical": 5,
+			"BorderWidth": 1,
+			"BorderStyle": "none",
+			"BorderSide": 15,
+			"BorderRadius": 0,
+			"BorderColor": "#000000",
+			"TitleAlignment": "left",
+			"TitleFontSize": 16,
+			"TitleFontFamily": "inherit",
+			"TitleBold": false,
+			"TitleItalic": false,
+			"IncludeTitleBorder": false,
+			"ShadowColor": "#000000",
+			"ShadowStyle": 0
+		}
+	],
+	"DefaultThemeID": 0
+}

Low Code App Editor_1Tests/Controllers/ExportControllerTests.cs

@@ -2,6 +2,7 @@
 {
 	using System.IO;
 	using System.Linq;
+	using System.Runtime.Remoting.Contexts;
 
 	using Low_Code_App_Editor_1.Json;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -33,5 +34,59 @@ public void ExtractThemeFromFile()
 
 			Assert.IsTrue(JToken.DeepEquals(usedThemesJson, correct));
 		}
+
+		[TestMethod]
+		public void MergeThemeFromFile()
+		{
+			// Original themes
+			var themesJson = JObject.Parse(File.ReadAllText(@"CompanionFiles\Themes_Merged.json"));
+			var allThemes = themesJson["Themes"] as JArray;
+			var allThemeIds = allThemes.Select(t => t["ID"].Value<int>()).ToList();
+
+			// Themes to be imported
+			var appThemesJson = JObject.Parse(File.ReadAllText(@"CompanionFiles\Themes_Extracted.json"));
+			var appThemes = appThemesJson["Themes"] as JArray;
+
+			// Merge the themes
+			for (int i = 0; i < appThemes.Count; i++)
+			{
+				var theme = appThemes[i];
+				var appThemeId = theme["ID"].Value<int>();
+				var appThemeName = theme["Name"].Value<string>();
+
+				var existingTheme = allThemes.FirstOrDefault(t => t["Name"].Value<string>() == appThemeName);
+				if (existingTheme != null)
+				{
+					var existingThemeId = existingTheme["ID"].Value<int>();
+					if (existingThemeId != appThemeId && allThemeIds.Exists(x => x == appThemeId))
+					{
+						var newId = allThemeIds.Max() + 1;
+						theme["ID"] = newId;
+						appThemeId = newId;
+						allThemeIds.Add(newId);
+					}
+
+					var existingThemeIndex = allThemes.IndexOf(existingTheme);
+					allThemes[existingThemeIndex] = theme;
+				}
+				else
+				{
+					if (allThemeIds.Exists(x => x == appThemeId))
+					{
+						var newId = allThemeIds.Max() + 1;
+						theme["ID"] = newId;
+						appThemeId = newId;
+						allThemeIds.Add(newId);
+					}
+
+					allThemes.Add(theme);
+				}
+			}
+
+			// Grab the solution
+			var correct = JObject.Parse(File.ReadAllText(@"CompanionFiles\Themes.json"));
+
+			Assert.IsTrue(JToken.DeepEquals(themesJson, correct));
+		}
 	}
 }

Low Code App Editor_1Tests/Low Code App Editor_1Tests.csproj

@@ -38,6 +38,9 @@
 	  <None Update="CompanionFiles\Themes_Extracted.json">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </None>
+	  <None Update="CompanionFiles\Themes_Merged.json">
+	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </None>
 	</ItemGroup>
 
 </Project>