Merge branch 'master' into feature/files

products/ASC.Files/Server/Model/FolderContentWrapper.cs

@@ -24,9 +24,12 @@
 */
 
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 using ASC.Common;
 using ASC.Files.Core;
@@ -162,4 +165,30 @@ namespace ASC.Api.Documents
                 .AddFolderWrapperHelperService();
         }
     }
+
+
+    public class FileEntryWrapperConverter : JsonConverter<FileEntryWrapper>
+    {
+        public override FileEntryWrapper Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return null;
+        }
+
+        public override void Write(Utf8JsonWriter writer, FileEntryWrapper value, JsonSerializerOptions options)
+        {
+            if (value is FolderWrapper<string> f1)
+            {
+                JsonSerializer.Serialize(writer, f1, typeof(FolderWrapper<string>), options);
+                return;
+            }
+
+            if (value is FolderWrapper<int> f2)
+            {
+                JsonSerializer.Serialize(writer, f2, typeof(FolderWrapper<int>), options);
+                return;
+            }
+
+            JsonSerializer.Serialize(writer, value, options);
+        }
+    }
 }

products/ASC.Files/Server/Startup.cs

@@ -50,6 +50,7 @@ namespace ASC.Files
                     options.JsonSerializerOptions.WriteIndented = false;
                     options.JsonSerializerOptions.IgnoreNullValues = true;
                     options.JsonSerializerOptions.Converters.Add(new ApiDateTimeConverter());
+                    options.JsonSerializerOptions.Converters.Add(new FileEntryWrapperConverter());
                 });
 
             services.AddMemoryCache();