@umbraco-cms/backoffice 1.0.0-next.e3cf00d3 → 1.0.0-next.e8be58ec

package/collection.d.ts

@@ -3,9 +3,9 @@ import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
 import { UmbCollectionRepository } from '@umbraco-cms/backoffice/repository';
-import { UmbFilterModel } from '@umbraco-cms/backoffice/models';
+import { UmbCollectionFilterModel as UmbCollectionFilterModel$1 } from '@umbraco-cms/backoffice/collection';
 
-declare class UmbCollectionContext<ItemType, FilterModelType extends UmbFilterModel> {
+declare class UmbCollectionContext<ItemType, FilterModelType extends UmbCollectionFilterModel$1> {
     #private;
     private _host;
     private _entityType;
@@ -29,4 +29,10 @@ declare class UmbCollectionContext<ItemType, FilterModelType extends UmbFilterMo
 }
 declare const UMB_COLLECTION_CONTEXT_TOKEN: UmbContextToken<UmbCollectionContext<any, any>>;
 
-export { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext };
+interface UmbCollectionFilterModel {
+    skip?: number;
+    take?: number;
+    filter?: string;
+}
+
+export { UMB_COLLECTION_CONTEXT_TOKEN, UmbCollectionContext, UmbCollectionFilterModel };

package/context-api.d.ts

@@ -1,6 +1,6 @@
 import { UmbControllerHostElement, UmbControllerInterface } from '@umbraco-cms/backoffice/controller';
 import { UmbWorkspaceContextInterface } from '@umbraco-cms/backoffice/workspace';
-import { BaseEntity } from '@umbraco-cms/backoffice/models';
+import { UmbEntityBase } from '@umbraco-cms/backoffice/models';
 
 declare class UmbContextToken<T = unknown> {
     protected alias: string;
@@ -170,7 +170,7 @@ interface UmbEntityWorkspaceContextInterface<EntityType = unknown> extends UmbWo
     save(): Promise<void>;
 }
 
-declare const UMB_ENTITY_WORKSPACE_CONTEXT: UmbContextToken<UmbEntityWorkspaceContextInterface<BaseEntity>>;
+declare const UMB_ENTITY_WORKSPACE_CONTEXT: UmbContextToken<UmbEntityWorkspaceContextInterface<UmbEntityBase>>;
 
 /**
  * Change the collection of Contexts into a simplified array of data

package/custom-elements.json

@@ -4187,66 +4187,6 @@
         }
       ]
     },
-    {
-      "name": "umb-input-user-group",
-      "path": "./../../src/backoffice/shared/components/input-user-group/input-user-group.element.ts",
-      "attributes": [
-        {
-          "name": "value",
-          "type": "string[]",
-          "default": "[]"
-        },
-        {
-          "name": "multiple",
-          "type": "boolean",
-          "default": "true"
-        },
-        {
-          "name": "modalType",
-          "default": "\"sidebar\""
-        },
-        {
-          "name": "modalSize",
-          "type": "UUIModalSidebarSize",
-          "default": "\"small\""
-        }
-      ],
-      "properties": [
-        {
-          "name": "styles",
-          "type": "CSSResult[]",
-          "default": "[\"UUITextStyles\",null]"
-        },
-        {
-          "name": "value",
-          "attribute": "value",
-          "type": "string[]",
-          "default": "[]"
-        },
-        {
-          "name": "multiple",
-          "attribute": "multiple",
-          "type": "boolean",
-          "default": "true"
-        },
-        {
-          "name": "modalType",
-          "attribute": "modalType",
-          "default": "\"sidebar\""
-        },
-        {
-          "name": "modalSize",
-          "attribute": "modalSize",
-          "type": "UUIModalSidebarSize",
-          "default": "\"small\""
-        }
-      ],
-      "events": [
-        {
-          "name": "change"
-        }
-      ]
-    },
     {
       "name": "umb-menu-item-base",
       "path": "./../../src/backoffice/shared/components/menu/menu-item-base/menu-item-base.element.ts",
@@ -7490,6 +7430,66 @@
         }
       ]
     },
+    {
+      "name": "umb-input-user-group",
+      "path": "./../../src/backoffice/users/user-groups/components/input-user-group/input-user-group.element.ts",
+      "attributes": [
+        {
+          "name": "value",
+          "type": "string[]",
+          "default": "[]"
+        },
+        {
+          "name": "multiple",
+          "type": "boolean",
+          "default": "true"
+        },
+        {
+          "name": "modalType",
+          "default": "\"sidebar\""
+        },
+        {
+          "name": "modalSize",
+          "type": "UUIModalSidebarSize",
+          "default": "\"small\""
+        }
+      ],
+      "properties": [
+        {
+          "name": "styles",
+          "type": "CSSResult[]",
+          "default": "[\"UUITextStyles\",null]"
+        },
+        {
+          "name": "value",
+          "attribute": "value",
+          "type": "string[]",
+          "default": "[]"
+        },
+        {
+          "name": "multiple",
+          "attribute": "multiple",
+          "type": "boolean",
+          "default": "true"
+        },
+        {
+          "name": "modalType",
+          "attribute": "modalType",
+          "default": "\"sidebar\""
+        },
+        {
+          "name": "modalSize",
+          "attribute": "modalSize",
+          "type": "UUIModalSidebarSize",
+          "default": "\"small\""
+        }
+      ],
+      "events": [
+        {
+          "name": "change"
+        }
+      ]
+    },
     {
       "name": "umb-user-group-picker-modal",
       "path": "./../../src/backoffice/users/user-groups/modals/user-group-picker/user-group-picker-modal.element.ts",

package/modal.d.ts

@@ -9,7 +9,6 @@ import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { Params } from '@umbraco-cms/backoffice/router';
 import { UmbModalToken as UmbModalToken$1, UmbModalConfig as UmbModalConfig$1, UmbPickerModalData as UmbPickerModalData$1 } from '@umbraco-cms/backoffice/modal';
 import { LanguageResponseModel, UserResponseModel, FolderReponseModel } from '@umbraco-cms/backoffice/backend-api';
-import { UserDetails } from '@umbraco-cms/backoffice/models';
 
 declare class UmbSearchModalElement extends LitElement {
     #private;
@@ -382,7 +381,7 @@ interface UmbTemplatePickerModalResult {
 }
 declare const UMB_TEMPLATE_PICKER_MODAL: UmbModalToken$1<UmbTemplatePickerModalData, UmbTemplatePickerModalResult>;
 
-declare const UMB_USER_GROUP_PICKER_MODAL: UmbModalToken$1<UmbPickerModalData$1<UserDetails>, unknown>;
+declare const UMB_USER_GROUP_PICKER_MODAL: UmbModalToken$1<UmbPickerModalData$1<any>, unknown>;
 
 type UmbUserPickerModalData = UmbPickerModalData$1<UserResponseModel>;
 interface UmbUserPickerModalResult {
@@ -410,11 +409,11 @@ declare const UMB_DATA_TYPE_PICKER_MODAL: UmbModalToken$1<UmbDataTypePickerModal
 
 interface UmbPickerModalData<T> {
     multiple: boolean;
-    selection: Array<string>;
+    selection: Array<string | null>;
     filter?: (item: T) => boolean;
 }
 interface UmbPickerModalResult {
-    selection: Array<string>;
+    selection: Array<string | null>;
 }
 
 export { OEmbedResult, OEmbedStatus, UMB_ALLOWED_DOCUMENT_TYPES_MODAL, UMB_CHANGE_PASSWORD_MODAL, UMB_CONFIRM_MODAL, UMB_CONTEXT_DEBUGGER_MODAL, UMB_CREATE_DICTIONARY_MODAL, UMB_CREATE_USER_MODAL, UMB_CURRENT_USER_MODAL, UMB_DATA_TYPE_PICKER_MODAL, UMB_DOCUMENT_PICKER_MODAL, UMB_DOCUMENT_TYPE_PICKER_MODAL, UMB_EMBEDDED_MEDIA_MODAL, UMB_EXAMINE_FIELDS_SETTINGS_MODAL, UMB_EXPORT_DICTIONARY_MODAL, UMB_FOLDER_MODAL, UMB_ICON_PICKER_MODAL, UMB_IMPORT_DICTIONARY_MODAL, UMB_INVITE_USER_MODAL, UMB_LANGUAGE_PICKER_MODAL, UMB_LINK_PICKER_MODAL, UMB_MEDIA_PICKER_MODAL, UMB_MODAL_CONTEXT_TOKEN, UMB_PROPERTY_EDITOR_UI_PICKER_MODAL, UMB_PROPERTY_SETTINGS_MODAL, UMB_SEARCH_MODAL, UMB_SECTION_PICKER_MODAL, UMB_TEMPLATE_MODAL, UMB_TEMPLATE_PICKER_MODAL, UMB_USER_GROUP_PICKER_MODAL, UMB_USER_PICKER_MODAL, UmbAllowedDocumentTypesModalData, UmbAllowedDocumentTypesModalResult, UmbChangePasswordModalData, UmbConfirmModalData, UmbConfirmModalResult, UmbContextDebuggerModalData, UmbCreateDictionaryModalData, UmbCreateDictionaryModalResult, UmbCreateDocumentModalResultData, UmbDataTypePickerModalData, UmbDataTypePickerModalResult, UmbDocumentPickerModalData, UmbDocumentPickerModalResult, UmbDocumentTypePickerModalData, UmbDocumentTypePickerModalResult, UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult, UmbExamineFieldsSettingsModalData, UmbExportDictionaryModalData, UmbExportDictionaryModalResult, UmbFolderModalData, UmbFolderModalResult, UmbIconPickerModalData, UmbIconPickerModalResult, UmbImportDictionaryModalData, UmbImportDictionaryModalResult, UmbLanguagePickerModalData, UmbLanguagePickerModalResult, UmbLinkPickerConfig, UmbLinkPickerLink, UmbLinkPickerModalData, UmbLinkPickerModalResult, UmbMediaPickerModalData, UmbMediaPickerModalResult, UmbModalConfig, UmbModalContext, UmbModalHandler, UmbModalHandlerClass, UmbModalRouteBuilder, UmbModalRouteRegistration, UmbModalRouteRegistrationController, UmbModalToken, UmbModalType, UmbPickerModalData, UmbPickerModalResult, UmbPropertyEditorUIPickerModalData, UmbPropertyEditorUIPickerModalResult, UmbPropertySettingsModalResult, UmbSectionPickerModalData, UmbTemplateModalData, UmbTemplateModalResult, UmbTemplatePickerModalData, UmbTemplatePickerModalResult, UmbUserPickerModalData, UmbUserPickerModalResult };

package/models.d.ts

@@ -1,97 +1,13 @@
-import { EntityTreeItemResponseModel, FolderTreeItemResponseModel, PackageManifestResponseModel } from '@umbraco-cms/backoffice/backend-api';
-
 type HTMLElementConstructor<T = HTMLElement> = new (...args: any[]) => T;
 type ClassConstructor<T> = new (...args: any[]) => T;
-interface Entity {
-    id: string;
-    name: string;
-    icon: string;
-    type: string;
-    hasChildren: boolean;
-    parentId: string | null;
-}
 /** Tried to find a common base of our entities — used by Entity Workspace Context */
-type BaseEntity = {
+type UmbEntityBase = {
     id?: string;
     name?: string;
 };
-interface UserEntity extends Entity {
-    type: 'user';
-}
-type UserStatus = 'enabled' | 'inactive' | 'invited' | 'disabled';
-interface UserDetails extends UserEntity {
-    email: string;
-    status: UserStatus;
-    language: string;
-    lastLoginDate?: string;
-    lastLockoutDate?: string;
-    lastPasswordChangeDate?: string;
-    updateDate: string;
-    createDate: string;
-    failedLoginAttempts: number;
-    userGroups: Array<string>;
-    contentStartNodes: Array<string>;
-    mediaStartNodes: Array<string>;
-}
-interface UserGroupEntity extends Entity {
-    type: 'user-group';
-}
-interface UserGroupDetails extends UserGroupEntity {
-    sections: Array<string>;
-    contentStartNode?: string;
-    mediaStartNode?: string;
-    permissions: Array<string>;
-}
-interface MemberTypeDetails extends EntityTreeItemResponseModel {
-    id: string;
-    alias: string;
-    properties: [];
-}
-interface MediaTypeDetails extends FolderTreeItemResponseModel {
-    id: string;
-    alias: string;
-    properties: [];
-}
-interface MemberGroupDetails extends EntityTreeItemResponseModel {
-    id: string;
-}
-interface MemberDetails extends EntityTreeItemResponseModel {
-    id: string;
-}
-interface DocumentBlueprintDetails {
-    id: string;
-    name: string;
-    type: 'document-blueprint';
-    properties: Array<any>;
-    data: Array<any>;
-    icon: string;
-    documentTypeKey: string;
-}
-interface SwatchDetails {
+interface UmbSwatchDetails {
     label: string;
     value: string;
 }
-type UmbPackage = PackageManifestResponseModel;
-type PackageManifestResponse = UmbPackage[];
-type UmbPackageWithMigrationStatus = UmbPackage & {
-    hasPendingMigrations: boolean;
-};
-interface UmbFilterModel {
-    skip?: number;
-    take?: number;
-    filter?: string;
-}
-interface UmbTreeRootModel {
-    type: string;
-    name: string;
-    hasChildren: boolean;
-    icon?: string;
-}
-interface UmbTreeRootEntityModel extends UmbTreeRootModel {
-    id: string | null;
-}
-interface UmbTreeRootFileSystemModel extends UmbTreeRootModel {
-    path: string | null;
-}
 
-export { BaseEntity, ClassConstructor, DocumentBlueprintDetails, Entity, HTMLElementConstructor, MediaTypeDetails, MemberDetails, MemberGroupDetails, MemberTypeDetails, PackageManifestResponse, SwatchDetails, UmbFilterModel, UmbPackage, UmbPackageWithMigrationStatus, UmbTreeRootEntityModel, UmbTreeRootFileSystemModel, UmbTreeRootModel, UserDetails, UserEntity, UserGroupDetails, UserGroupEntity, UserStatus };
+export { ClassConstructor, HTMLElementConstructor, UmbEntityBase, UmbSwatchDetails };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@umbraco-cms/backoffice",
-	"version": "1.0.0-next.e3cf00d3",
+	"version": "1.0.0-next.e8be58ec",
 	"license": "MIT",
 	"keywords": [
 		"umbraco",

package/repository.d.ts

@@ -1,7 +1,7 @@
 import { ApiError, CancelError, FolderReponseModel, CreateFolderRequestModel, UpdateFolderReponseModel, TreeItemPresentationModel, ProblemDetailsModel, FolderModelBaseModel, ItemResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api';
 import { DataSourceResponse as DataSourceResponse$1, UmbDataSourceErrorResponse as UmbDataSourceErrorResponse$1 } from '@umbraco-cms/backoffice/repository';
 import { Observable } from 'rxjs';
-import { UmbTreeRootModel, UmbTreeRootEntityModel } from '@umbraco-cms/backoffice/models';
+import { UmbTreeRootModel, UmbTreeRootEntityModel } from '@umbraco-cms/backoffice/tree';
 
 interface DataSourceResponse<T = undefined> extends UmbDataSourceErrorResponse {
     data?: T;

package/section.d.ts

@@ -2,7 +2,6 @@ import * as rxjs from 'rxjs';
 import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import { ManifestSection } from '@umbraco-cms/backoffice/extensions-registry';
-import { Entity } from '@umbraco-cms/backoffice/models';
 
 declare class UmbSectionSidebarContext {
     #private;
@@ -17,7 +16,6 @@ declare class UmbSectionSidebarContext {
 }
 declare const UMB_SECTION_SIDEBAR_CONTEXT_TOKEN: UmbContextToken<UmbSectionSidebarContext>;
 
-type ActiveTreeItemType = Entity | undefined;
 declare class UmbSectionContext {
     #private;
     readonly alias: rxjs.Observable<string | undefined>;
@@ -28,4 +26,4 @@ declare class UmbSectionContext {
 }
 declare const UMB_SECTION_CONTEXT_TOKEN: UmbContextToken<UmbSectionContext>;
 
-export { ActiveTreeItemType, UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, UmbSectionContext, UmbSectionSidebarContext };
+export { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, UmbSectionContext, UmbSectionSidebarContext };

package/tree.d.ts

@@ -0,0 +1,14 @@
+interface UmbTreeRootModel {
+    type: string;
+    name: string;
+    hasChildren: boolean;
+    icon?: string;
+}
+interface UmbTreeRootEntityModel extends UmbTreeRootModel {
+    id: string | null;
+}
+interface UmbTreeRootFileSystemModel extends UmbTreeRootModel {
+    path: string | null;
+}
+
+export { UmbTreeRootEntityModel, UmbTreeRootFileSystemModel, UmbTreeRootModel };

package/vscode-html-custom-data.json

@@ -296,7 +296,7 @@
     },
     {
       "name": "umb-member-group-workspace-edit",
-      "description": "Properties:\n\n  * `_memberGroup` - \n\n  * `styles` {`CSSResult[]`} - ",
+      "description": "Properties:\n\n  * `_memberGroup` {`MemberGroupDetails | undefined`} - \n\n  * `styles` {`CSSResult[]`} - ",
       "attributes": []
     },
     {
@@ -306,7 +306,7 @@
     },
     {
       "name": "umb-workspace-view-member-group-info",
-      "description": "Properties:\n\n  * `_memberGroup` - \n\n  * `styles` {`CSSResult[]`} - ",
+      "description": "Properties:\n\n  * `_memberGroup` {`MemberGroupDetails | undefined`} - \n\n  * `styles` {`CSSResult[]`} - ",
       "attributes": []
     },
     {
@@ -1689,47 +1689,6 @@
         }
       ]
     },
-    {
-      "name": "umb-input-user-group",
-      "description": "Events:\n\n  * `change` {`CustomEvent<unknown>`} - \n\nAttributes:\n\n  * `value` {`string[]`} - \n\n  * `multiple` {`boolean`} - \n\n  * `modalType` - \n\n  * `modalSize` {`UUIModalSidebarSize`} - \n\nProperties:\n\n  * `_userGroups` {`any[]`} - \n\n  * `_userGroupStore` - \n\n  * `styles` {`CSSResult[]`} - \n\n  * `value` {`string[]`} - \n\n  * `multiple` {`boolean`} - \n\n  * `modalType` - \n\n  * `modalSize` {`UUIModalSidebarSize`} - \n\n  * `pickerToken` - \n\n  * `_modalContext` - ",
-      "attributes": [
-        {
-          "name": "value",
-          "description": "`value` {`string[]`} - \n\nProperty: value\n\nDefault: "
-        },
-        {
-          "name": "multiple",
-          "description": "`multiple` {`boolean`} - \n\nProperty: multiple\n\nDefault: true",
-          "valueSet": "v"
-        },
-        {
-          "name": "modalType",
-          "description": "`modalType` - \n\nProperty: modalType\n\nDefault: sidebar"
-        },
-        {
-          "name": "modalSize",
-          "description": "`modalSize` {`UUIModalSidebarSize`} - \n\nProperty: modalSize\n\nDefault: small",
-          "values": [
-            {
-              "name": "small"
-            },
-            {
-              "name": "large"
-            },
-            {
-              "name": "medium"
-            },
-            {
-              "name": "full"
-            }
-          ]
-        },
-        {
-          "name": "onchange",
-          "description": "`change` {`CustomEvent<unknown>`} - "
-        }
-      ]
-    },
     {
       "name": "umb-menu-item-base",
       "description": "Attributes:\n\n  * `entity-type` {`string | undefined`} - \n\n  * `icon-name` {`string`} - \n\n  * `label` {`string`} - \n\n  * `has-children` {`boolean`} - \n\nProperties:\n\n  * `_entityType` {`string | undefined`} - \n\n  * `entityType` {`string | undefined`} - \n\n  * `iconName` {`string`} - \n\n  * `label` {`string`} - \n\n  * `hasChildren` {`boolean`} - \n\n  * `_href` {`string | undefined`} - \n\n  * `_hasActions` {`boolean`} - \n\n  * `styles` {`CSSResult[]`} - ",
@@ -2952,7 +2911,7 @@
     },
     {
       "name": "umb-current-user-header-app",
-      "description": "Properties:\n\n  * `_currentUser` - \n\n  * `_currentUserStore` - \n\n  * `_modalContext` - \n\n  * `styles` - ",
+      "description": "Properties:\n\n  * `_currentUser` {`UmbLoggedInUser | undefined`} - \n\n  * `_currentUserStore` - \n\n  * `_modalContext` - \n\n  * `styles` - ",
       "attributes": []
     },
     {
@@ -2967,7 +2926,7 @@
     },
     {
       "name": "umb-current-user-modal",
-      "description": "Properties:\n\n  * `modalHandler` - \n\n  * `_currentUser` - \n\n  * `_currentUserStore` - \n\n  * `styles` - ",
+      "description": "Properties:\n\n  * `modalHandler` - \n\n  * `_currentUser` {`UmbLoggedInUser | undefined`} - \n\n  * `_currentUserStore` - \n\n  * `styles` - ",
       "attributes": []
     },
     {
@@ -2987,7 +2946,7 @@
     },
     {
       "name": "umb-user-profile-app-profile",
-      "description": "Properties:\n\n  * `_currentUser` - \n\n  * `_modalContext` - \n\n  * `_currentUserStore` - \n\n  * `styles` {`CSSResult[]`} - ",
+      "description": "Properties:\n\n  * `_currentUser` {`UmbLoggedInUser | undefined`} - \n\n  * `_modalContext` - \n\n  * `_currentUserStore` - \n\n  * `styles` {`CSSResult[]`} - ",
       "attributes": []
     },
     {
@@ -2995,9 +2954,50 @@
       "description": "Properties:\n\n  * `_themeAlias` {`string | null`} - \n\n  * `_themes` {`any[]`} - \n\n  * `styles` {`CSSResult[]`} - ",
       "attributes": []
     },
+    {
+      "name": "umb-input-user-group",
+      "description": "Events:\n\n  * `change` {`CustomEvent<unknown>`} - \n\nAttributes:\n\n  * `value` {`string[]`} - \n\n  * `multiple` {`boolean`} - \n\n  * `modalType` - \n\n  * `modalSize` {`UUIModalSidebarSize`} - \n\nProperties:\n\n  * `_userGroups` {`UserGroupEntity[]`} - \n\n  * `_userGroupStore` - \n\n  * `styles` {`CSSResult[]`} - \n\n  * `value` {`string[]`} - \n\n  * `multiple` {`boolean`} - \n\n  * `modalType` - \n\n  * `modalSize` {`UUIModalSidebarSize`} - \n\n  * `pickerToken` - \n\n  * `_modalContext` - ",
+      "attributes": [
+        {
+          "name": "value",
+          "description": "`value` {`string[]`} - \n\nProperty: value\n\nDefault: "
+        },
+        {
+          "name": "multiple",
+          "description": "`multiple` {`boolean`} - \n\nProperty: multiple\n\nDefault: true",
+          "valueSet": "v"
+        },
+        {
+          "name": "modalType",
+          "description": "`modalType` - \n\nProperty: modalType\n\nDefault: sidebar"
+        },
+        {
+          "name": "modalSize",
+          "description": "`modalSize` {`UUIModalSidebarSize`} - \n\nProperty: modalSize\n\nDefault: small",
+          "values": [
+            {
+              "name": "small"
+            },
+            {
+              "name": "large"
+            },
+            {
+              "name": "medium"
+            },
+            {
+              "name": "full"
+            }
+          ]
+        },
+        {
+          "name": "onchange",
+          "description": "`change` {`CustomEvent<unknown>`} - "
+        }
+      ]
+    },
     {
       "name": "umb-user-group-picker-modal",
-      "description": "Properties:\n\n  * `_userGroups` {`any[]`} - \n\n  * `_userGroupStore` - \n\n  * `styles` {`CSSResult[]`} - ",
+      "description": "Properties:\n\n  * `_userGroups` {`UserGroupDetails[]`} - \n\n  * `_userGroupStore` - \n\n  * `styles` {`CSSResult[]`} - ",
       "attributes": []
     },
     {
@@ -3022,7 +3022,7 @@
     },
     {
       "name": "umb-user-group-workspace-edit",
-      "description": "Properties:\n\n  * `defaultPermissions` {`{ name: string; permissions: { name: string; description: string; value: boolean; }[]; }[]`} - \n\n  * `_userStore` - \n\n  * `_userGroup` - \n\n  * `_userKeys` {`string[] | undefined`} - \n\n  * `styles` {`CSSResult[]`} - ",
+      "description": "Properties:\n\n  * `defaultPermissions` {`{ name: string; permissions: { name: string; description: string; value: boolean; }[]; }[]`} - \n\n  * `_userStore` - \n\n  * `_userGroup` {`UserGroupDetails | undefined`} - \n\n  * `_userKeys` {`string[] | undefined`} - \n\n  * `styles` {`CSSResult[]`} - ",
       "attributes": []
     },
     {
@@ -3032,7 +3032,7 @@
     },
     {
       "name": "umb-workspace-view-user-groups",
-      "description": "Properties:\n\n  * `_userGroups` {`any[]`} - \n\n  * `_tableConfig` {`UmbTableConfig`} - \n\n  * `_tableColumns` {`UmbTableColumn[]`} - \n\n  * `_tableItems` {`UmbTableItem[]`} - \n\n  * `_selection` {`string[]`} - \n\n  * `_userGroupStore` - \n\n  * `styles` {`CSSResult[]`} - ",
+      "description": "Properties:\n\n  * `_userGroups` {`UserGroupDetails[]`} - \n\n  * `_tableConfig` {`UmbTableConfig`} - \n\n  * `_tableColumns` {`UmbTableColumn[]`} - \n\n  * `_tableItems` {`UmbTableItem[]`} - \n\n  * `_selection` {`string[]`} - \n\n  * `_userGroupStore` - \n\n  * `styles` {`CSSResult[]`} - ",
       "attributes": []
     },
     {

package/workspace.d.ts

@@ -2,7 +2,7 @@ import * as rxjs from 'rxjs';
 import { Observable } from 'rxjs';
 import { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller';
 import { UmbWorkspaceContextInterface as UmbWorkspaceContextInterface$1 } from '@umbraco-cms/backoffice/workspace';
-import { BaseEntity } from '@umbraco-cms/backoffice/models';
+import { UmbEntityBase } from '@umbraco-cms/backoffice/models';
 
 interface UmbWorkspaceContextInterface<DataType = unknown> {
     host: UmbControllerHostElement;
@@ -23,7 +23,7 @@ interface UmbEntityWorkspaceContextInterface<EntityType = unknown> extends UmbWo
     save(): Promise<void>;
 }
 
-declare abstract class UmbWorkspaceContext<T, EntityType extends BaseEntity> implements UmbEntityWorkspaceContextInterface<EntityType> {
+declare abstract class UmbWorkspaceContext<T, EntityType extends UmbEntityBase> implements UmbEntityWorkspaceContextInterface<EntityType> {
     #private;
     host: UmbControllerHostElement;
     repository: T;