make blocks auto expose on insert (#17724)

Author: nielslyngsoe

src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-entry.context.ts

@@ -499,15 +499,7 @@ export abstract class UmbBlockEntryContext<
 			]),
 			([variantId, variesByCulture, variesBySegment]) => {
 				if (!variantId || variesByCulture === undefined || variesBySegment === undefined) return;
-				if (!variesBySegment && !variesByCulture) {
-					variantId = UmbVariantId.CreateInvariant();
-				} else if (!variesBySegment) {
-					variantId = variantId.toSegmentInvariant();
-				} else if (!variesByCulture) {
-					variantId = variantId.toCultureInvariant();
-				}
-
-				this.#variantId.setValue(variantId);
+				this.#variantId.setValue(variantId.toVariant(variesByCulture, variesBySegment));
 				this.#gotVariantId();
 			},
 			'observeBlockType',

src/Umbraco.Web.UI.Client/src/packages/block/block/context/block-manager.context.ts

@@ -187,7 +187,7 @@ export abstract class UmbBlockManagerContext<
 		return this.#settings.asObservablePart((source) => source.find((x) => x.key === key));
 	}
 	currentExposeOf(contentKey: string) {
-		const variantId = this.#variantId.getValue();
+		const variantId = this.getVariantId();
 		if (!variantId) return;
 		return mergeObservables(
 			[this.#exposes.asObservablePart((source) => source.filter((x) => x.contentKey === contentKey)), this.variantId],
@@ -234,7 +234,7 @@ export abstract class UmbBlockManagerContext<
 		this.#exposes.filter((x) => x.contentKey !== contentKey);
 	}
 	removeCurrentExpose(contentKey: string) {
-		const variantId = this.#variantId.getValue();
+		const variantId = this.getVariantId();
 		if (!variantId) return;
 		this.#exposes.filter((x) => !(x.contentKey === contentKey && variantId.compare(x)));
 	}
@@ -340,6 +340,23 @@ export abstract class UmbBlockManagerContext<
 		if (settings && layoutEntry.settingsKey) {
 			this.#settings.appendOne(settings);
 		}
+
+		// Expose inserted block:
+		this.contentTypesLoaded.then(() => {
+			const contentStructure = this.getStructure(content.contentTypeKey);
+			if (!contentStructure) {
+				throw new Error(`Cannot expose block, missing content structure for ${content.contentTypeKey}`);
+			}
+			const variantId = this.getVariantId();
+			if (!variantId) {
+				throw new Error(`Cannot expose block, missing variantId`);
+			}
+			const blockVariantId = variantId.toVariant(
+				contentStructure.getVariesByCulture(),
+				contentStructure.getVariesBySegment(),
+			);
+			this.setOneExpose(content.key, blockVariantId);
+		});
 	}
 
 	protected removeBlockKey(contentKey: string) {

src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-structure-manager.class.ts

@@ -268,6 +268,15 @@ export class UmbContentTypeStructureManager<
 		return this.#ownerContentTypeUnique;
 	}
 
+	getVariesByCulture() {
+		const ownerContentType = this.getOwnerContentType();
+		return ownerContentType?.variesByCulture;
+	}
+	getVariesBySegment() {
+		const ownerContentType = this.getOwnerContentType();
+		return ownerContentType?.variesBySegment;
+	}
+
 	/**
 	 * 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.

src/Umbraco.Web.UI.Client/src/packages/core/variant/variant-id.class.ts

@@ -87,7 +87,10 @@ export class UmbVariantId {
 		return Object.freeze(new UmbVariantId(this.culture, null));
 	}
 	public toCultureInvariant(): UmbVariantId {
-		return Object.freeze(new UmbVariantId(null, this.culture));
+		return Object.freeze(new UmbVariantId(null, this.segment));
+	}
+	public toVariant(varyByCulture?: boolean, varyBySegment?: boolean): UmbVariantId {
+		return Object.freeze(new UmbVariantId(varyByCulture ? this.culture : null, varyBySegment ? this.segment : null));
 	}
 
 	// TODO: needs localization option: