From 80dfea874384f0d104f3faa23aaa6b20f88994d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.com>
Date: Fri, 12 Jun 2020 13:55:21 +0200
Subject: [PATCH] createElementTypeAndCallback working again for settings.

---
 ...blocklist.blockconfiguration.controller.js |  5 ++--
 ...t.blockconfiguration.overlay.controller.js | 24 ++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
index 5490d1aa08..3141f0418a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.controller.js
@@ -102,7 +102,7 @@
                     createNewItem: {
                         action: function() {
                             overlayService.close();
-                            vm.createElementTypeAndAdd(vm.addBlockFromElementTypeKey);
+                            vm.createElementTypeAndCallback(vm.addBlockFromElementTypeKey);
                         },
                         icon: "icon-add",
                         name: localized[1]
@@ -124,7 +124,7 @@
             });
         };
 
-        vm.createElementTypeAndAdd = function(callback) {
+        vm.createElementTypeAndCallback = function(callback) {
             const editor = {
                 create: true,
                 infiniteMode: true,
@@ -176,6 +176,7 @@
                     view: "views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.html",
                     size: "small",
                     submit: function(overlayModel) {
+                        loadElementTypes()// lets load elementType again, to ensure we are up to date.
                         TransferProperties(overlayModel.block, block);// transfer properties back to block object. (Doing this cause we dont know if block object is added to model jet, therefor we cant use index or replace the object.)
                         overlayModel.close();
                     },
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
index 5e7d43c6f4..b17ee35100 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.overlay.controller.js
@@ -44,6 +44,24 @@
             editorService.documentTypeEditor(editor);
         }
 
+        vm.createElementTypeAndCallback = function(callback) {
+            const editor = {
+                create: true,
+                infiniteMode: true,
+                isElement: true,
+                submit: function (model) {
+                    loadElementTypes().then( function () {
+                        callback(model.documentTypeKey);
+                    });
+                    editorService.close();
+                },
+                close: function () {
+                    editorService.close();
+                }
+            };
+            editorService.documentTypeEditor(editor);
+        }
+
         vm.addSettingsForBlock = function ($event, block) {
 
             localizationService.localizeMany(["blockEditor_headlineAddSettingsElementType", "blockEditor_labelcreateNewElementType"]).then(function(localized) {
@@ -58,15 +76,15 @@
                     createNewItem: {
                         action: function() {
                             overlayService.close();
-                            vm.createElementTypeAndAdd((alias) => {
-                                vm.applySettingsToBlock(block, alias);
+                            vm.createElementTypeAndCallback((key) => {
+                                vm.applySettingsToBlock(block, key);
                             });
                         },
                         icon: "icon-add",
                         name: localized[1]
                     },
                     submit: function (overlay) {
-                        vm.applySettingsToBlock(block, overlay.selectedItem.alias);
+                        vm.applySettingsToBlock(block, overlay.selectedItem.key);
                         overlayService.close();
                     },
                     close: function () {