Merge branch 'v15/dev' into contrib

.gitattributes

@@ -46,6 +46,7 @@
 *.xml text=auto
 *.resx text=auto
 *.yml text eol=lf core.whitespace whitespace=tab-in-indent,trailing-space,tabwidth=2
+*.sh eol=lf
 
 *.csproj text=auto merge=union
 *.vbproj text=auto merge=union

build/azure-pipelines.yml

@@ -117,8 +117,7 @@ stages:
           - checkout: self
             submodules: false
             lfs: false,
-            fetchDepth: 1
-            fetchFilter: tree:0
+            fetchDepth: 500
           - template: templates/backoffice-install.yml
           - script: npm run build:for:npm
             displayName: Run build:for:npm
@@ -936,6 +935,7 @@ stages:
             inputs:
               archiveFilePatterns: $(Build.SourcesDirectory)/csharp-docs.zip
               destinationFolder: $(Build.ArtifactStagingDirectory)/csharp-docs
+              overwriteExistingFiles: true
           - task: AzureFileCopy@4
             displayName: "Copy C# Docs to blob storage"
             inputs:
@@ -959,6 +959,7 @@ stages:
             inputs:
               archiveFilePatterns: $(Build.SourcesDirectory)/ui-docs.zip
               destinationFolder: $(Build.ArtifactStagingDirectory)/ui-docs
+              overwriteExistingFiles: true
           - task: AzureFileCopy@4
             displayName: "Copy Storybook to blob storage"
             inputs:
@@ -982,6 +983,7 @@ stages:
             inputs:
               archiveFilePatterns: $(Build.SourcesDirectory)/ui-api-docs.zip
               destinationFolder: $(Build.ArtifactStagingDirectory)/ui-api-docs
+              overwriteExistingFiles: true
           - task: AzureFileCopy@4
             displayName: "Copy UI API Docs to blob storage"
             inputs:

src/Umbraco.Web.UI.Client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@umbraco-cms/backoffice",
 	"license": "MIT",
-	"version": "15.1.0",
+	"version": "15.2.0-rc",
 	"type": "module",
 	"exports": {
 		".": null,

src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts

@@ -1,4 +1,4 @@
-import { handlers as backofficeHandlers } from './handlers/backoffice.handlers.js';
+import { handlers as backofficeHandlers } from './handlers/backoffice/backoffice.handlers.js';
 import { handlers as configHandlers } from './handlers/config.handlers.js';
 import { handlers as cultureHandlers } from './handlers/culture.handlers.js';
 import { handlers as dataTypeHandlers } from './handlers/data-type/index.js';

src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice.handlers.ts → src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/backoffice.handlers.ts

@@ -1,50 +1,46 @@
 const { rest } = window.MockServiceWorker;
 import { umbracoPath } from '@umbraco-cms/backoffice/utils';
 
-import logoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo.svg';
-import loginLogoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_light.svg';
-import loginLogoAlternativeUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_dark.svg';
-import loginBackgroundUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/login.jpg';
+const logoUrl = './src/mocks/handlers/backoffice/assets/logo.svg';
+const loginLogoUrl = './src/mocks/handlers/backoffice/assets/logo_light.svg';
+const loginLogoAlternativeUrl = './src/mocks/handlers/backoffice/assets/logo_dark.svg';
+const loginBackgroundUrl = './src/mocks/handlers/backoffice/assets/login.jpg';
 
 export const handlers = [
 	rest.get(umbracoPath('/security/back-office/graphics/logo'), async (req, res, ctx) => {
-		const imageBuffer = await fetch(logoUrl)
-			.then((res) => res.arrayBuffer());
+		const imageBuffer = await fetch(logoUrl).then((res) => res.arrayBuffer());
 
 		return res(
 			ctx.set('Content-Length', imageBuffer.byteLength.toString()),
 			ctx.set('Content-Type', 'image/svg+xml'),
-			ctx.body(imageBuffer)
+			ctx.body(imageBuffer),
 		);
 	}),
 	rest.get(umbracoPath('/security/back-office/graphics/login-logo'), async (req, res, ctx) => {
-		const imageBuffer = await fetch(loginLogoUrl)
-			.then((res) => res.arrayBuffer());
+		const imageBuffer = await fetch(loginLogoUrl).then((res) => res.arrayBuffer());
 
 		return res(
 			ctx.set('Content-Length', imageBuffer.byteLength.toString()),
 			ctx.set('Content-Type', 'image/svg+xml'),
-			ctx.body(imageBuffer)
+			ctx.body(imageBuffer),
 		);
 	}),
 	rest.get(umbracoPath('/security/back-office/graphics/login-logo-alternative'), async (req, res, ctx) => {
-		const imageBuffer = await fetch(loginLogoAlternativeUrl)
-			.then((res) => res.arrayBuffer());
+		const imageBuffer = await fetch(loginLogoAlternativeUrl).then((res) => res.arrayBuffer());
 
 		return res(
 			ctx.set('Content-Length', imageBuffer.byteLength.toString()),
 			ctx.set('Content-Type', 'image/svg+xml'),
-			ctx.body(imageBuffer)
+			ctx.body(imageBuffer),
 		);
 	}),
 	rest.get(umbracoPath('/security/back-office/graphics/login-background'), async (req, res, ctx) => {
-		const imageBuffer = await fetch(loginBackgroundUrl)
-			.then((res) => res.arrayBuffer());
+		const imageBuffer = await fetch(loginBackgroundUrl).then((res) => res.arrayBuffer());
 
 		return res(
 			ctx.set('Content-Length', imageBuffer.byteLength.toString()),
 			ctx.set('Content-Type', 'image/jpeg'),
-			ctx.body(imageBuffer)
+			ctx.body(imageBuffer),
 		);
 	}),
 ];

src/Umbraco.Web.UI.Client/utils/all-umb-consts/index.ts

@@ -96,7 +96,7 @@ export const foundConsts = [{
 			},
 {
 				path: '@umbraco-cms/backoffice/content',
-				consts: ["UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT","UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION","UMB_CONTENT_SECTION_ALIAS","UMB_CONTENT_PROPERTY_CONTEXT","UMB_CONTENT_WORKSPACE_CONTEXT"]
+				consts: ["UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT","UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION","UMB_CONTENT_SECTION_ALIAS","UMB_CONTENT_PROPERTY_CONTEXT","UMB_CONTENT_PROPERTY_DATASET_CONTEXT","UMB_CONTENT_WORKSPACE_CONTEXT"]
 			},
 {
 				path: '@umbraco-cms/backoffice/culture',
@@ -216,7 +216,7 @@ export const foundConsts = [{
 			},
 {
 				path: '@umbraco-cms/backoffice/member',
-				consts: ["UMB_MEMBER_COLLECTION_ALIAS","UMB_MEMBER_COLLECTION_CONTEXT","UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS","UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS","UMB_MEMBER_PICKER_MODAL","UMB_MEMBER_CREATE_OPTIONS_MODAL","UMB_MEMBER_ENTITY_TYPE","UMB_MEMBER_ROOT_ENTITY_TYPE","UMB_MEMBER_WORKSPACE_PATH","UMB_MEMBER_ROOT_WORKSPACE_PATH","UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN","UMB_MEMBER_VARIANT_CONTEXT","UMB_MEMBER_DETAIL_REPOSITORY_ALIAS","UMB_MEMBER_DETAIL_STORE_ALIAS","UMB_MEMBER_DETAIL_STORE_CONTEXT","UMB_MEMBER_ITEM_REPOSITORY_ALIAS","UMB_MEMBER_STORE_ALIAS","UMB_MEMBER_ITEM_STORE_CONTEXT","UMB_MEMBER_SEARCH_PROVIDER_ALIAS","UMB_MEMBER_DETAIL_MODEL_VARIANT_SCAFFOLD","UMB_MEMBER_WORKSPACE_ALIAS","UMB_MEMBER_WORKSPACE_CONTEXT","UMB_MEMBER_ROOT_WORKSPACE_ALIAS"]
+				consts: ["UMB_MEMBER_COLLECTION_ALIAS","UMB_MEMBER_COLLECTION_CONTEXT","UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS","UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS","UMB_MEMBER_PICKER_MODAL","UMB_MEMBER_CREATE_OPTIONS_MODAL","UMB_MEMBER_ENTITY_TYPE","UMB_MEMBER_ROOT_ENTITY_TYPE","UMB_MEMBER_WORKSPACE_PATH","UMB_MEMBER_ROOT_WORKSPACE_PATH","UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN","UMB_MEMBER_VARIANT_CONTEXT","UMB_MEMBER_DETAIL_REPOSITORY_ALIAS","UMB_MEMBER_DETAIL_STORE_ALIAS","UMB_MEMBER_DETAIL_STORE_CONTEXT","UMB_MEMBER_ITEM_REPOSITORY_ALIAS","UMB_MEMBER_STORE_ALIAS","UMB_MEMBER_ITEM_STORE_CONTEXT","UMB_MEMBER_VALIDATION_REPOSITORY_ALIAS","UMB_MEMBER_SEARCH_PROVIDER_ALIAS","UMB_MEMBER_DETAIL_MODEL_VARIANT_SCAFFOLD","UMB_MEMBER_WORKSPACE_ALIAS","UMB_MEMBER_WORKSPACE_CONTEXT","UMB_MEMBER_ROOT_WORKSPACE_ALIAS"]
 			},
 {
 				path: '@umbraco-cms/backoffice/menu',

src/Umbraco.Web.UI.Client/web-test-runner.index.ts

@@ -1,7 +1,7 @@
 import { handlers } from './src/mocks/browser-handlers.js';
 import { onUnhandledRequest } from './src/mocks/index.js';
 
-const { setupWorker, rest } = window.MockServiceWorker;
+const { setupWorker } = window.MockServiceWorker;
 
 const worker = setupWorker(...handlers);
 

templates/UmbracoProject/Dockerfile

@@ -1,10 +1,10 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["UmbracoProject/UmbracoProject.csproj", "UmbracoProject/"]

tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageMediaPicker.spec.ts

@@ -72,7 +72,7 @@ test('can add an image to the image media picker', async ({umbracoApi, umbracoUi
 
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
-  await umbracoUi.content.selectMediaByName(mediaName);
+  await umbracoUi.content.clickChooseButtonAndSelectMediaWithName(mediaName);
   await umbracoUi.content.clickSubmitButton();
   await umbracoUi.content.clickSaveButton();
 
@@ -141,7 +141,7 @@ test.skip('image count can not be more than max amount set in image media picker
 
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
-  await umbracoUi.content.selectMediaByName(mediaName);
+  await umbracoUi.content.clickChooseButtonAndSelectMediaWithName(mediaName);
   await umbracoUi.content.clickSubmitButton();
   await umbracoUi.content.clickSaveButton();
 
@@ -167,7 +167,7 @@ test('can add an image from the image media picker with a start node', async ({u
 
   // Act
   await umbracoUi.content.goToContentWithName(contentName);
-  await umbracoUi.content.selectMediaByName(mediaName);
+  await umbracoUi.content.clickChooseButtonAndSelectMediaWithName(mediaName);
   await umbracoUi.content.clickSubmitButton();
   await umbracoUi.content.clickSaveButton();