Skip to content

Commit 4b295cd

Browse files
ArneMaes0ArneMaes0
committed
Removed the Import button, since it's not recommended to use it anyway
Fixed issue where duplicate app names would crash the export and delete panel Fixed issue when installing a generated package, would fail if there was a draft app with no public version yet. Added the used themes to the package as well.
1 parent 3738105 commit 4b295cd

File tree

10 files changed

+918
-647
lines changed

10 files changed

+918
-647
lines changed

‎CompanionFiles/Skyline DataMiner/Documents/Low Code App Editor/Install.xml

+495-361
Large diffs are not rendered by default.

‎Low Code App Editor_1/Controllers/ExportController.cs

+42-2
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,29 @@
1313
using Low_Code_App_Editor_1.LCA;
1414
using Low_Code_App_Editor_1.Package;
1515
using Low_Code_App_Editor_1.UI;
16+
using Low_Code_App_Editor_1.Json;
17+
18+
using Newtonsoft.Json;
1619

1720
using Skyline.DataMiner.Automation;
1821
using Skyline.DataMiner.Net.AppPackages;
1922
using Skyline.DataMiner.Net.Apps.FileTime;
2023
using Skyline.DataMiner.Net.Apps.Modules;
24+
using Skyline.DataMiner.Web.Common.v1.Dashboards;
25+
using Newtonsoft.Json.Linq;
2126

2227
public class ExportController
2328
{
2429
public static readonly string ScriptPath = @"C:\Skyline DataMiner\Scripts";
2530
public static readonly string DllImportPath = @"C:\Skyline DataMiner\ProtocolScripts\DllImport";
2631
public static readonly string LowCodeAppEditorPath = @"C:\Skyline DataMiner\Documents\Low Code App Editor";
2732
public static readonly string LowCodeAppEditorExportPath = @"C:\Skyline DataMiner\Documents\DMA_COMMON_DOCUMENTS\Low Code Apps Exports";
33+
public static readonly string ThemesPath = @"C:\Skyline DataMiner\dashboards\Themes.json";
2834

2935
public static string ExportApps(IEngine engine, IEnumerable<App> apps, ExportOptions options)
3036
{
37+
return ExportPackage(engine, apps, options);
38+
3139
if (options.ExportPackage)
3240
{
3341
return ExportPackage(engine, apps, options);
@@ -106,6 +114,7 @@ private static string ExportPackage(IEngine engine, IEnumerable<App> apps, Expor
106114

107115
var domModuleIds = new List<string>();
108116
var images = new List<string>();
117+
var themes = new List<DMADashboardTheme>();
109118
foreach (var app in apps)
110119
{
111120
engine.GenerateInformation($"Adding App");
@@ -139,6 +148,9 @@ private static string ExportPackage(IEngine engine, IEnumerable<App> apps, Expor
139148

140149
// Add Images to companion files
141150
images.AddRangeUnique(app.LatestVersion.GetUsedImages());
151+
152+
// Add Theme
153+
themes.AddRangeUnique(app.LatestVersion.GetUsedThemes());
142154
}
143155

144156
// Add DOM modules
@@ -149,7 +161,12 @@ private static string ExportPackage(IEngine engine, IEnumerable<App> apps, Expor
149161
engine.GenerateInformation($"Adding Images");
150162
AddImagesToArchive(zip, images);
151163

164+
// Add Themes
165+
engine.GenerateInformation($"Adding Themes");
166+
AddThemesToArchive(zip, themes);
167+
152168
engine.GenerateInformation($"Adding Installer code");
169+
153170
// Add custom Low Code App Installer Code
154171
zip.CreateEntryFromDirectory(LowCodeAppEditorPath, "Scripts");
155172
}
@@ -267,14 +284,37 @@ private static void AddDomToArchive(IEngine engine, ZipArchive zip, IEnumerable<
267284

268285
private static void AddImagesToArchive(ZipArchive zip, List<string> images)
269286
{
270-
var imageFolder = Path.Combine("AppInstallContent", "CompanionFiles", "Images") + "/"; // Slash to indicate it's a directory
287+
var imageFolder = Path.Combine("AppInstallContent", "CompanionFiles", "Images") + "\\"; // Slash to indicate it's a directory
271288
zip.CreateEntry(imageFolder);
272289

273290
foreach (var image in images)
274291
{
275292
zip.CreateEntryFromFile(image, Path.Combine("AppInstallContent", "CompanionFiles", "Images", Path.GetFileName(image)));
276293
}
277294
}
295+
296+
private static void AddThemesToArchive(ZipArchive zip, List<DMADashboardTheme> themes)
297+
{
298+
// Original themes
299+
var themesJson = JObject.Parse(File.ReadAllText(ThemesPath));
300+
var allThemes = themesJson["Themes"] as JArray;
301+
302+
// Create a copy of the themes object, clear all the themes out.
303+
var usedThemesJson = themesJson.DeepClone();
304+
var usedThemesArray = usedThemesJson["Themes"] as JArray;
305+
usedThemesArray.Clear();
306+
307+
// Add the ones needed for the package to the cloned
308+
foreach(var theme in themes)
309+
{
310+
var usedTheme = allThemes.First(t => t["Name"].Value<string>() == theme.Name);
311+
usedThemesArray.Add(usedTheme);
312+
}
313+
314+
var themesPath = Path.Combine("AppInstallContent", "CompanionFiles", "Themes") + "\\"; // Slash to indicate it's a directory
315+
zip.CreateEntry(themesPath);
316+
zip.CreateEntryFromText(Path.Combine(themesPath, "Themes.json"), usedThemesJson.ToString());
317+
}
278318
}
279319

280320
public class ExportOptions
@@ -290,7 +330,7 @@ public static ExportOptions FromDialog(ExportDialog dialog)
290330
return new ExportOptions
291331
{
292332
IncludeVersions = dialog.ExportVersions.IsChecked,
293-
ExportPackage = dialog.ExportPackage.IsChecked,
333+
//ExportPackage = dialog.ExportPackage.IsChecked,
294334
ExportDomInstances = dialog.ExportDomInstances.IsChecked,
295335
};
296336
}

‎Low Code App Editor_1/Json/TypeConverter.cs

+95-94
Original file line numberDiff line numberDiff line change
@@ -5,108 +5,109 @@
55
using System.Linq;
66
using System.Text;
77
using System.Threading.Tasks;
8+
using System.Collections;
89

910
namespace Low_Code_App_Editor_1.Json
1011
{
11-
public class TypeConverter : JsonConverter
12-
{
13-
/// <summary>
14-
/// Determines whether this instance can convert the specified object type.
15-
/// </summary>
16-
/// <param name="objectType">The type of the object.</param>
17-
/// <returns><see langword="true"/> if this instance can convert the specified object type; otherwise, <see langword="false"/>.</returns>
18-
public override bool CanConvert(Type objectType)
19-
{
20-
return true;
21-
}
12+
public class TypeConverter : JsonConverter
13+
{
14+
/// <summary>
15+
/// Determines whether this instance can convert the specified object type.
16+
/// </summary>
17+
/// <param name="objectType">The type of the object.</param>
18+
/// <returns><see langword="true"/> if this instance can convert the specified object type; otherwise, <see langword="false"/>.</returns>
19+
public override bool CanConvert(Type objectType)
20+
{
21+
return true;
22+
}
2223

23-
/// <summary>
24-
/// Reads the JSON representation of the object.
25-
/// </summary>
26-
/// <param name="reader">The JsonReader to read from.</param>
27-
/// <param name="objectType">The type of the object.</param>
28-
/// <param name="existingValue">The existing value of object being read.</param>
29-
/// <param name="serializer">The JsonSerializer used to deserialize the object.</param>
30-
/// <returns>The deserialized object.</returns>
31-
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
32-
{
33-
JToken json;
34-
var foundType = objectType;
35-
try
36-
{
37-
if (reader.TokenType == JsonToken.StartArray)
38-
{
39-
json = JArray.Load(reader);
40-
if (objectType == typeof(object))
41-
{
42-
return null;
43-
}
24+
/// <summary>
25+
/// Reads the JSON representation of the object.
26+
/// </summary>
27+
/// <param name="reader">The JsonReader to read from.</param>
28+
/// <param name="objectType">The type of the object.</param>
29+
/// <param name="existingValue">The existing value of object being read.</param>
30+
/// <param name="serializer">The JsonSerializer used to deserialize the object.</param>
31+
/// <returns>The deserialized object.</returns>
32+
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
33+
{
34+
JToken json;
35+
var foundType = objectType;
36+
try
37+
{
38+
if (reader.TokenType == JsonToken.StartArray)
39+
{
40+
json = JArray.Load(reader);
41+
if (objectType == typeof(object))
42+
{
43+
return null;
44+
}
4445

45-
object[] resultArray = (object[])Array.CreateInstance(foundType.GetElementType(), ((JArray)json).Count);
46-
for (int i = 0; i < ((JArray)json).Count; i++)
47-
{
48-
var itemJson = ((JArray)json)[i];
49-
var typeName = Convert.ToString(itemJson["__type"]);
50-
foundType = objectType.Assembly.GetType(typeName);
51-
if (foundType == null) foundType = objectType;
52-
resultArray[i] = Activator.CreateInstance(foundType);
53-
serializer.Populate(itemJson.CreateReader(), resultArray[i]);
54-
}
46+
object[] resultArray = (object[])Array.CreateInstance(foundType.GetElementType(), ((JArray)json).Count);
47+
for (int i = 0; i < ((JArray)json).Count; i++)
48+
{
49+
var itemJson = ((JArray)json)[i];
50+
var typeName = Convert.ToString(itemJson["__type"]);
51+
foundType = objectType.Assembly.GetType(typeName);
52+
if (foundType == null) foundType = objectType;
53+
resultArray[i] = Activator.CreateInstance(foundType);
54+
serializer.Populate(itemJson.CreateReader(), resultArray[i]);
55+
}
5556

56-
return resultArray;
57-
}
58-
else if (reader.TokenType == JsonToken.StartObject)
59-
{
60-
json = JObject.Load(reader);
61-
var typeName = Convert.ToString(json["__type"]);
57+
return resultArray;
58+
}
59+
else if (reader.TokenType == JsonToken.StartObject)
60+
{
61+
json = JObject.Load(reader);
62+
var typeName = Convert.ToString(json["__type"]);
6263

63-
if (typeName == "Skyline.DataMiner.Web.Common.v1.DMAPrimitiveValue")
64-
{
65-
var result = JsonConvert.DeserializeObject<Skyline.DataMiner.Web.Common.v1.DMAPrimitiveValue>(json.ToString());
66-
return result;
67-
}
68-
else
69-
{
70-
foundType = objectType.Assembly.GetType(typeName);
71-
if (foundType == null) foundType = objectType;
72-
object result = Activator.CreateInstance(foundType);
73-
serializer.Populate(json.CreateReader(), result);
74-
return result;
75-
}
76-
}
77-
else
78-
{
79-
json = JToken.Load(reader);
80-
var jsonValue = json.ToString();
81-
if (foundType == typeof(bool))
82-
jsonValue = jsonValue.ToLower();
83-
if (foundType == typeof(string))
84-
return jsonValue;
85-
if (foundType == typeof(double))
86-
return Convert.ToDouble(jsonValue);
87-
var value = JsonConvert.DeserializeObject(jsonValue, foundType);
88-
return value;
89-
}
90-
}
91-
catch (Exception)
92-
{
93-
return null;
94-
}
95-
}
64+
if (typeName == "Skyline.DataMiner.Web.Common.v1.DMAPrimitiveValue")
65+
{
66+
var result = JsonConvert.DeserializeObject<Skyline.DataMiner.Web.Common.v1.DMAPrimitiveValue>(json.ToString());
67+
return result;
68+
}
69+
else
70+
{
71+
foundType = objectType.Assembly.GetType(typeName);
72+
if (foundType == null) foundType = objectType;
73+
object result = Activator.CreateInstance(foundType);
74+
serializer.Populate(json.CreateReader(), result);
75+
return result;
76+
}
77+
}
78+
else
79+
{
80+
json = JToken.Load(reader);
81+
var jsonValue = json.ToString();
82+
if (foundType == typeof(bool))
83+
jsonValue = jsonValue.ToLower();
84+
if (foundType == typeof(string))
85+
return jsonValue;
86+
if (foundType == typeof(double))
87+
return Convert.ToDouble(jsonValue);
88+
var value = JsonConvert.DeserializeObject(jsonValue, foundType);
89+
return value;
90+
}
91+
}
92+
catch (Exception)
93+
{
94+
return null;
95+
}
96+
}
9697

97-
/// <summary>
98-
/// Writes the JSON representation of the object.
99-
/// </summary>
100-
/// <param name="writer">The JsonWriter to write to.</param>
101-
/// <param name="value">The value to write.</param>
102-
/// <param name="serializer">The JsonSerializer used to serialize the object.</param>
103-
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
104-
{
105-
throw new NotSupportedException();
106-
}
98+
/// <summary>
99+
/// Writes the JSON representation of the object.
100+
/// </summary>
101+
/// <param name="writer">The JsonWriter to write to.</param>
102+
/// <param name="value">The value to write.</param>
103+
/// <param name="serializer">The JsonSerializer used to serialize the object.</param>
104+
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
105+
{
106+
throw new NotSupportedException();
107+
}
107108

108-
public override bool CanRead => true;
109+
public override bool CanRead => true;
109110

110-
public override bool CanWrite => false;
111-
}
111+
public override bool CanWrite => false;
112+
}
112113
}

0 commit comments

Comments
 (0)