@umbraco-cms/backoffice 14.0.0-d335c2c2 → 14.0.0-d542ed7d

package/dist-cms/packages/translation/dictionary/workspace/dictionary-workspace.context.js

@@ -7,8 +7,8 @@ export class UmbDictionaryWorkspaceContext extends UmbWorkspaceContext {
         super(host, new UmbDictionaryRepository(host));
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
-        this.name = this.#data.getObservablePart((data) => data?.name);
-        this.dictionary = this.#data.getObservablePart((data) => data);
+        this.name = this.#data.asObservablePart((data) => data?.name);
+        this.dictionary = this.#data.asObservablePart((data) => data);
     }
     getData() {
         return this.#data.getValue();

package/dist-cms/packages/umbraco-news/manifests.js

@@ -6,7 +6,6 @@ export const dashboard = {
     weight: 20,
     meta: {
         label: 'Welcome',
-        pathname: 'welcome',
     },
     conditions: {
         sections: ['Umb.Section.Content'],

package/dist-cms/packages/umbraco-news/umbraco-news-dashboard.element.js

@@ -4,6 +4,7 @@ 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_AUTH } from '../../shared/auth/index.js';
 import { css, html, customElement, state } from '../../external/lit/index.js';
 import { UmbLitElement } from '../../shared/lit-element/index.js';
@@ -26,11 +27,13 @@ export let UmbUmbracoNewsDashboardElement = class UmbUmbracoNewsDashboardElement
     }
     render() {
         return html `
-			<uui-box>
-				<h1>Welcome, ${this.name}</h1>
-				<p>This is a preview version of Umbraco, where you can have a first-hand look at the new Backoffice.</p>
-				<p>There is currently very limited functionality.</p>
+			<uui-box class="uui-text">
+				<h1 class="uui-h2" style="margin-top: var(--uui-size-layout-1);">Welcome, ${this.name}</h1>
+				<p class="uui-lead">
+					This is a preview version of Umbraco, where you can have a first-hand look at the new Backoffice.
+				</p>
 				<p>
+					There is currently very limited functionality.<br />
 					Please refer to the
 					<a target="_blank" href="http://docs.umbraco.com/umbraco-backoffice/">documentation</a> to learn more about
 					what is possible.
@@ -39,6 +42,7 @@ export let UmbUmbracoNewsDashboardElement = class UmbUmbracoNewsDashboardElement
 		`;
     }
     static { this.styles = [
+        UUITextStyles,
         css `
 			:host {
 				display: block;

package/dist-cms/packages/users/current-user/current-user-history.store.js

@@ -5,7 +5,7 @@ export class UmbCurrentUserHistoryStore extends UmbStoreBase {
     constructor(host) {
         super(host, UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([]));
         this.history = this._data.asObservable();
-        this.latestHistory = this._data.getObservablePart((historyItems) => historyItems.slice(-10));
+        this.latestHistory = this._data.asObservablePart((historyItems) => historyItems.slice(-10));
         if (!('navigation' in window))
             return;
         window.navigation.addEventListener('navigate', (event) => {

package/dist-cms/packages/users/user-groups/repository/user-group-item.store.js

@@ -17,7 +17,7 @@ export class UmbUserGroupItemStore extends UmbStoreBase {
         super(host, UMB_USER_GROUP_ITEM_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([], (x) => x.id));
     }
     items(ids) {
-        return this._data.getObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
+        return this._data.asObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
     }
 }
 export const UMB_USER_GROUP_ITEM_STORE_CONTEXT_TOKEN = new UmbContextToken('UmbUserGroupItemStore');

package/dist-cms/packages/users/user-groups/repository/user-group.store.js

@@ -48,7 +48,7 @@ export class UmbUserGroupStore extends UmbStoreBase {
             .then((data) => {
             this.#groups.append([data]);
         });
-        return this.#groups.getObservablePart((userGroups) => userGroups.find((userGroup) => userGroup.id === id));
+        return this.#groups.asObservablePart((userGroups) => userGroups.find((userGroup) => userGroup.id === id));
     }
     async save(userGroups) {
         // TODO: use Fetcher API.

package/dist-cms/packages/users/user-groups/workspace/user-group-workspace-editor.element.d.ts

@@ -5,7 +5,7 @@ export declare class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
     private _userGroup?;
     private _userKeys?;
     constructor();
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 export default UmbUserGroupWorkspaceEditorElement;

package/dist-cms/packages/users/user-groups/workspace/user-group-workspace.element.js

@@ -9,6 +9,7 @@ import { UmbUserGroupWorkspaceEditorElement } from './user-group-workspace-edito
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { html, customElement, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+import { UmbWorkspaceIsNewRedirectController } from '../../../core/workspace/index.js';
 export let UmbUserGroupWorkspaceElement = class UmbUserGroupWorkspaceElement extends UmbLitElement {
     constructor() {
         super(...arguments);
@@ -20,6 +21,7 @@ export let UmbUserGroupWorkspaceElement = class UmbUserGroupWorkspaceElement ext
                 component: () => this.#element,
                 setup: (component, info) => {
                     this.#workspaceContext.create();
+                    new UmbWorkspaceIsNewRedirectController(this, this.#workspaceContext, this.shadowRoot.querySelector('umb-router-slot'));
                 },
             },
             {

package/dist-cms/packages/users/users/collection/user-collection.context.d.ts

@@ -1,8 +1,8 @@
-import { UmbUserCollectionFilterModel } from '../types.js';
+import { UmbUserCollectionFilterModel, UmbUserDetail } from '../types.js';
 import { UmbCollectionContext } from '../../../core/collection/index.js';
-import { UserOrderModel, UserResponseModel, UserStateModel } from '../../../../external/backend-api/index.js';
+import { UserOrderModel, UserStateModel } from '../../../../external/backend-api/index.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-export declare class UmbUserCollectionContext extends UmbCollectionContext<UserResponseModel, UmbUserCollectionFilterModel> {
+export declare class UmbUserCollectionContext extends UmbCollectionContext<UmbUserDetail, UmbUserCollectionFilterModel> {
     constructor(host: UmbControllerHostElement);
     setStateFilter(selection: Array<UserStateModel>): void;
     setOrderByFilter(orderBy: UserOrderModel): void;

package/dist-cms/packages/users/users/collection/views/grid/user-collection-grid-view.element.js

@@ -37,7 +37,7 @@ export let UmbUserCollectionGridViewElement = class UmbUserCollectionGridViewEle
     #renderUserCard(user) {
         return html `
 			<uui-card-user
-				.name=${user.name}
+				.name=${user.name ?? 'Unnamed user'}
 				selectable
 				?select-only=${this._selection.length > 0}
 				?selected=${this.#collectionContext?.isSelected(user.id ?? '')}

package/dist-cms/packages/users/users/repository/sources/user-collection.server.data.d.ts

@@ -1,6 +1,5 @@
-import type { UmbUserCollectionFilterModel } from '../../types.js';
+import type { UmbUserCollectionFilterModel, UmbUserDetail } from '../../types.js';
 import { UmbCollectionDataSource } from '../../../../../shared/repository/index.js';
-import { UserResponseModel } from '../../../../../external/backend-api/index.js';
 import { UmbControllerHostElement } from '../../../../../libs/controller-api/index.js';
 /**
  * A data source for the User that fetches data from the server
@@ -8,7 +7,7 @@ import { UmbControllerHostElement } from '../../../../../libs/controller-api/ind
  * @class UmbUserCollectionServerDataSource
  * @implements {RepositoryDetailDataSource}
  */
-export declare class UmbUserCollectionServerDataSource implements UmbCollectionDataSource<UserResponseModel> {
+export declare class UmbUserCollectionServerDataSource implements UmbCollectionDataSource<UmbUserDetail> {
     #private;
     /**
      * Creates an instance of UmbUserCollectionServerDataSource.
@@ -16,6 +15,21 @@ export declare class UmbUserCollectionServerDataSource implements UmbCollectionD
      * @memberof UmbUserCollectionServerDataSource
      */
     constructor(host: UmbControllerHostElement);
-    getCollection(): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<import("../../../../../external/backend-api/index.js").PagedUserResponseModel>>;
+    getCollection(): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<import("../../../../../shared/repository/index.js").UmbPagedData<object & import("../../../../../external/backend-api/index.js").UserPresentationBaseModel & {
+        id?: string | undefined;
+        languageIsoCode?: string | null | undefined;
+        contentStartNodeIds?: string[] | undefined;
+        mediaStartNodeIds?: string[] | undefined;
+        avatarUrls?: string[] | undefined;
+        state?: import("../../../../../external/backend-api/index.js").UserStateModel | undefined;
+        failedLoginAttempts?: number | undefined;
+        createDate?: string | undefined;
+        updateDate?: string | undefined;
+        lastLoginDate?: string | null | undefined;
+        lastLockoutDate?: string | null | undefined;
+        lastPasswordChangeDate?: string | null | undefined;
+    } & {
+        entityType: "user";
+    }>>>;
     filterCollection(filter: UmbUserCollectionFilterModel): Promise<import("../../../../../shared/repository/index.js").DataSourceResponse<any>>;
 }

package/dist-cms/packages/users/users/repository/sources/user-collection.server.data.js

@@ -1,3 +1,4 @@
+import { extendDataSourcePagedResponseData } from '../../../../../shared/repository/index.js';
 import { UserResource } from '../../../../../external/backend-api/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
 /**
@@ -16,10 +17,14 @@ export class UmbUserCollectionServerDataSource {
     constructor(host) {
         this.#host = host;
     }
-    getCollection() {
-        return tryExecuteAndNotify(this.#host, UserResource.getUser({}));
+    async getCollection() {
+        const response = await tryExecuteAndNotify(this.#host, UserResource.getUser({}));
+        return extendDataSourcePagedResponseData(response, {
+            entityType: 'user',
+        });
     }
     filterCollection(filter) {
         return tryExecuteAndNotify(this.#host, UserResource.getUserFilter(filter));
+        // TODO: Most likely missing the right type, and should then extend the data set with entityType.
     }
 }

package/dist-cms/packages/users/users/repository/sources/user.server.data.d.ts

@@ -17,7 +17,22 @@ export declare class UmbUserServerDataSource implements UmbUserDetailDataSource
      */
     constructor(host: UmbControllerHostElement);
     createScaffold(parentId: string | null): Promise<DataSourceResponse<UserPresentationBaseModel>>;
-    get(id: string): Promise<DataSourceResponse<import("../../../../../external/backend-api/index.js").UserResponseModel>>;
+    get(id: string): Promise<DataSourceResponse<object & UserPresentationBaseModel & {
+        id?: string | undefined;
+        languageIsoCode?: string | null | undefined;
+        contentStartNodeIds?: string[] | undefined;
+        mediaStartNodeIds?: string[] | undefined;
+        avatarUrls?: string[] | undefined;
+        state?: import("../../../../../external/backend-api/index.js").UserStateModel | undefined;
+        failedLoginAttempts?: number | undefined;
+        createDate?: string | undefined;
+        updateDate?: string | undefined;
+        lastLoginDate?: string | null | undefined;
+        lastLockoutDate?: string | null | undefined;
+        lastPasswordChangeDate?: string | null | undefined;
+    } & {
+        entityType: "user";
+    }>>;
     insert(data: CreateUserRequestModel): Promise<DataSourceResponse<import("../../../../../external/backend-api/index.js").CreateUserResponseModel>>;
     update(id: string, data: UpdateUserRequestModel): Promise<DataSourceResponse<any>>;
     delete(id: string): Promise<DataSourceResponse<any>>;

package/dist-cms/packages/users/users/repository/sources/user.server.data.js

@@ -1,3 +1,4 @@
+import { extendDataSourceResponseData } from '../../../../../shared/repository/index.js';
 import { UserResource, } from '../../../../../external/backend-api/index.js';
 import { tryExecuteAndNotify } from '../../../../../shared/resources/index.js';
 /**
@@ -20,10 +21,13 @@ export class UmbUserServerDataSource {
     createScaffold(parentId) {
         throw new Error('Method not implemented.');
     }
-    get(id) {
+    async get(id) {
         if (!id)
             throw new Error('Id is missing');
-        return tryExecuteAndNotify(this.#host, UserResource.getUserById({ id }));
+        const response = await tryExecuteAndNotify(this.#host, UserResource.getUserById({ id }));
+        return extendDataSourceResponseData(response, {
+            entityType: 'user',
+        });
     }
     insert(data) {
         return tryExecuteAndNotify(this.#host, UserResource.postUser({ requestBody: data }));

package/dist-cms/packages/users/users/repository/user-item.store.js

@@ -17,7 +17,7 @@ export class UmbUserItemStore extends UmbStoreBase {
         super(host, UMB_USER_ITEM_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([], (x) => x.id));
     }
     items(ids) {
-        return this._data.getObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
+        return this._data.asObservablePart((items) => items.filter((item) => ids.includes(item.id ?? '')));
     }
 }
 export const UMB_USER_ITEM_STORE_CONTEXT_TOKEN = new UmbContextToken('UmbUserItemStore');

package/dist-cms/packages/users/users/repository/user.repository.d.ts

@@ -1,12 +1,12 @@
-import { UmbUserCollectionFilterModel, UmbUserDetailRepository } from '../types.js';
+import { UmbUserCollectionFilterModel, UmbUserDetail, UmbUserDetailRepository } from '../types.js';
 import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import { UmbCollectionRepository, UmbItemRepository } from '../../../../shared/repository/index.js';
-import { CreateUserRequestModel, InviteUserRequestModel, UpdateUserRequestModel, UserItemResponseModel, UserResponseModel } from '../../../../external/backend-api/index.js';
+import { CreateUserRequestModel, InviteUserRequestModel, UpdateUserRequestModel, UserItemResponseModel } from '../../../../external/backend-api/index.js';
 export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCollectionRepository, UmbItemRepository<UserItemResponseModel> {
     #private;
     constructor(host: UmbControllerHostElement);
-    requestCollection(filter?: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UserResponseModel>>>;
-    filterCollection(filter: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UserResponseModel>>>;
+    requestCollection(filter?: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UmbUserDetail>>>;
+    filterCollection(filter: UmbUserCollectionFilterModel): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../shared/repository/index.js").UmbPagedData<UmbUserDetail>>>;
     requestItems(ids: Array<string>): Promise<{
         data: import("../../../../external/backend-api/index.js").ItemResponseModelBaseModel[] | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
@@ -15,7 +15,7 @@ export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCo
     items(ids: Array<string>): Promise<import("rxjs").Observable<import("../../../../external/backend-api/index.js").ItemResponseModelBaseModel[]>>;
     createScaffold(parentId: string | null): Promise<import("../../../../shared/repository/index.js").DataSourceResponse<import("../../../../external/backend-api/index.js").UserPresentationBaseModel>>;
     requestById(id: string): Promise<{
-        data: UserResponseModel | undefined;
+        data: UmbUserDetail | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     setUserGroups(userIds: Array<string>, userGroupIds: Array<string>): Promise<{
@@ -24,7 +24,7 @@ export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCo
     byId(id: string): Promise<import("rxjs").Observable<any>>;
     create(userRequestData: CreateUserRequestModel): Promise<{
         data: {
-            user: UserResponseModel;
+            user: UmbUserDetail;
             createData: import("../../../../external/backend-api/index.js").CreateUserResponseModel;
         };
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
@@ -34,10 +34,10 @@ export declare class UmbUserRepository implements UmbUserDetailRepository, UmbCo
     }>;
     invite(inviteRequestData: InviteUserRequestModel): Promise<{
         data: any;
-        error: any;
+        error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     save(id: string, user: UpdateUserRequestModel): Promise<{
-        data: UserResponseModel | undefined;
+        data: UmbUserDetail | undefined;
         error: import("../../../../external/backend-api/index.js").ApiError | import("../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     delete(id: string): Promise<{

package/dist-cms/packages/users/users/repository/user.store.d.ts

@@ -1,7 +1,7 @@
+import { type UmbUserDetail } from '../index.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import { UmbStoreBase } from '../../../core/store/index.js';
-import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-import { UserResponseModel } from '../../../../external/backend-api/index.js';
+import { type UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 export declare const UMB_USER_STORE_CONTEXT_TOKEN: UmbContextToken<UmbUserStore>;
 /**
  * @export
@@ -13,20 +13,20 @@ export declare class UmbUserStore extends UmbStoreBase {
     constructor(host: UmbControllerHostElement);
     /**
      * Append a user to the store
-     * @param {UserResponseModel} user
+     * @param {UmbUserDetail} user
      * @memberof UmbUserStore
      */
-    append(user: UserResponseModel): void;
+    append(user: UmbUserDetail): void;
     /**
      * Get a user by id
      * @param {id} string id.
      * @memberof UmbUserStore
      */
-    byId(id: UserResponseModel['id']): import("rxjs").Observable<any>;
+    byId(id: UmbUserDetail['id']): import("rxjs").Observable<any>;
     /**
      * Removes data-types in the store with the given uniques
      * @param {string[]} uniques
      * @memberof UmbUserStore
      */
-    remove(uniques: Array<UserResponseModel['id']>): void;
+    remove(uniques: Array<UmbUserDetail['id']>): void;
 }

package/dist-cms/packages/users/users/repository/user.store.js

@@ -9,13 +9,13 @@ export const UMB_USER_STORE_CONTEXT_TOKEN = new UmbContextToken('UmbUserStore');
  * @description - Data Store for Users
  */
 export class UmbUserStore extends UmbStoreBase {
-    //#data = new UmbArrayState<UserResponseModel>([], (x) => x.id);
+    //#data = new UmbArrayState<UmbUserDetail>([], (x) => x.id);
     constructor(host) {
         super(host, UMB_USER_STORE_CONTEXT_TOKEN.toString(), new UmbArrayState([], (x) => x.id));
     }
     /**
      * Append a user to the store
-     * @param {UserResponseModel} user
+     * @param {UmbUserDetail} user
      * @memberof UmbUserStore
      */
     append(user) {
@@ -27,7 +27,7 @@ export class UmbUserStore extends UmbStoreBase {
      * @memberof UmbUserStore
      */
     byId(id) {
-        return this._data.getObservablePart((x) => x.find((y) => y.id === id));
+        return this._data.asObservablePart((x) => x.find((y) => y.id === id));
     }
     /**
      * Removes data-types in the store with the given uniques

package/dist-cms/packages/users/users/types.d.ts

@@ -1,5 +1,8 @@
 import type { CreateUserRequestModel, CreateUserResponseModel, DirectionModel, InviteUserRequestModel, UpdateUserRequestModel, UserOrderModel, UserResponseModel, UserStateModel } from '../../../external/backend-api/index.js';
-import { UmbDataSource, UmbDataSourceErrorResponse, UmbDetailRepository } from '../../../shared/repository/index.js';
+import { DataSourceResponse, UmbDataSource, UmbDataSourceErrorResponse, UmbDetailRepository } from '../../../shared/repository/index.js';
+export type UmbUserDetail = UserResponseModel & {
+    entityType: 'user';
+};
 export interface UmbCreateUserResponseModel {
     user: UserResponseModel;
     createData: CreateUserResponseModel;
@@ -13,8 +16,8 @@ export interface UmbUserCollectionFilterModel {
     userStates?: UserStateModel[];
     filter?: string;
 }
-export interface UmbUserDetailDataSource extends UmbDataSource<CreateUserRequestModel, CreateUserResponseModel, UpdateUserRequestModel, UserResponseModel> {
-    invite(data: InviteUserRequestModel): Promise<any>;
+export interface UmbUserDetailDataSource extends UmbDataSource<CreateUserRequestModel, CreateUserResponseModel, UpdateUserRequestModel, UmbUserDetail> {
+    invite(data: InviteUserRequestModel): Promise<DataSourceResponse<any>>;
 }
 export interface UmbUserSetGroupDataSource {
     setGroups(userIds: string[], userGroupIds: string[]): Promise<UmbDataSourceErrorResponse>;

package/dist-cms/packages/users/users/workspace/user-workspace.context.d.ts

@@ -1,16 +1,16 @@
 import { UmbUserRepository } from '../repository/user.repository.js';
+import { type UmbUserDetail } from '../index.js';
 import { UmbEntityWorkspaceContextInterface, UmbWorkspaceContext } from '../../../core/workspace/index.js';
 import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-import { UserResponseModel } from '../../../../external/backend-api/index.js';
-export declare class UmbUserWorkspaceContext extends UmbWorkspaceContext<UmbUserRepository, UserResponseModel> implements UmbEntityWorkspaceContextInterface<UserResponseModel | undefined> {
+export declare class UmbUserWorkspaceContext extends UmbWorkspaceContext<UmbUserRepository, UmbUserDetail> implements UmbEntityWorkspaceContextInterface<UmbUserDetail | undefined> {
     #private;
     constructor(host: UmbControllerHostElement);
-    data: import("rxjs").Observable<UserResponseModel | undefined>;
+    data: import("rxjs").Observable<UmbUserDetail | undefined>;
     load(id: string): Promise<void>;
     getEntityId(): string | undefined;
     getEntityType(): string;
-    getData(): UserResponseModel | undefined;
-    updateProperty<PropertyName extends keyof UserResponseModel>(propertyName: PropertyName, value: UserResponseModel[PropertyName]): void;
+    getData(): UmbUserDetail | undefined;
+    updateProperty<PropertyName extends keyof UmbUserDetail>(propertyName: PropertyName, value: UmbUserDetail[PropertyName]): void;
     save(): Promise<void>;
     destroy(): void;
 }

package/dist-cms/shared/repository/data-source/data-source-response.interface.d.ts

@@ -1,5 +1,5 @@
 import type { ApiError, CancelError } from '../../../external/backend-api/index.js';
-export interface DataSourceResponse<T = undefined> extends UmbDataSourceErrorResponse {
+export interface DataSourceResponse<T = unknown> extends UmbDataSourceErrorResponse {
     data?: T;
 }
 export interface UmbDataSourceErrorResponse {

package/dist-cms/shared/repository/data-source/extend-data-source-paged-response-data.function.d.ts

@@ -0,0 +1,20 @@
+import { DataSourceResponse, UmbPagedData } from '../index.js';
+import { Diff } from '../../utils/index.js';
+/**
+ * This function extends the data set of a paged DataSourceResponse.
+ * Provide the desired type as a generic type parameter.
+ * This will require the appendData argument to fill in the missing properties of the items.
+ * @param response {DataSourceResponse<UmbPagedData<object>>}
+ * @param appendData {object} Additional properties to append to the data set.
+ * @returns {DataSourceResponse<UmbPagedData<object>>}
+ *
+ * @example
+ *
+ * type originalResponseType = { foo: string };
+ * type extendedResponseType = { foo: string, bar: string };
+ *
+ * const extendedResponse = extendDataSourcePagedResponseData<extendedResponseType>(originalResponse, { bar: 'some additional data' });
+ *
+ * extendedResponse.data.items[0].bar is now equal to 'some additional data'
+ */
+export declare function extendDataSourcePagedResponseData<ExtendedDataType extends IncomingDataType, IncomingDataType extends object = object, MissingPropsType extends object = Diff<IncomingDataType, ExtendedDataType>, ToType = IncomingDataType & ExtendedDataType>(response: DataSourceResponse<UmbPagedData<IncomingDataType>>, appendData: MissingPropsType): DataSourceResponse<UmbPagedData<ToType>>;

package/dist-cms/shared/repository/data-source/extend-data-source-paged-response-data.function.js

@@ -0,0 +1,30 @@
+/**
+ * This function extends the data set of a paged DataSourceResponse.
+ * Provide the desired type as a generic type parameter.
+ * This will require the appendData argument to fill in the missing properties of the items.
+ * @param response {DataSourceResponse<UmbPagedData<object>>}
+ * @param appendData {object} Additional properties to append to the data set.
+ * @returns {DataSourceResponse<UmbPagedData<object>>}
+ *
+ * @example
+ *
+ * type originalResponseType = { foo: string };
+ * type extendedResponseType = { foo: string, bar: string };
+ *
+ * const extendedResponse = extendDataSourcePagedResponseData<extendedResponseType>(originalResponse, { bar: 'some additional data' });
+ *
+ * extendedResponse.data.items[0].bar is now equal to 'some additional data'
+ */
+export function extendDataSourcePagedResponseData(response, appendData) {
+    if (response.data === undefined)
+        return response;
+    return {
+        ...response,
+        data: {
+            ...response.data,
+            items: response.data.items.map((x) => {
+                return { ...x, ...appendData };
+            }),
+        },
+    };
+}

package/dist-cms/shared/repository/data-source/extend-data-source-response-data.function.d.ts

@@ -0,0 +1,20 @@
+import { DataSourceResponse } from '../index.js';
+import { Diff } from '../../utils/index.js';
+/**
+ * This function extends the data set of a DataSourceResponse.
+ * Provide the desired type as a generic type parameter.
+ * This will require the appendData argument to fill in the missing properties of the data.
+ * @param response {DataSourceResponse<object>}
+ * @param appendData {object} Additional properties to append to the data.
+ * @returns {DataSourceResponse<object>}
+ *
+ * @example
+ *
+ * type originalResponseType = { foo: string };
+ * type extendedResponseType = { foo: string, bar: string };
+ *
+ * const extendedResponse = extendDataSourceResponseData<extendedResponseType>(originalResponse, { bar: 'some additional data' });
+ *
+ * extendedResponse.data.bar is now equal to 'some additional data'
+ */
+export declare function extendDataSourceResponseData<ExtendedDataType extends IncomingDataType, IncomingDataType extends object = object, MissingPropsType extends object = Diff<IncomingDataType, ExtendedDataType>, ToType = IncomingDataType & ExtendedDataType>(response: DataSourceResponse<IncomingDataType>, appendData: MissingPropsType): DataSourceResponse<ToType>;

package/dist-cms/shared/repository/data-source/extend-data-source-response-data.function.js

@@ -0,0 +1,22 @@
+/**
+ * This function extends the data set of a DataSourceResponse.
+ * Provide the desired type as a generic type parameter.
+ * This will require the appendData argument to fill in the missing properties of the data.
+ * @param response {DataSourceResponse<object>}
+ * @param appendData {object} Additional properties to append to the data.
+ * @returns {DataSourceResponse<object>}
+ *
+ * @example
+ *
+ * type originalResponseType = { foo: string };
+ * type extendedResponseType = { foo: string, bar: string };
+ *
+ * const extendedResponse = extendDataSourceResponseData<extendedResponseType>(originalResponse, { bar: 'some additional data' });
+ *
+ * extendedResponse.data.bar is now equal to 'some additional data'
+ */
+export function extendDataSourceResponseData(response, appendData) {
+    if (response.data === undefined)
+        return response;
+    return { ...response, data: { ...response.data, ...appendData } };
+}

package/dist-cms/shared/repository/data-source/index.d.ts

@@ -1,8 +1,10 @@
+export * from './collection-data-source.interface.js';
+export * from './copy-data-source.interface.js';
 export * from './data-source-response.interface.js';
 export * from './data-source.interface.js';
+export * from './extend-data-source-paged-response-data.function.js';
+export * from './extend-data-source-response-data.function.js';
 export * from './folder-data-source.interface.js';
-export * from './tree-data-source.interface.js';
 export * from './item-data-source.interface.js';
 export * from './move-data-source.interface.js';
-export * from './copy-data-source.interface.js';
-export * from './collection-data-source.interface.js';
+export * from './tree-data-source.interface.js';

package/dist-cms/shared/repository/data-source/index.js

@@ -1,8 +1,10 @@
+export * from './collection-data-source.interface.js';
+export * from './copy-data-source.interface.js';
 export * from './data-source-response.interface.js';
 export * from './data-source.interface.js';
+export * from './extend-data-source-paged-response-data.function.js';
+export * from './extend-data-source-response-data.function.js';
 export * from './folder-data-source.interface.js';
-export * from './tree-data-source.interface.js';
 export * from './item-data-source.interface.js';
 export * from './move-data-source.interface.js';
-export * from './copy-data-source.interface.js';
-export * from './collection-data-source.interface.js';
+export * from './tree-data-source.interface.js';

package/dist-cms/shared/repository/folder-repository.interface.d.ts

@@ -1,22 +1,22 @@
-import type { CreateFolderRequestModel, FolderModelBaseModel, FolderReponseModel, ProblemDetailsModel, UpdateFolderReponseModel } from '../../external/backend-api/index.js';
+import type { CreateFolderRequestModel, FolderModelBaseModel, FolderReponseModel, ProblemDetails, UpdateFolderReponseModel } from '../../external/backend-api/index.js';
 export interface UmbFolderRepository {
     createFolderScaffold(parentId: string | null): Promise<{
         data?: FolderReponseModel;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
     }>;
     createFolder(folderRequest: CreateFolderRequestModel): Promise<{
         data?: string;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
     }>;
     requestFolder(unique: string): Promise<{
         data?: FolderReponseModel;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
     }>;
     updateFolder(unique: string, folder: FolderModelBaseModel): Promise<{
         data?: UpdateFolderReponseModel;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
     }>;
     deleteFolder(id: string): Promise<{
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
     }>;
 }

package/dist-cms/shared/repository/item-repository.interface.d.ts

@@ -1,9 +1,9 @@
 import type { Observable } from '../../external/rxjs/index.js';
-import { ItemResponseModelBaseModel, ProblemDetailsModel } from '../../external/backend-api/index.js';
+import { ItemResponseModelBaseModel, ProblemDetails } from '../../external/backend-api/index.js';
 export interface UmbItemRepository<ItemType extends ItemResponseModelBaseModel> {
     requestItems: (uniques: string[]) => Promise<{
         data?: Array<ItemType> | undefined;
-        error?: ProblemDetailsModel | undefined;
+        error?: ProblemDetails | undefined;
         asObservable?: () => Observable<Array<ItemType>>;
     }>;
     items: (uniques: string[]) => Promise<Observable<Array<ItemType>>>;