PR feedback updates

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/App_Plugins/UmbracoCms.Integrations/Crm/ActiveCampaign/js/formpicker.controller.js

@@ -60,7 +60,7 @@
     function getFormDetails(id) {
         vm.loading = true;
         umbracoCmsIntegrationsCrmActiveCampaignResource.getForm(id).then(function (response) {
-            if (response.message !== null && response.message.length > 0)
+            if (response.message && response.message.length > 0)
                 vm.status = response.message;
             else
                 vm.selectedForm = response.form;

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Controllers/FormsController.cs

@@ -38,15 +38,15 @@ public async Task<IActionResult> GetForms()
             var content = await response.Content.ReadAsStringAsync();
 
             if (!response.IsSuccessStatusCode)
-                return new JsonResult(new ResponseDto
+                return new JsonResult(new FormCollectionResponseDto
                 {
                     Message = string.IsNullOrEmpty(content)
                         ? response.StatusCode == System.Net.HttpStatusCode.Forbidden
                             ? Constants.Resources.AuthorizationFailed : Constants.Resources.ApiAccessFailed
                         : JsonNode.Parse(content)["message"].ToString()
                 });
 
-            return new JsonResult(JsonSerializer.Deserialize<ResponseDto>(content));
+            return new JsonResult(JsonSerializer.Deserialize<FormCollectionResponseDto>(content));
         }
 
         [HttpGet]
@@ -64,15 +64,15 @@ public async Task<IActionResult> GetForm(string id)
             var content = await response.Content.ReadAsStringAsync();
 
             if (!response.IsSuccessStatusCode)
-                return new JsonResult(new ResponseDto
+                return new JsonResult(new FormResponseDto
                 {
                     Message = string.IsNullOrEmpty(content)
                         ? response.StatusCode == System.Net.HttpStatusCode.Forbidden
                             ? Constants.Resources.AuthorizationFailed : Constants.Resources.ApiAccessFailed
                         : JsonNode.Parse(content)["message"].ToString()
                 });
 
-            return new JsonResult(JsonSerializer.Deserialize<ResponseDto>(content));
+            return new JsonResult(JsonSerializer.Deserialize<FormResponseDto>(content));
         }
 
     }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/ResponseDto.cs renamed to src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/BaseResponseDto.cs

@@ -2,14 +2,8 @@
 
 namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
 {
-    public class ResponseDto
+    public abstract class BaseResponseDto
     {
-        [JsonPropertyName("form")]
-        public FormDto Form { get; set; }
-
-        [JsonPropertyName("forms")]
-        public List<FormDto> Forms { get; set; }
-
         [JsonPropertyName("message")]
         public string Message { get; set; }
     }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/FormCollectionResponseDto.cs

@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
+{
+    public class FormCollectionResponseDto : BaseResponseDto
+    {
+        [JsonPropertyName("forms")]
+        public List<FormDto> Form { get; set; }
+    }
+}

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Models/Dtos/FormResponseDto.cs

@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos
+{
+    public class FormResponseDto : BaseResponseDto
+    {
+        [JsonPropertyName("form")]
+        public FormDto Form { get; set; }
+    }
+}