yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: enforce block variations to be present in all mandatory languages (#18280)

Browse Source 
* no need to re-request cause application refreshes when user changes

* implement promise to retrieve languages

* expose on all mandatory languages, to ensure the right mandatory effect
This commit is contained in:
Niels Lyngsø
2025-02-25 15:13:37 +01:00
committed by GitHub
parent 0794ff9bf5
commit 32da5a2358
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ import { UmbDocumentTypeDetailRepository } from '@umbraco-cms/backoffice/documen
import { UmbContentTypeStructureManager, type UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type';
import { UmbId } from '@umbraco-cms/backoffice/id';
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
import { UmbVariantId } from '@umbraco-cms/backoffice/variant';
import type { UmbBlockTypeBaseModel } from '@umbraco-cms/backoffice/block-type';
import { UmbReadOnlyVariantStateManager } from '@umbraco-cms/backoffice/utils';
import {
@@ -479,21 +479,36 @@ export abstract class UmbBlockManagerContext<
}
// 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);
});
this.#setInitialBlockExpose(content);
}
async #setInitialBlockExpose(content: UmbBlockDataModel) {
await this.contentTypesLoaded;
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 varyByCulture = contentStructure.getVariesByCulture();
const varyBySegment = contentStructure.getVariesBySegment();
const blockVariantId = variantId.toVariant(varyByCulture, varyBySegment);
this.setOneExpose(content.key, blockVariantId);
if (varyByCulture) {
// get all mandatory cultures:
const appLanguageContext = await this.getContext(UMB_APP_LANGUAGE_CONTEXT);
const mandatoryLanguages = await appLanguageContext.getMandatoryLanguages();
mandatoryLanguages.forEach((x) => {
// No need to insert the same expose twice:
if (blockVariantId.culture !== x.unique) {
this.setOneExpose(content.key, new UmbVariantId(x.unique));
}
});
}
}
protected removeBlockKey(contentKey: string) {