From cc8d3333d83c7c31a0239f4c2c418c94d47dcd43 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 26 Aug 2022 10:25:25 +0200 Subject: [PATCH] rename tree service to tree context --- .../tree/data-types/tree-data-types.context.ts | 4 ++-- .../tree/member-groups/tree-member-groups.context.ts | 4 ++-- .../backoffice/tree/members/tree-members.context.ts | 4 ++-- .../src/backoffice/tree/shared/tree-item.element.ts | 12 ++++++------ .../backoffice/tree/shared/tree-navigator.element.ts | 12 ++++++------ .../tree/{tree.service.ts => tree.context.ts} | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/tree/{tree.service.ts => tree.context.ts} (96%) diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts index 591ec6cfa1..3dd4a8bbf1 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/data-types/tree-data-types.context.ts @@ -1,8 +1,8 @@ import { UmbExtensionManifestTree } from '../../../core/extension'; import { UmbEntityStore } from '../../../core/stores/entity.store'; -import { ITreeService } from '../tree.service'; +import { ITreeContext } from '../tree.context'; -export class UmbTreeDataTypesContext implements ITreeService { +export class UmbTreeDataTypesContext implements ITreeContext { public tree: UmbExtensionManifestTree; public entityStore: UmbEntityStore; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts index 757cf83199..40fbed29ff 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/member-groups/tree-member-groups.context.ts @@ -1,7 +1,7 @@ import { UmbExtensionManifestTree } from '../../../core/extension'; -import { ITreeService } from '../tree.service'; +import { ITreeContext } from '../tree.context'; -export class UmbTreeMemberGroupsContext implements ITreeService { +export class UmbTreeMemberGroupsContext implements ITreeContext { public tree: UmbExtensionManifestTree; constructor(tree: UmbExtensionManifestTree) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.context.ts index 7f34d03c74..29fd21764a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/members/tree-members.context.ts @@ -1,7 +1,7 @@ import { UmbExtensionManifestTree } from '../../../core/extension'; -import { ITreeService } from '../tree.service'; +import { ITreeContext } from '../tree.context'; -export class UmbTreeMemberContext implements ITreeService { +export class UmbTreeMemberContext implements ITreeContext { public tree: UmbExtensionManifestTree; constructor(tree: UmbExtensionManifestTree) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts index 150a02c21c..44d8d8172e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-item.element.ts @@ -2,7 +2,7 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { UmbContextConsumerMixin } from '../../../core/context'; -import { ITreeService } from '../tree.service'; +import { ITreeContext } from '../tree.context'; import { UUIMenuItemEvent } from '@umbraco-ui/uui'; import { UmbSectionContext } from '../../sections/section.context'; import { map, Subscription } from 'rxjs'; @@ -36,7 +36,7 @@ export class UmbTreeItem extends UmbContextConsumerMixin(LitElement) { @state() private _sectionPathname?: string; - private _treeService?: ITreeService; + private _treeContext?: ITreeContext; private _entityStore?: UmbEntityStore; @@ -49,9 +49,9 @@ export class UmbTreeItem extends UmbContextConsumerMixin(LitElement) { constructor() { super(); - this.consumeContext('umbTreeContext', (treeService: ITreeService) => { - this._treeService = treeService; - this._pathName = this._treeService?.tree?.meta?.pathname; + this.consumeContext('umbTreeContext', (treeContext: ITreeContext) => { + this._treeContext = treeContext; + this._pathName = this._treeContext?.tree?.meta?.pathname; }); this.consumeContext('umbSectionContext', (sectionContext: UmbSectionContext) => { @@ -90,7 +90,7 @@ export class UmbTreeItem extends UmbContextConsumerMixin(LitElement) { this._loading = true; - this._treeService?.getChildren(this.itemId).then((items) => { + this._treeContext?.getChildren(this.itemId).then((items) => { this.childItems = items; this._loading = false; }); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts index c13cb0d9b5..c4fd5a5b31 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/shared/tree-navigator.element.ts @@ -2,7 +2,7 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { UmbContextConsumerMixin } from '../../../core/context'; -import { ITreeService } from '../tree.service'; +import { ITreeContext } from '../tree.context'; import './tree-item.element'; @@ -10,7 +10,7 @@ import './tree-item.element'; export class UmbTreeNavigator extends UmbContextConsumerMixin(LitElement) { static styles = [UUITextStyles, css``]; - private _treeService?: ITreeService; + private _treeContext?: ITreeContext; @state() private _id = -1; @@ -30,17 +30,17 @@ export class UmbTreeNavigator extends UmbContextConsumerMixin(LitElement) { connectedCallback(): void { super.connectedCallback(); - this.consumeContext('umbTreeContext', async (treeService) => { - this._treeService = treeService; + this.consumeContext('umbTreeContext', async (treeContext) => { + this._treeContext = treeContext; - const item = await this._treeService?.getRoot?.(); + const item = await this._treeContext?.getRoot?.(); if (!item) return; this._id = item.id; this._label = item.name; this._hasChildren = item.hasChildren; this._loading = false; - this._href = this._treeService?.tree?.meta?.pathname; + this._href = this._treeContext?.tree?.meta?.pathname; }); } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.context.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.service.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.context.ts index e877df17b6..b427083983 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/tree/tree.context.ts @@ -2,7 +2,7 @@ import { UmbExtensionManifestTree } from '../../core/extension'; -export interface ITreeService { +export interface ITreeContext { tree: UmbExtensionManifestTree; getRoot?(): Promise; getChildren(id: number): Promise>; @@ -15,7 +15,7 @@ export interface UmbTreeItem { hasChildren: boolean; } -export class UmbTreeService implements ITreeService { +export class UmbTreeContext implements ITreeContext { public tree: UmbExtensionManifestTree; constructor(tree: UmbExtensionManifestTree) {