-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
index 5406927d38..b16722e7de 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
@@ -1,191 +1,228 @@
angular.module("umbraco").controller("Umbraco.PrevalueEditors.MultiColorPickerController",
- function ($scope, angularHelper, $element, eventsService) {
+ function ($scope, angularHelper, $element, eventsService) {
- const vm = this;
+ const vm = this;
- vm.add = add;
- vm.remove = remove;
- vm.edit = edit;
- vm.cancel = cancel;
+ vm.add = add;
+ vm.addOnEnter = addOnEnter;
+ vm.validateLabel = validateLabel;
+ vm.remove = remove;
+ vm.edit = edit;
+ vm.cancel = cancel;
- vm.show = show;
- vm.hide = hide;
- vm.change = change;
+ vm.show = show;
+ vm.hide = hide;
+ vm.change = change;
- vm.labelEnabled = false;
- vm.editItem = null;
+ vm.labelEnabled = false;
+ vm.editItem = null;
- // NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive.
- const defaultColor = "000000";
- const defaultLabel = null;
+ // NOTE: We need to make each color an object, not just a string because you cannot 2-way bind to a primitive.
+ const defaultColor = "000000";
+ const defaultLabel = null;
- $scope.newColor = defaultColor;
- $scope.newLabel = defaultLabel;
- $scope.hasError = false;
- $scope.focusOnNew = false;
+ $scope.newColor = defaultColor;
+ $scope.newLabel = defaultLabel;
+ $scope.colorHasError = false;
+ $scope.labelHasError = false;
+ $scope.focusOnNew = false;
- $scope.options = {
- type: "color",
- color: defaultColor,
- allowEmpty: false,
- showAlpha: false
- };
+ $scope.options = {
+ type: "color",
+ color: defaultColor,
+ allowEmpty: false,
+ showAlpha: false
+ };
- function hide() {
- // show the add button
- $element.find(".btn.add").show();
+ function hide() {
+ // show the add button
+ $element.find(".btn.add").show();
+ }
+
+ function show() {
+ // hide the add button
+ $element.find(".btn.add").hide();
+ }
+
+ function change(color) {
+ angularHelper.safeApply($scope, function () {
+ if (color) {
+ $scope.newColor = color.toHexString().trimStart("#");
+ $scope.colorHasError = !colorIsValid();
}
+ });
+ }
- function show() {
- // hide the add button
- $element.find(".btn.add").hide();
- }
-
- function change(color) {
- angularHelper.safeApply($scope, function () {
- if (color) {
- $scope.newColor = color.toHexString().trimStart("#");
- }
- });
- }
-
- var evts = [];
- evts.push(eventsService.on("toggleValue", function (e, args) {
- if (args.inputId === "useLabel") {
- vm.labelEnabled = args.value;
- }
- }));
-
- $scope.$on('$destroy', function () {
- for (var e in evts) {
- eventsService.unsubscribe(evts[e]);
- }
- });
-
- if (!Utilities.isArray($scope.model.value)) {
- //make an array from the dictionary
- var items = [];
- for (var i in $scope.model.value) {
- var oldValue = $scope.model.value[i];
- if (Object.prototype.hasOwnProperty.call(oldValue, "value")) {
- items.push({
- value: oldValue.value,
- label: oldValue.label,
- sortOrder: oldValue.sortOrder,
- id: i
- });
- } else {
- items.push({
- value: oldValue,
- label: oldValue,
- sortOrder: oldValue.sortOrder,
- id: i
- });
- }
- }
-
- //ensure the items are sorted by the provided sort order
- items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
-
- //now make the editor model the array
- $scope.model.value = items;
- }
-
- // ensure labels
- for (var ii = 0; ii < $scope.model.value.length; ii++) {
- var item = $scope.model.value[ii];
- item.label = Object.prototype.hasOwnProperty.call(item, "label") ? item.label : item.value;
- }
-
- function validLabel(label) {
- return label !== null && typeof label !== "undefined" && label !== "" && label.length && label.length > 0;
- }
-
- function remove(item, evt) {
-
- evt.preventDefault();
-
- $scope.model.value = _.reject($scope.model.value, function (x) {
- return x.value === item.value && x.label === item.label;
- });
-
- setDirty();
- }
-
- function add(evt) {
- evt.preventDefault();
-
- if ($scope.newColor) {
- var newLabel = validLabel($scope.newLabel) ? $scope.newLabel : $scope.newColor;
- var exists = _.find($scope.model.value, function (item) {
- return item != vm.editItem && (item.value.toUpperCase() === $scope.newColor.toUpperCase() || item.label.toUpperCase() === newLabel.toUpperCase());
- });
- if (!exists) {
- if (vm.editItem == null) {
- $scope.model.value.push({
- value: $scope.newColor,
- label: newLabel
- });
- } else {
-
- if(vm.editItem.value === vm.editItem.label && vm.editItem.value === newLabel) {
- vm.editItem.label = $scope.newColor;
-
- }
- else {
- vm.editItem.label = newLabel;
- }
-
- vm.editItem.value = $scope.newColor;
-
- vm.editItem = null;
- }
-
- $scope.newLabel = "";
- $scope.hasError = false;
- $scope.focusOnNew = true;
- setDirty();
- return;
- }
-
- // there was an error, do the highlight (will be set back by the directive)
- $scope.hasError = true;
- }
- }
-
- function edit(item, evt) {
- evt.preventDefault();
-
- vm.editItem = item;
-
- $scope.newColor = item.value;
- $scope.newLabel = item.label;
- }
-
- function cancel(evt) {
- evt.preventDefault();
-
- vm.editItem = null;
- $scope.newColor = defaultColor;
- $scope.newLabel = defaultLabel;
- }
-
- function setDirty() {
- if (vm.modelValueForm) {
- vm.modelValueForm.selectedColor.$setDirty();
- }
- }
-
- $scope.sortableOptions = {
- axis: 'y',
- containment: 'parent',
- cursor: 'move',
- //handle: ".handle, .thumbnail",
- items: '> div.control-group',
- tolerance: 'pointer',
- update: function () {
- setDirty();
- }
- };
+ var evts = [];
+ evts.push(eventsService.on("toggleValue", function (e, args) {
+ if (args.inputId === "useLabel") {
+ vm.labelEnabled = args.value;
+ }
+ }));
+ $scope.$on('$destroy', function () {
+ for (var e in evts) {
+ eventsService.unsubscribe(evts[e]);
+ }
});
+
+ if (!Utilities.isArray($scope.model.value)) {
+ //make an array from the dictionary
+ var items = [];
+ for (var i in $scope.model.value) {
+ var oldValue = $scope.model.value[i];
+ if (Object.prototype.hasOwnProperty.call(oldValue, "value")) {
+ items.push({
+ value: oldValue.value,
+ label: oldValue.label,
+ sortOrder: oldValue.sortOrder,
+ id: i
+ });
+ } else {
+ items.push({
+ value: oldValue,
+ label: oldValue,
+ sortOrder: oldValue.sortOrder,
+ id: i
+ });
+ }
+ }
+
+ //ensure the items are sorted by the provided sort order
+ items.sort(function (a, b) { return (a.sortOrder > b.sortOrder) ? 1 : ((b.sortOrder > a.sortOrder) ? -1 : 0); });
+
+ //now make the editor model the array
+ $scope.model.value = items;
+ }
+
+ // ensure labels
+ for (var ii = 0; ii < $scope.model.value.length; ii++) {
+ var item = $scope.model.value[ii];
+ item.label = Object.prototype.hasOwnProperty.call(item, "label") ? item.label : item.value;
+ }
+
+ function remove(item, evt) {
+
+ evt.preventDefault();
+
+ $scope.model.value = _.reject($scope.model.value, function (x) {
+ return x.value === item.value && x.label === item.label;
+ });
+
+ setDirty();
+ }
+
+ function colorIsValid() {
+ var colorExists = _.find($scope.model.value, function (item) {
+ return item != vm.editItem && item.value.toUpperCase() === $scope.newColor.toUpperCase();
+ });
+
+ return colorExists ? false : true;
+ }
+
+ function getLabel() {
+ var validLabel = $scope.newLabel !== null && typeof $scope.newLabel !== "undefined" && $scope.newLabel !== "" && $scope.newLabel.length && $scope.newLabel.length > 0;
+ return validLabel ? $scope.newLabel : $scope.newColor;
+ }
+
+ function labelIsValid() {
+ var label = getLabel();
+ label = label.toUpperCase();
+
+ var labelExists = _.find($scope.model.value, function (item) {
+ return item != vm.editItem && item.label.toUpperCase() === label;
+ });
+
+ return labelExists ? false : true;
+ }
+
+ function validateLabel() {
+ $scope.labelHasError = !labelIsValid();
+ }
+
+ function addOnEnter(evt) {
+ if (evt.keyCode === 13) {
+ add(evt);
+ }
+ }
+
+ function add(evt) {
+ evt.preventDefault();
+
+ if ($scope.newColor) {
+
+ $scope.colorHasError = !colorIsValid();
+ $scope.labelHasError = !labelIsValid();
+
+ if ($scope.labelHasError || $scope.colorHasError) {
+ return;
+ }
+
+ var newLabel = getLabel();
+
+ if (vm.editItem == null) {
+ $scope.model.value.push({
+ value: $scope.newColor,
+ label: newLabel
+ });
+ } else {
+
+ if (vm.editItem.value === vm.editItem.label && vm.editItem.value === newLabel) {
+ vm.editItem.label = $scope.newColor;
+
+ }
+ else {
+ vm.editItem.label = newLabel;
+ }
+
+ vm.editItem.value = $scope.newColor;
+
+ vm.editItem = null;
+ }
+
+ $scope.newLabel = "";
+ $scope.colorHasError = false;
+ $scope.labelHasError = false;
+ $scope.focusOnNew = true;
+ setDirty();
+ return;
+
+ }
+ }
+
+ function edit(item, evt) {
+ evt.preventDefault();
+
+ vm.editItem = item;
+
+ $scope.newColor = item.value;
+ $scope.newLabel = item.label;
+ }
+
+ function cancel(evt) {
+ evt.preventDefault();
+
+ vm.editItem = null;
+ $scope.newColor = defaultColor;
+ $scope.newLabel = defaultLabel;
+ }
+
+ function setDirty() {
+ if (vm.modelValueForm) {
+ vm.modelValueForm.selectedColor.$setDirty();
+ }
+ }
+
+ $scope.sortableOptions = {
+ axis: 'y',
+ containment: 'parent',
+ cursor: 'move',
+ //handle: ".handle, .thumbnail",
+ items: '> div.control-group',
+ tolerance: 'pointer',
+ update: function () {
+ setDirty();
+ }
+ };
+
+ });
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
index 453347bc1b..80d0cc16c9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
@@ -20,8 +20,9 @@ angular.module('umbraco')
var umbracoSettings = Umbraco.Sys.ServerVariables.umbracoSettings;
$scope.acceptFileExt = mediaHelper.formatFileTypes(umbracoSettings.imageFileTypes);
+
/**
- * Called when the umgImageGravity component updates the focal point value
+ * Called when the umbImageGravity component updates the focal point value
* @param {any} left
* @param {any} top
*/
@@ -81,7 +82,7 @@ angular.module('umbraco')
function imageLoaded(isCroppable, hasDimensions) {
$scope.isCroppable = isCroppable;
$scope.hasDimensions = hasDimensions;
- };
+ }
/**
* Called when the file collection changes
diff --git a/src/Umbraco.Web.Website/Controllers/UmbTwoFactorLoginController.cs b/src/Umbraco.Web.Website/Controllers/UmbTwoFactorLoginController.cs
index f498189ff0..3a4715b537 100644
--- a/src/Umbraco.Web.Website/Controllers/UmbTwoFactorLoginController.cs
+++ b/src/Umbraco.Web.Website/Controllers/UmbTwoFactorLoginController.cs
@@ -73,7 +73,7 @@ public class UmbTwoFactorLoginController : SurfaceController
MemberIdentityUser? user = await _memberSignInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null!)
{
- _logger.LogWarning("PostVerify2FACode :: No verified member found, returning 404");
+ _logger.LogWarning("Verify2FACode :: No verified member found, returning 404");
return NotFound();
}
diff --git a/tests/Umbraco.TestData/LoadTestController.cs b/tests/Umbraco.TestData/LoadTestController.cs
index 741fe4e94b..676b5c0256 100644
--- a/tests/Umbraco.TestData/LoadTestController.cs
+++ b/tests/Umbraco.TestData/LoadTestController.cs
@@ -7,6 +7,7 @@ using System.Threading;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Hosting;
using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Extensions;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
@@ -99,7 +100,7 @@ public class LoadTestController : Controller
private readonly IDataTypeService _dataTypeService;
private readonly IFileService _fileService;
private readonly IHostApplicationLifetime _hostApplicationLifetime;
- private readonly IHostingEnvironment _hostingEnvironment;
+ private readonly IHostEnvironment _hostEnvironment;
private readonly IShortStringHelper _shortStringHelper;
public LoadTestController(
@@ -108,7 +109,7 @@ public class LoadTestController : Controller
IDataTypeService dataTypeService,
IFileService fileService,
IShortStringHelper shortStringHelper,
- IHostingEnvironment hostingEnvironment,
+ IHostEnvironment hostEnvironment,
IHostApplicationLifetime hostApplicationLifetime)
{
_contentTypeService = contentTypeService;
@@ -116,7 +117,7 @@ public class LoadTestController : Controller
_dataTypeService = dataTypeService;
_fileService = fileService;
_shortStringHelper = shortStringHelper;
- _hostingEnvironment = hostingEnvironment;
+ _hostEnvironment = hostEnvironment;
_hostApplicationLifetime = hostApplicationLifetime;
}
@@ -321,7 +322,7 @@ public class LoadTestController : Controller
public IActionResult ColdBootRestart()
{
Directory.Delete(
- _hostingEnvironment.MapPathContentRoot(Path.Combine(Constants.SystemDirectories.TempData, "DistCache")),
+ _hostEnvironment.MapPathContentRoot(Path.Combine(Constants.SystemDirectories.TempData, "DistCache")),
true);
DoRestart();
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index 28bcb052fc..02c46ac329 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -23,7 +23,7 @@
"prompt": "^1.2.0",
"tslib": "^2.4.0",
"typescript": "^4.8.3",
- "wait-on": "^6.0.1"
+ "wait-on": "^7.2.0"
}
},
"node_modules/@colors/colors": {
@@ -177,12 +177,14 @@
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"node_modules/axios": {
- "version": "0.25.0",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
- "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
+ "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"dev": true,
"dependencies": {
- "follow-redirects": "^1.14.7"
+ "follow-redirects": "^1.15.0",
+ "form-data": "^4.0.0",
+ "proxy-from-env": "^1.1.0"
}
},
"node_modules/balanced-match": {
@@ -364,9 +366,9 @@
}
},
"node_modules/follow-redirects": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
- "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+ "version": "1.15.3",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+ "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
"dev": true,
"funding": [
{
@@ -563,15 +565,15 @@
"dev": true
},
"node_modules/joi": {
- "version": "17.6.3",
- "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.3.tgz",
- "integrity": "sha512-YlQsIaS9MHYekzf1Qe11LjTkNzx9qhYluK3172z38RxYoAUf82XMX1p1DG1H4Wtk2ED/vPdSn9OggqtDu+aTow==",
+ "version": "17.11.0",
+ "resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
+ "integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==",
"dev": true,
"dependencies": {
"@hapi/hoek": "^9.0.0",
"@hapi/topo": "^5.0.0",
"@sideway/address": "^4.1.3",
- "@sideway/formula": "^3.0.0",
+ "@sideway/formula": "^3.0.1",
"@sideway/pinpoint": "^2.0.0"
}
},
@@ -635,9 +637,9 @@
}
},
"node_modules/minimist": {
- "version": "1.2.7",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
- "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
"dev": true,
"funding": {
"url": "https://github.com/sponsors/ljharb"
@@ -777,6 +779,12 @@
"node": ">= 6.0.0"
}
},
+ "node_modules/proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+ "dev": true
+ },
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -867,9 +875,9 @@
}
},
"node_modules/rxjs": {
- "version": "7.5.7",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
- "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
+ "version": "7.8.1",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+ "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
"dev": true,
"dependencies": {
"tslib": "^2.1.0"
@@ -930,22 +938,22 @@
}
},
"node_modules/wait-on": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-6.0.1.tgz",
- "integrity": "sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
+ "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
"dev": true,
"dependencies": {
- "axios": "^0.25.0",
- "joi": "^17.6.0",
+ "axios": "^1.6.1",
+ "joi": "^17.11.0",
"lodash": "^4.17.21",
- "minimist": "^1.2.5",
- "rxjs": "^7.5.4"
+ "minimist": "^1.2.8",
+ "rxjs": "^7.8.1"
},
"bin": {
"wait-on": "bin/wait-on"
},
"engines": {
- "node": ">=10.0.0"
+ "node": ">=12.0.0"
}
},
"node_modules/webidl-conversions": {
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 2e86d70d5e..adcdf64f1d 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -16,7 +16,7 @@
"del": "^6.0.0",
"ncp": "^2.0.0",
"prompt": "^1.2.0",
- "wait-on": "^6.0.1"
+ "wait-on": "^7.2.0"
},
"dependencies": {
"@umbraco/json-models-builders": "^1.0.6",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/helpLinks.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/helpLinks.spec.ts
index 882eaf1bbf..2239613571 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/helpLinks.spec.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/HelpPanel/helpLinks.spec.ts
@@ -36,6 +36,19 @@ test("Check the youtube link works as expected", async ({ page, umbracoUi }) =>
} else {
await expect(page).toHaveURL(/.*UmbracoLearningBase/);
+ await page.close();
}
});
+ test("Check the Our Umbraco link works as expected", async ({ page, umbracoUi }) => {
+ // Action
+ await umbracoUi.clickElement(umbracoUi.getGlobalHelp());
+ let ourUmbracoLink = await page.locator('[key="help_umbracoForum"]');
+ await ourUmbracoLink.click();
+ let ourUmbraco = page.waitForEvent("popup");
+ let ourUmbracoPopup = await ourUmbraco;
+
+ //Assert
+ await expect(ourUmbracoPopup).toHaveURL(/.*our.umbraco.com/);
+ await ourUmbracoPopup.close();
+ });
});
\ No newline at end of file
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/BackOfficeExamineSearcherTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/BackOfficeExamineSearcherTests.cs
new file mode 100644
index 0000000000..3447dff634
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/BackOfficeExamineSearcherTests.cs
@@ -0,0 +1,611 @@
+using Examine;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Sync;
+using Umbraco.Cms.Infrastructure.Examine;
+using Umbraco.Cms.Infrastructure.Examine.DependencyInjection;
+using Umbraco.Cms.Infrastructure.HostedServices;
+using Umbraco.Cms.Infrastructure.Search;
+using Umbraco.Cms.Tests.Common.Builders;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+using Umbraco.Cms.Web.BackOffice.Security;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class BackOfficeExamineSearcherTests : ExamineBaseTest
+{
+ [SetUp]
+ public void Setup()
+ {
+ TestHelper.DeleteDirectory(GetIndexPath(Constants.UmbracoIndexes.InternalIndexName));
+ TestHelper.DeleteDirectory(GetIndexPath(Constants.UmbracoIndexes.ExternalIndexName));
+ var httpContext = new DefaultHttpContext();
+ httpContext.RequestServices = Services;
+ Mock.Get(TestHelper.GetHttpContextAccessor()).Setup(x => x.HttpContext).Returns(httpContext);
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ // When disposing examine, it does a final write, which ends up locking the file if the indexing is not done yet. So we have this wait to circumvent that.
+ Thread.Sleep(1500);
+ // Sometimes we do not dispose all services in time and the test fails because the log file is locked. Resulting in all other tests failing as well
+ Services.DisposeIfDisposable();
+ }
+
+ private IBackOfficeExamineSearcher BackOfficeExamineSearcher => GetRequiredService
();
+
+ private IContentTypeService ContentTypeService => GetRequiredService();
+
+ private ILocalizationService LocalizationService => GetRequiredService();
+
+ private ContentService ContentService => (ContentService)GetRequiredService();
+
+ private IUserStore BackOfficeUserStore =>
+ GetRequiredService>();
+
+ private IBackOfficeSignInManager BackOfficeSignInManager => GetRequiredService();
+
+ protected override void CustomTestSetup(IUmbracoBuilder builder)
+ {
+ builder.Services.AddUnique();
+ builder.Services.AddUnique();
+ builder
+ .AddNotificationHandler();
+ builder.AddNotificationHandler();
+ builder.AddExamineIndexes();
+ builder.AddBackOfficeIdentity();
+ builder.Services.AddHostedService();
+ }
+
+ private IEnumerable BackOfficeExamineSearch(string query, int pageSize = 20, int pageIndex = 0) =>
+ BackOfficeExamineSearcher.Search(query, UmbracoEntityTypes.Document,
+ pageSize, pageIndex, out _, ignoreUserStartNodes: true);
+
+ private async Task SetupUserIdentity(string userId)
+ {
+ var identity =
+ await BackOfficeUserStore.FindByIdAsync(userId, CancellationToken.None);
+ await BackOfficeSignInManager.SignInAsync(identity, false);
+ }
+
+ private async Task CreateDefaultPublishedContent(string contentName)
+ {
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentTypeService.Save(contentType), Constants.UmbracoIndexes.InternalIndexName);
+
+ var content = new ContentBuilder()
+ .WithId(0)
+ .WithName(contentName)
+ .WithContentType(contentType)
+ .Build();
+
+ var createdContent = await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(content), Constants.UmbracoIndexes.InternalIndexName);
+
+ return createdContent;
+ }
+
+ private async Task CreateDefaultPublishedContentWithTwoLanguages(string englishNodeName, string danishNodeName)
+ {
+ const string usIso = "en-US";
+ const string dkIso = "da";
+
+ var langDa = new LanguageBuilder()
+ .WithCultureInfo(dkIso)
+ .Build();
+ LocalizationService.Save(langDa);
+
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .WithContentVariation(ContentVariation.Culture)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentTypeService.Save(contentType), Constants.UmbracoIndexes.InternalIndexName);
+
+ var content = new ContentBuilder()
+ .WithId(0)
+ .WithCultureName(usIso, englishNodeName)
+ .WithCultureName(dkIso, danishNodeName)
+ .WithContentType(contentType)
+ .Build();
+ var createdContent = await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(content), Constants.UmbracoIndexes.InternalIndexName);
+
+ return createdContent;
+ }
+
+ [Test]
+ public async Task Search_Published_Content_With_Empty_Query()
+ {
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ // Arrange
+ const string contentName = "TestContent";
+ await CreateDefaultPublishedContent(contentName);
+
+ string query = string.Empty;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ Assert.AreEqual(0, actual.Count());
+ }
+
+ [Test]
+ public async Task Search_Published_Content_With_Query_By_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "TestContent";
+ await CreateDefaultPublishedContent(contentName);
+
+ string query = contentName;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+ Assert.AreEqual(searchResults.First().Values["nodeName"], contentName);
+ }
+
+ [Test]
+ public async Task Search_Published_Content_With_Query_By_Non_Existing_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "TestContent";
+ await CreateDefaultPublishedContent(contentName);
+
+ string query = "ContentTest";
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ Assert.AreEqual(0, actual.Count());
+ }
+
+ [Test]
+ public async Task Search_Published_Content_With_Query_By_Content_Id()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "RandomContentName";
+ PublishResult createdContent = await CreateDefaultPublishedContent(contentName);
+
+ string contentId = createdContent.Content.Id.ToString();
+
+ string query = contentId;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+ Assert.AreEqual(searchResults.First().Values["nodeName"], contentName);
+ Assert.AreEqual(searchResults.First().Id, contentId);
+ }
+
+ [Test]
+ public async Task Search_Two_Published_Content_With_Similar_Names_By_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "TestName Original";
+ const string secondContentName = "TestName Copy";
+
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentTypeService.Save(contentType), Constants.UmbracoIndexes.InternalIndexName);
+
+ var firstContent = new ContentBuilder()
+ .WithId(0)
+ .WithName(contentName)
+ .WithContentType(contentType)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(firstContent), Constants.UmbracoIndexes.InternalIndexName);
+
+ var secondContent = new ContentBuilder()
+ .WithId(0)
+ .WithName(secondContentName)
+ .WithContentType(contentType)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(secondContent), Constants.UmbracoIndexes.InternalIndexName);
+
+ string query = contentName;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(2, searchResults.Count());
+ // Checks if the first content in the search is the original content
+ Assert.AreEqual(searchResults.First().Id, firstContent.Id.ToString());
+ // Checks if the score for the original name is higher than the score for the copy
+ Assert.Greater(searchResults.First().Score, searchResults.Last().Score);
+ }
+
+ [Test]
+ public async Task Search_For_Child_Published_Content_With_Query_By_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "ParentTestContent";
+ const string childContentName = "ChildTestContent";
+
+ var contentType = new ContentTypeBuilder()
+ .WithName("Document")
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentTypeService.Save(contentType), Constants.UmbracoIndexes.InternalIndexName);
+
+ var content = new ContentBuilder()
+ .WithName(contentName)
+ .WithContentType(contentType)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(content), Constants.UmbracoIndexes.InternalIndexName);
+
+ var childContent = new ContentBuilder()
+ .WithName(childContentName)
+ .WithContentType(contentType)
+ .WithParentId(content.Id)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(childContent), Constants.UmbracoIndexes.InternalIndexName);
+
+ string parentQuery = content.Id.ToString();
+
+ string childQuery = childContent.Id.ToString();
+
+ // Act
+ IEnumerable parentContentActual = BackOfficeExamineSearch(parentQuery);
+ IEnumerable childContentActual = BackOfficeExamineSearch(childQuery);
+
+ // Assert
+ IEnumerable contentActual = parentContentActual.ToArray();
+ IEnumerable searchResults = childContentActual.ToArray();
+ Assert.AreEqual(1, contentActual.Count());
+ Assert.AreEqual(1, searchResults.Count());
+ Assert.AreEqual(contentActual.First().Values["nodeName"], contentName);
+ Assert.AreEqual(searchResults.First().Values["nodeName"], childContentName);
+ }
+
+ [Test]
+ public async Task Search_For_Child_In_Child_Published_Content_With_Query_By_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "ParentTestContent";
+ const string childContentName = "ChildTestContent";
+ const string childChildContentName = "ChildChildTestContent";
+
+ var contentType = new ContentTypeBuilder()
+ .WithName("Document")
+ .Build();
+ ContentTypeService.Save(contentType);
+
+ var content = new ContentBuilder()
+ .WithName(contentName)
+ .WithContentType(contentType)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(content), Constants.UmbracoIndexes.InternalIndexName);
+
+ var childContent = new ContentBuilder()
+ .WithName(childContentName)
+ .WithContentType(contentType)
+ .WithParentId(content.Id)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(childContent), Constants.UmbracoIndexes.InternalIndexName);
+
+ var childChildContent = new ContentBuilder()
+ .WithName(childChildContentName)
+ .WithContentType(contentType)
+ .WithParentId(childContent.Id)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(childChildContent), Constants.UmbracoIndexes.InternalIndexName);
+
+ string parentQuery = content.Id.ToString();
+ string childQuery = childContent.Id.ToString();
+ string childChildQuery = childChildContent.Id.ToString();
+
+ // Act
+ IEnumerable parentContentActual = BackOfficeExamineSearch(parentQuery);
+ IEnumerable childContentActual = BackOfficeExamineSearch(childQuery);
+ IEnumerable childChildContentActual = BackOfficeExamineSearch(childChildQuery);
+
+ IEnumerable parentSearchResults = parentContentActual.ToArray();
+ IEnumerable childSearchResults = childContentActual.ToArray();
+ IEnumerable childChildSearchResults = childChildContentActual.ToArray();
+
+ // Assert
+ Assert.AreEqual(1, parentSearchResults.Count());
+ Assert.AreEqual(1, childSearchResults.Count());
+ Assert.AreEqual(1, childChildSearchResults.Count());
+ Assert.AreEqual(parentSearchResults.First().Values["nodeName"], contentName);
+ Assert.AreEqual(childSearchResults.First().Values["nodeName"], childContentName);
+ Assert.AreEqual(childChildSearchResults.First().Values["nodeName"], childChildContentName);
+ }
+
+ [Test]
+ public async Task Search_Published_Content_With_Query_With_Content_Name_No_User_Logged_In()
+ {
+ // Arrange
+ const string contentName = "TestContent";
+
+ PublishResult createdContent = await CreateDefaultPublishedContent(contentName);
+
+ string query = createdContent.Content.Id.ToString();
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ Assert.AreEqual(0, actual.Count());
+ }
+
+ // Multiple Languages
+ [Test]
+ public async Task Search_Published_Content_By_Content_Name_With_Two_Languages()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string usIso = "en-US";
+ const string dkIso = "da";
+ const string englishNodeName = "EnglishNode";
+ const string danishNodeName = "DanishNode";
+
+ var langDa = new LanguageBuilder()
+ .WithCultureInfo(dkIso)
+ .Build();
+ LocalizationService.Save(langDa);
+
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .WithContentVariation(ContentVariation.Culture)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentTypeService.Save(contentType), Constants.UmbracoIndexes.InternalIndexName);
+
+ var content = new ContentBuilder()
+ .WithId(0)
+ .WithCultureName(usIso, englishNodeName)
+ .WithCultureName(dkIso, danishNodeName)
+ .WithContentType(contentType)
+ .Build();
+ PublishResult createdContent = await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(content), Constants.UmbracoIndexes.InternalIndexName);
+
+ string query = createdContent.Content.Id.ToString();
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+ var nodeNameEn = searchResults.First().Values["nodeName_en-us"];
+ var nodeNameDa = searchResults.First().Values["nodeName_da"];
+ Assert.AreEqual(englishNodeName, nodeNameEn);
+ Assert.AreEqual(danishNodeName, nodeNameDa);
+ }
+
+ [Test]
+ public async Task Search_For_Published_Content_Name_With_Two_Languages_By_Default_Language_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string englishNodeName = "EnglishNode";
+ const string danishNodeName = "DanishNode";
+
+ await CreateDefaultPublishedContentWithTwoLanguages(englishNodeName, danishNodeName);
+
+ string query = englishNodeName;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+ var nodeNameEn = searchResults.First().Values["nodeName_en-us"];
+ var nodeNameDa = searchResults.First().Values["nodeName_da"];
+ Assert.AreEqual(englishNodeName, nodeNameEn);
+ Assert.AreEqual(danishNodeName, nodeNameDa);
+ }
+
+ [Test]
+ public async Task Search_For_Published_Content_Name_With_Two_Languages_By_Non_Default_Language_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string englishNodeName = "EnglishNode";
+ const string danishNodeName = "DanishNode";
+
+ await CreateDefaultPublishedContentWithTwoLanguages(englishNodeName, danishNodeName);
+
+ string query = danishNodeName;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+ var nodeNameDa = searchResults.First().Values["nodeName_da"];
+ var nodeNameEn = searchResults.First().Values["nodeName_en-us"];
+ Assert.AreEqual(englishNodeName, nodeNameEn);
+ Assert.AreEqual(danishNodeName, nodeNameDa);
+ }
+
+ [Test]
+ public async Task Search_Published_Content_With_Two_Languages_By_Id()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string englishNodeName = "EnglishNode";
+ const string danishNodeName = "DanishNode";
+
+ var contentNode = await CreateDefaultPublishedContentWithTwoLanguages(englishNodeName, danishNodeName);
+
+ string query = contentNode.Content.Id.ToString();
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+ var nodeNameDa = searchResults.First().Values["nodeName_da"];
+ var nodeNameEn = searchResults.First().Values["nodeName_en-us"];
+ Assert.AreEqual(englishNodeName, nodeNameEn);
+ Assert.AreEqual(danishNodeName, nodeNameDa);
+ }
+
+ // Check All Indexed Values
+ [Test]
+ public async Task Check_All_Indexed_Values_For_Published_Content_With_No_Properties()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "TestContent";
+
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .Build();
+ ContentTypeService.Save(contentType);
+
+ var contentNode = new ContentBuilder()
+ .WithId(0)
+ .WithName(contentName)
+ .WithContentType(contentType)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(contentNode), Constants.UmbracoIndexes.InternalIndexName);
+
+ string query = contentName;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+
+ string contentNodePublish = string.Empty;
+ if (contentNode.Published)
+ {
+ contentNodePublish = "y";
+ }
+
+ string contentTypeCultureVariations = string.Empty;
+
+ if (contentType.Variations == ContentVariation.Nothing)
+ {
+ contentTypeCultureVariations = "n";
+ }
+
+ Assert.Multiple(() =>
+ {
+ Assert.AreEqual(searchResults.First().Values["__NodeId"], contentNode.Id.ToString());
+ Assert.AreEqual(searchResults.First().Values["__IndexType"], "content");
+ Assert.AreEqual(searchResults.First().Values["__NodeTypeAlias"], contentNode.ContentType.Alias);
+ Assert.AreEqual(searchResults.First().Values["__Published"], contentNodePublish);
+ Assert.AreEqual(searchResults.First().Values["id"], contentNode.Id.ToString());
+ Assert.AreEqual(searchResults.First().Values["__Key"], contentNode.Key.ToString());
+ Assert.AreEqual(searchResults.First().Values["parentID"], contentNode.ParentId.ToString());
+ Assert.AreEqual(searchResults.First().Values["nodeName"], contentNode.Name);
+ Assert.AreEqual(searchResults.First().Values["__VariesByCulture"], contentTypeCultureVariations);
+ Assert.AreEqual(searchResults.First().Values["__Icon"], contentNode.ContentType.Icon);
+ });
+ }
+
+ [Test]
+ public async Task Check_All_Indexed_Values_For_Published_Content_With_Properties()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ const string contentName = "TestContent";
+ const string propertyEditorName = "TestBox";
+
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .AddPropertyType()
+ .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+ .WithName(propertyEditorName)
+ .WithAlias("testBox")
+ .Done()
+ .Build();
+ ContentTypeService.Save(contentType);
+
+ var contentNode = new ContentBuilder()
+ .WithId(0)
+ .WithName(contentName)
+ .WithContentType(contentType)
+ .WithPropertyValues(new { testBox = "TestValue" })
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(contentNode), Constants.UmbracoIndexes.InternalIndexName);
+
+ string query = contentName;
+
+ // Act
+ IEnumerable actual = BackOfficeExamineSearch(query);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+
+ string contentNodePublish = string.Empty;
+ string contentTypeCultureVariations = string.Empty;
+
+ if (contentNode.Published)
+ {
+ contentNodePublish = "y";
+ }
+
+ if (contentType.Variations == ContentVariation.Nothing)
+ {
+ contentTypeCultureVariations = "n";
+ }
+
+ Assert.Multiple(() =>
+ {
+ Assert.AreEqual(searchResults.First().Values["__NodeId"], contentNode.Id.ToString());
+ Assert.AreEqual(searchResults.First().Values["__IndexType"], "content");
+ Assert.AreEqual(searchResults.First().Values["__NodeTypeAlias"], contentNode.ContentType.Alias);
+ Assert.AreEqual(searchResults.First().Values["__Published"], contentNodePublish);
+ Assert.AreEqual(searchResults.First().Values["id"], contentNode.Id.ToString());
+ Assert.AreEqual(searchResults.First().Values["__Key"], contentNode.Key.ToString());
+ Assert.AreEqual(searchResults.First().Values["parentID"], contentNode.ParentId.ToString());
+ Assert.AreEqual(searchResults.First().Values["nodeName"], contentNode.Name);
+ Assert.AreEqual(searchResults.First().Values["__VariesByCulture"], contentTypeCultureVariations);
+ Assert.AreEqual(searchResults.First().Values["__Icon"], contentNode.ContentType.Icon);
+ });
+ }
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs
index 381464faf3..3d97f4ede0 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs
@@ -1,4 +1,5 @@
using System.Data;
+using Examine;
using Examine.Lucene.Providers;
using Microsoft.Extensions.DependencyInjection;
using Moq;
@@ -25,6 +26,8 @@ public abstract class ExamineBaseTest : UmbracoIntegrationTest
protected IRuntimeState RunningRuntimeState { get; } = Mock.Of(x => x.Level == RuntimeLevel.Run);
+ protected IExamineManager ExamineManager => GetRequiredService();
+
protected override void ConfigureTestServices(IServiceCollection services)
=> services.AddSingleton();
@@ -113,6 +116,43 @@ public abstract class ExamineBaseTest : UmbracoIntegrationTest
return new DisposableWrapper(syncMode, index, luceneDir);
}
+ private AutoResetEvent indexingHandle = new(false);
+
+ protected async Task ExecuteAndWaitForIndexing(Action indexUpdatingAction, string indexName) =>
+ await ExecuteAndWaitForIndexing(
+ () =>
+ {
+ indexUpdatingAction();
+ return null;
+ }, indexName);
+
+ ///
+ /// Performs and action and waits for the specified index to be done indexing.
+ ///
+ /// The action that causes the index to be updated.
+ /// The name of the index to wait for rebuild.
+ /// The type returned from the action.
+ /// The result of the action.
+ protected async Task ExecuteAndWaitForIndexing (Func indexUpdatingAction, string indexName)
+ {
+ // Set up an action to release the handle when the index is populated.
+ if (ExamineManager.TryGetIndex(indexName, out IIndex index) is false)
+ {
+ throw new InvalidOperationException($"Could not find index: {indexName}");
+ }
+
+ index.IndexOperationComplete += (_, _) =>
+ {
+ indexingHandle.Set();
+ };
+
+ // Perform the action, and wait for the handle to be freed, meaning the index is done populating.
+ var result = indexUpdatingAction();
+ await indexingHandle.WaitOneAsync();
+
+ return result;
+ }
+
private class DisposableWrapper : IDisposable
{
private readonly IDisposable[] _disposables;
@@ -127,4 +167,10 @@ public abstract class ExamineBaseTest : UmbracoIntegrationTest
}
}
}
+
+ protected string GetIndexPath(string indexName)
+ {
+ var root = TestContext.CurrentContext.TestDirectory.Split("Umbraco.Tests.Integration")[0];
+ return Path.Combine(root, "Umbraco.Tests.Integration", "umbraco", "Data", "TEMP", "ExamineIndexes", indexName);
+ }
}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexSearcherTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexSearcherTest.cs
new file mode 100644
index 0000000000..38eb270b3c
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexSearcherTest.cs
@@ -0,0 +1,417 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System.Globalization;
+using System.Text;
+using System.Text.RegularExpressions;
+using Examine;
+using Examine.Search;
+using Lucene.Net.QueryParsers.Classic;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Mapping;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Models.Entities;
+using Umbraco.Cms.Core.Models.Membership;
+using Umbraco.Cms.Core.Routing;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Examine;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+public class ExamineExternalIndexSearcherTest : IExamineExternalIndexSearcherTest
+{
+ private readonly AppCaches _appCaches;
+ private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+ private readonly IEntityService _entityService;
+ private readonly IExamineManager _examineManager;
+ private readonly ILocalizationService _languageService;
+ private readonly IPublishedUrlProvider _publishedUrlProvider;
+ private readonly IUmbracoTreeSearcherFields _treeSearcherFields;
+ private readonly IUmbracoMapper _umbracoMapper;
+
+ public ExamineExternalIndexSearcherTest(
+ IExamineManager examineManager,
+ ILocalizationService languageService,
+ IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+ IEntityService entityService,
+ IUmbracoTreeSearcherFields treeSearcherFields,
+ AppCaches appCaches,
+ IUmbracoMapper umbracoMapper,
+ IPublishedUrlProvider publishedUrlProvider)
+ {
+ _examineManager = examineManager;
+ _languageService = languageService;
+ _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
+ _entityService = entityService;
+ _treeSearcherFields = treeSearcherFields;
+ _appCaches = appCaches;
+ _umbracoMapper = umbracoMapper;
+ _publishedUrlProvider = publishedUrlProvider;
+ }
+
+ public IEnumerable Search(
+ string query,
+ UmbracoEntityTypes entityType,
+ int pageSize,
+ long pageIndex,
+ out long totalFound,
+ string? searchFrom = null,
+ bool ignoreUserStartNodes = false)
+ {
+ var sb = new StringBuilder();
+
+ string type;
+ var indexName = Constants.UmbracoIndexes.ExternalIndexName;
+ var fields = _treeSearcherFields.GetBackOfficeFields().ToList();
+
+ ISet fieldsToLoad = new HashSet(_treeSearcherFields.GetBackOfficeFieldsToLoad());
+
+ // TODO: WE should try to allow passing in a lucene raw query, however we will still need to do some manual string
+ // manipulation for things like start paths, member types, etc...
+ //if (Examine.ExamineExtensions.TryParseLuceneQuery(query))
+ //{
+
+ //}
+
+ //special GUID check since if a user searches on one specifically we need to escape it
+ if (Guid.TryParse(query, out Guid g))
+ {
+ query = "\"" + g + "\"";
+ }
+
+ IUser? currentUser = _backOfficeSecurityAccessor?.BackOfficeSecurity?.CurrentUser;
+
+ switch (entityType)
+ {
+ case UmbracoEntityTypes.Member:
+ indexName = Constants.UmbracoIndexes.MembersIndexName;
+ type = "member";
+ fields.AddRange(_treeSearcherFields.GetBackOfficeMembersFields());
+ foreach (var field in _treeSearcherFields.GetBackOfficeMembersFieldsToLoad())
+ {
+ fieldsToLoad.Add(field);
+ }
+
+ if (searchFrom != null && searchFrom != Constants.Conventions.MemberTypes.AllMembersListId &&
+ searchFrom.Trim() != "-1")
+ {
+ sb.Append("+__NodeTypeAlias:");
+ sb.Append(searchFrom);
+ sb.Append(" ");
+ }
+
+ break;
+ case UmbracoEntityTypes.Media:
+ type = "media";
+ fields.AddRange(_treeSearcherFields.GetBackOfficeMediaFields());
+ foreach (var field in _treeSearcherFields.GetBackOfficeMediaFieldsToLoad())
+ {
+ fieldsToLoad.Add(field);
+ }
+
+ var allMediaStartNodes = currentUser != null
+ ? currentUser.CalculateMediaStartNodeIds(_entityService, _appCaches)
+ : Array.Empty();
+ AppendPath(sb, UmbracoObjectTypes.Media, allMediaStartNodes, searchFrom, ignoreUserStartNodes, _entityService);
+ break;
+ case UmbracoEntityTypes.Document:
+ type = "content";
+ fields.AddRange(_treeSearcherFields.GetBackOfficeDocumentFields());
+ foreach (var field in _treeSearcherFields.GetBackOfficeDocumentFieldsToLoad())
+ {
+ fieldsToLoad.Add(field);
+ }
+
+ var allContentStartNodes = currentUser != null
+ ? currentUser.CalculateContentStartNodeIds(_entityService, _appCaches)
+ : Array.Empty();
+ AppendPath(sb, UmbracoObjectTypes.Document, allContentStartNodes, searchFrom, ignoreUserStartNodes, _entityService);
+ break;
+ default:
+ throw new NotSupportedException("The " + typeof(BackOfficeExamineSearcher) +
+ " currently does not support searching against object type " +
+ entityType);
+ }
+
+ if (!_examineManager.TryGetIndex(indexName, out IIndex? index))
+ {
+ throw new InvalidOperationException("No index found by name " + indexName);
+ }
+
+ if (!BuildQuery(sb, query, searchFrom, fields, type))
+ {
+ totalFound = 0;
+ return Enumerable.Empty();
+ }
+
+ ISearchResults? result = index.Searcher
+ .CreateQuery()
+ .NativeQuery(sb.ToString())
+ .SelectFields(fieldsToLoad)
+ //only return the number of items specified to read up to the amount of records to fill from 0 -> the number of items on the page requested
+ .Execute(QueryOptions.SkipTake(Convert.ToInt32(pageSize * pageIndex), pageSize));
+
+ totalFound = result.TotalItemCount;
+
+ return result;
+ }
+
+ private bool BuildQuery(StringBuilder sb, string query, string? searchFrom, List fields, string type)
+ {
+ //build a lucene query:
+ // the nodeName will be boosted 10x without wildcards
+ // then nodeName will be matched normally with wildcards
+ // the rest will be normal without wildcards
+
+ var allLangs = _languageService.GetAllLanguages().Select(x => x.IsoCode.ToLowerInvariant()).ToList();
+
+ // the chars [*-_] in the query will mess everything up so let's remove those
+ // However we cannot just remove - and _ since these signify a space, so we instead replace them with that.
+ query = Regex.Replace(query, "[\\*]", string.Empty);
+ query = Regex.Replace(query, "[\\-_]", " ");
+
+
+ //check if text is surrounded by single or double quotes, if so, then exact match
+ var surroundedByQuotes = Regex.IsMatch(query, "^\".*?\"$")
+ || Regex.IsMatch(query, "^\'.*?\'$");
+
+ if (surroundedByQuotes)
+ {
+ //strip quotes, escape string, the replace again
+ query = query.Trim(Constants.CharArrays.DoubleQuoteSingleQuote);
+
+ query = QueryParserBase.Escape(query);
+
+ //nothing to search
+ if (searchFrom.IsNullOrWhiteSpace() && query.IsNullOrWhiteSpace())
+ {
+ return false;
+ }
+
+ //update the query with the query term
+ if (query.IsNullOrWhiteSpace() == false)
+ {
+ //add back the surrounding quotes
+ query = string.Format("{0}{1}{0}", "\"", query);
+
+ sb.Append("+(");
+
+ AppendNodeNamePhraseWithBoost(sb, query, allLangs);
+
+ foreach (var f in fields)
+ {
+ //additional fields normally
+ sb.Append(f);
+ sb.Append(": (");
+ sb.Append(query);
+ sb.Append(") ");
+ }
+
+ sb.Append(") ");
+ }
+ }
+ else
+ {
+ var trimmed = query.Trim(Constants.CharArrays.DoubleQuoteSingleQuote);
+
+ //nothing to search
+ if (searchFrom.IsNullOrWhiteSpace() && trimmed.IsNullOrWhiteSpace())
+ {
+ return false;
+ }
+
+ //update the query with the query term
+ if (trimmed.IsNullOrWhiteSpace() == false)
+ {
+ query = QueryParserBase.Escape(query);
+
+ var querywords = query.Split(Constants.CharArrays.Space, StringSplitOptions.RemoveEmptyEntries);
+
+ sb.Append("+(");
+
+ AppendNodeNameExactWithBoost(sb, query, allLangs);
+
+ AppendNodeNameWithWildcards(sb, querywords, allLangs);
+
+ foreach (var f in fields)
+ {
+ var queryWordsReplaced = new string[querywords.Length];
+
+ // when searching file names containing hyphens we need to replace the hyphens with spaces
+ if (f.Equals(UmbracoExamineFieldNames.UmbracoFileFieldName))
+ {
+ for (var index = 0; index < querywords.Length; index++)
+ {
+ queryWordsReplaced[index] =
+ querywords[index].Replace("\\-", " ").Replace("_", " ").Trim(" ");
+ }
+ }
+ else
+ {
+ queryWordsReplaced = querywords;
+ }
+
+ //additional fields normally
+ sb.Append(f);
+ sb.Append(":");
+ sb.Append("(");
+ foreach (var w in queryWordsReplaced)
+ {
+ sb.Append(w.ToLower());
+ sb.Append("* ");
+ }
+
+ sb.Append(")");
+ sb.Append(" ");
+ }
+
+ sb.Append(") ");
+ }
+ }
+
+ //must match index type
+ sb.Append("+__IndexType:");
+ sb.Append(type);
+
+ return true;
+ }
+
+ private void AppendNodeNamePhraseWithBoost(StringBuilder sb, string query, IEnumerable allLangs)
+ {
+ //node name exactly boost x 10
+ sb.Append("nodeName: (");
+ sb.Append(query.ToLower());
+ sb.Append(")^10.0 ");
+
+ //also search on all variant node names
+ foreach (var lang in allLangs)
+ {
+ //node name exactly boost x 10
+ sb.Append($"nodeName_{lang}: (");
+ sb.Append(query.ToLower());
+ sb.Append(")^10.0 ");
+ }
+ }
+
+ private void AppendNodeNameExactWithBoost(StringBuilder sb, string query, IEnumerable allLangs)
+ {
+ //node name exactly boost x 10
+ sb.Append("nodeName:");
+ sb.Append("\"");
+ sb.Append(query.ToLower());
+ sb.Append("\"");
+ sb.Append("^10.0 ");
+ //also search on all variant node names
+ foreach (var lang in allLangs)
+ {
+ //node name exactly boost x 10
+ sb.Append($"nodeName_{lang}:");
+ sb.Append("\"");
+ sb.Append(query.ToLower());
+ sb.Append("\"");
+ sb.Append("^10.0 ");
+ }
+ }
+
+ private void AppendNodeNameWithWildcards(StringBuilder sb, string[] querywords, IEnumerable allLangs)
+ {
+ //node name normally with wildcards
+ sb.Append("nodeName:");
+ sb.Append("(");
+ foreach (var w in querywords)
+ {
+ sb.Append(w.ToLower());
+ sb.Append("* ");
+ }
+
+ sb.Append(") ");
+ //also search on all variant node names
+ foreach (var lang in allLangs)
+ {
+ //node name normally with wildcards
+ sb.Append($"nodeName_{lang}:");
+ sb.Append("(");
+ foreach (var w in querywords)
+ {
+ sb.Append(w.ToLower());
+ sb.Append("* ");
+ }
+
+ sb.Append(") ");
+ }
+ }
+
+ private void AppendPath(StringBuilder sb, UmbracoObjectTypes objectType, int[]? startNodeIds, string? searchFrom, bool ignoreUserStartNodes, IEntityService entityService)
+ {
+ if (sb == null)
+ {
+ throw new ArgumentNullException(nameof(sb));
+ }
+
+ if (entityService == null)
+ {
+ throw new ArgumentNullException(nameof(entityService));
+ }
+
+ UdiParser.TryParse(searchFrom, true, out Udi? udi);
+ searchFrom = udi == null ? searchFrom : entityService.GetId(udi).Result.ToString();
+
+ TreeEntityPath? entityPath =
+ int.TryParse(searchFrom, NumberStyles.Integer, CultureInfo.InvariantCulture, out var searchFromId) &&
+ searchFromId > 0
+ ? entityService.GetAllPaths(objectType, searchFromId).FirstOrDefault()
+ : null;
+ if (entityPath != null)
+ {
+ // find... only what's underneath
+ sb.Append("+__Path:");
+ AppendPath(sb, entityPath.Path, false);
+ sb.Append(" ");
+ }
+ else if (startNodeIds?.Length == 0)
+ {
+ // make sure we don't find anything
+ sb.Append("+__Path:none ");
+ }
+ else if (startNodeIds?.Contains(-1) == false && ignoreUserStartNodes == false) // -1 = no restriction
+ {
+ IEnumerable entityPaths = entityService.GetAllPaths(objectType, startNodeIds);
+
+ // for each start node, find the start node, and what's underneath
+ // +__Path:(-1*,1234 -1*,1234,* -1*,5678 -1*,5678,* ...)
+ sb.Append("+__Path:(");
+ var first = true;
+ foreach (TreeEntityPath ep in entityPaths)
+ {
+ if (first)
+ {
+ first = false;
+ }
+ else
+ {
+ sb.Append(" ");
+ }
+
+ AppendPath(sb, ep.Path, true);
+ }
+
+ sb.Append(") ");
+ }
+ }
+
+ private void AppendPath(StringBuilder sb, string path, bool includeThisNode)
+ {
+ path = path.Replace("-", "\\-").Replace(",", "\\,");
+ if (includeThisNode)
+ {
+ sb.Append(path);
+ sb.Append(" ");
+ }
+
+ sb.Append(path);
+ sb.Append("\\,*");
+ }
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexTests.cs
new file mode 100644
index 0000000000..41b66a193c
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexTests.cs
@@ -0,0 +1,137 @@
+using Examine;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Cms.Core;
+using Umbraco.Cms.Core.Cache;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.Notifications;
+using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Sync;
+using Umbraco.Cms.Infrastructure.Examine.DependencyInjection;
+using Umbraco.Cms.Infrastructure.HostedServices;
+using Umbraco.Cms.Infrastructure.Search;
+using Umbraco.Cms.Tests.Common.Builders;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Testing;
+using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+using Umbraco.Cms.Web.BackOffice.Security;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ExamineExternalIndexTests : ExamineBaseTest
+{
+ private const string ContentName = "TestContent";
+
+ [SetUp]
+ public void Setup()
+ {
+ TestHelper.DeleteDirectory(GetIndexPath(Constants.UmbracoIndexes.InternalIndexName));
+ TestHelper.DeleteDirectory(GetIndexPath(Constants.UmbracoIndexes.ExternalIndexName));
+ var httpContext = new DefaultHttpContext();
+ httpContext.RequestServices = Services;
+ Mock.Get(TestHelper.GetHttpContextAccessor()).Setup(x => x.HttpContext).Returns(httpContext);
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ // When disposing examine, it does a final write, which ends up locking the file if the indexing is not done yet. So we have this wait to circumvent that.
+ Thread.Sleep(1500);
+ // Sometimes we do not dispose all services in time and the test fails because the log file is locked. Resulting in all other tests failing as well
+ Services.DisposeIfDisposable();
+ }
+
+ private IExamineExternalIndexSearcherTest ExamineExternalIndexSearcher =>
+ GetRequiredService();
+
+ private IContentTypeService ContentTypeService => GetRequiredService();
+
+ private ContentService ContentService => (ContentService)GetRequiredService();
+
+ private IUserStore BackOfficeUserStore =>
+ GetRequiredService>();
+
+ private IBackOfficeSignInManager BackOfficeSignInManager => GetRequiredService();
+
+ protected override void CustomTestSetup(IUmbracoBuilder builder)
+ {
+ builder.Services.AddUnique();
+ builder.Services.AddUnique();
+ builder
+ .AddNotificationHandler();
+ builder.AddNotificationHandler();
+ builder.AddExamineIndexes();
+ builder.AddBackOfficeIdentity();
+ builder.Services.AddHostedService();
+ }
+
+ private IEnumerable ExamineExternalIndexSearch(string query, int pageSize = 20, int pageIndex = 0) =>
+ ExamineExternalIndexSearcher.Search(query, UmbracoEntityTypes.Document,
+ pageSize, pageIndex, out _, ignoreUserStartNodes: true);
+
+ private async Task SetupUserIdentity(string userId)
+ {
+ var identity =
+ await BackOfficeUserStore.FindByIdAsync(userId, CancellationToken.None);
+ await BackOfficeSignInManager.SignInAsync(identity, false);
+ }
+
+ [Test]
+ public async Task Search_Published_Content_With_Query_By_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .Build();
+ ContentTypeService.Save(contentType);
+
+ var content = new ContentBuilder()
+ .WithId(0)
+ .WithName(ContentName)
+ .WithContentType(contentType)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.SaveAndPublish(content), Constants.UmbracoIndexes.ExternalIndexName);
+
+ // Act
+ IEnumerable actual = ExamineExternalIndexSearch(ContentName);
+
+ // Assert
+ IEnumerable searchResults = actual.ToArray();
+ Assert.AreEqual(1, searchResults.Count());
+ Assert.AreEqual(searchResults.First().Values["nodeName"], ContentName);
+ }
+
+ [Test]
+ public async Task Search_Unpublished_Content_With_Query_By_Content_Name()
+ {
+ // Arrange
+ await SetupUserIdentity(Constants.Security.SuperUserIdAsString);
+
+ var contentType = new ContentTypeBuilder()
+ .WithId(0)
+ .Build();
+ ContentTypeService.Save(contentType);
+
+ var content = new ContentBuilder()
+ .WithId(0)
+ .WithName(ContentName)
+ .WithContentType(contentType)
+ .Build();
+ await ExecuteAndWaitForIndexing(() => ContentService.Save(content), Constants.UmbracoIndexes.ExternalIndexName);
+
+ // Act
+ IEnumerable actual = ExamineExternalIndexSearch(ContentName);
+
+ // Assert
+ Assert.AreEqual(0, actual.Count());
+ }
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IExamineExternalIndexSearcherTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IExamineExternalIndexSearcherTest.cs
new file mode 100644
index 0000000000..eba1ebf7bb
--- /dev/null
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IExamineExternalIndexSearcherTest.cs
@@ -0,0 +1,18 @@
+using Examine;
+using Umbraco.Cms.Core.Models.ContentEditing;
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+public interface IExamineExternalIndexSearcherTest
+{
+
+ IEnumerable Search(
+ string query,
+ UmbracoEntityTypes entityType,
+ int pageSize,
+ long pageIndex,
+ out long totalFound,
+ string? searchFrom = null,
+ bool ignoreUserStartNodes = false);
+
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
index 01ca9284f7..21a06c3643 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
@@ -19,7 +19,6 @@ using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Strings;
using Umbraco.Cms.Infrastructure.Examine;
using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Web.Common.DependencyInjection;
using Directory = Lucene.Net.Store.Directory;
using StaticServiceProvider = Umbraco.Cms.Core.DependencyInjection.StaticServiceProvider;
@@ -37,6 +36,7 @@ public class IndexInitializer
private readonly PropertyEditorCollection _propertyEditors;
private readonly IScopeProvider _scopeProvider;
private readonly IShortStringHelper _shortStringHelper;
+ private readonly IContentTypeService _contentTypeService;
public IndexInitializer(
IShortStringHelper shortStringHelper,
@@ -45,7 +45,8 @@ public class IndexInitializer
IScopeProvider scopeProvider,
ILoggerFactory loggerFactory,
IOptions contentSettings,
- ILocalizationService localizationService)
+ ILocalizationService localizationService,
+ IContentTypeService contentTypeService)
{
_shortStringHelper = shortStringHelper;
_propertyEditors = propertyEditors;
@@ -54,6 +55,7 @@ public class IndexInitializer
_loggerFactory = loggerFactory;
_contentSettings = contentSettings;
_localizationService = localizationService;
+ _contentTypeService = contentTypeService;
}
public IndexInitializer(
@@ -62,7 +64,7 @@ public class IndexInitializer
MediaUrlGeneratorCollection mediaUrlGenerators,
IScopeProvider scopeProvider,
ILoggerFactory loggerFactory,
- IOptions contentSettings)
+ IOptions contentSettings, IContentTypeService contentTypeService)
: this(
shortStringHelper,
propertyEditors,
@@ -70,7 +72,7 @@ public class IndexInitializer
scopeProvider,
loggerFactory,
contentSettings,
- StaticServiceProvider.Instance.GetRequiredService())
+ StaticServiceProvider.Instance.GetRequiredService(), contentTypeService)
{
}
@@ -83,7 +85,9 @@ public class IndexInitializer
_shortStringHelper,
_scopeProvider,
publishedValuesOnly,
- _localizationService);
+ _localizationService,
+ _contentTypeService,
+ _loggerFactory.CreateLogger());
return contentValueSetBuilder;
}