From 4eb75799e7458ddebec05958b53e80b2030ad8d7 Mon Sep 17 00:00:00 2001
From: Paul Johnson <pmj@umbraco.com>
Date: Mon, 27 Sep 2021 14:39:04 +0100
Subject: [PATCH] Update content picker to use GetUrlsByUdis

---
 .../common/mocks/resources/entity.mocks.js    | 13 +++++++
 .../src/common/resources/entity.resource.js   | 15 ++++++++
 .../contentpicker/contentpicker.controller.js | 36 +++++++------------
 3 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
index 2c2007dd91..05594115e1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
@@ -34,6 +34,15 @@ angular.module('umbraco.mocks').
           return [200, nodes, null];
       }
 
+      function returnUrlsbyUdis(status, data, headers) {
+
+          if (!mocksUtils.checkAuth()) {
+              return [401, null, null];
+          }
+
+          return [200, {}, null];
+      }
+
       function returnEntitybyIdsPost(method, url, data, headers) {
 
           if (!mocksUtils.checkAuth()) {
@@ -73,6 +82,10 @@ angular.module('umbraco.mocks').
                   .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetByIds'))
                   .respond(returnEntitybyIdsPost);
 
+              $httpBackend
+                  .whenPOST(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetUrlsByUdis'))
+                  .respond(returnUrlsbyUdis);
+
               $httpBackend
                   .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetAncestors'))
                   .respond(returnEntitybyIds);
diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index 0b060da34b..1c29a69c2d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -127,6 +127,21 @@ function entityResource($q, $http, umbRequestHelper) {
                'Failed to retrieve url for id:' + id);
         },
 
+        getUrlsByUdis: function(ids, culture) {
+          var query = "culture=" + (culture || "");
+
+          return umbRequestHelper.resourcePromise(
+             $http.post(
+                 umbRequestHelper.getApiUrl(
+                     "entityApiBaseUrl",
+                     "GetUrlsByUdis",
+                     query),
+                 {
+                     ids: ids
+                 }),
+             'Failed to retrieve url map for ids ' + ids);
+        },
+
         getUrlByUdi: function (udi, culture) {
 
             if (!udi) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index d8c7b3e76a..7c8c1e64fb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -413,8 +413,13 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
             var missingIds = _.difference(valueIds, renderModelIds);
 
             if (missingIds.length > 0) {
-                return entityResource.getByIds(missingIds, entityType).then(function (data) {
 
+                var requests = [
+                    entityResource.getByIds(missingIds, entityType),
+                    entityResource.getUrlsByUdis(missingIds)
+                ];
+
+                return $q.all(requests).then(function ([data, urlMap]) {
                     _.each(valueIds,
                         function (id, i) {
                             var entity = _.find(data, function (d) {
@@ -422,7 +427,12 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
                             });
 
                             if (entity) {
-                                addSelectedItem(entity);
+
+                              entity.url = entity.trashed
+                                ? vm.labels.general_recycleBin
+                                : urlMap[id];
+
+                              addSelectedItem(entity);
                             }
 
                         });
@@ -469,26 +479,6 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
 
     }
 
-    function setEntityUrl(entity) {
-
-        // get url for content and media items
-        if (entityType !== "Member") {
-            entityResource.getUrl(entity.id, entityType).then(function (data) {
-                // update url
-                $scope.renderModel.forEach(function (item) {
-                    if (item.id === entity.id) {
-                        if (entity.trashed) {
-                            item.url = vm.labels.general_recycleBin;
-                        } else {
-                            item.url = data;
-                        }
-                    }
-                });
-            });
-        }
-
-    }
-
     function addSelectedItem(item) {
 
         // set icon
@@ -523,8 +513,6 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
             "published": (item.metaData && item.metaData.IsPublished === false && entityType === "Document") ? false : true
             // only content supports published/unpublished content so we set everything else to published so the UI looks correct
         });
-
-        setEntityUrl(item);
     }
 
     function setSortingState(items) {