Merge branch 'develop' into feature/personal

packages/asc-web-components/package.json

@@ -26,14 +26,14 @@
     "@babel/preset-react": "^7.12.10",
     "@emotion/babel-preset-css-prop": "^10.2.1",
     "@emotion/styled": "^10.0.27",
-    "@storybook/addon-actions": "^6.1.20",
+    "@storybook/addon-actions": "6.3.0",
     "@storybook/addon-contexts": "^5.3.21",
-    "@storybook/addon-controls": "^6.1.20",
-    "@storybook/addon-docs": "^6.1.20",
-    "@storybook/addon-essentials": "^6.1.20",
-    "@storybook/addon-links": "^6.1.20",
-    "@storybook/addon-viewport": "^6.1.21",
-    "@storybook/react": "^6.1.20",
+    "@storybook/addon-controls": "6.3.0",
+    "@storybook/addon-docs": "6.3.0",
+    "@storybook/addon-essentials": "6.3.0",
+    "@storybook/addon-links": "6.3.0",
+    "@storybook/addon-viewport": "6.3.0",
+    "@storybook/react": "6.3.0",
     "@svgr/rollup": "^5.5.0",
     "@svgr/webpack": "^5.5.0",
     "@testing-library/react": "^9.5.0",

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

@@ -160,11 +160,14 @@ public ContactInfoDto GetContactInfoByID(int contactid, int id)
         [Create(@"contact/{contactid:int}/data")]
         public ContactInfoDto CreateContactInfo(
             [FromRoute] int contactid,
-            [FromForm] ContactInfoType infoType,
-            [FromForm] string data,
-            [FromForm] bool isPrimary,
-            [FromForm] string category)
+            [FromBody] CreateContactInfoRequestDto inDto)
         {
+
+            var data = inDto.Data;
+            var infoType = inDto.InfoType;
+            var category = inDto.Category;
+            var isPrimary = inDto.IsPrimary;
+
             if (string.IsNullOrEmpty(data) || contactid <= 0) throw new ArgumentException();
             var contact = _daoFactory.GetContactDao().GetByID(contactid);
             if (contact == null) throw new ItemNotFoundException();

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

@@ -1910,8 +1910,11 @@ public IProgressItem SendMailSMTPToContacts(
 
         /// <visible>false</visible>
         [Create(@"contact/mailsmtp/preview")]
-        public string GetMailSMTPToContactsPreview([FromForm] string template, [FromForm] int contactId)
+        public string GetMailSMTPToContactsPreview([FromBody] GetMailSMTPToContactsPreviewRequestDto inDto)
         {
+            var contactId = inDto.ContactId;
+            var template = inDto.Template;
+
             if (contactId == 0 || String.IsNullOrEmpty(template)) throw new ArgumentException();
 
             var manager = new MailTemplateManager(_daoFactory);

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

@@ -31,6 +31,7 @@
 using ASC.Api.CRM;
 using ASC.Core.Common.Settings;
 using ASC.CRM.ApiModels;
+
 using ASC.CRM.Core;
 using ASC.CRM.Core.Dao;
 using ASC.CRM.Resources;
@@ -131,10 +132,13 @@ public CurrencyRateDto GetCurrencyRate(string fromCurrency, string toCurrency)
         /// <returns></returns>
         [Create(@"currency/rates")]
         public CurrencyRateDto CreateCurrencyRate(
-             [FromForm] string fromCurrency,
-             [FromForm] string toCurrency,
-             [FromForm] decimal rate)
+            [FromBody] CreateCurrencyRateRequestDto inDto)
         {
+
+            var rate = inDto.Rate;
+            var fromCurrency = inDto.FromCurrency;
+            var toCurrency = inDto.ToCurrency;
+
             ValidateRate(rate);
 
             ValidateCurrencies(new[] { fromCurrency, toCurrency });
@@ -191,9 +195,11 @@ public CurrencyRateDto UpdateCurrencyRate(int id, string fromCurrency, string to
         /// <returns></returns>
         [Create(@"currency/setrates")]
         public List<CurrencyRateDto> SetCurrencyRates(
-             [FromForm] String currency,
-             [FromForm] List<CurrencyRate> rates)
+             SetCurrencyRatesRequestDto inDto)
         {
+            var currency = inDto.Currency;
+            var rates = inDto.Rates;
+
             if (!_crmSecurity.IsAdmin)
                 throw _crmSecurity.CreateSecurityException();
 

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

@@ -31,6 +31,7 @@
 using ASC.Api.CRM;
 using ASC.Common.Web;
 using ASC.CRM.ApiModels;
+
 using ASC.CRM.Core;
 using ASC.CRM.Core.Dao;
 using ASC.CRM.Core.Entities;
@@ -108,7 +109,7 @@ public CustomFieldBaseDto SetEntityCustomFieldValue(
             [FromRoute] string entityType,
             [FromRoute] int entityid,
             [FromRoute] int fieldid,
-            [FromForm] string fieldValue)
+            [FromBody] string fieldValue)
         {
             var customField = _daoFactory.GetCustomFieldDao().GetFieldDescription(fieldid);
 
@@ -217,12 +218,17 @@ public CustomFieldBaseDto SetEntityCustomFieldValue(
         [Create(@"{entityType:regex(contact|person|company|opportunity|case)}/customfield")]
         public CustomFieldDto CreateCustomFieldValue(
             [FromRoute] string entityType,
-            [FromForm] string label,
-            [FromForm] int fieldType,
-            [FromForm] int position,
-            [FromForm] string mask)
+            [FromBody] CreateOrUpdateCustomFieldValueRequestDto inDto
+         )
         {
+
+            var label = inDto.Label;
+            var fieldType = inDto.FieldType;
+            var position = inDto.Position;
+            var mask = inDto.Mask;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
+
             var entityTypeObj = ToEntityType(entityType);
             var fieldID = _daoFactory.GetCustomFieldDao().CreateField(entityTypeObj, label, (CustomFieldType)fieldType, mask);
             var wrapper = _daoFactory.GetCustomFieldDao().GetFieldDescription(fieldID);

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

@@ -34,6 +34,7 @@
 using ASC.Common.Web;
 using ASC.Core.Common.Settings;
 using ASC.CRM.ApiModels;
+
 using ASC.CRM.Classes;
 using ASC.CRM.Core;
 using ASC.CRM.Core.Dao;
@@ -800,11 +801,13 @@ private ASC.Files.Core.File<int> GetInvoicePdfExistingOrCreate(ASC.CRM.Core.Enti
         /// <category>Invoices</category>
         /// <returns>ConverterData</returns>
         [Create(@"invoice/converter/data")]
-        public ConverterData GetInvoiceConverterData(
-            [FromForm] int invoiceId,
-            [FromForm] string storageUrl,
-            [FromForm] string revisionId)
+        public ConverterData CreateInvoiceConverterData(
+    [FromBody] CreateInvoiceConverterDataRequestDto inDto)
         {
+            var invoiceId = inDto.InvoiceId;
+            var storageUrl = inDto.StorageUrl;
+            var revisionId = inDto.RevisionId;
+
             if (invoiceId <= 0) throw new ArgumentException();
 
             var invoice = _daoFactory.GetInvoiceDao().GetByID(invoiceId);

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

@@ -31,6 +31,7 @@
 using ASC.Api.CRM;
 using ASC.Common.Web;
 using ASC.CRM.ApiModels;
+
 using ASC.CRM.Core;
 using ASC.CRM.Core.Dao;
 using ASC.CRM.Core.Entities;
@@ -76,13 +77,14 @@ public ListItemsController(CrmSecurity crmSecurity,
         ///    Opportunity stage
         /// </returns>
         [Create(@"opportunity/stage")]
-        public DealMilestoneDto CreateDealMilestone(
-            [FromForm] string title,
-            [FromForm] string description,
-            [FromForm] string color,
-            [FromForm] int successProbability,
-            [FromForm] DealMilestoneStatus stageType)
+        public DealMilestoneDto CreateDealMilestone([FromBody] CreateOrUpdateDealMilestoneRequestDto inDto)
         {
+            var title = inDto.Title;
+            var successProbability = inDto.SuccessProbability;
+            var description = inDto.Description;
+            var color = inDto.Color;
+            var stageType = inDto.StageType;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             if (string.IsNullOrEmpty(title)) throw new ArgumentException();
@@ -121,14 +123,14 @@ public DealMilestoneDto CreateDealMilestone(
         ///    Opportunity stage
         /// </returns>
         [Update(@"opportunity/stage/{id:int}")]
-        public DealMilestoneDto UpdateDealMilestone(
-            int id,
-            string title,
-            string description,
-            string color,
-            int successProbability,
-            DealMilestoneStatus stageType)
+        public DealMilestoneDto UpdateDealMilestone([FromRoute] int id, [FromBody] CreateOrUpdateDealMilestoneRequestDto inDto)
         {
+            var title = inDto.Title;
+            var successProbability = inDto.SuccessProbability;
+            var description = inDto.Description;
+            var color = inDto.Color;
+            var stageType = inDto.StageType;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             if (id <= 0 || string.IsNullOrEmpty(title)) throw new ArgumentException();
@@ -167,7 +169,7 @@ public DealMilestoneDto UpdateDealMilestone(
         ///    Opportunity stage
         /// </returns>
         [Update(@"opportunity/stage/{id:int}/color")]
-        public DealMilestoneDto UpdateDealMilestoneColor(int id, string color)
+        public DealMilestoneDto UpdateDealMilestoneColor([FromRoute] int id, [FromBody] string color)
         {
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
@@ -256,12 +258,14 @@ public DealMilestoneDto DeleteDealMilestone(int id)
         ///<returns>History category</returns>
         ///<exception cref="ArgumentException"></exception>
         [Create(@"history/category")]
-        public HistoryCategoryDto CreateHistoryCategory(
-            [FromForm] string title,
-            [FromForm] string description,
-            [FromForm] string imageName,
-            [FromForm] int sortOrder)
+        public HistoryCategoryDto CreateHistoryCategory([FromBody] CreateListItemCategoryRequestDto inDto)
         {
+
+            var title = inDto.Title;
+            var description = inDto.Description;
+            var sortOrder = inDto.SortOrder;
+            var imageName = inDto.ImageName;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             if (string.IsNullOrEmpty(title)) throw new ArgumentException();
@@ -428,19 +432,16 @@ public HistoryCategoryDto DeleteHistoryCategory(int id)
         ///</returns>
         [Create(@"task/category")]
         public TaskCategoryDto CreateTaskCategory(
-            [FromForm] string title,
-            [FromForm] string description,
-            [FromForm] string imageName,
-            [FromForm] int sortOrder)
+            [FromBody] CreateListItemCategoryRequestDto inDto)
         {
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             var listItem = new ListItem
             {
-                Title = title,
-                Description = description,
-                SortOrder = sortOrder,
-                AdditionalParams = imageName
+                Title = inDto.Title,
+                Description = inDto.Description,
+                SortOrder = inDto.SortOrder,
+                AdditionalParams =inDto.ImageName
             };
 
             listItem.ID = _daoFactory.GetListItemDao().CreateItem(ListType.TaskCategory, listItem);
@@ -536,7 +537,7 @@ public TaskCategoryDto UpdateTaskCategoryIcon(int id, string imageName)
         /// <exception cref="ArgumentException"></exception>
         /// <exception cref="ItemNotFoundException"></exception>
         [Update(@"task/category/reorder")]
-        public IEnumerable<TaskCategoryDto> UpdateTaskCategoriesOrder(IEnumerable<string> titles)
+        public IEnumerable<TaskCategoryDto> UpdateTaskCategoriesOrder([FromBody] IEnumerable<string> titles)
         {
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
@@ -562,7 +563,7 @@ public IEnumerable<TaskCategoryDto> UpdateTaskCategoriesOrder(IEnumerable<string
         ///<exception cref="ItemNotFoundException"></exception>
         ///<exception cref="SecurityException"></exception>
         [Delete(@"task/category/{categoryid:int}")]
-        public TaskCategoryDto DeleteTaskCategory(int categoryid, int newcategoryid)
+        public TaskCategoryDto DeleteTaskCategory([FromRoute] int categoryid, [FromBody] int newcategoryid)
         {
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
@@ -599,11 +600,14 @@ public TaskCategoryDto DeleteTaskCategory(int categoryid, int newcategoryid)
         /// </returns>
         [Create(@"contact/status")]
         public ContactStatusDto CreateContactStatus(
-            [FromForm] string title,
-            [FromForm] string description,
-            [FromForm] string color,
-            [FromForm] int sortOrder)
+            [FromBody] CreateOrUpdateContactStatusRequestDto inDto)
         {
+
+            var title = inDto.Title;
+            var description = inDto.Description;
+            var color = inDto.Color;
+            var sortOrder = inDto.SortOrder;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             var listItem = new ListItem
@@ -638,8 +642,16 @@ public ContactStatusDto CreateContactStatus(
         ///    Contact status
         /// </returns>
         [Update(@"contact/status/{id:int}")]
-        public ContactStatusDto UpdateContactStatus(int id, string title, string description, string color, int sortOrder)
+        public ContactStatusDto UpdateContactStatus(
+            [FromRoute] int id,
+            [FromBody] CreateOrUpdateContactStatusRequestDto inDto)
         {
+
+            var title = inDto.Title;
+            var description = inDto.Description;
+            var color = inDto.Color;
+            var sortOrder = inDto.SortOrder;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             if (id <= 0 || string.IsNullOrEmpty(title)) throw new ArgumentException();
@@ -675,7 +687,7 @@ public ContactStatusDto UpdateContactStatus(int id, string title, string descrip
         ///    Contact status
         /// </returns>
         [Update(@"contact/status/{id:int}/color")]
-        public ContactStatusDto UpdateContactStatusColor(int id, string color)
+        public ContactStatusDto UpdateContactStatusColor([FromRoute] int id, [FromBody] string color)
         {
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
@@ -707,7 +719,7 @@ public ContactStatusDto UpdateContactStatusColor(int id, string color)
         /// <exception cref="ArgumentException"></exception>
         /// <exception cref="ItemNotFoundException"></exception>
         [Update(@"contact/status/reorder")]
-        public IEnumerable<ContactStatusDto> UpdateContactStatusesOrder(IEnumerable<string> titles)
+        public IEnumerable<ContactStatusDto> UpdateContactStatusesOrder([FromBody] IEnumerable<string> titles)
         {
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
@@ -790,8 +802,11 @@ public ContactStatusDto GetContactStatusByID(int contactStatusid)
         ///    Contact type
         /// </returns>
         [Create(@"contact/type")]
-        public ContactTypeDto CreateContactType([FromForm] string title, [FromForm] int sortOrder)
+        public ContactTypeDto CreateContactType([FromBody] CreateOrUpdateContactTypeRequestDto inDto)
         {
+            var title = inDto.Title;
+            var sortOrder = inDto.SortOrder;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             var listItem = new ListItem
@@ -823,8 +838,11 @@ public ContactTypeDto CreateContactType([FromForm] string title, [FromForm] int
         ///    Contact type
         /// </returns>
         [Update(@"contact/type/{id:int}")]
-        public ContactTypeDto UpdateContactType(int id, string title, int sortOrder)
+        public ContactTypeDto UpdateContactType(int id, [FromBody] CreateOrUpdateContactTypeRequestDto inDto)
         {
+            var title = inDto.Title;
+            var sortOrder = inDto.SortOrder;
+
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 
             if (id <= 0 || string.IsNullOrEmpty(title)) throw new ArgumentException();
@@ -860,7 +878,7 @@ public ContactTypeDto UpdateContactType(int id, string title, int sortOrder)
         /// <exception cref="ArgumentException"></exception>
         /// <exception cref="ItemNotFoundException"></exception>
         [Update(@"contact/type/reorder")]
-        public IEnumerable<ContactTypeDto> UpdateContactTypesOrder(IEnumerable<string> titles)
+        public IEnumerable<ContactTypeDto> UpdateContactTypesOrder([FromBody] IEnumerable<string> titles)
         {
             if (!(_crmSecurity.IsAdmin)) throw _crmSecurity.CreateSecurityException();
 

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

@@ -251,9 +251,11 @@ public RelationshipEventDto DeleteHistory(int id)
         public FileWrapper<int> CreateTextFile(
             [FromRoute] string entityType,
             [FromRoute] int entityid,
-            [FromForm] string title,
-            [FromForm] string content)
+            [FromBody] RelationshipEventCreateTextFileRequestDto inDto)
         {
+            var title = inDto.Title;
+            var content = inDto.Content;
+
             if (title == null) throw new ArgumentNullException("title");
             if (content == null) throw new ArgumentNullException("content");