Skip to content

Commit ede906e

Browse files
DocumentUrlDataResolver: Use UMB_VARIANT_CONTEXT instead of UMB_PROPERTY_DATASET_CONTEXT (#19537)
* change to variant context * remove unused
1 parent 5cafa59 commit ede906e

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/Umbraco.Web.UI.Client/src/packages/documents/documents/url/document-urls-data-resolver.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import type { UmbDocumentUrlModel } from './repository/types.js';
22
import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
33
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
44
import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api';
5-
import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
6-
import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
5+
import { UMB_VARIANT_CONTEXT, type UmbVariantId } from '@umbraco-cms/backoffice/variant';
76

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

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

32-
// TODO: listen for UMB_VARIANT_CONTEXT when available
3331
this.#init = Promise.all([
34-
this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
35-
this.#propertyDataSetCulture = context?.getVariantId();
36-
this.#setCultureAwareValues();
32+
this.consumeContext(UMB_VARIANT_CONTEXT, async (context) => {
33+
this.#variantId = await context?.getVariantId();
3734
}).asPromise(),
3835
]);
3936
}
@@ -83,7 +80,7 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
8380
}
8481

8582
#getCurrentCulture(): string | undefined {
86-
return this.#propertyDataSetCulture?.culture || this.#appCulture;
83+
return this.#variantId?.culture || this.#appCulture;
8784
}
8885

8986
#getDataForCurrentCulture(): Array<UmbDocumentUrlModel> | undefined {

0 commit comments

Comments
 (0)