Zapier V9 multi-target

Author: acoumb

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

@@ -81,21 +81,16 @@
                                 <span ng-bind="row.webHookUrl"></span>
                             </div>
                             <div class="umb-table-cell">
-                                <umb-button action="vm.onTrigger(row.contentTypeName, row.webHookUrl)"
+                                <umb-button action="vm.onTrigger(row.webHookUrl, row.contentTypeName)"
                                             label="Trigger Webhook"
                                             type="button"
                                             button-style="info">
                                 </umb-button>
-                                <umb-button action="row.showDeletePrompt = true"
+                                <umb-button action="vm.onDelete(row.id)"
                                             label="Delete"
                                             type="button"
                                             button-style="danger">
                                 </umb-button>
-                                <umb-confirm-action ng-if="row.showDeletePrompt"
-                                                    direction="right"
-                                                    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.controller.js

@@ -1,4 +1,4 @@
-function zapierController($scope, notificationsService, umbracoCmsIntegrationsAutomationZapierResource, umbracoCmsIntegrationsAutomationZapierValidationService) {
+function zapierController(notificationsService, overlayService, localizationService, umbracoCmsIntegrationsAutomationZapierValidationService, umbracoCmsIntegrationsAutomationZapierResource) {
 
     var vm = this;
 
@@ -19,7 +19,7 @@
             notificationsService.warning("Zapier Content Config", validationResult);
             return;
         }
-        
+
         umbracoCmsIntegrationsAutomationZapierResource.addConfig(vm.webHookUrl, vm.selectedContentType).then(function (response) {
 
             if (response.length > 0) {
@@ -35,11 +35,11 @@
         });
     }
 
-    vm.onTrigger = function (contentTypeName, webHookUrl) {
+    vm.onTrigger = function (webHookUrl, contentTypeName) {
 
         vm.loading = true;
 
-        umbracoCmsIntegrationsAutomationZapierResource.triggerWebHook(webHookUrl, contentTypeName).then(function(response) {
+        umbracoCmsIntegrationsAutomationZapierResource.triggerWebHook(webHookUrl, contentTypeName).then(function (response) {
 
             vm.loading = false;
 
@@ -50,12 +50,33 @@
         });
     }
 
-    vm.onDelete = function(id) {
-        umbracoCmsIntegrationsAutomationZapierResource.deleteConfig(id).then(function () {
-            getContentTypes();
-
-            getContentConfigs();
-        });
+    vm.onDelete = function (id) {
+
+        localizationService.localizeMany(["dashboardTabs_promptDeleteTitle", "dashboardTabs_promptDeleteContent", "general_yes", "general_no"])
+            .then(function (labels) {
+                var overlay = {
+                    view: "confirm",
+                    title: labels[0],
+                    content: labels[1],
+                    closeButtonLabel: labels[3],
+                    submitButtonLabel: labels[2],
+                    submitButtonStyle: "danger",
+                    close: function () {
+                        overlayService.close();
+                    },
+                    submit: function () {
+
+                        umbracoCmsIntegrationsAutomationZapierResource.deleteConfig(id).then(function () {
+                            getContentTypes();
+
+                            getContentConfigs();
+                        });
+
+                        overlayService.close();
+                    }
+                };
+                overlayService.open(overlay);
+            });
     }
 
     function getContentTypes() {
@@ -75,7 +96,7 @@
         vm.selectedContentType = "";
     }
 
-    
+
 }
 
 angular.module("umbraco")

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

@@ -17,11 +17,11 @@
                 return umbRequestHelper.resourcePromise(
                     $http.get(`${apiEndpoint}/GetAll`), "Failed to get resource");
             },
-            triggerWebHook: function(webHookUrl, contentTypeName) {
+            triggerWebHook: function (webHookUrl, contentTypeName) {
                 return umbRequestHelper.resourcePromise(
-                    $http.post(`${apiEndpoint}/TriggerAsync`, { contentTypeName: contentTypeName, webHookUrl: webHookUrl }), "Failed to get resource");
+                    $http.post(`${apiEndpoint}/TriggerWebHook`, { contentTypeName: contentTypeName, webHookUrl: webHookUrl }), "Failed to get resource");
             },
-            deleteConfig: function(id) {
+            deleteConfig: function (id) {
                 return umbRequestHelper.resourcePromise(
                     $http.delete(`${apiEndpoint}/Delete?id=${id}`), "Failed to get resource");
             }

src/Umbraco.Cms.Integrations.Automation.Zapier/App_Plugins/UmbracoCms.Integrations/Automation/Zapier/lang/en-US.xml

@@ -2,5 +2,7 @@
 <language>
 	<area alias="dashboardTabs">
 		<key alias="zapierDashboard">Zapier Integrations</key>
+		<key alias="promptDeleteTitle">Delete Registered Webhook</key>
+		<key alias="promptDeleteContent">Are you sure?</key>
 	</area>
-</language>
+</language>

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

@@ -2,18 +2,66 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
+
+
 using Umbraco.Cms.Integrations.Automation.Zapier.Services;
 using Umbraco.Core;
+
+#if NETCOREAPP
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Notifications;
+#else
 using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
+#endif
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Components
 {
+#if NETCOREAPP
+    public class NewContentPublishedNotification : INotificationHandler<ContentPublishedNotification>
+    {
+        private readonly ZapConfigService _zapConfigService;
+
+        private readonly ZapierService _zapierService;
+
+        private readonly ILogger<NewContentPublishedNotification> _logger;
+
+        public NewContentPublishedNotification(ZapConfigService zapConfigService, ZapierService zapierService, ILogger<NewContentPublishedNotification> logger)
+        {
+            _zapConfigService = zapConfigService;
+
+            _zapierService = zapierService;
+
+            _logger = logger;
+        }
+
+        public void Handle(ContentPublishedNotification notification)
+        {
+            foreach (var node in notification.PublishedEntities)
+            {
+                var zapContentConfig = _zapConfigService.GetByName(node.ContentType.Name);
+                if (zapContentConfig == null) continue;
 
+                var content = new Dictionary<string, string>
+                {
+                    { Constants.Content.Name, node.Name },
+                    { Constants.Content.PublishDate, DateTime.UtcNow.ToString() }
+                };
+
+                var t = Task.Run(async () => await _zapierService.TriggerAsync(zapContentConfig.WebHookUrl, content));
+
+                var result = t.Result;
+
+                if (!string.IsNullOrEmpty(result))
+                    _logger.LogError(result);
+            }
+        }
+    }
+#else
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public class NewContentPublishedComposer : ComponentComposer<NewContentPublishedComponent>
     { }
@@ -67,4 +115,5 @@ private void ContentServiceOnPublished(IContentService sender, ContentPublishedE
             }
         }
     }
+#endif
 }

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

@@ -1,15 +1,67 @@
-using Umbraco.Cms.Integrations.Automation.Zapier.Migrations;
+
+using Umbraco.Cms.Integrations.Automation.Zapier.Migrations;
+
+#if NETCOREAPP
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Events;
+using Umbraco.Cms.Core.Migrations;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Migrations;
+using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
+#else
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Migrations;
 using Umbraco.Core.Migrations.Upgrade;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
+#endif
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Components
 {
+#if NETCOREAPP
+    public class ZapContentConfigMigration : INotificationHandler<UmbracoApplicationStartingNotification>
+    {
+        private readonly IMigrationPlanExecutor _migrationPlanExecutor;
+        
+        private readonly IScopeProvider _scopeProvider;
+        
+        private readonly IKeyValueService _keyValueService;
+        
+        private readonly IRuntimeState _runtimeState;
+
+        public ZapContentConfigMigration(
+            IScopeProvider scopeProvider,
+            IMigrationPlanExecutor migrationPlanExecutor,
+            IKeyValueService keyValueService,
+            IRuntimeState runtimeState)
+        {
+            _migrationPlanExecutor = migrationPlanExecutor;
+
+            _scopeProvider = scopeProvider;
+
+            _keyValueService = keyValueService;
+
+            _runtimeState = runtimeState;
+        }
+
+        public void Handle(UmbracoApplicationStartingNotification notification)
+        {
+            if(_runtimeState.Level < RuntimeLevel.Run) return;
 
+            var migrationPlan = new MigrationPlan(Constants.MigrationPlanName);
+
+            migrationPlan.From(string.Empty)
+                .To<ZapContentConfigTable>(Constants.TargetStateName);
+
+            var upgrader = new Upgrader(migrationPlan);
+            upgrader.Execute(_migrationPlanExecutor, _scopeProvider, _keyValueService);
+        }
+    }
+#else
     [RuntimeLevel(MinLevel = RuntimeLevel.Run)]
     public class ZapContentConfigComposer : ComponentComposer<ZapContentConfigComponent>
     {
@@ -39,10 +91,10 @@ public ZapContentConfigComponent(IScopeProvider scopeProvider, IMigrationBuilder
 
         public void Initialize()
         {
-            var migrationPlan = new MigrationPlan("ZapContentConfig");
+            var migrationPlan = new MigrationPlan(Constants.MigrationPlanName);
 
             migrationPlan.From(string.Empty)
-                .To<ZapContentConfigTable>("zapiercontentconfigurations-db");
+                .To<ZapContentConfigTable>(Constants.TargetStateName);
 
             var upgrader = new Upgrader(migrationPlan);
             upgrader.Execute(_scopeProvider, _migrationBuilder, _keyValueService, _logger);
@@ -52,4 +104,5 @@ public void Terminate()
         {
         }
     }
+#endif
 }

src/Umbraco.Cms.Integrations.Automation.Zapier/Configuration/ZapierSettings.cs

@@ -0,0 +1,19 @@
+using System.Collections.Specialized;
+
+namespace Umbraco.Cms.Integrations.Automation.Zapier.Configuration
+{
+    public class ZapierSettings
+    {
+        public ZapierSettings()
+        {
+
+        }
+
+        public ZapierSettings(NameValueCollection appSettings)
+        {
+            UserGroup = appSettings[Constants.UmbracoCmsIntegrationsAutomationZapierUserGroup];
+        }
+
+        public string UserGroup { get; set; }
+    }
+}

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

@@ -5,6 +5,17 @@ public class Constants
     {
         public const string ZapContentConfigTable = "zapContentConfig";
 
+        public const string MigrationPlanName = "ZapContentConfig";
+
+        public const string TargetStateName = "zapiercontentconfigurations-db";
+
+        public const string UmbracoCmsIntegrationsAutomationZapierUserGroup = "Umbraco.Cms.Integrations.Automation.Zapier.UserGroup";
+
+        public static class Configuration
+        {
+            public const string Settings = "Umbraco:Forms:Integrations:Automation:Zapier:Settings";
+        }
+
         public static class Content
         {
             public const string Name = "Name";