@@ -2,8 +2,7 @@ import type { UmbDocumentUrlModel } from './repository/types.js';
2
2
import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api' ;
3
3
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api' ;
4
4
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' ;
7
6
8
7
/**
9
8
* A controller for resolving data for document urls
@@ -13,7 +12,7 @@ import type { UmbVariantId } from '@umbraco-cms/backoffice/variant';
13
12
*/
14
13
export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
15
14
#appCulture?: string ;
16
- #propertyDataSetCulture ?: UmbVariantId ;
15
+ #variantId ?: UmbVariantId ;
17
16
#data?: Array < UmbDocumentUrlModel > | undefined ;
18
17
19
18
#init: Promise < unknown > ;
@@ -29,11 +28,9 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
29
28
constructor ( host : UmbControllerHost ) {
30
29
super ( host ) ;
31
30
32
- // TODO: listen for UMB_VARIANT_CONTEXT when available
33
31
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 ( ) ;
37
34
} ) . asPromise ( ) ,
38
35
] ) ;
39
36
}
@@ -83,7 +80,7 @@ export class UmbDocumentUrlsDataResolver extends UmbControllerBase {
83
80
}
84
81
85
82
#getCurrentCulture( ) : string | undefined {
86
- return this . #propertyDataSetCulture ?. culture || this . #appCulture;
83
+ return this . #variantId ?. culture || this . #appCulture;
87
84
}
88
85
89
86
#getDataForCurrentCulture( ) : Array < UmbDocumentUrlModel > | undefined {
0 commit comments