Merge branch 'main' into v14/feature/document-notifications

Author: iOvergaard

.sonarlint/connectedMode.json

@@ -0,0 +1,4 @@
+{
+    "sonarCloudOrganization": "umbraco",
+    "projectKey": "umbraco_Umbraco.CMS.Backoffice"
+}

devops/tsconfig/index.js

@@ -18,6 +18,9 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 const tsConfigBase = {
 	compilerOptions: {
 		module: 'esnext',
+		moduleResolution: 'bundler',
+		moduleDetection: 'force',
+		verbatimModuleSyntax: true,
 		target: 'es2022',
 		lib: ['es2022', 'dom', 'dom.iterable'],
 		outDir: './types',
@@ -29,8 +32,6 @@ const tsConfigBase = {
 		incremental: true,
 		skipLibCheck: true,
 		noImplicitOverride: true,
-		/* Bundler mode */
-		moduleResolution: 'bundler',
 		allowImportingTsExtensions: true,
 		resolveJsonModule: true,
 		isolatedModules: true,

examples/sorter-with-nested-containers/sorter-item.ts

@@ -1,7 +1,6 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, html, customElement, LitElement, state, repeat, property } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, LitElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
-import { UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 
 @customElement('example-sorter-item')
 export class ExampleSorterItem extends UmbElementMixin(LitElement) {

examples/sorter-with-two-containers/sorter-group.ts

@@ -1,10 +1,10 @@
+import type ExampleSorterItem from './sorter-item.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import { css, html, customElement, LitElement, repeat, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
-import { UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
+import { UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 
 import './sorter-item.js';
-import ExampleSorterItem from './sorter-item.js';
 
 export type ModelEntryType = {
 	name: string;

examples/sorter-with-two-containers/sorter-item.ts

@@ -1,7 +1,6 @@
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import { css, html, customElement, LitElement, state, repeat, property } from '@umbraco-cms/backoffice/external/lit';
+import { css, html, customElement, LitElement, property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbElementMixin } from '@umbraco-cms/backoffice/element-api';
-import { UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 
 @customElement('example-sorter-item')
 export class ExampleSorterItem extends UmbElementMixin(LitElement) {

package-lock.json

@@ -131,35 +131,7 @@
 		"url": "https://umbraco.com"
 	},
 	"workspaces": [
-		"./src/packages/block",
-		"./src/packages/code-editor",
-		"./src/packages/core",
-		"./src/packages/data-type",
-		"./src/packages/dictionary",
-		"./src/packages/documents",
-		"./src/packages/health-check",
-		"./src/packages/language",
-		"./src/packages/log-viewer",
-		"./src/packages/markdown-editor",
-		"./src/packages/media",
-		"./src/packages/members",
-		"./src/packages/models-builder",
-		"./src/packages/multi-url-picker",
-		"./src/packages/packages",
-		"./src/packages/performance-profiling",
-		"./src/packages/property-editors",
-		"./src/packages/publish-cache",
-		"./src/packages/relations",
-		"./src/packages/search",
-		"./src/packages/static-file",
-		"./src/packages/tags",
-		"./src/packages/telemetry",
-		"./src/packages/templating",
-		"./src/packages/tiny-mce",
-		"./src/packages/ufm",
-		"./src/packages/umbraco-news",
-		"./src/packages/user",
-		"./src/packages/webhook"
+		"./src/packages/*"
 	],
 	"scripts": {
 		"backoffice:test:e2e": "npx playwright test",
@@ -216,8 +188,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

@@ -1532,12 +1532,12 @@ export default {
 		andAllMediaItems: 'i sve medijske stavke koje koriste ovu vrstu',
 		andAllMembers: 'i svi članovi koji koriste ovaj tip',
 		memberCanEdit: 'Član može uređivati',
-		memberCanEditDescription: 'Dozvolite da ovu vrijednost svojstva uređuje član na svojoj stranici profila\n    ',
+		memberCanEditDescription: 'Dozvolite da ovu vrijednost svojstva uređuje član na svojoj stranici profila',
 		isSensitiveData: 'Osjetljivi podaci',
 		isSensitiveDataDescription:
-			'Sakrij ovu vrijednost svojstva od uređivača sadržaja koji nemaju pristup pregledu\n      osjetljive informacije\n    ',
+			'Sakrij ovu vrijednost svojstva od uređivača sadržaja koji nemaju pristup pregledu osjetljive informacije',
 		showOnMemberProfile: 'Prikaži na profilu člana',
-		showOnMemberProfileDescription: 'Dozvolite da se ova vrijednost svojstva prikaže na stranici profila člana\n    ',
+		showOnMemberProfileDescription: 'Dozvolite da se ova vrijednost svojstva prikaže na stranici profila člana',
 		tabHasNoSortOrder: 'kartica nema redoslijed sortiranja',
 		compositionUsageHeading: 'Gdje se koristi ovaj sastav?',
 		compositionUsageSpecification: 'Ovaj sastav se trenutno koristi u sastavu sljedećih\n      tipa sadržaja:\n    ',