Merge branch 'main' into v14/feature/version-check

iOvergaard · web-flow · commit 3c61a3c0a306 · 2024-09-13T10:10:17.000+02:00
diff --git a/devops/tsconfig/index.js b/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,
diff --git a/examples/sorter-with-nested-containers/sorter-item.ts b/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) {
diff --git a/examples/sorter-with-two-containers/sorter-group.ts b/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;
diff --git a/examples/sorter-with-two-containers/sorter-item.ts b/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) {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -188,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",
diff --git a/src/external/router-slot/config.ts b/src/external/router-slot/config.ts
@@ -1,4 +1,4 @@
-import { PathMatch } from './model.js';
+import type { PathMatch } from './model.js';
 
 export const CATCH_ALL_WILDCARD: string = '**';
 export const TRAVERSE_FLAG: string = '\\.\\.\\/';
diff --git a/src/external/router-slot/router-slot.ts b/src/external/router-slot/router-slot.ts
@@ -1,5 +1,5 @@
 import { GLOBAL_ROUTER_EVENTS_TARGET, ROUTER_SLOT_TAG_NAME } from './config.js';
-import {
+import type {
 	Cancel,
 	EventListenerSubscription,
 	GlobalRouterEvent,
diff --git a/src/external/router-slot/util/events.ts b/src/external/router-slot/util/events.ts
@@ -1,5 +1,5 @@
-import { GLOBAL_ROUTER_EVENTS_TARGET } from '../config';
-import { EventListenerSubscription, GlobalRouterEvent, IRoute, IRoutingInfo } from '../model';
+import { GLOBAL_ROUTER_EVENTS_TARGET } from '../config.js';
+import type { EventListenerSubscription, GlobalRouterEvent, IRoute, IRoutingInfo } from '../model.js';
 
 /**
  * Dispatches a did change route event.
diff --git a/src/external/router-slot/util/history.ts b/src/external/router-slot/util/history.ts
@@ -1,6 +1,6 @@
-import { GLOBAL_ROUTER_EVENTS_TARGET, HISTORY_PATCH_NATIVE_KEY } from '../config';
-import { GlobalRouterEvent } from '../model';
-import { dispatchGlobalRouterEvent } from './events';
+import { GLOBAL_ROUTER_EVENTS_TARGET, HISTORY_PATCH_NATIVE_KEY } from '../config.js';
+import type { GlobalRouterEvent } from '../model.js';
+import { dispatchGlobalRouterEvent } from './events.js';
 
 // Mapping a history functions to the events they are going to dispatch.
 export const historyPatches: [string, GlobalRouterEvent[]][] = [
diff --git a/src/external/router-slot/util/router.ts b/src/external/router-slot/util/router.ts
@@ -1,5 +1,5 @@
-import { CATCH_ALL_WILDCARD, DEFAULT_PATH_MATCH, PARAM_IDENTIFIER, TRAVERSE_FLAG } from '../config';
-import {
+import { CATCH_ALL_WILDCARD, DEFAULT_PATH_MATCH, PARAM_IDENTIFIER, TRAVERSE_FLAG } from '../config.js';
+import type {
 	IComponentRoute,
 	IRedirectRoute,
 	IResolverRoute,
@@ -12,8 +12,8 @@ import {
 	PathFragment,
 	RouterTree,
 	IRoutingInfo,
-} from '../model';
-import { constructPathWithBasePath, path as getPath, queryString, stripSlash } from './url';
+} from '../model.js';
+import { constructPathWithBasePath, path as getPath, queryString, stripSlash } from './url.js';
 
 /**
  * Determines whether the path is active.
diff --git a/src/external/router-slot/util/shadow.ts b/src/external/router-slot/util/shadow.ts
@@ -1,5 +1,5 @@
-import { ROUTER_SLOT_TAG_NAME } from '../config';
-import { IRouterSlot } from '../model';
+import { ROUTER_SLOT_TAG_NAME } from '../config.js';
+import type { IRouterSlot } from '../model.js';
 
 /**
  * Queries the parent router.
diff --git a/src/external/router-slot/util/url.ts b/src/external/router-slot/util/url.ts
@@ -1,4 +1,4 @@
-import { ISlashOptions, Params, Query } from '../model';
+import type { ISlashOptions, Query } from '../model.js';
 
 const $anchor = document.createElement('a');
 
diff --git a/src/mocks/data/utils/entity/entity-tree.manager.ts b/src/mocks/data/utils/entity/entity-tree.manager.ts
@@ -62,7 +62,7 @@ export class UmbMockEntityTreeManager<T extends { id: string; parent?: { id: str
 		const destinationItem = this.#db.read(destinationId);
 		if (!destinationItem) throw new Error(`Destination item with id ${destinationId} not found`);
 
-		// TODO: Notice we don't add numbers to the 'copy' name.
+		// Notice we don't add numbers to the 'copy' name.
 		const items: Array<any> = [];
 
 		ids.forEach((id) => {
diff --git a/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts b/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts
@@ -47,11 +47,10 @@ export class UmbRefListBlockElement extends UmbLitElement {
 	}
 
 	override render() {
-		// TODO: apply `slot="name"` to the `umb-ufm-render` element, when UUI supports it. [NL]
 		return html`
 			<uui-ref-node standalone href=${this._workspaceEditPath ?? '#'}>
 				<umb-icon slot="icon" .name=${this.icon}></umb-icon>
-				<umb-ufm-render inline .markdown=${this.label} .value=${this._content}></umb-ufm-render>
+				<umb-ufm-render slot="name" inline .markdown=${this.label} .value=${this._content}></umb-ufm-render>
 			</uui-ref-node>
 		`;
 	}
diff --git a/src/packages/core/content-type/structure/content-type-structure-manager.class.ts b/src/packages/core/content-type/structure/content-type-structure-manager.class.ts
@@ -46,8 +46,20 @@ export class UmbContentTypeStructureManager<
 		(x) => x.find((y) => y.unique === this.#ownerContentTypeUnique)?.compositions,
 	);
 
-	readonly #contentTypeContainers = this.#contentTypes.asObservablePart(() => {
-		return this.#contentTypes.getValue().flatMap((x) => x.containers ?? []);
+	readonly #contentTypeContainers = this.#contentTypes.asObservablePart((contentTypes) => {
+		// Notice this may need to use getValue to avoid resetting it self. [NL]
+		return contentTypes.flatMap((x) => x.containers ?? []);
+	});
+	readonly contentTypeProperties = this.#contentTypes.asObservablePart((contentTypes) => {
+		// Notice this may need to use getValue to avoid resetting it self. [NL]
+		return contentTypes.flatMap((x) => x.properties ?? []);
+	});
+	readonly contentTypeHasProperties = this.#contentTypes.asObservablePart((contentTypes) => {
+		// Notice this may need to use getValue to avoid resetting it self. [NL]
+		return contentTypes.some((x) => x.properties.length > 0);
+	});
+	readonly contentTypePropertyAliases = this.#contentTypes.asObservablePart((contentTypes) => {
+		return contentTypes.flatMap((x) => x.properties ?? []).map((x) => x.alias);
 	});
 	readonly contentTypeUniques = this.#contentTypes.asObservablePart((x) => x.map((y) => y.unique));
 	readonly contentTypeAliases = this.#contentTypes.asObservablePart((x) => x.map((y) => y.alias));
@@ -77,7 +89,8 @@ export class UmbContentTypeStructureManager<
 	/**
 	 * loadType will load the ContentType and all inherited and composed ContentTypes.
 	 * This will give us all the structure for properties and containers.
-	 * @param unique
+	 * @param {string} unique - The unique of the ContentType to load.
+	 * @returns {Promise} - Promise resolved
 	 */
 	public async loadType(unique?: string) {
 		this._reset();
@@ -219,6 +232,14 @@ export class UmbContentTypeStructureManager<
 		return this.#ownerContentTypeUnique;
 	}
 
+	/**
+	 * Figure out if any of the Content Types has a Property.
+	 * @returns {boolean} - true if any of the Content Type in this composition has a Property.
+	 */
+	getHasProperties() {
+		return this.#contentTypes.getValue().some((y) => y.properties.length > 0);
+	}
+
 	updateOwnerContentType(entry: Partial<T>) {
 		this.#contentTypes.updateOne(this.#ownerContentTypeUnique, entry);
 	}
diff --git a/src/packages/core/content/workspace/views/edit/conditions/has-properties/content-has-properties.condition.ts b/src/packages/core/content/workspace/views/edit/conditions/has-properties/content-has-properties.condition.ts
@@ -16,12 +16,11 @@ export class UmbContentHasPropertiesWorkspaceCondition
 
 		this.consumeContext(UMB_CONTENT_WORKSPACE_CONTEXT, (context) => {
 			this.observe(
-				context.structure.contentTypes,
-				(contentTypes) => {
-					const hasProperties = contentTypes.some((contentType) => contentType.properties.length > 0);
+				context.structure.contentTypeHasProperties,
+				(hasProperties) => {
 					this.permitted = hasProperties;
 				},
-				'contentTypesObserver',
+				'hasPropertiesObserver',
 			);
 		});
 	}
diff --git a/src/packages/core/property/property-dataset/property-dataset.element.ts b/src/packages/core/property/property-dataset/property-dataset.element.ts
@@ -16,10 +16,10 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 
 	public readonly context: UmbPropertyDatasetContextBase;
 
+	@property({ attribute: false })
 	/**
 	 * The value of the dataset.
-	 * @returns {Array<UmbPropertyValueData>}
-	 * @memberof UmbBasicVariantElement
+	 * @returns {Array<UmbPropertyValueData>} - The value of the dataset
 	 * @example
 	 * ```ts
 	 * const dataSet = [
@@ -46,7 +46,6 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 	 * `
 	 * ```
 	 */
-	@property({ attribute: false })
 	public set value(value: Array<UmbPropertyValueData>) {
 		this.#allowChangeEvent = false;
 		this.context.setValues(value);
@@ -57,11 +56,12 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 		return this.context.getValues();
 	}
 
+	@property({ attribute: false })
 	/**
 	 * The name of the dataset, this name varies depending on the use-case. But this is either
+	 * @property name
 	 * @type {string}
 	 * @returns {string}
-	 * @memberof UmbBasicVariantElement
 	 * @example
 	 * ```ts
 	 * html`
@@ -70,7 +70,6 @@ export class UmbPropertyDatasetElement extends UmbLitElement {
 	 * </umb-property-dataset>
 	 * `
 	 */
-	@property({ attribute: false })
 	public set name(value: string | undefined) {
 		this.#allowChangeEvent = false;
 		this.context.setName(value);
diff --git a/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/packages/documents/documents/workspace/document-workspace.context.ts
@@ -25,7 +25,7 @@ import {
 } from '../paths.js';
 import { UMB_DOCUMENTS_SECTION_PATH } from '../../section/paths.js';
 import { UmbDocumentPreviewRepository } from '../repository/preview/index.js';
-
+import { sortVariants } from '../utils.js';
 import { UMB_DOCUMENT_WORKSPACE_ALIAS } from './manifests.js';
 import { UmbEntityContext } from '@umbraco-cms/backoffice/entity';
 import { UMB_INVARIANT_CULTURE, UmbVariantId } from '@umbraco-cms/backoffice/variant';
@@ -68,7 +68,6 @@ import type { UmbContentWorkspaceContext } from '@umbraco-cms/backoffice/content
 import type { UmbDocumentTypeDetailModel } from '@umbraco-cms/backoffice/document-type';
 import { UmbIsTrashedEntityContext } from '@umbraco-cms/backoffice/recycle-bin';
 import { UmbReadOnlyVariantStateManager } from '@umbraco-cms/backoffice/utils';
-import { sortVariants } from '../utils.js';
 
 type EntityType = UmbDocumentDetailModel;
 export class UmbDocumentWorkspaceContext
diff --git a/src/packages/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts b/src/packages/tiny-mce/property-editors/tiny-mce/Umbraco.RichText.ts
@@ -8,23 +8,26 @@ export const manifest: ManifestPropertyEditorSchema = {
 		defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.TinyMCE',
 		settings: {
 			properties: [
+				{
+					alias: 'blocks',
+					label: 'Available Blocks',
+					description: 'Define the available blocks.',
+					propertyEditorUiAlias: 'Umb.PropertyEditorUi.BlockRteTypeConfiguration',
+					weight: 80,
+				},
 				{
 					alias: 'mediaParentId',
 					label: 'Image Upload Folder',
 					description: 'Choose the upload location of pasted images',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUi.MediaEntityPicker',
 					config: [{ alias: 'validationLimit', value: { min: 0, max: 1 } }],
+					weight: 90,
 				},
 				{
 					alias: 'ignoreUserStartNodes',
 					label: 'Ignore User Start Nodes',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle',
-				},
-				{
-					alias: 'blocks',
-					label: 'Available Blocks',
-					description: 'Define the available blocks.',
-					propertyEditorUiAlias: 'Umb.PropertyEditorUi.BlockRteTypeConfiguration',
+					weight: 100,
 				},
 			],
 		},
diff --git a/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts b/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts
@@ -22,6 +22,7 @@ const manifest: ManifestPropertyEditorUi = {
 					label: 'Toolbar',
 					description: 'Pick the toolbar options that should be available when editing',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.ToolbarConfiguration',
+					weight: 10,
 					config: [
 						{
 							alias: 'toolbar',
@@ -68,36 +69,42 @@ const manifest: ManifestPropertyEditorUi = {
 					label: 'Stylesheets',
 					description: 'Pick the stylesheets whose editor styles should be available when editing',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.StylesheetsConfiguration',
+					weight: 20,
 				},
 				{
 					alias: 'dimensions',
 					label: 'Dimensions',
 					description: 'Set the editor dimensions',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.DimensionsConfiguration',
+					weight: 30,
 				},
 				{
 					alias: 'maxImageSize',
 					label: 'Maximum size for inserted images',
 					description: 'Maximum width or height - enter 0 to disable resizing',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.MaxImageSizeConfiguration',
+					weight: 40,
 				},
 				{
 					alias: 'mode',
 					label: 'Mode',
 					description: 'Select the mode for the editor',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUi.RadioButtonList',
 					config: [{ alias: 'items', value: ['Classic', 'Inline'] }],
+					weight: 50,
 				},
 				{
 					alias: 'overlaySize',
 					label: 'Overlay Size',
 					description: 'Select the width of the overlay (link picker)',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUi.OverlaySize',
+					weight: 81,
 				},
 				{
 					alias: 'hideLabel',
 					label: 'Hide Label',
 					propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle',
+					weight: 82,
 				},
 			],
 			defaultData: [
diff --git a/tsconfig.json b/tsconfig.json
@@ -10,6 +10,9 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 {
 	"compilerOptions": {
 		"module": "esnext",
+		"moduleResolution": "bundler",
+		"moduleDetection": "force",
+		"verbatimModuleSyntax": true,
 		"target": "es2022",
 		"lib": ["es2022", "dom", "dom.iterable"],
 		"outDir": "./types",
@@ -21,7 +24,6 @@ DON'T EDIT THIS FILE DIRECTLY. It is generated by /devops/tsconfig/index.js
 		"incremental": true,
 		"skipLibCheck": true,
 		"noImplicitOverride": true,
-		"moduleResolution": "bundler",
 		"allowImportingTsExtensions": true,
 		"resolveJsonModule": true,
 		"isolatedModules": true,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { PathMatch } from './model.js';`
	`1`	`+import type { PathMatch } from './model.js';`
`2`	`2`
`3`	`3`	`export const CATCH_ALL_WILDCARD: string = '**';`
`4`	`4`	`export const TRAVERSE_FLAG: string = '\\.\\.\\/';`