From cd36b0a46d7ab51d3b847bd6c14c1562c476477f Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 28 Dec 2023 23:28:39 +0100 Subject: [PATCH 1/3] Cleanup dynamic root pickers --- .../pickdynamicrootcustomstep.controller.js | 19 ++++---- .../pickdynamicrootorigin.controller.js | 46 ++++++++++++------- .../pickdynamicrootquerystep.controller.js | 30 ++++++------ 3 files changed, 56 insertions(+), 39 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js index 1af37043f127..170e0075f2f7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.controller.js @@ -3,31 +3,32 @@ function PickDynamicRootCustomStepController($scope, localizationService) { - var vm = this; + const vm = this; + + vm.submit = submit; + vm.close = close; function onInit() { - if(!$scope.model.title) { - localizationService.localize("dynamicRoot_pickDynamicRootQueryStepTitle").then(function(value){ + if (!$scope.model.title) { + localizationService.localize("dynamicRoot_pickDynamicRootQueryStepTitle").then(value => { $scope.model.title = value; }); } - if(!$scope.model.subtitle) { - localizationService.localize("dynamicRoot_pickDynamicRootQueryStepDesc").then(function(value){ + if (!$scope.model.subtitle) { + localizationService.localize("dynamicRoot_pickDynamicRootQueryStepDesc").then(value => { $scope.model.subtitle = value; }); } } - - vm.submit = submit; + function submit() { if ($scope.model.submit) { $scope.model.submit($scope.model); } } - vm.close = close; function close() { - if($scope.model.close) { + if ($scope.model.close) { $scope.model.close(); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js index 9851c5f71041..f304792554ba 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js @@ -3,45 +3,58 @@ function PickDynamicRootOriginController($scope, localizationService, editorService, udiParser) { - var vm = this; + const vm = this; + + vm.chooseRoot = chooseRoot; + vm.chooseParent = chooseParent; + vm.chooseCurrent = chooseCurrent; + vm.chooseSite = chooseSite; + vm.chooseByKey = chooseByKey; + + vm.submit = submit; + vm.close = close; function onInit() { - if(!$scope.model.title) { - localizationService.localize("dynamicRoot_pickDynamicRootOriginTitle").then(function(value){ + if (!$scope.model.title) { + localizationService.localize("dynamicRoot_pickDynamicRootOriginTitle").then(value => { $scope.model.title = value; }); } - if(!$scope.model.subtitle) { - localizationService.localize("dynamicRoot_pickDynamicRootOriginDesc").then(function(value){ + if (!$scope.model.subtitle) { + localizationService.localize("dynamicRoot_pickDynamicRootOriginDesc").then(value => { $scope.model.subtitle = value; }); } } - vm.chooseRoot = function() { + function chooseRoot() { $scope.model.value.originAlias = "Root"; $scope.model.value.originKey = null; vm.submit($scope.model); } - vm.chooseParent = function() { + + function chooseParent() { $scope.model.value.originAlias = "Parent"; $scope.model.value.originKey = null; vm.submit($scope.model); } - vm.chooseCurrent = function() { + + function chooseCurrent() { $scope.model.value.originAlias = "Current"; $scope.model.value.originKey = null; vm.submit($scope.model); } - vm.chooseSite = function() { + + function chooseSite() { $scope.model.value.originAlias = "Site"; $scope.model.value.originKey = null; vm.submit($scope.model); } - vm.chooseByKey = function() { - var treePicker = { + + function chooseByKey() { + const dialog = { idType: "udi", section: $scope.model.contentType, treeAlias: $scope.model.contentType, @@ -57,19 +70,18 @@ editorService.close(); } }; - editorService.treePicker(treePicker); - } - vm.submit = submit; + editorService.treePicker(dialog); + } + function submit(model) { if ($scope.model.submit) { $scope.model.submit(model); } } - - vm.close = close; + function close() { - if($scope.model.close) { + if ($scope.model.close) { $scope.model.close(); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js index 00005aa0193d..7904db2ee14b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js @@ -3,23 +3,29 @@ function PickDynamicRootQueryStepController($scope, localizationService, editorService, udiParser) { - var vm = this; + const vm = this; + + vm.choose = choose; + vm.chooseCustom = chooseCustom; + + vm.submit = submit; + vm.close = close; function onInit() { - if(!$scope.model.title) { - localizationService.localize("dynamicRoot_pickDynamicRootQueryStepTitle").then(function(value){ + if (!$scope.model.title) { + localizationService.localize("dynamicRoot_pickDynamicRootQueryStepTitle").then(value => { $scope.model.title = value; }); } - if(!$scope.model.subtitle) { - localizationService.localize("dynamicRoot_pickDynamicRootQueryStepDesc").then(function(value){ + if (!$scope.model.subtitle) { + localizationService.localize("dynamicRoot_pickDynamicRootQueryStepDesc").then(value => { $scope.model.subtitle = value; }); } } - vm.choose = function(queryStepAlias) { - var editor = { + function choose(queryStepAlias) { + const editor = { multiPicker: true, filterCssClass: "not-allowed not-published", filter: function (item) { @@ -50,8 +56,8 @@ } } - vm.chooseCustom = function() { - var customStepPicker = { + function chooseCustom() { + const customStepPicker = { view: "views/common/infiniteeditors/pickdynamicrootcustomstep/pickdynamicrootcustomstep.html", size: "small", value: "", @@ -68,17 +74,15 @@ }; editorService.open(customStepPicker); } - - vm.submit = submit; + function submit(model) { if ($scope.model.submit) { $scope.model.submit(model); } } - vm.close = close; function close() { - if($scope.model.close) { + if ($scope.model.close) { $scope.model.close(); } } From 788942159aeaf3deda59e386d4c24ee6ed977dfd Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Thu, 28 Dec 2023 23:48:26 +0100 Subject: [PATCH 2/3] Use contentTypePicker --- .../pickdynamicrootorigin.controller.js | 15 +++++++++++---- .../pickdynamicrootquerystep.controller.js | 6 ++++-- .../treesourcetypepicker.controller.js | 10 ++++++---- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js index f304792554ba..adfc70cda456 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js @@ -54,10 +54,8 @@ } function chooseByKey() { - const dialog = { + const editor = { idType: "udi", - section: $scope.model.contentType, - treeAlias: $scope.model.contentType, multiPicker: false, submit: function(model) { var item = model.selection[0]; @@ -71,7 +69,16 @@ } }; - editorService.treePicker(dialog); + switch ($scope.model.contentType) { + case "content": + editor.entityType = "documentType"; + break; + case "media": + editor.entityType = "mediaType"; + break; + } + + editorService.contentTypePicker(editor); } function submit(model) { diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js index 7904db2ee14b..0a1e607ebcb8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootquerystep/pickdynamicrootquerystep.controller.js @@ -48,12 +48,14 @@ switch ($scope.model.contentType) { case "content": - editorService.contentTypePicker(editor); + editor.entityType = "documentType"; break; case "media": - editorService.mediaTypePicker(editor); + editor.entityType = "mediaType"; break; } + + editorService.contentTypePicker(editor); } function chooseCustom() { diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js index d02e626bfa2f..0bfe20f28e1a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js @@ -39,7 +39,7 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe return; } - var editor = { + const editor = { multiPicker: true, filterCssClass: "not-allowed not-published", filter: function (item) { @@ -62,15 +62,17 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe switch (currentItemType) { case "content": - editorService.contentTypePicker(editor); + editor.entityType = "documentType"; break; case "media": - editorService.mediaTypePicker(editor); + editor.entityType = "mediaType"; break; case "member": - editorService.memberTypePicker(editor); + editor.entityType = "memberType"; break; } + + editorService.contentTypePicker(editor); } function remove(itemType) { From 73347822b2abbe5002dbaef54606c801c020934c Mon Sep 17 00:00:00 2001 From: Bjarne Fyrstenborg Date: Tue, 13 Feb 2024 21:30:06 +0100 Subject: [PATCH 3/3] Use content, media and member picker instead --- .../pickdynamicrootorigin.controller.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js index adfc70cda456..c7643d390b48 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/pickdynamicrootorigin/pickdynamicrootorigin.controller.js @@ -71,14 +71,15 @@ switch ($scope.model.contentType) { case "content": - editor.entityType = "documentType"; + editorService.contentPicker(editor); break; case "media": - editor.entityType = "mediaType"; + editorService.mediaPicker(editor); + break; + case "member": + editorService.memberPicker(editor); break; } - - editorService.contentTypePicker(editor); } function submit(model) {