Merge branch 'v15/dev' into v15/feature/emm-collection

Author: madsrasmussen

devops/openapi-ts/openapi-ts.config.js

@@ -2,7 +2,7 @@ import { defineConfig } from '@hey-api/openapi-ts';
 
 export default defineConfig({
 	client: 'fetch',
-	input: 'https://raw.githubusercontent.com/umbraco/Umbraco-CMS/v14/dev/src/Umbraco.Cms.Api.Management/OpenApi.json',
+	input: 'https://raw.githubusercontent.com/umbraco/Umbraco-CMS/v15/dev/src/Umbraco.Cms.Api.Management/OpenApi.json',
 	output: {
 		path: 'src/external/backend-api/src',
 		format: 'prettier',

package-lock.json

@@ -190,8 +190,8 @@
 		"@types/diff": "^5.2.1",
 		"@types/dompurify": "^3.0.5",
 		"@types/uuid": "^10.0.0",
-		"@umbraco-ui/uui": "^1.9.0",
-		"@umbraco-ui/uui-css": "^1.9.0",
+		"@umbraco-ui/uui": "^v1.10.0-rc.0",
+		"@umbraco-ui/uui-css": "^v1.10.0-rc.0",
 		"base64-js": "^1.5.1",
 		"diff": "^5.2.0",
 		"dompurify": "^3.1.6",

package.json

@@ -10,6 +10,7 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 import type { UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
 import { UMB_CURRENT_USER_CONTEXT } from '@umbraco-cms/backoffice/current-user';
+import { UmbSysinfoRepository } from '@umbraco-cms/backoffice/sysinfo';
 
 export class UmbBackofficeContext extends UmbContextBase<UmbBackofficeContext> {
 	#activeSectionAlias = new UmbStringState(undefined);
@@ -76,6 +77,12 @@ export class UmbBackofficeContext extends UmbContextBase<UmbBackofficeContext> {
 	public setActiveSectionAlias(alias: string) {
 		this.#activeSectionAlias.setValue(alias);
 	}
+
+	public async serverUpgradeCheck(): Promise<boolean> {
+		const repository = new UmbSysinfoRepository(this);
+		const check = await repository.serverUpgradeCheck();
+		return !!check;
+	}
 }
 
 export const UMB_BACKOFFICE_CONTEXT = new UmbContextToken<UmbBackofficeContext>('UmbBackofficeContext');

src/apps/backoffice/backoffice.context.ts

@@ -1,10 +1,10 @@
-import { isCurrentUserAnAdmin } from '@umbraco-cms/backoffice/current-user';
 import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js';
+import { isCurrentUserAnAdmin } from '@umbraco-cms/backoffice/current-user';
 import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
-import { UMB_SYSINFO_MODAL } from '@umbraco-cms/backoffice/sysinfo';
+import { UMB_NEWVERSION_MODAL, UMB_SYSINFO_MODAL } from '@umbraco-cms/backoffice/sysinfo';
 
 @customElement('umb-backoffice-header-logo')
 export class UmbBackofficeHeaderLogoElement extends UmbLitElement {
@@ -14,6 +14,11 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement {
 	@state()
 	private _isUserAdmin = false;
 
+	@state()
+	private _serverUpgradeCheck = false;
+
+	#backofficeContext?: typeof UMB_BACKOFFICE_CONTEXT.TYPE;
+
 	constructor() {
 		super();
 
@@ -26,13 +31,19 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement {
 				},
 				'_observeVersion',
 			);
+
+			this.#backofficeContext = context;
 		});
 
 		this.#isAdmin();
 	}
 
 	async #isAdmin() {
 		this._isUserAdmin = await isCurrentUserAnAdmin(this);
+
+		if (this._isUserAdmin) {
+			this._serverUpgradeCheck = this.#backofficeContext ? await this.#backofficeContext.serverUpgradeCheck() : false;
+		}
 	}
 
 	override render() {
@@ -50,6 +61,14 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement {
 							height="82"
 							loading="lazy" />
 						<span>${this._version}</span>
+
+						${this._serverUpgradeCheck
+							? html`<uui-button
+									@click=${this.#openNewVersion}
+									color="danger"
+									label=${this.localize.term('general_newVersionAvailable')}></uui-button>`
+							: ''}
+
 						<a href="https://umbraco.com" target="_blank" rel="noopener">Umbraco.com</a>
 
 						${this._isUserAdmin
@@ -72,6 +91,14 @@ export class UmbBackofficeHeaderLogoElement extends UmbLitElement {
 			.catch(() => {});
 	}
 
+	async #openNewVersion() {
+		const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
+		modalManager
+			.open(this, UMB_NEWVERSION_MODAL)
+			.onSubmit()
+			.catch(() => {});
+	}
+
 	static override styles = [
 		UmbTextStyles,
 		css`

src/apps/backoffice/components/backoffice-header-logo.element.ts

@@ -910,6 +910,7 @@ export default {
 		lastUpdated: 'Last Updated',
 		skipToMenu: 'Skip to menu',
 		skipToContent: 'Skip to content',
+		newVersionAvailable: 'Ny version tilgængelig',
 	},
 	colors: {
 		blue: 'Blå',

src/assets/lang/da-dk.ts

@@ -879,6 +879,7 @@ export default {
 		header: 'Kopf',
 		systemField: 'System Feld',
 		lastUpdated: 'Zuletzt geändert',
+		newVersionAvailable: 'Neue Version verfügbar',
 	},
 	colors: {
 		blue: 'Blau',

src/assets/lang/de-de.ts

@@ -921,6 +921,7 @@ export default {
 		skipToMenu: 'Skip to menu',
 		skipToContent: 'Skip to content',
 		restore: 'Restore',
+		newVersionAvailable: 'New version available',
 	},
 	colors: {
 		blue: 'Blue',

src/assets/lang/en-us.ts

@@ -934,6 +934,7 @@ export default {
 		media: 'Media',
 		revert: 'Revert',
 		validate: 'Validate',
+		newVersionAvailable: 'New version available',
 	},
 	colors: {
 		blue: 'Blue',

src/assets/lang/en.ts

@@ -1,14 +1,21 @@
 export type ApiRequestOptions<T = unknown> = {
-	readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
-	readonly url: string;
-	readonly path?: Record<string, unknown>;
+	readonly body?: any;
 	readonly cookies?: Record<string, unknown>;
+	readonly errors?: Record<number | string, string>;
+	readonly formData?: Record<string, unknown> | any[] | Blob | File;
 	readonly headers?: Record<string, unknown>;
-	readonly query?: Record<string, unknown>;
-	readonly formData?: Record<string, unknown>;
-	readonly body?: any;
 	readonly mediaType?: string;
+	readonly method:
+		| 'DELETE'
+		| 'GET'
+		| 'HEAD'
+		| 'OPTIONS'
+		| 'PATCH'
+		| 'POST'
+		| 'PUT';
+	readonly path?: Record<string, unknown>;
+	readonly query?: Record<string, unknown>;
 	readonly responseHeader?: string;
 	readonly responseTransformer?: (data: unknown) => Promise<T>;
-	readonly errors?: Record<number | string, string>;
+	readonly url: string;
 };