Calling async methods, validations, delete confirmation.

Author: acoumb

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/dashboard.html

@@ -1,9 +1,9 @@
-<div ng-controller="Umbraco.Cms.Integrations.Automation.Zapier.ZapConfigController as vm"> 
+<div ng-controller="Umbraco.Cms.Integrations.Automation.Zapier.ZapConfigController as vm">
     <umb-box>
         <umb-box-header title="Configuration"></umb-box-header>
         <umb-content>
             <div class="mt2 ml2">
-                <input id="inWebHookUrl" type="text" ng-model="vm.webHookUrl" class="w-20 mb0" placeholder="WebHook URL"/>
+                <input id="inWebHookUrl" type="text" ng-model="vm.webHookUrl" class="w-20 mb0" placeholder="WebHook URL" />
                 <select id="selContentTypes" ng-model="vm.selectedContentType" class="mb0">
                     <option value="">Please select a content type</option>
                     <option ng-repeat="item in vm.contentTypes" value="{{ item.alias }}">{{ item.name }}</option>
@@ -31,7 +31,7 @@
                                     <span>WebHook URL</span>
                                 </a>
                             </div>
-                            <div class="umb-table-cell"></div>
+                            <div class="mr7"></div>
                         </div>
                     </div>
 
@@ -46,10 +46,15 @@
                             <div class="umb-table-cell">
                                 <span ng-bind="row.webHookUrl"></span>
                             </div>
-                            <div class="umb-table-cell">
-                                <div class="umb-forms-mapping-remove -no-margin-right">
-                                    <a href="javascript:void(0)" ng-click="vm.onDelete(row.id)"><i class="icon-trash"></i></a>
-                                </div>
+                            <div class="mr7" style="position: relative;">
+                                <a href="javascript:void(0)" ng-click="row.showDeletePrompt = true">
+                                    <i class="icon-trash"></i>
+                                </a>
+                                <umb-confirm-action ng-if="row.showDeletePrompt"
+                                                    direction="left"
+                                                    on-confirm="vm.onDelete(row.id)"
+                                                    on-cancel="row.showDeletePrompt = false">
+                                </umb-confirm-action>
                             </div>
                         </div>
                     </div>

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/js/zapier-validation.service.js

@@ -1,23 +1,30 @@
 function zapierValidationService() {
+
+    const resources = {
+        WebHookEmpty: "WebHook Url is required.",
+        WebHookUrlInvalid: "WebHook Url format is invalid.",
+        ContentTypeEmpty: "Content type is required."
+    };
+
     return {
-        isValidConfig: (webHookUrl, contentTypeAlias) => {
+        validateConfiguration: (webHookUrl, contentTypeAlias) => {
 
-            if (webHookUrl === undefined || webHookUrl.length === 0) return false;
+            if (webHookUrl === undefined || webHookUrl.length === 0) return resources.WebHookEmpty;
 
             let url;
 
             try {
                 url = new URL(webHookUrl);
             }
             catch (_) {
-                return false;
+                return resources.WebHookUrlInvalid;
             }
 
-            if (!(url.protocol === "http:" || url.protocol === "https:")) return false;
+            if (!(url.protocol === "http:" || url.protocol === "https:")) return resources.WebHookUrlInvalid;
 
-            if (contentTypeAlias === undefined || contentTypeAlias.length === 0) return false;
+            if (contentTypeAlias === undefined || contentTypeAlias.length === 0) return resources.ContentTypeEmpty;
 
-            return true;
+            return "";
         }
     }
 }

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/js/zapier.controller.js

@@ -10,13 +10,12 @@
     getContentConfigs();
 
     vm.onAdd = function () {
-
-        const isValid =
-            umbracoCmsIntegrationsAutomationZapierValidationService.isValidConfig(vm.webHookUrl,
+        const validationResult =
+            umbracoCmsIntegrationsAutomationZapierValidationService.validateConfiguration(vm.webHookUrl,
                 vm.selectedContentType);
 
-        if (!isValid) {
-            notificationsService.warning("Zapier Content Config", "Zapier configuration is invalid");
+        if (validationResult.length > 0) {
+            notificationsService.warning("Zapier Content Config", validationResult);
             return;
         }
 
@@ -54,6 +53,8 @@
         vm.webHookUrl = "";
         vm.selectedContentType = "";
     }
+
+    
 }
 
 angular.module("umbraco")

src/Umbraco.Cms.Integrations.Automation.Zapier/Components/NewContentPublishedComponent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
-
+using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -50,15 +50,17 @@ private void ContentServiceOnPublished(IContentService sender, ContentPublishedE
             foreach (var node in e.PublishedEntities)
             {
                 var zapContentConfig = _zapConfigService.GetByAlias(node.ContentType.Alias);
-                if (zapContentConfig == null) return;
+                if (zapContentConfig == null) continue;
 
                 var content = new Dictionary<string, string>
                 {
                     { Constants.Content.Name, node.ContentType.Name },
                     { Constants.Content.PublishDate, DateTime.UtcNow.ToString() }
                 };
 
-                var result = _zapierService.TriggerAsync(zapContentConfig.WebHookUrl, content);
+                var t = Task.Run(async () => await _zapierService.TriggerAsync(zapContentConfig.WebHookUrl, content));
+
+                var result = t.Result;
 
                 if(!string.IsNullOrEmpty(result))
                     _logger.Error<NewContentPublishedComponent>(result);

src/Umbraco.Cms.Integrations.Automation.Zapier/Controllers/ZapConfigController.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web.Http;
@@ -34,11 +35,14 @@ public IEnumerable<ContentTypeDto> GetContentTypes()
 
             var configEntities = _zapConfigService.GetAll().Select(p => p.ContentTypeAlias);
 
-            return contentTypes.Where(p => !configEntities.Contains(p.Alias)).Select(p => new ContentTypeDto
-                {
-                    Alias = p.Alias,
-                    Name = p.Name
-                });
+            return contentTypes
+                .Where(p => !configEntities.Contains(p.Alias))
+                .OrderBy(p => p.Name)
+                .Select(p => new ContentTypeDto
+                    {
+                        Alias = p.Alias,
+                        Name = p.Name
+                    });
         }
 
         [HttpPost]
@@ -47,8 +51,10 @@ public string Add([FromBody] ContentConfigDto dto)
             var result = _zapConfigService.Add(dto);
             if (!string.IsNullOrEmpty(result)) return result;
 
-            result = _zapierService.TriggerAsync(dto.WebHookUrl,
-                new Dictionary<string, string> {{Constants.Content.Name, dto.ContentTypeAlias}});
+            var t = Task.Run(async () => await _zapierService.TriggerAsync(dto.WebHookUrl,
+                new Dictionary<string, string> {{Constants.Content.Name, dto.ContentTypeAlias}}));
+
+            result = t.Result;
 
             if (!string.IsNullOrEmpty(result)) return result;
 

src/Umbraco.Cms.Integrations.Automation.Zapier/Models/Dtos/ContentConfigDto.cs

@@ -19,5 +19,9 @@ public ContentConfigDto(string webHookUrl)
 
         [JsonProperty("webHookUrl")]
         public string WebHookUrl { get; set; }
+
+
+        [JsonProperty("showDeletePrompt")]
+        public bool ShowDeletePrompt { get; set; }
     }
 }

src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapConfigService.cs

@@ -71,9 +71,12 @@ public string Delete(int id)
             {
                 using (var scope = _scopeProvider.CreateScope())
                 {
-                    var entity = scope.Database.Query<ZapContentConfigTable.ZapContentConfig>().First(p => p.Id == id);
-
-                    scope.Database.Delete(entity);
+                    var entity = scope.Database.Query<ZapContentConfigTable.ZapContentConfig>().FirstOrDefault(p => p.Id == id);
+                    if (entity != null)
+                    {
+                        scope.Database.Delete(entity);
+                    }
+                    
                     scope.Complete();
                 }
 

src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapierService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Services
 {
@@ -12,9 +13,9 @@ public class ZapierService
         // Access to the client within the class is via ClientFactory(), allowing us to mock the responses in tests.
         public static Func<HttpClient> ClientFactory = () => s_client;
 
-        public string TriggerAsync(string requestUri, Dictionary<string, string> content)
+        public async Task<string> TriggerAsync(string requestUri, Dictionary<string, string> content)
         {
-            var result = ClientFactory().PostAsync(requestUri, new FormUrlEncodedContent(content)).GetAwaiter().GetResult();
+            var result = await ClientFactory().PostAsync(requestUri, new FormUrlEncodedContent(content));
 
             return result.IsSuccessStatusCode ? string.Empty : result.ReasonPhrase;
         }

src/Umbraco.Cms.Integrations.Automation.Zapier/ZapierDashboard.cs

@@ -5,7 +5,7 @@
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier
 {
-    [Weight(-10)]
+    [Weight(30)]
     public class ZapierDashboard : IDashboard
     {
         public string Alias => "zapierDashboard";