Skip to content

DocumentUrlDataResolver: Use UMB_VARIANT_CONTEXT instead of UMB_PROPERTY_DATASET_CONTEXT #19537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 27, 2025
Merged

DocumentUrlDataResolver: Use UMB_VARIANT_CONTEXT instead of UMB_PROPERTY_DATASET_CONTEXT #19537

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9400b55
change to variant context
madsrasmussen Jun 12, 2025
30f69e6
remove unused
madsrasmussen Jun 12, 2025
f108dd1
Merge branch 'main' into v16/bugfix/use-variant-context-in-url-data-r…
madsrasmussen Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions ...Umbraco.Web.UI.Client/src/packages/documents/documents/url/document-urls-data-resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import type { UmbDocumentUrlModel } from './repository/types.js';
import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
import { UMB_VARIANT_CONTEXT, type UmbVariantId } from '@umbraco-cms/backoffice/variant';

/**
* A controller for resolving data for document urls
Expand All @@ -13,7 +12,7 @@ import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
*/
export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
#appCulture?: string;
#propertyDataSetCulture?: UmbVariantId;
#variantId?: UmbVariantId;
#data?: Array<UmbDocumentUrlModel> | undefined;

#init: Promise<unknown>;
Expand All @@ -29,11 +28,9 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
constructor(host: UmbControllerHost) {
super(host);

// TODO: listen for UMB_VARIANT_CONTEXT when available
this.#init = Promise.all([
this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
this.#propertyDataSetCulture = context?.getVariantId();
this.#setCultureAwareValues();
this.consumeContext(UMB_VARIANT_CONTEXT, async (context) => {
this.#variantId = await context?.getVariantId();
}).asPromise(),
]);
}
Expand Down Expand Up @@ -83,7 +80,7 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
}

#getCurrentCulture(): string | undefined {
return this.#propertyDataSetCulture?.culture || this.#appCulture;
return this.#variantId?.culture || this.#appCulture;
}

#getDataForCurrentCulture(): Array<UmbDocumentUrlModel> | undefined {
Expand Down
Loading