Feature/remove item list

products/ASC.CRM/Server/Api/CasesController.cs

@@ -617,7 +617,7 @@ public IEnumerable<ContactDto> GetCasesMembers(int caseid)
             var contacts = _daoFactory.GetContactDao().GetContacts(contactIDs);
 
             return contactIDs == null
-                       ? new ItemList<ContactDto>()
+                       ? new List<ContactDto>()
                        : _mapper.Map<List<Contact>, List<ContactDto>>(contacts);
         }
 

products/ASC.Files/Core/Helpers/DocuSignHelper.cs

@@ -454,7 +454,7 @@ public class DocuSignData
 
         public string Name { get; set; }
 
-        public ItemList<Guid> Users { get; set; }
+        public List<Guid> Users { get; set; }
     }
 
     public enum DocuSignStatus

products/ASC.Files/Core/Services/DocumentService/Configuration.cs

@@ -254,7 +254,7 @@ public string Uploaded
             get { return File.CreateOnString; }
         }
 
-        public ItemList<AceShortWrapper> SharingSettings
+        public List<AceShortWrapper> SharingSettings
         {
             set { }
             get

products/ASC.Files/Core/Services/WCFService/FileEntrySerializer.cs

@@ -44,7 +44,7 @@ public class FileEntrySerializer
         static FileEntrySerializer()
         {
             serializers[typeof(File<>)] = new DataContractSerializer(typeof(File<>));
-            //serializers[typeof(ItemList<FileEntry<>>)] = new DataContractSerializer(typeof(ItemList<FileEntry<>>));
+            //serializers[typeof(List<FileEntry<>>)] = new DataContractSerializer(typeof(List<FileEntry<>>));
             serializers[typeof(DataWrapper<>)] = new DataContractSerializer(typeof(DataWrapper<>));
 
             //if (WorkContext.IsMono && !string.IsNullOrEmpty(WorkContext.MonoVersion))
@@ -54,7 +54,7 @@ static FileEntrySerializer()
             //    if (2 <= version.Length && (Convert.ToInt32(version[0]) * 1000 + Convert.ToInt32(version[1])) < 4002)
             //    {
             //        oldMonoSerializer = true;
-            //        serializers[typeof(ItemList<FileEntry>)] = new DataContractSerializer(typeof(ItemList<FileEntry>), Type.EmptyTypes, ushort.MaxValue, false, false, null, new FileEntryResolver());
+            //        serializers[typeof(List<FileEntry>)] = new DataContractSerializer(typeof(List<FileEntry>), Type.EmptyTypes, ushort.MaxValue, false, false, null, new FileEntryResolver());
             //        serializers[typeof(DataWrapper)] = new DataContractSerializer(typeof(DataWrapper), Type.EmptyTypes, ushort.MaxValue, false, false, null, new FileEntryResolver());
             //    }
             //}

products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs

@@ -54,7 +54,7 @@ public FileOperationsManager(TempStream tempStream, DistributedTaskQueueOptionsM
             ServiceProvider = serviceProvider;
         }
 
-        public ItemList<FileOperationResult> GetOperationResults(Guid userId)
+        public List<FileOperationResult> GetOperationResults(Guid userId)
         {
             var operations = tasks.GetTasks();
             var processlist = Process.GetProcesses();
@@ -91,10 +91,10 @@ public ItemList<FileOperationResult> GetOperationResults(Guid userId)
                 })
                 .ToList();
 
-            return new ItemList<FileOperationResult>(results);
+            return new List<FileOperationResult>(results);
         }
 
-        public ItemList<FileOperationResult> CancelOperations(Guid userId)
+        public List<FileOperationResult> CancelOperations(Guid userId)
         {
             var operations = tasks.GetTasks()
                 .Where(t => t.GetProperty<Guid>(FileOperation.OWNER) == userId);
@@ -108,15 +108,15 @@ public ItemList<FileOperationResult> CancelOperations(Guid userId)
         }
 
 
-        public ItemList<FileOperationResult> MarkAsRead(Guid userId, Tenant tenant, IEnumerable<JsonElement> folderIds, IEnumerable<JsonElement> fileIds)
+        public List<FileOperationResult> MarkAsRead(Guid userId, Tenant tenant, IEnumerable<JsonElement> folderIds, IEnumerable<JsonElement> fileIds)
         {
             var op1 = new FileMarkAsReadOperation<int>(ServiceProvider, new FileMarkAsReadOperationData<int>(folderIds.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()), fileIds.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()), tenant));
             var op2 = new FileMarkAsReadOperation<string>(ServiceProvider, new FileMarkAsReadOperationData<string>(folderIds.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()), fileIds.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()), tenant));
             var op = new FileMarkAsReadOperation(ServiceProvider, op2, op1);
             return QueueTask(userId, op);
         }
 
-        public ItemList<FileOperationResult> Download(Guid userId, Tenant tenant, Dictionary<JsonElement, string> folders, Dictionary<JsonElement, string> files, IDictionary<string, StringValues> headers)
+        public List<FileOperationResult> Download(Guid userId, Tenant tenant, Dictionary<JsonElement, string> folders, Dictionary<JsonElement, string> files, IDictionary<string, StringValues> headers)
         {
             var operations = tasks.GetTasks()
                 .Where(t => t.GetProperty<Guid>(FileOperation.OWNER) == userId)
@@ -134,7 +134,7 @@ public ItemList<FileOperationResult> Download(Guid userId, Tenant tenant, Dictio
             return QueueTask(userId, op);
         }
 
-        public ItemList<FileOperationResult> MoveOrCopy(Guid userId, Tenant tenant, IEnumerable<JsonElement> folders, IEnumerable<JsonElement> files, JsonElement destFolderId, bool copy, FileConflictResolveType resolveType, bool holdResult, IDictionary<string, StringValues> headers)
+        public List<FileOperationResult> MoveOrCopy(Guid userId, Tenant tenant, IEnumerable<JsonElement> folders, IEnumerable<JsonElement> files, JsonElement destFolderId, bool copy, FileConflictResolveType resolveType, bool holdResult, IDictionary<string, StringValues> headers)
         {
             var op1 = new FileMoveCopyOperation<int>(ServiceProvider, new FileMoveCopyOperationData<int>(folders.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()), files.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()), tenant, destFolderId, copy, resolveType, holdResult, headers));
             var op2 = new FileMoveCopyOperation<string>(ServiceProvider, new FileMoveCopyOperationData<string>(folders.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()), files.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()), tenant, destFolderId, copy, resolveType, holdResult, headers));
@@ -143,13 +143,13 @@ public ItemList<FileOperationResult> MoveOrCopy(Guid userId, Tenant tenant, IEnu
             return QueueTask(userId, op);
         }
 
-        public ItemList<FileOperationResult> Delete<T>(Guid userId, Tenant tenant, IEnumerable<T> folders, IEnumerable<T> files, bool ignoreException, bool holdResult, bool immediately, IDictionary<string, StringValues> headers)
+        public List<FileOperationResult> Delete<T>(Guid userId, Tenant tenant, IEnumerable<T> folders, IEnumerable<T> files, bool ignoreException, bool holdResult, bool immediately, IDictionary<string, StringValues> headers)
         {
             var op = new FileDeleteOperation<T>(ServiceProvider, new FileDeleteOperationData<T>(folders, files, tenant, holdResult, ignoreException, immediately, headers));
             return QueueTask(userId, op);
         }
 
-        public ItemList<FileOperationResult> Delete(Guid userId, Tenant tenant, IEnumerable<JsonElement> folders, IEnumerable<JsonElement> files, bool ignoreException, bool holdResult, bool immediately, IDictionary<string, StringValues> headers)
+        public List<FileOperationResult> Delete(Guid userId, Tenant tenant, IEnumerable<JsonElement> folders, IEnumerable<JsonElement> files, bool ignoreException, bool holdResult, bool immediately, IDictionary<string, StringValues> headers)
         {
             var op1 = new FileDeleteOperation<int>(ServiceProvider, new FileDeleteOperationData<int>(folders.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()), files.Where(r => r.ValueKind == JsonValueKind.Number).Select(r => r.GetInt32()), tenant, holdResult, ignoreException, immediately, headers));
             var op2 = new FileDeleteOperation<string>(ServiceProvider, new FileDeleteOperationData<string>(folders.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()), files.Where(r => r.ValueKind == JsonValueKind.String).Select(r => r.GetString()), tenant, holdResult, ignoreException, immediately, headers));
@@ -159,13 +159,13 @@ public ItemList<FileOperationResult> Delete(Guid userId, Tenant tenant, IEnumera
         }
 
 
-        private ItemList<FileOperationResult> QueueTask(Guid userId, FileOperation op)
+        private List<FileOperationResult> QueueTask(Guid userId, FileOperation op)
         {
             tasks.QueueTask(op.RunJob, op.GetDistributedTask());
             return GetOperationResults(userId);
         }
 
-        private ItemList<FileOperationResult> QueueTask<T, TId>(Guid userId, FileOperation<T, TId> op) where T : FileOperationData<TId>
+        private List<FileOperationResult> QueueTask<T, TId>(Guid userId, FileOperation<T, TId> op) where T : FileOperationData<TId>
         {
             tasks.QueueTask(op.RunJob, op.GetDistributedTask());
             return GetOperationResults(userId);

products/ASC.Files/Core/Services/WCFService/Wrappers/AceWrapper.cs

@@ -39,7 +39,7 @@ public class AceCollection<T>
         public IEnumerable<T> Files { get; set; }
         public IEnumerable<T> Folders { get; set; }
 
-        public ItemList<AceWrapper> Aces { get; set; }
+        public List<AceWrapper> Aces { get; set; }
 
         public string Message { get; set; }
     }

products/ASC.Files/Core/Services/WCFService/Wrappers/DataWrapper.cs

@@ -24,6 +24,7 @@
 */
 
 
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 using ASC.Files.Core;
@@ -32,12 +33,12 @@ namespace ASC.Web.Files.Services.WCFService
 {
     public class DataWrapper<T>
     {
-        public ItemList<FileEntry> Entries { get; set; }
+        public List<FileEntry> Entries { get; set; }
 
         public int Total { get; set; }
 
         [JsonPropertyName("path_parts")]
-        public ItemList<object> FolderPathParts { get; set; }
+        public List<object> FolderPathParts { get; set; }
 
         [JsonPropertyName("folder_info")]
         public Folder<T> FolderInfo { get; set; }

products/ASC.Files/Core/Utils/FileSharing.cs

@@ -432,7 +432,7 @@ public List<AceWrapper> GetSharedInfo<T>(FileEntry<T> entry)
             return result;
         }
 
-        public ItemList<AceWrapper> GetSharedInfo<T>(IEnumerable<T> fileIds, IEnumerable<T> folderIds)
+        public List<AceWrapper> GetSharedInfo<T>(IEnumerable<T> fileIds, IEnumerable<T> folderIds)
         {
             if (!AuthContext.IsAuthenticated)
             {
@@ -542,26 +542,26 @@ public ItemList<AceWrapper> GetSharedInfo<T>(IEnumerable<T> fileIds, IEnumerable
                 result = new List<AceWrapper> { linkAce }.Concat(result).ToList();
             }
 
-            return new ItemList<AceWrapper>(result);
+            return new List<AceWrapper>(result);
         }
 
-        public ItemList<AceShortWrapper> GetSharedInfoShortFile<T>(T fileID)
+        public List<AceShortWrapper> GetSharedInfoShortFile<T>(T fileID)
         {
             var aces = GetSharedInfo(new List<T> { fileID}, new List<T>());
 
             return GetAceShortWrappers(aces);
         }
 
-        public ItemList<AceShortWrapper> GetSharedInfoShortFolder<T>(T folderId)
+        public List<AceShortWrapper> GetSharedInfoShortFolder<T>(T folderId)
         {
             var aces = GetSharedInfo(new List<T>(), new List<T> { folderId });
 
             return GetAceShortWrappers(aces);
         }
 
-        private ItemList<AceShortWrapper> GetAceShortWrappers(ItemList<AceWrapper> aces)
+        private List<AceShortWrapper> GetAceShortWrappers(List<AceWrapper> aces)
         {
-            return new ItemList<AceShortWrapper>(aces
+            return new List<AceShortWrapper>(aces
                 .Where(aceWrapper => !aceWrapper.SubjectId.Equals(FileConstant.ShareLinkId) || aceWrapper.Share != FileShare.Restrict)
                 .Select(aceWrapper => new AceShortWrapper(aceWrapper)));
         }

products/ASC.Files/Server/Helpers/FilesControllerHelper.cs

@@ -369,9 +369,9 @@ public IEnumerable<ConversationResult<T>> StartConversion(T fileId)
 
         public IEnumerable<ConversationResult<T>> CheckConversion(T fileId, bool start)
         {
-            return FileStorageService.CheckConversion(new ItemList<ItemList<string>>
+            return FileStorageService.CheckConversion(new List<List<string>>
             {
-                new ItemList<string> { fileId.ToString(), "0", start.ToString() }
+                new List<string> { fileId.ToString(), "0", start.ToString() }
             })
             .Select(r =>
             {
@@ -550,7 +550,7 @@ public IEnumerable<FileShareWrapper> SetSecurityInfo(IEnumerable<T> fileIds, IEn
         {
             if (share != null && share.Any())
             {
-                var list = new ItemList<AceWrapper>(share.Select(FileShareParamsHelper.ToAceObject));
+                var list = new List<AceWrapper>(share.Select(FileShareParamsHelper.ToAceObject));
                 var aceCollection = new AceCollection<T>
                 {
                     Files = fileIds,
@@ -578,7 +578,7 @@ public string GenerateSharedLink(T fileId, FileShare share)
             var sharedInfo = FileStorageService.GetSharedInfo(new List<T> { fileId }, new List<T> { }).Find(r => r.SubjectId == FileConstant.ShareLinkId);
             if (sharedInfo == null || sharedInfo.Share != share)
             {
-                var list = new ItemList<AceWrapper>
+                var list = new List<AceWrapper>
                     {
                         new AceWrapper
                             {

products/ASC.Files/Tests/SharedWithMeTest.cs

@@ -277,7 +277,7 @@ private async Task WaitLongOperation(FileOperationWraper result, string assertEr
                 return;
             }
 
-            ItemList<FileOperationResult> statuses;
+            List<FileOperationResult> statuses;
             while (true)
             {
                 statuses = FileStorageService.GetTasksStatuses();

products/ASC.Files/Tests/Trash.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 
 using ASC.Api.Documents;
@@ -52,9 +53,9 @@ public void CreateFileReturnsFolderWrapper(string fileTitle)
         [Order(2)]
         public void DeleteFileFromTrash()
         {
-            var Empty = FilesControllerHelper.EmptyTrash();
-            
-            ItemList<FileOperationResult> statuses;
+            var Empty = FilesControllerHelper.EmptyTrash();
+
+            List<FileOperationResult> statuses;
 
             while (true)
             {