Skip to content

Commit 31072ba

Browse files
authored
Stop using promise.reject to avoid the promise to resolve. (#20790)
1 parent d687c43 commit 31072ba

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.ts

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -207,24 +207,22 @@ export class UmbContentTypeDesignEditorPropertiesElement extends UmbLitElement {
207207
this._ownerContentTypeUnique = workspaceContext?.structure.getOwnerContentTypeUnique();
208208
this.#createPropertyTypeWorkspaceRoutes();
209209

210-
const varyByCulturePromise =
211-
this.observe(
212-
workspaceContext?.variesByCulture,
213-
(variesByCulture) => {
214-
this._ownerContentTypeVariesByCulture = variesByCulture;
215-
},
216-
'observeOwnerVariesByCulture',
217-
)?.asPromise() ?? Promise.reject();
218-
const varyBySegmentPromise =
219-
this.observe(
220-
workspaceContext?.variesBySegment,
221-
(variesBySegment) => {
222-
this._ownerContentTypeVariesBySegment = variesBySegment;
223-
},
224-
'observeOwnerVariesBySegment',
225-
)?.asPromise() ?? Promise.reject();
226-
227-
if (this.#initResolver) {
210+
const varyByCulturePromise = this.observe(
211+
workspaceContext?.variesByCulture,
212+
(variesByCulture) => {
213+
this._ownerContentTypeVariesByCulture = variesByCulture;
214+
},
215+
'observeOwnerVariesByCulture',
216+
)?.asPromise();
217+
const varyBySegmentPromise = this.observe(
218+
workspaceContext?.variesBySegment,
219+
(variesBySegment) => {
220+
this._ownerContentTypeVariesBySegment = variesBySegment;
221+
},
222+
'observeOwnerVariesBySegment',
223+
)?.asPromise();
224+
225+
if (varyByCulturePromise && varyBySegmentPromise && this.#initResolver) {
228226
Promise.all([varyByCulturePromise, varyBySegmentPromise])
229227
.then(() => {
230228
this.#initResolver?.();

0 commit comments

Comments
 (0)