Save content type name configuration instead of alias.

Author: acoumb

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

@@ -6,7 +6,7 @@
                 <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>
+                    <option ng-repeat="item in vm.contentTypes" value="{{ item.name }}">{{ item.name }}</option>
                 </select>
                 <umb-button action="vm.onAdd()"
                             type="button"
@@ -23,7 +23,7 @@
                             </div>
                             <div class="umb-table-cell">
                                 <a class="umb-table-head__link" href="#" prevent-default>
-                                    <span>Content Type Alias</span>
+                                    <span>Content Type Name</span>
                                 </a>
                             </div>
                             <div class="umb-table-cell">
@@ -41,7 +41,7 @@
                              ng-repeat="row in vm.contentConfigs track by $index">
                             <div class="umb-table-cell"></div>
                             <div class="umb-table-cell">
-                                <span ng-bind="row.contentTypeAlias"></span>
+                                <span ng-bind="row.contentTypeName"></span>
                             </div>
                             <div class="umb-table-cell">
                                 <span ng-bind="row.webHookUrl"></span>

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

@@ -21,7 +21,7 @@
 
         umbracoCmsIntegrationsAutomationZapierResource.addConfig(vm.webHookUrl, vm.selectedContentType).then(function (r) {
 
-            getContentTypes(vm.selectedContentType);
+            getContentTypes();
 
             getContentConfigs();
 

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

@@ -9,9 +9,9 @@
                     $http.get(`${apiEndpoint}/GetContentTypes`),
                     "Failed to get resource");
             },
-            addConfig: function (webHookUrl, contentTypeAlias) {
+            addConfig: function (webHookUrl, contentTypeName) {
                 return umbRequestHelper.resourcePromise(
-                    $http.post(`${apiEndpoint}/Add`, { contentTypeAlias: contentTypeAlias, webHookUrl: webHookUrl }), "Failed to get resource");
+                    $http.post(`${apiEndpoint}/Add`, { contentTypeName: contentTypeName, webHookUrl: webHookUrl }), "Failed to get resource");
             },
             getAllConfigs: function () {
                 return umbRequestHelper.resourcePromise(

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

@@ -33,14 +33,13 @@ public IEnumerable<ContentTypeDto> GetContentTypes()
 
             var contentTypes = contentTypeService.GetAll();
 
-            var configEntities = _zapConfigService.GetAll().Select(p => p.ContentTypeAlias);
+            var configEntities = _zapConfigService.GetAll().Select(p => p.ContentTypeName);
 
             return contentTypes
-                .Where(p => !configEntities.Contains(p.Alias))
+                .Where(p => !configEntities.Contains(p.Name))
                 .OrderBy(p => p.Name)
                 .Select(p => new ContentTypeDto
                     {
-                        Alias = p.Alias,
                         Name = p.Name
                     });
         }
@@ -52,7 +51,7 @@ public string Add([FromBody] ContentConfigDto dto)
             if (!string.IsNullOrEmpty(result)) return result;
 
             var t = Task.Run(async () => await _zapierService.TriggerAsync(dto.WebHookUrl,
-                new Dictionary<string, string> {{Constants.Content.Name, dto.ContentTypeAlias}}));
+                new Dictionary<string, string> {{Constants.Content.Name, dto.ContentTypeName}}));
 
             result = t.Result;
 

src/Umbraco.Cms.Integrations.Automation.Zapier/Migrations/ZapContentConfigTable.cs

@@ -35,8 +35,8 @@ public class ZapContentConfig
             [Column("Id")]
             public int Id { get; set; }
 
-            [Column("ContentTypeAlias")]
-            public string ContentTypeAlias { get; set; }
+            [Column("ContentTypeName")]
+            public string ContentTypeName { get; set; }
 
             [Column("WebHookUrl")] 
             public string WebHookUrl { get; set; }

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

@@ -14,13 +14,12 @@ public ContentConfigDto(string webHookUrl)
         [JsonProperty("id")]
         public int Id { get; set; }
 
-        [JsonProperty("contentTypeAlias")]
-        public string ContentTypeAlias { get; set; }
+        [JsonProperty("contentTypeName")]
+        public string ContentTypeName { get; set; }
 
         [JsonProperty("webHookUrl")]
         public string WebHookUrl { get; set; }
 
-
         [JsonProperty("showDeletePrompt")]
         public bool ShowDeletePrompt { get; set; }
     }

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

@@ -5,9 +5,6 @@ namespace Umbraco.Cms.Integrations.Automation.Zapier.Models.Dtos
     public class ContentTypeDto
     {
 
-        [JsonProperty("alias")]
-        public string Alias { get; set; }
-
         [JsonProperty("name")]
         public string Name { get; set; }
     }

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

@@ -31,7 +31,7 @@ public IEnumerable<ContentConfigDto> GetAll()
                 return data.Select(p => new ContentConfigDto
                 {
                     Id = p.Id,
-                    ContentTypeAlias = p.ContentTypeAlias,
+                    ContentTypeName = p.ContentTypeName,
                     WebHookUrl = p.WebHookUrl
                 });
             }
@@ -45,7 +45,7 @@ public string Add(ContentConfigDto contentConfigDto)
                 {
                     var zapContentConfig = new ZapContentConfigTable.ZapContentConfig
                     {
-                        ContentTypeAlias = contentConfigDto.ContentTypeAlias,
+                        ContentTypeName = contentConfigDto.ContentTypeName,
                         WebHookUrl = contentConfigDto.WebHookUrl
                     };