Merge branch 'main' into v14/feature/property_dataset_properties_observable

nielslyngsoe · nielslyngsoe · commit fb16adec303a · 2024-09-13T09:56:06.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-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts b/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts
@@ -11,8 +11,8 @@ import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
 export class UmbBlockGridInlinePropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext {
 	#entryContext: UmbBlockGridEntryContext;
 
-	#currentVariantCultureIsReadOnly = new UmbBooleanState(false);
-	public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable();
+	#readOnly = new UmbBooleanState(false);
+	public readOnly = this.#readOnly.asObservable();
 
 	// default data:
 
@@ -67,7 +67,7 @@ export class UmbBlockGridInlinePropertyDatasetContext extends UmbControllerBase
 	 * @returns {*}  {boolean}
 	 * @memberof UmbBlockGridInlinePropertyDatasetContext
 	 */
-	getCurrentVariantCultureIsReadOnly(): boolean {
-		return this.#currentVariantCultureIsReadOnly.getValue();
+	getReadOnly(): boolean {
+		return this.#readOnly.getValue();
 	}
 }
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/block/block/workspace/block-element-property-dataset.context.ts b/src/packages/block/block/workspace/block-element-property-dataset.context.ts
@@ -12,8 +12,8 @@ import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
 export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext {
 	#elementManager: UmbBlockElementManager;
 
-	#currentVariantCultureIsReadOnly = new UmbBooleanState(false);
-	public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable();
+	#readOnly = new UmbBooleanState(false);
+	public readOnly = this.#readOnly.asObservable();
 
 	// default data:
 
@@ -41,7 +41,7 @@ export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase imp
 			this.observe(
 				workspace.readOnlyState.isOn,
 				(value) => {
-					this.#currentVariantCultureIsReadOnly.setValue(value);
+					this.#readOnly.setValue(value);
 				},
 				'umbObserveReadOnlyStates',
 			);
@@ -80,7 +80,7 @@ export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase imp
 	 * @returns {*}  {boolean}
 	 * @memberof UmbBlockGridInlinePropertyDatasetContext
 	 */
-	getCurrentVariantCultureIsReadOnly(): boolean {
-		return this.#currentVariantCultureIsReadOnly.getValue();
+	getReadOnly(): boolean {
+		return this.#readOnly.getValue();
 	}
 }
diff --git a/src/packages/core/content/property-dataset-context/content-property-dataset.context.ts b/src/packages/core/content/property-dataset-context/content-property-dataset.context.ts
@@ -30,8 +30,8 @@ export class UmbContentPropertyDatasetContext<
 	culture = this.#currentVariant.asObservablePart((x) => x?.culture);
 	segment = this.#currentVariant.asObservablePart((x) => x?.segment);
 
-	#currentVariantCultureIsReadOnly = new UmbBooleanState(false);
-	public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable();
+	#readOnly = new UmbBooleanState(false);
+	public readOnly = this.#readOnly.asObservable();
 
 	getEntityType(): string {
 		return this.#workspace.getEntityType();
@@ -49,8 +49,8 @@ export class UmbContentPropertyDatasetContext<
 		return this.#workspace.getVariant(this.#variantId);
 	}
 
-	getCurrentVariantCultureIsReadOnly() {
-		return this.#currentVariantCultureIsReadOnly.getValue();
+	getReadOnly() {
+		return this.#readOnly.getValue();
 	}
 
 	constructor(
@@ -76,7 +76,7 @@ export class UmbContentPropertyDatasetContext<
 			this.#workspace.readOnlyState.states,
 			(states) => {
 				const isReadOnly = states.some((state) => state.variantId.equal(this.#variantId));
-				this.#currentVariantCultureIsReadOnly.setValue(isReadOnly);
+				this.#readOnly.setValue(isReadOnly);
 			},
 			'umbObserveReadOnlyStates',
 		);
diff --git a/src/packages/core/property/property-dataset/property-dataset-base-context.ts b/src/packages/core/property/property-dataset/property-dataset-base-context.ts
@@ -24,8 +24,8 @@ export class UmbPropertyDatasetContextBase
 	private _entityType!: string;
 	private _unique!: string;
 
-	#currentVariantCultureIsReadOnly = new UmbBooleanState(false);
-	public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable();
+	#readOnly = new UmbBooleanState(false);
+	public readOnly = this.#readOnly.asObservable();
 
 	getEntityType() {
 		return this._entityType;
@@ -85,7 +85,7 @@ export class UmbPropertyDatasetContextBase
 	 * @return {*}  {boolean}
 	 * @memberof UmbBlockGridInlinePropertyDatasetContext
 	 */
-	getCurrentVariantCultureIsReadOnly(): boolean {
-		return this.#currentVariantCultureIsReadOnly.getValue();
+	getReadOnly(): boolean {
+		return this.#readOnly.getValue();
 	}
 }
diff --git a/src/packages/core/property/property-dataset/property-dataset-context.interface.ts b/src/packages/core/property/property-dataset/property-dataset-context.interface.ts
@@ -25,8 +25,8 @@ export interface UmbPropertyDatasetContext extends UmbContext {
 	getName(): string | undefined;
 	readonly name: Observable<string | undefined>;
 
-	getCurrentVariantCultureIsReadOnly(): boolean;
-	readonly currentVariantCultureIsReadOnly: Observable<boolean>;
+	getReadOnly(): boolean;
+	readonly readOnly: Observable<boolean>;
 
 	// Should it be possible to get the properties as a list of property aliases?
 	//readonly properties: Observable<Array<string>>;
diff --git a/src/packages/core/property/property/property.context.ts b/src/packages/core/property/property/property.context.ts
@@ -128,7 +128,7 @@ export class UmbPropertyContext<ValueType = any> extends UmbContextBase<UmbPrope
 			'observeValue',
 		);
 
-		this.observe(this.#datasetContext.currentVariantCultureIsReadOnly, (value) => {
+		this.observe(this.#datasetContext.readOnly, (value) => {
 			this.#isReadOnly.setValue(value);
 		});
 	}
diff --git a/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts b/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts
@@ -15,8 +15,8 @@ export class UmbInvariantWorkspacePropertyDatasetContext<
 	extends UmbContextBase<UmbPropertyDatasetContext>
 	implements UmbPropertyDatasetContext, UmbNameablePropertyDatasetContext
 {
-	#currentVariantCultureIsReadOnly = new UmbBooleanState(false);
-	public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable();
+	#readOnly = new UmbBooleanState(false);
+	public readOnly = this.#readOnly.asObservable();
 
 	#workspace: WorkspaceType;
 
@@ -66,7 +66,7 @@ export class UmbInvariantWorkspacePropertyDatasetContext<
 		return this.#workspace.setPropertyValue(propertyAlias, value);
 	}
 
-	getCurrentVariantCultureIsReadOnly() {
-		return this.#currentVariantCultureIsReadOnly.getValue();
+	getReadOnly() {
+		return this.#readOnly.getValue();
 	}
 }
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 = '\\.\\.\\/';`