diff --git a/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/counter-workspace-context.ts b/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/counter-workspace-context.ts index 06b7ae2a1a..cfcfb13a33 100644 --- a/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/counter-workspace-context.ts +++ b/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/counter-workspace-context.ts @@ -1,10 +1,10 @@ import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { type UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbNumberState } from '@umbraco-cms/backoffice/observable-api'; // The Example Workspace Context Controller: -export class WorkspaceContextCounter extends UmbBaseController { +export class WorkspaceContextCounter extends UmbControllerBase { // We always keep our states private, and expose the values as observables: #counter = new UmbNumberState(0); readonly counter = this.#counter.asObservable(); diff --git a/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/incrementor-workspace-action.ts b/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/incrementor-workspace-action.ts index b0cfe188b4..4e7fff5932 100644 --- a/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/incrementor-workspace-action.ts +++ b/src/Umbraco.Web.UI.Client/examples/workspace-context-counter/incrementor-workspace-action.ts @@ -1,9 +1,9 @@ -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbWorkspaceAction } from '@umbraco-cms/backoffice/workspace'; import { EXAMPLE_COUNTER_CONTEXT } from './counter-workspace-context'; // The Example Incrementor Workspace Action Controller: -export class ExampleIncrementorWorkspaceAction extends UmbBaseController implements UmbWorkspaceAction { +export class ExampleIncrementorWorkspaceAction extends UmbControllerBase implements UmbWorkspaceAction { // This method is executed async execute() { await this.consumeContext(EXAMPLE_COUNTER_CONTEXT, (context) => { diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app.context.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app.context.ts index ed00430c48..17d0c4c997 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/app.context.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/app.context.ts @@ -1,9 +1,9 @@ import type { UmbAppContextConfig } from './app-context-config.interface.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; -export class UmbAppContext extends UmbBaseController { +export class UmbAppContext extends UmbControllerBase { #serverUrl: string; #backofficePath: string; diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts index 1eef6bad1f..0f13864082 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/server-extension-registrator.controller.ts @@ -1,5 +1,5 @@ import { PackageResource, OpenAPI } from '@umbraco-cms/backoffice/external/backend-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; @@ -7,7 +7,7 @@ import type { ManifestBase } from '@umbraco-cms/backoffice/extension-api'; import { isManifestBaseType } from '@umbraco-cms/backoffice/extension-api'; // TODO: consider if this can be replaced by the new extension controllers -export class UmbServerExtensionRegistrator extends UmbBaseController { +export class UmbServerExtensionRegistrator extends UmbControllerBase { #extensionRegistry: UmbBackofficeExtensionRegistry; #apiBaseUrl = OpenAPI.BASE; diff --git a/src/Umbraco.Web.UI.Client/src/libs/class-api/context-base.class.ts b/src/Umbraco.Web.UI.Client/src/libs/class-api/context-base.class.ts index cb4440e022..779189dc30 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/class-api/context-base.class.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/class-api/context-base.class.ts @@ -1,7 +1,7 @@ import type { UmbContextToken } from '../context-api/index.js'; import type { UmbControllerHost } from '../controller-api/index.js'; import type { UmbContext } from './context.interface.js'; -import { UmbBaseController } from './controller-base.class.js'; +import { UmbControllerBase } from './controller-base.class.js'; /** * This base provides the necessary for a class to become a context-api controller. @@ -11,7 +11,7 @@ export abstract class UmbContextBase< ContextType, GivenContextToken extends UmbContextToken = UmbContextToken, > - extends UmbBaseController + extends UmbControllerBase implements UmbContext { constructor(host: UmbControllerHost, contextToken: GivenContextToken | string) { diff --git a/src/Umbraco.Web.UI.Client/src/libs/class-api/controller-base.class.ts b/src/Umbraco.Web.UI.Client/src/libs/class-api/controller-base.class.ts index 7d0badcc51..6d70f03106 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/class-api/controller-base.class.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/class-api/controller-base.class.ts @@ -6,4 +6,4 @@ import { UmbClassMixin } from './class.mixin.js'; * This enables controllers to be added to the life cycle of this element. * */ -export abstract class UmbBaseController extends UmbClassMixin(EventTarget) implements UmbController {} +export abstract class UmbControllerBase extends UmbClassMixin(EventTarget) implements UmbController {} diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts index 23e639a49f..2430700ae9 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.test.ts @@ -10,7 +10,7 @@ import type { UmbExtensionCondition } from '../condition/extension-condition.int import type { UmbControllerHostElement } from '../../controller-api/controller-host-element.mixin.js'; import { UmbControllerHostElementMixin } from '../../controller-api/controller-host-element.mixin.js'; import { UmbBaseExtensionInitializer } from './index.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { customElement, html } from '@umbraco-cms/backoffice/external/lit'; import { UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -38,7 +38,7 @@ class UmbTestExtensionController extends UmbBaseExtensionInitializer { } } -class UmbTestConditionAlwaysValid extends UmbBaseController implements UmbExtensionCondition { +class UmbTestConditionAlwaysValid extends UmbControllerBase implements UmbExtensionCondition { config: UmbConditionConfigBase; constructor(args: { host: UmbControllerHost; config: UmbConditionConfigBase }) { super(args.host); @@ -46,7 +46,7 @@ class UmbTestConditionAlwaysValid extends UmbBaseController implements UmbExtens } permitted = true; } -class UmbTestConditionAlwaysInvalid extends UmbBaseController implements UmbExtensionCondition { +class UmbTestConditionAlwaysInvalid extends UmbControllerBase implements UmbExtensionCondition { config: UmbConditionConfigBase; constructor(args: { host: UmbControllerHost; config: UmbConditionConfigBase }) { super(args.host); diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.ts index 61ffa31853..4effd65a63 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extension-initializer.controller.ts @@ -1,7 +1,7 @@ import { createExtensionApi } from '../functions/index.js'; import type { UmbExtensionCondition } from '../condition/extension-condition.interface.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbConditionConfigBase, ManifestCondition, @@ -21,7 +21,7 @@ import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-a export abstract class UmbBaseExtensionInitializer< ManifestType extends ManifestWithDynamicConditions = ManifestWithDynamicConditions, SubClassType = never, -> extends UmbBaseController { +> extends UmbControllerBase { // #promiseResolvers: Array<() => void> = []; #manifestObserver!: UmbObserverController; diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.test.ts index bd2257eff8..2123b6647b 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.test.ts @@ -4,7 +4,7 @@ import type { ManifestCondition, ManifestWithDynamicConditions, UmbConditionConf import type { UmbExtensionCondition } from '../condition/extension-condition.interface.js'; import type { PermittedControllerType } from './index.js'; import { UmbBaseExtensionInitializer, UmbBaseExtensionsInitializer } from './index.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api'; import { customElement, html } from '@umbraco-cms/backoffice/external/lit'; @@ -65,7 +65,7 @@ class UmbTestExtensionsController< } } -class UmbTestConditionAlwaysValid extends UmbBaseController implements UmbExtensionCondition { +class UmbTestConditionAlwaysValid extends UmbControllerBase implements UmbExtensionCondition { config: UmbConditionConfigBase; constructor(args: { host: UmbControllerHost; config: UmbConditionConfigBase }) { super(args.host); @@ -73,7 +73,7 @@ class UmbTestConditionAlwaysValid extends UmbBaseController implements UmbExtens } permitted = true; } -class UmbTestConditionAlwaysInvalid extends UmbBaseController implements UmbExtensionCondition { +class UmbTestConditionAlwaysInvalid extends UmbControllerBase implements UmbExtensionCondition { config: UmbConditionConfigBase; constructor(args: { host: UmbControllerHost; config: UmbConditionConfigBase }) { super(args.host); diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts index 5600fdbc44..083e4ebbbd 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/base-extensions-initializer.controller.ts @@ -5,7 +5,7 @@ import type { UmbBaseExtensionInitializer, UmbExtensionRegistry, } from '@umbraco-cms/backoffice/extension-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export type PermittedControllerType = ControllerType & { @@ -26,7 +26,7 @@ export abstract class UmbBaseExtensionsInitializer< ManifestType extends ManifestBase = SpecificManifestTypeOrManifestBase, ControllerType extends UmbBaseExtensionInitializer = UmbBaseExtensionInitializer, MyPermittedControllerType extends ControllerType = PermittedControllerType, -> extends UmbBaseController { +> extends UmbControllerBase { #promiseResolvers: Array<() => void> = []; #extensionRegistry: UmbExtensionRegistry; #type: ManifestTypeName | Array; diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts index 96569a144f..42677615b2 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/controller/extension-api-initializer.test.ts @@ -2,7 +2,7 @@ import { expect, fixture } from '@open-wc/testing'; import { UmbExtensionRegistry } from '../registry/extension.registry.js'; import type { ManifestApi, ManifestWithDynamicConditions } from '../types/index.js'; import { UmbExtensionApiInitializer } from './index.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api'; import type { UmbControllerHostElement, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { customElement, html } from '@umbraco-cms/backoffice/external/lit'; @@ -11,7 +11,7 @@ import { type ManifestSection, UmbSwitchCondition } from '@umbraco-cms/backoffic @customElement('umb-test-controller-host') class UmbTestControllerHostElement extends UmbControllerHostElementMixin(HTMLElement) {} -class UmbTestApiController extends UmbBaseController { +class UmbTestApiController extends UmbControllerBase { public i_am_test_api_controller = true; constructor(host: UmbControllerHost) { diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/bundle-extension-initializer.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/bundle-extension-initializer.ts index 23555f8246..49957b38ec 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/bundle-extension-initializer.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/bundle-extension-initializer.ts @@ -1,10 +1,10 @@ import type { ManifestBase, ManifestBundle } from '../types/index.js'; import type { UmbExtensionRegistry } from '../registry/extension.registry.js'; import { loadManifestPlainJs } from '../functions/load-manifest-plain-js.function.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -export class UmbBundleExtensionInitializer extends UmbBaseController { +export class UmbBundleExtensionInitializer extends UmbControllerBase { #extensionRegistry; #bundleMap = new Map(); diff --git a/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/entry-point-extension-initializer.ts b/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/entry-point-extension-initializer.ts index 5823bc9c59..a1af6f23c2 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/entry-point-extension-initializer.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/entry-point-extension-initializer.ts @@ -1,10 +1,10 @@ import type { ManifestEntryPoint } from '../types/index.js'; import type { UmbExtensionRegistry } from '../registry/extension.registry.js'; import { hasInitExport, loadManifestPlainJs } from '../functions/index.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbElement } from '@umbraco-cms/backoffice/element-api'; -export class UmbEntryPointExtensionInitializer extends UmbBaseController { +export class UmbEntryPointExtensionInitializer extends UmbControllerBase { #host; #extensionRegistry; #entryPointMap = new Map(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts index 71117902ba..de11eb5f99 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/audit-log/repository/audit-log.repository.ts @@ -4,9 +4,9 @@ import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controlle import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { AuditTypeModel, DirectionModel } from '@umbraco-cms/backoffice/external/backend-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -export class UmbAuditLogRepository extends UmbBaseController { +export class UmbAuditLogRepository extends UmbControllerBase { #dataSource: UmbAuditLogServerDataSource; #notificationService?: UmbNotificationContext; #init; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts index 148671f7ae..fcf5f2db09 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts @@ -3,11 +3,11 @@ import { UMB_BLOCK_GRID_INLINE_PROPERTY_DATASET_CONTEXT } from './block-grid-inl import type { UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property'; import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -export class UmbBlockGridInlinePropertyDatasetContext extends UmbBaseController implements UmbPropertyDatasetContext { +export class UmbBlockGridInlinePropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext { #entryContext: UmbBlockGridEntryContext; // default data: diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-scale-manager/block-grid-scale-manager.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-scale-manager/block-grid-scale-manager.controller.ts index 456076f1f6..bff5d556c0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-scale-manager/block-grid-scale-manager.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/context/block-grid-scale-manager/block-grid-scale-manager.controller.ts @@ -1,6 +1,6 @@ import { getAccumulatedValueOfIndex, getInterpolatedIndexOfPositionInWeightMap } from '@umbraco-cms/backoffice/utils'; import { closestColumnSpanOption } from '../../utils/index.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; // This might be more generic than Block Grid, but this is where it belongs currently: @@ -19,7 +19,7 @@ export interface UmbBlockGridScalableContainerContext extends UmbControllerHost getLayoutContainerElement: () => HTMLElement | undefined; } -export class UmbBlockGridScaleManager extends UmbBaseController { +export class UmbBlockGridScaleManager extends UmbControllerBase { // #runtimeGridColumns: Array = []; #runtimeGridRows: Array = []; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts index 50ca6a1a71..15c781b4d1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-entry-show-content-edit.condition.ts @@ -1,12 +1,12 @@ import { UMB_BLOCK_ENTRY_CONTEXT } from '../context/block-entry.context-token.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbBlockEntryShowContentEditCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbBlockEntryShowContentEditCondition extends UmbControllerBase implements UmbExtensionCondition { config: BlockEntryShowContentEditConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts index 2680b2e27d..8ebcee6bdf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/conditions/block-workspace-has-settings.condition.ts @@ -1,12 +1,12 @@ import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../workspace/block-workspace.context-token.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbBlockWorkspaceHasSettingsCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbBlockWorkspaceHasSettingsCondition extends UmbControllerBase implements UmbExtensionCondition { config: BlockWorkspaceHasSettingsConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts index 7cb991d068..577909f5a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts @@ -4,10 +4,10 @@ import type { UmbContentTypeModel } from '@umbraco-cms/backoffice/content-type'; import { UmbContentTypePropertyStructureManager } from '@umbraco-cms/backoffice/content-type'; import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbDocumentTypeDetailRepository } from '@umbraco-cms/backoffice/document-type'; -export class UmbBlockElementManager extends UmbBaseController { +export class UmbBlockElementManager extends UmbControllerBase { // #data = new UmbObjectState(undefined); readonly data = this.#data.asObservable(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts index e21c0488b3..989f8d2730 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts @@ -3,11 +3,11 @@ import { UMB_BLOCK_ELEMENT_PROPERTY_DATASET_CONTEXT } from './block-element-prop import type { UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property'; import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; -export class UmbBlockElementPropertyDatasetContext extends UmbBaseController implements UmbPropertyDatasetContext { +export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext { #elementManager: UmbBlockElementManager; // default data: diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts index ebcb378547..da6edddeab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/action/repository-action.ts @@ -1,9 +1,9 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { type UmbApi, UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -export class UmbActionBase extends UmbBaseController implements UmbApi { +export class UmbActionBase extends UmbControllerBase implements UmbApi { repository?: RepositoryType; constructor(host: UmbControllerHost, repositoryAlias: string) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts index d46cf740e5..55db16df90 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/auth.context.ts @@ -3,10 +3,10 @@ import { UMB_AUTH_CONTEXT } from './auth.context.token.js'; import type { UmbOpenApiConfiguration } from './models/openApiConfiguration.js'; import { OpenAPI } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; -export class UmbAuthContext extends UmbBaseController { +export class UmbAuthContext extends UmbControllerBase { #isAuthorized = new UmbBooleanState(false); readonly isAuthorized = this.#isAuthorized.asObservable(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-base.ts index e89dc022fe..05d2566918 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/action/collection-action-base.ts @@ -1,10 +1,10 @@ -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; export interface UmbCollectionAction extends UmbApi { execute(): Promise; } -export abstract class UmbCollectionActionBase extends UmbBaseController implements UmbCollectionAction { +export abstract class UmbCollectionActionBase extends UmbControllerBase implements UmbCollectionAction { abstract execute(): Promise; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-alias.condition.ts index 5dbf7488e8..be314ea34c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-alias.condition.ts @@ -1,9 +1,9 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from './default/collection-default.context.js'; import type { CollectionAliasConditionConfig } from './collection-alias.manifest.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api'; -export class UmbCollectionAliasCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbCollectionAliasCondition extends UmbControllerBase implements UmbExtensionCondition { config: CollectionAliasConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-bulk-action-permission.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-bulk-action-permission.condition.ts index c22b4c5ef8..0d64b554e5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-bulk-action-permission.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-bulk-action-permission.condition.ts @@ -1,9 +1,9 @@ import { UMB_DEFAULT_COLLECTION_CONTEXT } from './default/collection-default.context.js'; import type { CollectionBulkActionPermissionConditionConfig } from './collection-bulk-action-permission.manifest.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbConditionControllerArguments, UmbExtensionCondition } from '@umbraco-cms/backoffice/extension-api'; -export class UmbCollectionBulkActionPermissionCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbCollectionBulkActionPermissionCondition extends UmbControllerBase implements UmbExtensionCondition { config: CollectionBulkActionPermissionConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts index e8fdc32f3e..ff9229ab3f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/collection-view.manager.ts @@ -1,4 +1,4 @@ -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbExtensionsManifestInitializer, createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbArrayState, UmbObjectState, UmbStringState } from '@umbraco-cms/backoffice/observable-api'; @@ -10,7 +10,7 @@ export interface UmbCollectionViewManagerConfig { defaultViewAlias?: string; } -export class UmbCollectionViewManager extends UmbBaseController { +export class UmbCollectionViewManager extends UmbControllerBase { #views = new UmbArrayState([], (x) => x.alias); public readonly views = this.#views.asObservable(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts index 07ba0a22f7..89ba1eaa2d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts @@ -16,9 +16,9 @@ import { filterFrozenArray, } from '@umbraco-cms/backoffice/observable-api'; import { incrementString } from '@umbraco-cms/backoffice/utils'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -export class UmbContentTypePropertyStructureManager extends UmbBaseController { +export class UmbContentTypePropertyStructureManager extends UmbControllerBase { #init!: Promise; #contentTypeRepository: UmbDetailRepository; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts index de7c5ed683..d6623ab03e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/culture/repository/culture.repository.ts @@ -1,9 +1,9 @@ import { UmbCultureServerDataSource } from './sources/culture.server.data.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -export class UmbCultureRepository extends UmbBaseController implements UmbApi { +export class UmbCultureRepository extends UmbControllerBase implements UmbApi { #dataSource: UmbCultureServerDataSource; constructor(host: UmbControllerHost) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/debug/context-debug.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/debug/context-debug.controller.ts index b7ad12f008..0b6edacb45 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/debug/context-debug.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/debug/context-debug.controller.ts @@ -1,9 +1,9 @@ import { contextData, UMB_DEBUG_CONTEXT_EVENT_TYPE } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; // Temp controller to get the code away from the app.element.ts -export class UmbContextDebugController extends UmbBaseController { +export class UmbContextDebugController extends UmbControllerBase { constructor(host: UmbControllerHost) { super(host); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts index 6ffee549df..86b69bbaa2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/menu-alias.condition.ts @@ -1,5 +1,5 @@ import { UMB_MENU_CONTEXT } from '../../menu/menu.context.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, @@ -11,7 +11,7 @@ export type MenuAliasConditionConfig = UmbConditionConfigBase & { match: string; }; -export class UmbMenuAliasCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbMenuAliasCondition extends UmbControllerBase implements UmbExtensionCondition { config: MenuAliasConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/section-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/section-alias.condition.ts index 6b42617f12..bafece2c5f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/section-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/section-alias.condition.ts @@ -1,4 +1,4 @@ -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, @@ -7,7 +7,7 @@ import type { } from '@umbraco-cms/backoffice/extension-api'; import { UMB_SECTION_CONTEXT } from '@umbraco-cms/backoffice/section'; -export class UmbSectionAliasCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbSectionAliasCondition extends UmbControllerBase implements UmbExtensionCondition { config: SectionAliasConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/switch.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/switch.condition.ts index de0c728c65..30a5c1545b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/switch.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/conditions/switch.condition.ts @@ -1,12 +1,12 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbSwitchCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbSwitchCondition extends UmbControllerBase implements UmbExtensionCondition { #timer?: ReturnType; config: SwitchConditionConfig; permitted = false; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.controller.ts index 1fa482ab54..191cbbd410 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.controller.ts @@ -1,11 +1,11 @@ import { UMB_CONFIRM_MODAL, type UmbConfirmModalData } from '../../token/confirm-modal.token.js'; import { UMB_MODAL_MANAGER_CONTEXT } from '../../context/modal-manager.context.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; export interface UmbConfirmModalArgs extends UmbConfirmModalData {} -export class UmbConfirmModalController extends UmbBaseController { +export class UmbConfirmModalController extends UmbControllerBase { async open(args: UmbConfirmModalArgs): Promise { const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts index 01ccc82f7f..d863bc74aa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/picker-input/picker-input.context.ts @@ -1,11 +1,11 @@ import { UmbChangeEvent } from '@umbraco-cms/backoffice/event'; import { type UmbItemRepository, UmbRepositoryItemsManager } from '@umbraco-cms/backoffice/repository'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbModalToken, UmbPickerModalData, UmbPickerModalValue } from '@umbraco-cms/backoffice/modal'; import { UMB_MODAL_MANAGER_CONTEXT, umbConfirmModal } from '@umbraco-cms/backoffice/modal'; -export class UmbPickerInputContext extends UmbBaseController { +export class UmbPickerInputContext extends UmbControllerBase { // TODO: We are way too unsecure about the requirements for the Modal Token, as we have certain expectation for the data and value. modalAlias: string | UmbModalToken, UmbPickerModalValue>; repository?: UmbItemRepository; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts index 194c1c44e8..d177891bc1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts @@ -1,7 +1,7 @@ import { UMB_PROPERTY_DATASET_CONTEXT } from '../property-dataset/index.js'; import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { UmbArrayState, @@ -15,7 +15,7 @@ import type { UmbPropertyEditorConfigProperty } from '@umbraco-cms/backoffice/pr import { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; -export class UmbPropertyContext extends UmbBaseController { +export class UmbPropertyContext extends UmbControllerBase { private _providerController: UmbContextProviderController; #alias = new UmbStringState(undefined); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-base.ts index 51b25e8978..138e18c838 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-base.ts @@ -1,8 +1,8 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; // TODO: Revisit if constructor method should be omitted -export abstract class UmbRepositoryBase extends UmbBaseController { +export abstract class UmbRepositoryBase extends UmbControllerBase { constructor(host: UmbControllerHost) { super(host); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts index 6bf631221a..9c0f969933 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/repository/repository-items.manager.ts @@ -3,9 +3,9 @@ import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbArrayState } from '@umbraco-cms/backoffice/observable-api'; import { type ManifestRepository, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -export class UmbRepositoryItemsManager extends UmbBaseController { +export class UmbRepositoryItemsManager extends UmbControllerBase { // repository?: UmbItemRepository; #getUnique: (entry: ItemType) => string | undefined; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts index 9d261f5165..17463b9f79 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/resources/resource.controller.ts @@ -2,11 +2,11 @@ import { isApiError, isCancelError, isCancelablePromise } from './apiTypeValidators.function.js'; import { UMB_NOTIFICATION_CONTEXT, type UmbNotificationOptions } from '@umbraco-cms/backoffice/notification'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api'; import type { DataSourceResponse } from '@umbraco-cms/backoffice/repository'; -export class UmbResourceController extends UmbBaseController { +export class UmbResourceController extends UmbControllerBase { #promise: Promise; #notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/route.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route.context.ts index 00ed0028b8..9b75568c8d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/router/route.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/route.context.ts @@ -3,14 +3,14 @@ import { createRoutePathBuilder } from './generate-route-path-builder.function.j import type { IRoutingInfo, IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UMB_MODAL_MANAGER_CONTEXT, type UmbModalRouteRegistration } from '@umbraco-cms/backoffice/modal'; const EmptyDiv = document.createElement('div'); type UmbRoutePlusModalKey = UmbRoute & { __modalKey: string }; -export class UmbRouteContext extends UmbBaseController { +export class UmbRouteContext extends UmbControllerBase { #mainRouter: IRouterSlot; #modalRouter: IRouterSlot; #modalRegistrations: UmbModalRouteRegistration[] = []; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts index 2cdcf19a73..1b5a8fd094 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/sorter/sorter.controller.ts @@ -1,5 +1,5 @@ import { isWithinRect } from '@umbraco-cms/backoffice/utils'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; const autoScrollSensitivity = 50; @@ -164,7 +164,7 @@ export type UmbSorterConfig = * @implements {UmbControllerInterface} * @description This controller can make user able to sort items. */ -export class UmbSorterController extends UmbBaseController { +export class UmbSorterController extends UmbControllerBase { // // The sorter who last indicated that it was okay or not okay to drop here: static lastIndicationSorter?: UmbSorterController; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file-manager.class.ts index 891acdba74..26706f9957 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file-manager.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/temporary-file/temporary-file-manager.class.ts @@ -1,7 +1,7 @@ import { UmbTemporaryFileRepository } from './temporary-file.repository.js'; import { UmbArrayState, UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; export type TemporaryFileStatus = 'complete' | 'waiting' | 'error'; @@ -11,7 +11,7 @@ export interface TemporaryFileQueueItem { status?: TemporaryFileStatus; } -export class UmbTemporaryFileManager extends UmbBaseController { +export class UmbTemporaryFileManager extends UmbControllerBase { #temporaryFileRepository; #queue = new UmbArrayState([], (item) => item.unique); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts index f069308ec8..1f7d49c9ae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/themes/theme.context.ts @@ -3,14 +3,14 @@ import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { UmbStringState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestTheme } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { loadManifestPlainCss } from '@umbraco-cms/backoffice/extension-api'; const LOCAL_STORAGE_KEY = 'umb-theme-alias'; -export class UmbThemeContext extends UmbBaseController { +export class UmbThemeContext extends UmbControllerBase { #theme = new UmbStringState('umb-light-theme'); #themeObserver?: UmbObserverController; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts index 7d97023e32..c2586c7d4d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item-base/tree-item-base.context.ts @@ -8,7 +8,7 @@ import type { UmbSectionContext, UmbSectionSidebarContext } from '@umbraco-cms/b import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbBooleanState, UmbDeepState, UmbStringState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { UMB_ACTION_EVENT_CONTEXT, type UmbActionEventContext } from '@umbraco-cms/backoffice/action'; import type { UmbEntityActionEvent } from '@umbraco-cms/backoffice/entity-action'; @@ -18,7 +18,7 @@ export type UmbTreeItemUniqueFunction ) => string | null | undefined; export class UmbTreeItemContextBase - extends UmbBaseController + extends UmbControllerBase implements UmbTreeItemContext { public unique?: string | null; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts index d80ac33eca..e76e3e2b01 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree.context.ts @@ -9,7 +9,7 @@ import { type ManifestTree, umbExtensionsRegistry, } from '@umbraco-cms/backoffice/extension-registry'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-api'; import type { ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api'; @@ -18,7 +18,7 @@ import type { UmbEntityActionEvent } from '@umbraco-cms/backoffice/entity-action import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; // TODO: update interface -export interface UmbTreeContext extends UmbBaseController { +export interface UmbTreeContext extends UmbControllerBase { selection: UmbSelectionManager; requestChildrenOf: (parentUnique: string | null) => Promise<{ data?: UmbPagedModel; @@ -28,7 +28,7 @@ export interface UmbTreeContext exten } export class UmbTreeContextBase - extends UmbBaseController + extends UmbControllerBase implements UmbTreeContext { #treeRoot = new UmbObjectState(undefined); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts index 4f1f5a9d49..4062f8b5e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts @@ -1,4 +1,4 @@ -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UmbSelectionChangeEvent } from '@umbraco-cms/backoffice/event'; import { UmbArrayState, UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; @@ -8,7 +8,7 @@ import { UmbArrayState, UmbBooleanState } from '@umbraco-cms/backoffice/observab * @export * @class UmbSelectionManager */ -export class UmbSelectionManager extends UmbBaseController { +export class UmbSelectionManager extends UmbControllerBase { #selectable = new UmbBooleanState(false); public readonly selectable = this.#selectable.asObservable(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action-base.ts index 1a7151ffac..e127a95512 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-action/workspace-action-base.ts @@ -1,7 +1,7 @@ -import type { UmbWorkspaceContextInterface} from '../../workspace-context/index.js'; +import type { UmbWorkspaceContextInterface } from '../../workspace-context/index.js'; import { UMB_WORKSPACE_CONTEXT } from '../../workspace-context/index.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; export interface UmbWorkspaceAction extends UmbApi { @@ -9,7 +9,7 @@ export interface UmbWorkspaceAction extends UmbApi { } export abstract class UmbWorkspaceActionBase - extends UmbBaseController + extends UmbControllerBase implements UmbWorkspaceAction { workspaceContext?: WorkspaceContextType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.ts index f3ff0b0882..07c73692f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.ts @@ -2,11 +2,11 @@ import { UMB_VARIANT_WORKSPACE_CONTEXT } from '../../workspace-context/index.js' import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbNumberState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbPropertyDatasetContext } from '@umbraco-cms/backoffice/property'; -export class UmbWorkspaceSplitViewContext extends UmbBaseController { +export class UmbWorkspaceSplitViewContext extends UmbControllerBase { #workspaceContext?: typeof UMB_VARIANT_WORKSPACE_CONTEXT.TYPE; public getWorkspaceContext() { return this.#workspaceContext; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-alias.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-alias.condition.ts index fa0dcfba0c..701eb5913c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-alias.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-alias.condition.ts @@ -1,5 +1,5 @@ import { UMB_WORKSPACE_CONTEXT, type UmbWorkspaceContextInterface } from './workspace-context/index.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, @@ -7,7 +7,7 @@ import type { UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbWorkspaceAliasCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbWorkspaceAliasCondition extends UmbControllerBase implements UmbExtensionCondition { config: WorkspaceAliasConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-entity-type.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-entity-type.condition.ts index 8021480272..81db4263bd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-entity-type.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-entity-type.condition.ts @@ -1,5 +1,5 @@ import { UMB_WORKSPACE_CONTEXT } from './workspace-context/index.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, @@ -7,7 +7,7 @@ import type { UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbWorkspaceEntityTypeCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbWorkspaceEntityTypeCondition extends UmbControllerBase implements UmbExtensionCondition { config: WorkspaceEntityTypeConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.ts index 831ab0f5af..a38a724724 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-is-new-redirect-controller/workspace-is-new-redirect-controller.ts @@ -1,6 +1,6 @@ import type { UmbEditableWorkspaceContextBase } from '../workspace-context/index.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { createRoutePathBuilder, type UmbRouterSlotElement } from '@umbraco-cms/backoffice/router'; import { ensurePathEndsWithSlash } from '@umbraco-cms/backoffice/utils'; @@ -13,7 +13,7 @@ import { ensurePathEndsWithSlash } from '@umbraco-cms/backoffice/utils'; * @param workspaceContext * @param router */ -export class UmbWorkspaceIsNewRedirectController extends UmbBaseController { +export class UmbWorkspaceIsNewRedirectController extends UmbControllerBase { constructor( host: UmbControllerHost, workspaceContext: UmbEditableWorkspaceContextBase, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts index f3123b772d..9f1997eda5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts @@ -1,7 +1,7 @@ import type { UmbPropertyDatasetContext, UmbNameablePropertyDatasetContext } from '@umbraco-cms/backoffice/property'; import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; import type { UmbInvariantableWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace'; @@ -11,7 +11,7 @@ import type { UmbInvariantableWorkspaceContextInterface } from '@umbraco-cms/bac export class UmbInvariantWorkspacePropertyDatasetContext< WorkspaceType extends UmbInvariantableWorkspaceContextInterface = UmbInvariantableWorkspaceContextInterface, > - extends UmbBaseController + extends UmbControllerBase implements UmbPropertyDatasetContext, UmbNameablePropertyDatasetContext { #workspace: WorkspaceType; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/conditions/document-workspace-has-collection.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/conditions/document-workspace-has-collection.condition.ts index 7d89100596..b358f3d6b1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/conditions/document-workspace-has-collection.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/conditions/document-workspace-has-collection.condition.ts @@ -1,5 +1,5 @@ import { UMB_DOCUMENT_WORKSPACE_CONTEXT } from '../workspace/document-workspace.context-token.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, @@ -7,7 +7,7 @@ import type { UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbDocumentWorkspaceHasCollectionCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbDocumentWorkspaceHasCollectionCondition extends UmbControllerBase implements UmbExtensionCondition { config: DocumentWorkspaceHasCollectionConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts index be3ae10cea..5394709ce3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/repository/culture-and-hostnames.repository.ts @@ -1,11 +1,11 @@ import { UmbDocumentCultureAndHostnamesServerDataSource } from './culture-and-hostnames.server.data.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; import type { DomainsPresentationModelBaseModel } from '@umbraco-cms/backoffice/external/backend-api'; -export class UmbDocumentCultureAndHostnamesRepository extends UmbBaseController implements UmbApi { +export class UmbDocumentCultureAndHostnamesRepository extends UmbControllerBase implements UmbApi { #dataSource = new UmbDocumentCultureAndHostnamesServerDataSource(this); #notificationContext?: typeof UMB_NOTIFICATION_CONTEXT.TYPE; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts index 556aa465e3..3087e5cef9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/repository/public-access.repository.ts @@ -1,12 +1,12 @@ import { UmbDocumentPublicAccessServerDataSource } from './public-access.server.data.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; import type { PublicAccessRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; -export class UmbDocumentPublicAccessRepository extends UmbBaseController implements UmbApi { +export class UmbDocumentPublicAccessRepository extends UmbControllerBase implements UmbApi { #dataSource: UmbDocumentPublicAccessServerDataSource; #notificationContext?: UmbNotificationContext; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/pick-document-variant-modal.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/pick-document-variant-modal.controller.ts index a5a03b7463..cdb45ade87 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/pick-document-variant-modal.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/pick-document-variant-modal.controller.ts @@ -5,7 +5,7 @@ import { type UmbDocumentVariantPickerModalType, } from './variant-picker/document-variant-picker-modal.token.js'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; @@ -15,7 +15,7 @@ export interface UmbPickDocumentVariantModalArgs { selected?: Array; } -export class UmbPickDocumentVariantModalController extends UmbBaseController { +export class UmbPickDocumentVariantModalController extends UmbControllerBase { async open(args: UmbPickDocumentVariantModalArgs): Promise { const modalManagerContext = await this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, () => {}).asPromise(); const selected = args.selected ?? []; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.repository.ts index 9f155faae0..7373952374 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tracked-reference/repository/document-tracked-reference.repository.ts @@ -1,8 +1,8 @@ import { UmbDocumentTrackedReferenceServerDataSource } from './document-tracked-reference.server.data.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -export class UmbDocumentTrackedReferenceRepository extends UmbBaseController { +export class UmbDocumentTrackedReferenceRepository extends UmbControllerBase { #trackedReferenceSource: UmbDocumentTrackedReferenceServerDataSource; constructor(host: UmbControllerHostElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/repository/document-permission.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/repository/document-permission.repository.ts index cef88807a6..cb423a2f15 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/repository/document-permission.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/user-permissions/repository/document-permission.repository.ts @@ -1,8 +1,8 @@ import { UmbDocumentPermissionServerDataSource } from './document-permission.server.data.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -export class UmbDocumentPermissionRepository extends UmbBaseController { +export class UmbDocumentPermissionRepository extends UmbControllerBase { #permissionSource: UmbDocumentPermissionServerDataSource; constructor(host: UmbControllerHostElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts index 323b9b7f5c..69dae07edd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dynamic-root/repository/dynamic-root.repository.ts @@ -1,12 +1,12 @@ import { UmbDynamicRootServerDataSource } from './dynamic-root.server.data.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import type { DynamicRootRequestModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbTreePickerDynamicRoot } from '@umbraco-cms/backoffice/components'; const GUID_EMPTY: string = '00000000-0000-0000-0000-000000000000'; -export class UmbDynamicRootRepository extends UmbBaseController { +export class UmbDynamicRootRepository extends UmbControllerBase { #dataSource: UmbDynamicRootServerDataSource; constructor(host: UmbControllerHostElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/global-contexts/app-language.context.ts b/src/Umbraco.Web.UI.Client/src/packages/language/global-contexts/app-language.context.ts index e26d796c27..e45bc7f149 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/global-contexts/app-language.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/global-contexts/app-language.context.ts @@ -2,11 +2,11 @@ import { UmbLanguageCollectionRepository } from '../collection/index.js'; import type { UmbLanguageDetailModel } from '../types.js'; import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -export class UmbAppLanguageContext extends UmbBaseController implements UmbApi { +export class UmbAppLanguageContext extends UmbControllerBase implements UmbApi { #languageCollectionRepository: UmbLanguageCollectionRepository; #languages: Array = []; #appLanguage = new UmbObjectState(undefined); diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts index e1d74e1916..cd2a3f4f6a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/logviewer.context.ts @@ -10,7 +10,7 @@ import type { } from '@umbraco-cms/backoffice/external/backend-api'; import { DirectionModel, LogLevelModel } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import { query } from '@umbraco-cms/backoffice/router'; import type { UmbWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace'; @@ -27,7 +27,7 @@ export interface LogViewerDateRange { } // TODO: Revisit usage of workspace for this case... -export class UmbLogViewerWorkspaceContext extends UmbBaseController implements UmbWorkspaceContextInterface { +export class UmbLogViewerWorkspaceContext extends UmbControllerBase implements UmbWorkspaceContextInterface { public readonly workspaceAlias: string = 'Umb.Workspace.LogViewer'; #repository: UmbLogViewerRepository; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/conditions/media-workspace-has-collection.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/conditions/media-workspace-has-collection.condition.ts index 7b9ff178bf..b065464c5e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/conditions/media-workspace-has-collection.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/conditions/media-workspace-has-collection.condition.ts @@ -1,5 +1,5 @@ import { UMB_MEDIA_WORKSPACE_CONTEXT } from '../workspace/media-workspace.context-token.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, @@ -7,7 +7,7 @@ import type { UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbMediaWorkspaceHasCollectionCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbMediaWorkspaceHasCollectionCondition extends UmbControllerBase implements UmbExtensionCondition { config: MediaWorkspaceHasCollectionConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/tracked-reference/repository/media-tracked-reference.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/tracked-reference/repository/media-tracked-reference.repository.ts index d8e4c84154..1a211464b6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/tracked-reference/repository/media-tracked-reference.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/tracked-reference/repository/media-tracked-reference.repository.ts @@ -1,8 +1,8 @@ import { UmbMediaTrackedReferenceServerDataSource } from './media-tracked-reference.server.data.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -export class UmbMediaTrackedReferenceRepository extends UmbBaseController { +export class UmbMediaTrackedReferenceRepository extends UmbControllerBase { #trackedReferenceSource: UmbMediaTrackedReferenceServerDataSource; constructor(host: UmbControllerHostElement) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts index 9e93f4e23a..7669921f21 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/object-type/object-type.repository.ts @@ -1,10 +1,10 @@ import { ObjectTypesResource } from '@umbraco-cms/backoffice/external/backend-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -export class UmbObjectTypeRepository extends UmbBaseController implements UmbApi { +export class UmbObjectTypeRepository extends UmbControllerBase implements UmbApi { #host: UmbControllerHost; constructor(host: UmbControllerHost) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts index a7c81ededd..e0f05c7f75 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/package.repository.ts @@ -2,7 +2,7 @@ import type { UmbPackageStore } from './package.store.js'; import { UMB_PACKAGE_STORE_TOKEN } from './package.store.js'; import { UmbPackageServerDataSource } from './sources/package.server.data.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbApi, ManifestBase } from '@umbraco-cms/backoffice/extension-api'; import { isManifestBaseType } from '@umbraco-cms/backoffice/extension-api'; import { OpenAPI } from '@umbraco-cms/backoffice/external/backend-api'; @@ -11,7 +11,7 @@ import { OpenAPI } from '@umbraco-cms/backoffice/external/backend-api'; * A repository for Packages which mimics a tree store. * @export */ -export class UmbPackageRepository extends UmbBaseController implements UmbApi { +export class UmbPackageRepository extends UmbControllerBase implements UmbApi { #init!: Promise; #packageStore?: UmbPackageStore; #packageSource: UmbPackageServerDataSource; diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/server-extension.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/server-extension.controller.ts index 2ab203436b..35fec06957 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/server-extension.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package/repository/server-extension.controller.ts @@ -1,9 +1,9 @@ import { UmbPackageRepository } from './package.repository.js'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry'; -export class UmbExtensionInitializer extends UmbBaseController { +export class UmbExtensionInitializer extends UmbControllerBase { #extensionRegistry: UmbBackofficeExtensionRegistry; #repository: UmbPackageRepository; #localPackages: Array>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts index 18a57d0fd0..22584bf980 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/repository/relation-type.repository.ts @@ -4,7 +4,7 @@ import { UmbRelationTypeServerDataSource } from './sources/relation-type.server. import type { UmbRelationTypeStore } from './relation-type.store.js'; import { UMB_RELATION_TYPE_STORE_CONTEXT } from './relation-type.store.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { CreateRelationTypeRequestModel, UpdateRelationTypeRequestModel, @@ -13,7 +13,7 @@ import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notificatio import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -export class UmbRelationTypeRepository extends UmbBaseController implements UmbApi { +export class UmbRelationTypeRepository extends UmbControllerBase implements UmbApi { #init!: Promise; #treeStore?: UmbRelationTypeTreeStore; diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/relation.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/relation.repository.ts index f67547563c..86565f5ca1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/relation.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relations/repository/relation.repository.ts @@ -1,11 +1,11 @@ import { UmbRelationServerDataSource } from './sources/relation.server.data.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbNotificationContext } from '@umbraco-cms/backoffice/notification'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -export class UmbRelationRepository extends UmbBaseController implements UmbApi { +export class UmbRelationRepository extends UmbControllerBase implements UmbApi { #init!: Promise; #detailDataSource: UmbRelationServerDataSource; diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts index 388797b20a..9a16402963 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/repository/tag.repository.ts @@ -2,10 +2,10 @@ import { UmbTagServerDataSource } from './sources/tag.server.data.js'; import type { UmbTagStore } from './tag.store.js'; import { UMB_TAG_STORE_CONTEXT } from './tag.store.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -export class UmbTagRepository extends UmbBaseController implements UmbApi { +export class UmbTagRepository extends UmbControllerBase implements UmbApi { #init!: Promise; #dataSource: UmbTagServerDataSource; diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/tiny-mce-plugin.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/tiny-mce-plugin.ts index 10001238dc..c7da513d31 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/tiny-mce-plugin.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/tiny-mce-plugin.ts @@ -1,10 +1,10 @@ import type { UmbInputTinyMceElement } from './input-tiny-mce.element.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; import type { Editor } from '@umbraco-cms/backoffice/external/tinymce'; import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor'; -export class UmbTinyMcePluginBase extends UmbBaseController implements UmbApi { +export class UmbTinyMcePluginBase extends UmbControllerBase implements UmbApi { editor: Editor; configuration?: UmbPropertyEditorConfigCollection; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts index 4139988aa9..c2479659ab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/repository/user-group-collection.repository.ts @@ -5,9 +5,9 @@ import type { UmbUserGroupCollectionFilterModel } from '../types.js'; import { UmbUserGroupCollectionServerDataSource } from './user-group-collection.server.data-source.js'; import type { UmbCollectionDataSource, UmbCollectionRepository } from '@umbraco-cms/backoffice/collection'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; -export class UmbUserGroupCollectionRepository extends UmbBaseController implements UmbCollectionRepository { +export class UmbUserGroupCollectionRepository extends UmbControllerBase implements UmbCollectionRepository { #init; #detailStore?: UmbUserGroupDetailStore; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/conditions/user-permission.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/conditions/user-permission.condition.ts index b5329783c5..d2d9b0db68 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/conditions/user-permission.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-permission/conditions/user-permission.condition.ts @@ -1,5 +1,5 @@ import { UMB_CURRENT_USER_CONTEXT } from '../../current-user/current-user.context.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import type { ManifestCondition, UmbConditionConfigBase, @@ -7,7 +7,7 @@ import type { UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbUserPermissionCondition extends UmbBaseController implements UmbExtensionCondition { +export class UmbUserPermissionCondition extends UmbControllerBase implements UmbExtensionCondition { config: UserPermissionConditionConfig; permitted = false; #onChange: () => void; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts index cc3500951b..1af420c01a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/conditions/user-allow-action-base.condition.ts @@ -1,6 +1,6 @@ import type { UmbUserStateEnum } from '../types.js'; import { UMB_USER_WORKSPACE_CONTEXT } from '../workspace/user-workspace.context.js'; -import { UmbBaseController } from '@umbraco-cms/backoffice/class-api'; +import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api'; import { isCurrentUser } from '@umbraco-cms/backoffice/current-user'; import type { UmbConditionConfigBase, @@ -8,7 +8,7 @@ import type { UmbExtensionCondition, } from '@umbraco-cms/backoffice/extension-api'; -export class UmbUserActionConditionBase extends UmbBaseController implements UmbExtensionCondition { +export class UmbUserActionConditionBase extends UmbControllerBase implements UmbExtensionCondition { config: UmbConditionConfigBase; permitted = false; #onChange: () => void;