@umbraco-cms/backoffice 14.0.0-c26a40c4 → 14.0.0-ce7724db

package/dist-cms/packages/settings/data-types/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, customElement, property, state, repeat } from '../../../../../external/lit/index.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { groupBy } from '../../../../../external/lodash/index.js';
 import { umbExtensionsRegistry } from '../../../../core/extension-registry/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
@@ -27,8 +27,9 @@ export let UmbPropertyEditorUIPickerModalElement = class UmbPropertyEditorUIPick
         if (!this.data)
             return;
         this.observe(umbExtensionsRegistry.extensionsOfType('propertyEditorUi'), (propertyEditorUIs) => {
-            this._propertyEditorUIs = propertyEditorUIs;
-            this._groupedPropertyEditorUIs = groupBy(propertyEditorUIs, 'meta.group');
+            // Only include Property Editor UIs which has Property Editor Schema Alias
+            this._propertyEditorUIs = propertyEditorUIs.filter((propertyEditorUi) => !!propertyEditorUi.meta.propertyEditorSchemaAlias);
+            this._groupedPropertyEditorUIs = groupBy(this._propertyEditorUIs, 'meta.group');
         });
     }
     _handleClick(propertyEditorUi) {
@@ -88,7 +89,7 @@ export let UmbPropertyEditorUIPickerModalElement = class UmbPropertyEditorUIPick
 		</ul>`;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			#filter {
 				width: 100%;

package/dist-cms/packages/settings/data-types/repository/data-type-item.store.d.ts

@@ -17,4 +17,4 @@ export declare class UmbDataTypeItemStore extends UmbStoreBase<DataTypeItemRespo
     constructor(host: UmbControllerHostElement);
     items(ids: Array<string>): import("rxjs").Observable<DataTypeItemResponseModel[]>;
 }
-export declare const UMB_DATA_TYPE_ITEM_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDataTypeItemStore>;
+export declare const UMB_DATA_TYPE_ITEM_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDataTypeItemStore, UmbDataTypeItemStore>;

package/dist-cms/packages/settings/data-types/repository/data-type.repository.d.ts

@@ -48,7 +48,7 @@ export declare class UmbDataTypeRepository implements UmbItemRepository<DataType
     delete(id: string): Promise<{
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
-    createFolderScaffold(parentId: string | null): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").FolderReponseModel>>;
+    createFolderScaffold(parentId: string | null): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").FolderResponseModel>>;
     createFolder(folderRequest: CreateFolderRequestModel & {
         id?: string | undefined;
     }): Promise<{
@@ -60,7 +60,7 @@ export declare class UmbDataTypeRepository implements UmbItemRepository<DataType
     updateFolder(id: string, folder: FolderModelBaseModel): Promise<{
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
-    requestFolder(id: string): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").FolderReponseModel>>;
+    requestFolder(id: string): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").FolderResponseModel>>;
     move(id: string, targetId: string | null): Promise<{
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;

package/dist-cms/packages/settings/data-types/repository/data-type.store.d.ts

@@ -2,7 +2,7 @@ import type { DataTypeResponseModel } from '../../../../external/backend-api/ind
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import { UmbStoreBase } from '../../../core/store/index.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-export declare const UMB_DATA_TYPE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDataTypeStore>;
+export declare const UMB_DATA_TYPE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDataTypeStore, UmbDataTypeStore>;
 /**
  * @export
  * @class UmbDataTypeStore

package/dist-cms/packages/settings/data-types/repository/data-type.tree.store.d.ts

@@ -15,4 +15,4 @@ export declare class UmbDataTypeTreeStore extends UmbEntityTreeStore {
      */
     constructor(host: UmbControllerHostElement);
 }
-export declare const UMB_DATA_TYPE_TREE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDataTypeTreeStore>;
+export declare const UMB_DATA_TYPE_TREE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbDataTypeTreeStore, UmbDataTypeTreeStore>;

package/dist-cms/packages/settings/data-types/repository/sources/data-type-folder.server.data.d.ts

@@ -1,5 +1,5 @@
 import { UmbFolderDataSource } from '../../../../../shared/repository/index.js';
-import { FolderReponseModel, CreateFolderRequestModel, FolderModelBaseModel } from '../../../../../external/backend-api/index.js';
+import { FolderResponseModel, CreateFolderRequestModel, FolderModelBaseModel } from '../../../../../external/backend-api/index.js';
 import { UmbControllerHostElement } from '../../../../../libs/controller-api/index.js';
 /**
  * A data source for a Data Type folder that fetches data from the server
@@ -22,7 +22,7 @@ export declare class UmbDataTypeFolderServerDataSource implements UmbFolderDataS
      * @memberof UmbDataTypeFolderServerDataSource
      */
     createScaffold(parentId: string | null): Promise<{
-        data: FolderReponseModel;
+        data: FolderResponseModel;
     }>;
     /**
      * Fetches a Data Type folder with the given id from the server
@@ -30,7 +30,7 @@ export declare class UmbDataTypeFolderServerDataSource implements UmbFolderDataS
      * @return {*}
      * @memberof UmbDataTypeFolderServerDataSource
      */
-    get(id: string): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<FolderReponseModel>>;
+    get(id: string): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<FolderResponseModel>>;
     /**
      * Inserts a new Data Type folder on the server
      * @param {folder} folder

package/dist-cms/packages/settings/data-types/variant-context/data-type-variant-context.d.ts

@@ -0,0 +1,7 @@
+import { UmbDataTypeWorkspaceContext } from "../workspace/data-type-workspace.context.js";
+import { UmbControllerHost } from "../../../../libs/controller-api/index.js";
+import { UmbInvariantWorkspaceVariantContext } from "../../../core/workspace/index.js";
+export declare class UmbDataTypeVariantContext extends UmbInvariantWorkspaceVariantContext<UmbDataTypeWorkspaceContext> {
+    properties: import("rxjs").Observable<import("../../../core/index.js").PropertyEditorConfigProperty[] | undefined>;
+    constructor(host: UmbControllerHost, workspace: UmbDataTypeWorkspaceContext);
+}

package/dist-cms/packages/settings/data-types/variant-context/data-type-variant-context.js

@@ -0,0 +1,8 @@
+import { UmbInvariantWorkspaceVariantContext } from "../../../core/workspace/index.js";
+export class UmbDataTypeVariantContext extends UmbInvariantWorkspaceVariantContext {
+    // default data:
+    constructor(host, workspace) {
+        super(host, workspace);
+        this.properties = this._workspace.properties;
+    }
+}

package/dist-cms/packages/settings/data-types/variant-context/data-type-variant-context.token.d.ts

@@ -0,0 +1,5 @@
+import type { UmbDataTypeVariantContext } from "./data-type-variant-context.js";
+import { UmbVariantContext } from "../../../core/workspace/index.js";
+import { UmbContextToken } from "../../../../libs/context-api/index.js";
+export declare const isDataTypeVariantContext: (context: UmbVariantContext) => context is UmbDataTypeVariantContext;
+export declare const UMB_DATA_TYPE_VARIANT_CONTEXT: UmbContextToken<UmbVariantContext, UmbDataTypeVariantContext>;

package/dist-cms/packages/settings/data-types/variant-context/data-type-variant-context.token.js

@@ -0,0 +1,3 @@
+import { UmbContextToken } from "../../../../libs/context-api/index.js";
+export const isDataTypeVariantContext = (context) => ('properties' in context && context.getType() === 'data-type');
+export const UMB_DATA_TYPE_VARIANT_CONTEXT = new UmbContextToken("UmbVariantContext", isDataTypeVariantContext);

package/dist-cms/packages/settings/data-types/variant-context/index.d.ts

@@ -0,0 +1,2 @@
+export * from './data-type-variant-context.token.js';
+export * from './data-type-variant-context.js';

package/dist-cms/packages/settings/data-types/variant-context/index.js

@@ -0,0 +1,2 @@
+export * from './data-type-variant-context.token.js';
+export * from './data-type-variant-context.js';

package/dist-cms/packages/settings/data-types/workspace/data-type-workspace-editor.element.js

@@ -4,10 +4,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UUIInputEvent, UUITextStyles } from '../../../../external/uui/index.js';
+import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from './data-type-workspace.context.js';
+import { UUIInputEvent } from '../../../../external/uui/index.js';
 import { css, html, customElement, property, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { UMB_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
 /**
  * @element umb-data-type-workspace-editor
  * @description - Element for displaying the Data Type Workspace edit route.
@@ -17,8 +17,9 @@ export let UmbDataTypeWorkspaceEditorElement = class UmbDataTypeWorkspaceEditorE
     constructor() {
         super();
         this._dataTypeName = '';
-        this.consumeContext(UMB_WORKSPACE_CONTEXT, (workspaceContext) => {
+        this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (workspaceContext) => {
             this.#workspaceContext = workspaceContext;
+            this.#workspaceContext?.createVariantContext(this);
             this.#observeIsNew();
             this.#observeName();
         });
@@ -63,7 +64,6 @@ export let UmbDataTypeWorkspaceEditorElement = class UmbDataTypeWorkspaceEditorE
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			:host {
 				display: block;
@@ -78,7 +78,7 @@ export let UmbDataTypeWorkspaceEditorElement = class UmbDataTypeWorkspaceEditorE
     ]; }
 };
 __decorate([
-    property()
+    property({ attribute: false })
 ], UmbDataTypeWorkspaceEditorElement.prototype, "manifest", void 0);
 __decorate([
     state()

package/dist-cms/packages/settings/data-types/workspace/data-type-workspace.context.d.ts

@@ -1,25 +1,47 @@
 import { UmbDataTypeRepository } from '../repository/data-type.repository.js';
-import { UmbEntityWorkspaceContextInterface, UmbWorkspaceContext } from '../../../core/workspace/index.js';
+import { UmbDataTypeVariantContext } from '../variant-context/data-type-variant-context.js';
+import { UmbInvariantableWorkspaceContextInterface, UmbWorkspaceContext, UmbWorkspaceContextInterface } from '../../../core/workspace/index.js';
 import type { DataTypeResponseModel } from '../../../../external/backend-api/index.js';
-import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-export declare class UmbDataTypeWorkspaceContext extends UmbWorkspaceContext<UmbDataTypeRepository, DataTypeResponseModel> implements UmbEntityWorkspaceContextInterface<DataTypeResponseModel | undefined> {
+import { UmbControllerHost, UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+import { Observable } from '../../../../external/rxjs/index.js';
+import { PropertyEditorConfigDefaultData, PropertyEditorConfigProperty } from '../../../core/extension-registry/index.js';
+export declare class UmbDataTypeWorkspaceContext extends UmbWorkspaceContext<UmbDataTypeRepository, DataTypeResponseModel> implements UmbInvariantableWorkspaceContextInterface<DataTypeResponseModel | undefined> {
     #private;
-    data: import("rxjs").Observable<DataTypeResponseModel | undefined>;
-    name: import("rxjs").Observable<string | undefined>;
-    id: import("rxjs").Observable<string | undefined>;
+    data: Observable<DataTypeResponseModel | undefined>;
+    name: Observable<string | undefined>;
+    id: Observable<string | undefined>;
+    propertyEditorUiAlias: Observable<string | null | undefined>;
+    propertyEditorSchemaAlias: Observable<string | undefined>;
+    properties: Observable<Array<PropertyEditorConfigProperty> | undefined>;
+    private _propertyEditorSchemaConfigDefaultData;
+    private _propertyEditorUISettingsDefaultData;
+    private _propertyEditorSchemaConfigProperties?;
+    private _propertyEditorUISettingsProperties?;
+    private _configDefaultData?;
+    defaults: Observable<PropertyEditorConfigDefaultData[]>;
     constructor(host: UmbControllerHostElement);
+    private _observePropertyEditorSchemaConfig;
+    private _mergeConfigProperties;
+    private _mergeConfigDefaultData;
+    getPropertyDefaultValue(alias: string): unknown;
+    createVariantContext(host: UmbControllerHost): UmbDataTypeVariantContext;
     load(id: string): Promise<void>;
     create(parentId: string | null): Promise<{
-        data: import("../../../../external/backend-api/index.js").CreateDataTypeRequestModel | undefined;
+        data: any;
     }>;
     getData(): DataTypeResponseModel | undefined;
     getEntityId(): string;
     getEntityType(): string;
+    getName(): string | undefined;
     setName(name: string): void;
     setPropertyEditorSchemaAlias(alias?: string): void;
     setPropertyEditorUiAlias(alias?: string): void;
-    setPropertyValue(alias: string, value: unknown): void;
+    propertyValueByAlias<ReturnType = unknown>(propertyAlias: string): Promise<Observable<ReturnType>>;
+    getPropertyValue<ReturnType = unknown>(propertyAlias: string): ReturnType;
+    setPropertyValue(alias: string, value: unknown): Promise<void>;
     save(): Promise<void>;
     delete(id: string): Promise<void>;
     destroy(): void;
 }
+export declare const UMB_DATA_TYPE_WORKSPACE_CONTEXT: UmbContextToken<UmbWorkspaceContextInterface<unknown>, UmbDataTypeWorkspaceContext>;

package/dist-cms/packages/settings/data-types/workspace/data-type-workspace.context.js

@@ -1,9 +1,17 @@
 import { UmbDataTypeRepository } from '../repository/data-type.repository.js';
+import { UmbDataTypeVariantContext } from '../variant-context/data-type-variant-context.js';
 import { UmbWorkspaceContext } from '../../../core/workspace/index.js';
-import { appendToFrozenArray, UmbObjectState } from '../../../../libs/observable-api/index.js';
+import { appendToFrozenArray, UmbArrayState, UmbObjectState } from '../../../../libs/observable-api/index.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+import { combineLatest, map } from '../../../../external/rxjs/index.js';
+import { umbExtensionsRegistry } from '../../../core/extension-registry/index.js';
+import { UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT } from '../../../core/property-editor/index.js';
 export class UmbDataTypeWorkspaceContext extends UmbWorkspaceContext {
     // TODO: revisit. temp solution because the create and response models are different.
     #data;
+    #getDataPromise;
+    #properties;
+    #defaults;
     constructor(host) {
         super(host, 'Umb.Workspace.DataType', new UmbDataTypeRepository(host));
         // TODO: revisit. temp solution because the create and response models are different.
@@ -11,16 +19,72 @@ export class UmbDataTypeWorkspaceContext extends UmbWorkspaceContext {
         this.data = this.#data.asObservable();
         this.name = this.#data.asObservablePart((data) => data?.name);
         this.id = this.#data.asObservablePart((data) => data?.id);
+        this.propertyEditorUiAlias = this.#data.asObservablePart((data) => data?.propertyEditorUiAlias);
+        this.propertyEditorSchemaAlias = this.#data.asObservablePart((data) => data?.propertyEditorAlias);
+        this.#properties = new UmbObjectState(undefined);
+        this.properties = this.#properties.asObservable();
+        this._propertyEditorSchemaConfigDefaultData = [];
+        this._propertyEditorUISettingsDefaultData = [];
+        this.#defaults = new UmbArrayState([], (entry) => entry.alias);
+        this.defaults = this.#defaults.asObservable();
+        this.observe(this.propertyEditorUiAlias, (propertyEditorUiAlias) => {
+            if (!propertyEditorUiAlias) {
+                // No property editor ui alias, so we clean up and reset the properties.
+                this.removeControllerByAlias('propertyEditorUiAlias');
+                this._propertyEditorUISettingsProperties = [];
+                this._propertyEditorUISettingsDefaultData = [];
+                this._mergeConfigProperties();
+                this._mergeConfigDefaultData();
+                return;
+            }
+            this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUi', propertyEditorUiAlias), (manifest) => {
+                this._observePropertyEditorSchemaConfig(manifest?.meta.propertyEditorSchemaAlias || UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT);
+                this._propertyEditorUISettingsProperties = manifest?.meta.settings?.properties || [];
+                this._propertyEditorUISettingsDefaultData = manifest?.meta.settings?.defaultData || [];
+                this._mergeConfigProperties();
+                this._mergeConfigDefaultData();
+            }, 'observePropertyEditorUiAlias');
+        });
+    }
+    _observePropertyEditorSchemaConfig(propertyEditorSchemaAlias) {
+        this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorSchema', propertyEditorSchemaAlias), (manifest) => {
+            this._propertyEditorSchemaConfigProperties = manifest?.meta.settings?.properties || [];
+            this._propertyEditorSchemaConfigDefaultData = manifest?.meta.settings?.defaultData || [];
+            this._mergeConfigProperties();
+            this._mergeConfigDefaultData();
+        });
+    }
+    _mergeConfigProperties() {
+        if (this._propertyEditorSchemaConfigProperties && this._propertyEditorUISettingsProperties) {
+            this.#properties.next([...this._propertyEditorSchemaConfigProperties, ...this._propertyEditorUISettingsProperties]);
+        }
+    }
+    _mergeConfigDefaultData() {
+        if (!this._propertyEditorSchemaConfigDefaultData || !this._propertyEditorUISettingsDefaultData)
+            return;
+        this._configDefaultData = [
+            ...this._propertyEditorSchemaConfigDefaultData,
+            ...this._propertyEditorUISettingsDefaultData,
+        ];
+        this.#defaults.next(this._configDefaultData);
+    }
+    getPropertyDefaultValue(alias) {
+        return this._configDefaultData?.find((x) => x.alias === alias)?.value;
+    }
+    createVariantContext(host) {
+        return new UmbDataTypeVariantContext(host, this);
     }
     async load(id) {
-        const { data } = await this.repository.requestById(id);
+        this.#getDataPromise = this.repository.requestById(id);
+        const { data } = await this.#getDataPromise;
         if (data) {
             this.setIsNew(false);
             this.#data.update(data);
         }
     }
     async create(parentId) {
-        let { data } = await this.repository.createScaffold(parentId);
+        this.#getDataPromise = this.repository.createScaffold(parentId);
+        let { data } = await this.#getDataPromise;
         if (this.modalContext) {
             data = { ...data, ...this.modalContext.data.preset };
         }
@@ -39,6 +103,9 @@ export class UmbDataTypeWorkspaceContext extends UmbWorkspaceContext {
     getEntityType() {
         return 'data-type';
     }
+    getName() {
+        return this.#data.getValue()?.name;
+    }
     setName(name) {
         this.#data.update({ name });
     }
@@ -48,8 +115,23 @@ export class UmbDataTypeWorkspaceContext extends UmbWorkspaceContext {
     setPropertyEditorUiAlias(alias) {
         this.#data.update({ propertyEditorUiAlias: alias });
     }
+    async propertyValueByAlias(propertyAlias) {
+        await this.#getDataPromise;
+        // TODO: Merge map..
+        return combineLatest([
+            this.#data.asObservablePart((data) => data?.values?.find((x) => x.alias === propertyAlias)?.value),
+            this.#defaults.asObservablePart((defaults) => defaults?.find((x) => x.alias === propertyAlias)?.value),
+        ]).pipe(map(([value, defaultValue]) => {
+            return (value ?? defaultValue);
+        }));
+        //return this.#data.asObservablePart((data) => data?.values?.find((x) => x.alias === propertyAlias)?.value ?? this.getPropertyDefaultValue(propertyAlias) as ReturnType);
+    }
+    getPropertyValue(propertyAlias) {
+        return this.#data.getValue()?.values?.find((x) => x.alias === propertyAlias)?.value ?? this.getPropertyDefaultValue(propertyAlias);
+    }
     // TODO: its not called a property in the model, but we do consider this way in our front-end
-    setPropertyValue(alias, value) {
+    async setPropertyValue(alias, value) {
+        await this.#getDataPromise;
         const entry = { alias: alias, value: value };
         const currentData = this.#data.value;
         if (currentData) {
@@ -78,3 +160,4 @@ export class UmbDataTypeWorkspaceContext extends UmbWorkspaceContext {
         this.#data.complete();
     }
 }
+export const UMB_DATA_TYPE_WORKSPACE_CONTEXT = new UmbContextToken('UmbWorkspaceContext', (context) => context.getEntityType?.() === 'data-type');

package/dist-cms/packages/settings/data-types/workspace/data-type-workspace.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbDataTypeWorkspaceContext } from './data-type-workspace.context.js';
-import { UUITextStyles } from '../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../shared/style/index.js";
 import { html, customElement } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import './data-type-workspace-editor.element.js';
@@ -40,7 +40,7 @@ export let UmbDataTypeWorkspaceElement = class UmbDataTypeWorkspaceElement exten
     render() {
         return html `<umb-router-slot .routes=${this._routes}></umb-router-slot>`;
     }
-    static { this.styles = [UUITextStyles]; }
+    static { this.styles = [UmbTextStyles]; }
 };
 UmbDataTypeWorkspaceElement = __decorate([
     customElement('umb-data-type-workspace')

package/dist-cms/packages/settings/data-types/workspace/views/details/data-type-details-workspace-view.element.js

@@ -4,9 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UUITextStyles } from '../../../../../../external/uui/index.js';
+import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '../../data-type-workspace.context.js';
+import { UmbTextStyles } from "../../../../../../shared/style/index.js";
 import { css, html, nothing, customElement, state } from '../../../../../../external/lit/index.js';
-import { UMB_WORKSPACE_CONTEXT } from '../../../../../core/workspace/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL, } from '../../../../../core/modal/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
 import { umbExtensionsRegistry, } from '../../../../../core/extension-registry/index.js';
@@ -17,8 +17,7 @@ export let UmbDataTypeDetailsWorkspaceViewEditElement = class UmbDataTypeDetails
         this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (instance) => {
             this._modalContext = instance;
         });
-        // TODO: Figure out if this is the best way to consume a context or if it could be strongly typed using UmbContextToken
-        this.consumeContext(UMB_WORKSPACE_CONTEXT, (_instance) => {
+        this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (_instance) => {
             this._workspaceContext = _instance;
             this._observeDataType();
         });
@@ -40,7 +39,7 @@ export let UmbDataTypeDetailsWorkspaceViewEditElement = class UmbDataTypeDetails
                         if (!propertyEditorSchema)
                             return;
                         this._setPropertyEditorUiAlias(propertyEditorSchema.meta.defaultPropertyEditorUiAlias ?? undefined);
-                    }, '_observepropertyEditorSchemaForDefaultUI');
+                    }, '_observePropertyEditorSchemaForDefaultUI');
                 }
                 else {
                     this._setPropertyEditorUiAlias(undefined);
@@ -67,8 +66,8 @@ export let UmbDataTypeDetailsWorkspaceViewEditElement = class UmbDataTypeDetails
             this.removeControllerByAlias('_observePropertyEditorUI');
             return;
         }
-        // remove the '_observepropertyEditorSchemaForDefaultUI' controller, as we do not want to observe for default value anymore:
-        this.removeControllerByAlias('_observepropertyEditorSchemaForDefaultUI');
+        // remove the '_observePropertyEditorSchemaForDefaultUI' controller, as we do not want to observe for default value anymore:
+        this.removeControllerByAlias('_observePropertyEditorSchemaForDefaultUI');
         this.observe(umbExtensionsRegistry.getByTypeAndAlias('propertyEditorUi', propertyEditorUiAlias), (propertyEditorUI) => {
             // TODO: show error. We have stored a PropertyEditorUIAlias and can't find the PropertyEditorUI in the registry.
             if (!propertyEditorUI)
@@ -144,7 +143,7 @@ export let UmbDataTypeDetailsWorkspaceViewEditElement = class UmbDataTypeDetails
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			:host {
 				display: block;

package/dist-cms/packages/settings/data-types/workspace/views/info/workspace-view-data-type-info.element.js

@@ -4,15 +4,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UUITextStyles } from '../../../../../../external/uui/index.js';
+import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from '../../data-type-workspace.context.js';
+import { UmbTextStyles } from "../../../../../../shared/style/index.js";
 import { css, html, customElement, state } from '../../../../../../external/lit/index.js';
-import { UMB_WORKSPACE_CONTEXT } from '../../../../../core/workspace/index.js';
 import { UmbLitElement } from '../../../../../../shared/lit-element/index.js';
 export let UmbWorkspaceViewDataTypeInfoElement = class UmbWorkspaceViewDataTypeInfoElement extends UmbLitElement {
     constructor() {
         super();
-        // TODO: Figure out if this is the best way to consume the context or if it can be strongly typed with an UmbContextToken
-        this.consumeContext(UMB_WORKSPACE_CONTEXT, (dataTypeContext) => {
+        this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (dataTypeContext) => {
             this._workspaceContext = dataTypeContext;
             this._observeDataType();
         });
@@ -49,7 +48,7 @@ export let UmbWorkspaceViewDataTypeInfoElement = class UmbWorkspaceViewDataTypeI
         return html ` <uui-box headline="References"> </uui-box> `;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			:host {
 				display: block;

package/dist-cms/packages/settings/extensions/workspace/extension-root-workspace.element.js

@@ -6,7 +6,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { css, html, customElement, state } from '../../../../external/lit/index.js';
 import { map } from '../../../../external/rxjs/index.js';
-import { isManifestElementNameType } from '../../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../../core/extension-registry/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UMB_CONFIRM_MODAL, } from '../../../core/modal/index.js';
@@ -61,7 +60,7 @@ export let UmbExtensionRootWorkspaceElement = class UmbExtensionRootWorkspaceEle
 								<uui-table-row>
 									<uui-table-cell>${extension.type}</uui-table-cell>
 									<uui-table-cell>
-										${isManifestElementNameType(extension) ? extension.name : `[Custom extension] ${extension.name}`}
+										${extension.name}
 									</uui-table-cell>
 									<uui-table-cell>${extension.alias}</uui-table-cell>
 									<uui-table-cell>${extension.weight ? extension.weight : ''} </uui-table-cell>

package/dist-cms/packages/settings/languages/app-language-select/app-language-select.element.js

@@ -6,7 +6,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbLanguageRepository } from '../repository/language.repository.js';
 import { UMB_APP_LANGUAGE_CONTEXT_TOKEN } from './app-language.context.js';
-import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, customElement, state, repeat, ifDefined } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export let UmbAppLanguageSelectElement = class UmbAppLanguageSelectElement extends UmbLitElement {
@@ -74,16 +73,15 @@ export let UmbAppLanguageSelectElement = class UmbAppLanguageSelectElement exten
     #renderContent() {
         return html `<div slot="dropdown">
 			${repeat(this._languages, (language) => language.isoCode, (language) => html `
-						<uui-menu-item
-							label=${ifDefined(language.name)}
-							@click-label=${this.#onLabelClick}
-							data-iso-code=${ifDefined(language.isoCode)}
-							?active=${language.isoCode === this._appLanguage?.isoCode}></uui-menu-item>
-					`)}
+					<uui-menu-item
+						label=${ifDefined(language.name)}
+						@click-label=${this.#onLabelClick}
+						data-iso-code=${ifDefined(language.isoCode)}
+						?active=${language.isoCode === this._appLanguage?.isoCode}></uui-menu-item>
+				`)}
 		</div>`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			:host {
 				display: block;
@@ -104,6 +102,7 @@ export let UmbAppLanguageSelectElement = class UmbAppLanguageSelectElement exten
 				align-items: center;
 				justify-content: space-between;
 				cursor: pointer;
+				font-family: inherit;
 			}
 
 			#toggle:hover {

package/dist-cms/packages/settings/languages/app-language-select/app-language.context.d.ts

@@ -8,4 +8,4 @@ export declare class UmbAppLanguageContext {
     setLanguage(isoCode: string): void;
 }
 export default UmbAppLanguageContext;
-export declare const UMB_APP_LANGUAGE_CONTEXT_TOKEN: UmbContextToken<UmbAppLanguageContext>;
+export declare const UMB_APP_LANGUAGE_CONTEXT_TOKEN: UmbContextToken<UmbAppLanguageContext, UmbAppLanguageContext>;

package/dist-cms/packages/settings/languages/components/input-language-picker/input-language-picker.element.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { UmbLanguagePickerContext } from './input-language-picker.context.js';
 import { css, html, ifDefined, customElement, property, state } from '../../../../../external/lit/index.js';
-import { UUITextStyles, FormControlMixin } from '../../../../../external/uui/index.js';
+import { FormControlMixin } from '../../../../../external/uui/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
 export let UmbInputLanguagePickerElement = class UmbInputLanguagePickerElement extends FormControlMixin(UmbLitElement) {
     /**
@@ -104,7 +104,6 @@ export let UmbInputLanguagePickerElement = class UmbInputLanguagePickerElement e
 		`;
     }
     static { this.styles = [
-        UUITextStyles,
         css `
 			#add-button {
 				width: 100%;

package/dist-cms/packages/settings/languages/modals/language-picker/language-picker-modal.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbLanguageRepository } from '../../repository/language.repository.js';
-import { UUITextStyles } from '../../../../../external/uui/index.js';
+import { UmbTextStyles } from "../../../../../shared/style/index.js";
 import { css, html, customElement, state, repeat } from '../../../../../external/lit/index.js';
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { UmbSelectionManagerBase } from '../../../../../shared/utils/index.js';
@@ -61,7 +61,7 @@ export let UmbLanguagePickerModalElement = class UmbLanguagePickerModalElement e
 			</div>
 		</umb-body-layout> `;
     }
-    static { this.styles = [UUITextStyles, css ``]; }
+    static { this.styles = [UmbTextStyles, css ``]; }
 };
 __decorate([
     state()

package/dist-cms/packages/settings/languages/repository/language-item.store.d.ts

@@ -3,7 +3,7 @@ import { UmbStoreBase } from '../../../core/store/index.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import { LanguageResponseModel } from '../../../../external/backend-api/index.js';
 import type { UmbItemStore } from '../../../core/store/index.js';
-export declare const UMB_LANGUAGE_ITEM_STORE_CONTEXT_TOKEN: UmbContextToken<UmbLanguageItemStore>;
+export declare const UMB_LANGUAGE_ITEM_STORE_CONTEXT_TOKEN: UmbContextToken<UmbLanguageItemStore, UmbLanguageItemStore>;
 /**
  * @export
  * @class UmbLanguageItemStore

package/dist-cms/packages/settings/languages/repository/language.store.d.ts

@@ -2,7 +2,7 @@ import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import { UmbStoreBase } from '../../../core/store/index.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import { LanguageResponseModel } from '../../../../external/backend-api/index.js';
-export declare const UMB_LANGUAGE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbLanguageStore>;
+export declare const UMB_LANGUAGE_STORE_CONTEXT_TOKEN: UmbContextToken<UmbLanguageStore, UmbLanguageStore>;
 /**
  * @export
  * @class UmbLanguageStore

package/dist-cms/packages/settings/languages/workspace/language/language-workspace-editor.element.js

@@ -4,15 +4,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UUITextStyles, UUIInputEvent } from '../../../../../external/uui/index.js';
+import { UMB_LANGUAGE_WORKSPACE_CONTEXT } from './language-workspace.context.js';
+import { UUIInputEvent } from '../../../../../external/uui/index.js';
 import { css, html, customElement, state, ifDefined } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
-import { UMB_WORKSPACE_CONTEXT } from '../../../../core/workspace/index.js';
+import { UmbTextStyles } from '../../../../../shared/style/index.js';
 export let UmbLanguageWorkspaceEditorElement = class UmbLanguageWorkspaceEditorElement extends UmbLitElement {
     #workspaceContext;
     constructor() {
         super();
-        this.consumeContext(UMB_WORKSPACE_CONTEXT, (context) => {
+        this.consumeContext(UMB_LANGUAGE_WORKSPACE_CONTEXT, (context) => {
             this.#workspaceContext = context;
             this.#observeData();
         });
@@ -55,7 +56,7 @@ export let UmbLanguageWorkspaceEditorElement = class UmbLanguageWorkspaceEditorE
 		</umb-workspace-editor>`;
     }
     static { this.styles = [
-        UUITextStyles,
+        UmbTextStyles,
         css `
 			#header {
 				display: flex;