From 805e7c753d7a07affe3df4626f8f5b8a1c66b81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 27 Apr 2023 10:26:36 +0200 Subject: [PATCH] usage of sections --- .../backoffice-header-sections.element.ts | 2 +- .../backoffice-frame/backoffice-main.element.ts | 2 +- .../components/backoffice-frame/backoffice.context.ts | 10 +--------- .../components/input-section/input-section.element.ts | 2 +- .../section-picker/section-picker-modal.element.ts | 2 +- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts index 1e8fc69156..a44bf574db 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-header-sections.element.ts @@ -57,7 +57,7 @@ export class UmbBackofficeHeaderSectionsElement extends UmbLitElement { private _observeSections() { if (!this._backofficeContext) return; - this.observe(this._backofficeContext.getAllowedSections(), (allowedSections) => { + this.observe(this._backofficeContext.allowedSections, (allowedSections) => { this._sections = allowedSections; this._visibleSections = this._sections; }); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts index 9000dbd312..33b26cd422 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-main.element.ts @@ -37,7 +37,7 @@ export class UmbBackofficeMainElement extends UmbLitElement { private async _observeBackoffice() { if (this._backofficeContext) { this.observe( - this._backofficeContext.getAllowedSections(), + this._backofficeContext.allowedSections, (sections) => { this._sections = sections; this._createRoutes(); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice.context.ts index f7562f6296..65a41ade1f 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice.context.ts @@ -5,15 +5,7 @@ import { UmbStringState } from '@umbraco-cms/backoffice/observable-api'; export class UmbBackofficeContext { #activeSectionAlias = new UmbStringState(undefined); public readonly activeSectionAlias = this.#activeSectionAlias.asObservable(); - - public getAllowedSections() { - // TODO: implemented allowed filtering based on user, maybe this will be a general need and solved else where so this might not be needed in the end. - /* - const { data } = await getUserSections({}); - this._allowedSection = data.sections; - */ - return umbExtensionsRegistry.extensionsOfType('section'); - } + public readonly allowedSections = umbExtensionsRegistry.extensionsOfType('section'); public setActiveSectionAlias(alias: string) { this.#activeSectionAlias.next(alias); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.element.ts index 361c5cf166..7e94b12316 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-section/input-section.element.ts @@ -21,7 +21,7 @@ export class UmbInputPickerSectionElement extends UmbInputListBaseElement { private _observeSections() { if (this.value.length > 0) { - umbExtensionsRegistry.extensionsOfType('section').subscribe((sections: Array) => { + this.observe(umbExtensionsRegistry.extensionsOfType('section'), (sections: Array) => { this._sections = sections.filter((section) => this.value.includes(section.alias)); }); } else { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts index 38b4cee6a4..4755886bf6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/section-picker/section-picker-modal.element.ts @@ -14,7 +14,7 @@ export class UmbSectionPickerModalElement extends UmbModalElementPickerBase) => { + this.observe(umbExtensionsRegistry.extensionsOfType('section'), (sections: Array) => { this._sections = sections; }); }