From 435b6f0650b46d9b3f0cd712e5835b753d4754c5 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Fri, 20 Jan 2023 08:13:37 +0100
Subject: [PATCH] V11: Prevalues as toggles have problems in datatype settings
 view (#13709)

* format preValues with DataTypeHelper.createPreValuesProps before rendering so they have the 'alias' prop used for input-id to umb-toggle

* preValues are now formatted on fetch so we do not need to do it again

(cherry picked from commit 7aee15d6d1359ce4eb1b3a5c01d25b62151150e0)
---
 .../datatypesettings/datatypesettings.controller.js        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
index e2a6e30405..171f7d9c86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.controller.js
@@ -76,7 +76,7 @@
 
         // get pre values
         dataTypeResource.getPreValues(newDataType.selectedEditor).then(function(preValues) {
-          newDataType.preValues = preValues;
+          newDataType.preValues = dataTypeHelper.createPreValueProps(preValues);
           vm.dataType = newDataType;
           vm.loadingDataType = false;
         });
@@ -89,6 +89,7 @@
       vm.loadingDataType = true;
       dataTypeResource.getById($scope.model.id).then(function (dataType) {
         vm.dataType = dataType;
+        vm.dataType.preValues = dataTypeHelper.createPreValueProps(dataType.preValues);
         vm.loadingDataType = false;
       });
     }
@@ -106,9 +107,7 @@
 
       vm.saveButtonState = "busy";
 
-      var preValues = dataTypeHelper.createPreValueProps(vm.dataType.preValues);
-
-      dataTypeResource.save(vm.dataType, preValues, $scope.model.create).then(
+      dataTypeResource.save(vm.dataType, vm.dataType.preValues, $scope.model.create).then(
         function(newDataType) {
           $scope.model.dataType = newDataType;