@umbraco-cms/backoffice 14.0.0-3aaba617 → 14.0.0-3e938fa1

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

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { getLookAndColorFromUserStatus } from '../../utils.js';
 import { UUIInputEvent, UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, nothing, customElement, state, ifDefined, repeat, } from '../../../../external/lit/index.js';
+import { firstValueFrom } from '../../../../external/rxjs/index.js';
 import { UMB_CHANGE_PASSWORD_MODAL } from '../../../core/modal/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../../../core/workspace/index.js';
@@ -18,11 +19,11 @@ import { UMB_AUTH } from '../../../../shared/auth/index.js';
 export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement extends UmbLitElement {
     #auth;
     #modalContext;
-    #languages = []; //TODO Add languages
     #workspaceContext;
     #userRepository;
     constructor() {
         super();
+        this.languages = [];
         this.consumeContext(UMB_AUTH, (instance) => {
             this.#auth = instance;
             this.#observeCurrentUser();
@@ -52,7 +53,36 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
     #observeCurrentUser() {
         if (!this.#auth)
             return;
-        this.observe(this.#auth.currentUser, (currentUser) => (this._currentUser = currentUser));
+        this.observe(this.#auth.currentUser, async (currentUser) => {
+            this._currentUser = currentUser;
+            if (!currentUser) {
+                return;
+            }
+            // Find all translations and make a unique list of iso codes
+            const translations = await firstValueFrom(umbExtensionsRegistry.extensionsOfType('translations'));
+            this.languages = translations
+                .filter((isoCode) => isoCode !== undefined)
+                .map((translation) => ({
+                value: translation.meta.culture.toLowerCase(),
+                name: translation.name,
+                selected: false,
+            }));
+            const currentUserLanguageCode = currentUser.languageIsoCode?.toLowerCase();
+            // Set the current user's language as selected
+            const currentUserLanguage = this.languages.find((language) => language.value === currentUserLanguageCode);
+            if (currentUserLanguage) {
+                currentUserLanguage.selected = true;
+            }
+            else {
+                // If users language code did not fit any of the options. We will create an option that fits, named unknown.
+                // In this way the user can keep their choice though a given language was not present at this time.
+                this.languages.push({
+                    value: currentUserLanguageCode ?? 'en-us',
+                    name: currentUserLanguageCode ? `${currentUserLanguageCode} (unknown)` : 'Unknown',
+                    selected: true,
+                });
+            }
+        });
     }
     #onUserStatusChange() {
         if (!this._user || !this._user.id)
@@ -81,6 +111,12 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
             }
         }
     }
+    #onLanguageChange(event) {
+        const target = event.composedPath()[0];
+        if (typeof target?.value === 'string') {
+            this.#workspaceContext?.updateProperty('languageIsoCode', target.value);
+        }
+    }
     #onPasswordChange() {
         // TODO: check if current user is admin
         this.#modalContext?.open(UMB_CHANGE_PASSWORD_MODAL, {
@@ -114,12 +150,18 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
         if (!this._user)
             return nothing;
         return html ` <uui-box>
-				<div slot="headline">Profile</div>
+				<div slot="headline"><umb-localize key="user_profile">Profile</umb-localize></div>
 				<umb-workspace-property-layout label="Email">
-					<uui-input slot="editor" name="email" label="email" readonly value=${this._user.email}></uui-input>
+					<uui-input slot="editor" name="email" label="email" readonly value=${ifDefined(this._user.email)}></uui-input>
 				</umb-workspace-property-layout>
 				<umb-workspace-property-layout label="Language" description="The language of the UI in the Backoffice">
-					<uui-select slot="editor" name="language" label="language" .options=${this.#languages}> </uui-select>
+					<uui-select
+						slot="editor"
+						name="language"
+						label="language"
+						.options=${this.languages}
+						@change="${this.#onLanguageChange}">
+					</uui-select>
 				</umb-workspace-property-layout>
 			</uui-box>
 			<uui-box>
@@ -135,7 +177,7 @@ export let UmbUserWorkspaceEditorElement = class UmbUserWorkspaceEditorElement e
 						label="Content start node"
 						description="Limit the content tree to specific start nodes">
 						<umb-property-editor-ui-document-picker
-							.value=${this._user.contentStartNodeIds}
+							.value=${this._user.contentStartNodeIds ?? []}
 							@property-value-change=${(e) => this.#workspaceContext?.updateProperty('contentStartNodeIds', e.target.value)}
 							slot="editor"></umb-property-editor-ui-document-picker>
 					</umb-workspace-property-layout>
@@ -316,6 +358,9 @@ __decorate([
 __decorate([
     state()
 ], UmbUserWorkspaceEditorElement.prototype, "_user", void 0);
+__decorate([
+    state()
+], UmbUserWorkspaceEditorElement.prototype, "languages", void 0);
 UmbUserWorkspaceEditorElement = __decorate([
     customElement('umb-user-workspace-editor')
 ], UmbUserWorkspaceEditorElement);

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/internal/Observable.js").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/packages/users/users/workspace/user-workspace.context.js

@@ -1,11 +1,18 @@
 import { UmbUserRepository } from '../repository/user.repository.js';
 import { UmbWorkspaceContext } from '../../../core/workspace/index.js';
 import { UmbObjectState } from '../../../../libs/observable-api/index.js';
+import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
+import { UMB_AUTH } from '../../../../shared/auth/index.js';
+import { firstValueFrom } from '../../../../external/rxjs/index.js';
 export class UmbUserWorkspaceContext extends UmbWorkspaceContext {
+    #authContext;
     constructor(host) {
         super(host, new UmbUserRepository(host));
         this.#data = new UmbObjectState(undefined);
         this.data = this.#data.asObservable();
+        new UmbContextConsumerController(host, UMB_AUTH, (auth) => {
+            this.#authContext = auth;
+        });
     }
     #data;
     async load(id) {
@@ -41,6 +48,16 @@ export class UmbUserWorkspaceContext extends UmbWorkspaceContext {
         }
         // If it went well, then its not new anymore?.
         this.setIsNew(false);
+        // If we are saving the current user, we need to refetch it
+        await this.#reloadCurrentUser(this.#data.value.id);
+    }
+    async #reloadCurrentUser(savedUserId) {
+        if (!this.#authContext)
+            return;
+        const currentUser = await firstValueFrom(this.#authContext.currentUser);
+        if (currentUser?.id === savedUserId) {
+            await this.#authContext.fetchCurrentUser();
+        }
     }
     destroy() {
         this.#data.complete();

package/dist-cms/shared/auth/auth.context.d.ts

@@ -7,6 +7,7 @@ export declare class UmbAuthContext implements IUmbAuth {
     #private;
     readonly currentUser: import("rxjs/internal/Observable.js").Observable<UmbLoggedInUser | undefined>;
     readonly isLoggedIn: ReplaySubject<boolean>;
+    readonly languageIsoCode: import("rxjs/internal/Observable.js").Observable<string>;
     constructor(host: UmbControllerHostElement, authFlow: UmbAuthFlow);
     setInitialState(): Promise<void>;
     fetchCurrentUser(): Promise<UmbLoggedInUser | undefined>;

package/dist-cms/shared/auth/auth.context.js

@@ -10,6 +10,7 @@ export class UmbAuthContext {
         this.#currentUser = new UmbObjectState(undefined);
         this.currentUser = this.#currentUser.asObservable();
         this.isLoggedIn = new ReplaySubject(1);
+        this.languageIsoCode = this.#currentUser.asObservablePart((user) => user?.languageIsoCode ?? 'en-us');
         this.#host = host;
         this.#authFlow = authFlow;
         this.isLoggedIn.subscribe((isLoggedIn) => {
@@ -23,8 +24,6 @@ export class UmbAuthContext {
     }
     async fetchCurrentUser() {
         const { data } = await tryExecuteAndNotify(this.#host, UserResource.getUserCurrent());
-        if (!data)
-            return;
         this.#currentUser.next(data);
         return data;
     }

package/dist-cms/shared/auth/auth.interface.d.ts

@@ -19,6 +19,10 @@ export interface IUmbAuth {
      * Get the current user model of the current user.
      */
     get currentUser(): Observable<UmbLoggedInUser | undefined>;
+    /**
+     * Get the current user's language ISO code.
+     */
+    languageIsoCode: Observable<string>;
     /**
      * Make a server request for the current user and save the state
      */

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/data-source.interface.d.ts

@@ -1,6 +1,6 @@
 import type { DataSourceResponse } from '../index.js';
-export interface UmbDataSource<CreateRequestType, CreateResponseType, UpdateRequestType, ResponseType> {
-    createScaffold(parentId: string | null): Promise<DataSourceResponse<CreateRequestType>>;
+export interface UmbDataSource<CreateRequestType, CreateResponseType, UpdateRequestType, ResponseType, CreateScaffoldPresetType = Partial<CreateRequestType>> {
+    createScaffold(parentId: string | null, preset?: Partial<CreateRequestType> | CreateScaffoldPresetType): Promise<DataSourceResponse<CreateRequestType>>;
     get(unique: string): Promise<DataSourceResponse<ResponseType>>;
     insert(data: CreateRequestType): Promise<DataSourceResponse<CreateResponseType>>;
     update(unique: string, data: UpdateRequestType): Promise<DataSourceResponse<ResponseType>>;

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/detail-repository.interface.d.ts

@@ -1,7 +1,7 @@
 import type { DataSourceResponse, UmbDataSourceErrorResponse } from './data-source/index.js';
 import { Observable } from '../../external/rxjs/index.js';
-export interface UmbDetailRepository<CreateRequestType = any, CreateResponseType = any, UpdateRequestType = any, ResponseType = any> {
-    createScaffold(parentId: string | null, preset?: Partial<CreateRequestType>): Promise<DataSourceResponse<CreateRequestType>>;
+export interface UmbDetailRepository<CreateRequestType = any, CreateResponseType = any, UpdateRequestType = any, ResponseType = any, CreateScaffoldPresetType = Partial<CreateRequestType>> {
+    createScaffold(parentId: string | null, preset?: Partial<CreateRequestType> | CreateScaffoldPresetType): Promise<DataSourceResponse<CreateRequestType>>;
     requestById(id: string): Promise<DataSourceResponse<ResponseType | undefined>>;
     byId(id: string): Promise<Observable<ResponseType | undefined>>;
     create(data: CreateRequestType): Promise<DataSourceResponse<CreateResponseType>>;

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>>>;

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

@@ -1,28 +1,28 @@
 import type { Observable } from '../../external/rxjs/index.js';
 import type { UmbTreeRootEntityModel, UmbTreeRootModel } from '../../packages/core/tree/index.js';
-import { ProblemDetailsModel, TreeItemPresentationModel } from '../../external/backend-api/index.js';
+import { ProblemDetails, EntityTreeItemResponseModel } from '../../external/backend-api/index.js';
 export interface UmbPagedData<T> {
     total: number;
     items: Array<T>;
 }
-export interface UmbTreeRepository<TreeItemType extends TreeItemPresentationModel, TreeRootType extends UmbTreeRootModel = UmbTreeRootEntityModel> {
+export interface UmbTreeRepository<TreeItemType extends EntityTreeItemResponseModel, TreeRootType extends UmbTreeRootModel = UmbTreeRootEntityModel> {
     requestTreeRoot: () => Promise<{
         data?: TreeRootType;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
     }>;
     requestRootTreeItems: () => Promise<{
         data?: UmbPagedData<TreeItemType>;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
         asObservable?: () => Observable<TreeItemType[]>;
     }>;
     requestTreeItemsOf: (parentUnique: string | null) => Promise<{
         data?: UmbPagedData<TreeItemType>;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
         asObservable?: () => Observable<TreeItemType[]>;
     }>;
     requestItemsLegacy?: (uniques: string[]) => Promise<{
         data?: Array<TreeItemType>;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
         asObservable?: () => Observable<any[]>;
     }>;
     rootTreeItems: () => Promise<Observable<TreeItemType[]>>;

package/dist-cms/shared/resources/resource.controller.js

@@ -51,7 +51,7 @@ export class UmbResourceController extends UmbBaseController {
                 return {};
             }
             else {
-                // ApiError - body could hold a ProblemDetailsModel from the server
+                // ApiError - body could hold a ProblemDetails from the server
                 if (typeof error.body !== 'undefined' && !!error.body) {
                     try {
                         error.body = typeof error.body === 'string' ? JSON.parse(error.body) : error.body;

package/dist-cms/shared/router/generate-route-path-builder.function.d.ts

@@ -1,3 +1,3 @@
-export declare function generateRoutePathBuilder(path: string): (params: {
+export declare function createRoutePathBuilder(path: string): (params: {
     [key: string]: string | number;
 } | null) => string;

package/dist-cms/shared/router/generate-route-path-builder.function.js

@@ -1,7 +1,7 @@
 /* eslint-disable */
 import { stripSlash } from '../../external/router-slot/index.js'; // This must only include the util to avoid side effects of registering the route element.
 const PARAM_IDENTIFIER = /:([^\\/]+)/g;
-export function generateRoutePathBuilder(path) {
+export function createRoutePathBuilder(path) {
     return (params) => {
         return ('/' +
             stripSlash(params

package/dist-cms/shared/router/route.context.js

@@ -1,4 +1,4 @@
-import { generateRoutePathBuilder } from './generate-route-path-builder.function.js';
+import { createRoutePathBuilder } from './generate-route-path-builder.function.js';
 import { UmbContextToken } from '../../libs/context-api/index.js';
 import { UmbBaseController } from '../../libs/controller-api/index.js';
 import { UMB_MODAL_MANAGER_CONTEXT_TOKEN } from '../../packages/core/modal/index.js';
@@ -24,7 +24,7 @@ export class UmbRouteContext extends UmbBaseController {
     }
     registerModal(registration) {
         this.#modalRegistrations.push(registration);
-        this.#generateNewUrlBuilder(registration);
+        this.#createNewUrlBuilder(registration);
         this.#generateModalRoutes();
         return registration;
     }
@@ -83,13 +83,13 @@ export class UmbRouteContext extends UmbBaseController {
         if (this.#routerBasePath === routerBasePath)
             return;
         this.#routerBasePath = routerBasePath;
-        this.#generateNewUrlBuilders();
+        this.#createNewUrlBuilders();
     }
     _internal_routerGotActiveLocalPath(routerActiveLocalPath) {
         if (this.#routerActiveLocalPath === routerActiveLocalPath)
             return;
         this.#routerActiveLocalPath = routerActiveLocalPath;
-        this.#generateNewUrlBuilders();
+        this.#createNewUrlBuilders();
     }
     // Also notice each registration should now hold its handler when its active.
     _internal_modalRouterChanged(activeModalPath) {
@@ -106,10 +106,10 @@ export class UmbRouteContext extends UmbBaseController {
         }
         this.#activeModalPath = activeModalPath;
     }
-    #generateNewUrlBuilders() {
-        this.#modalRegistrations.forEach(this.#generateNewUrlBuilder);
+    #createNewUrlBuilders() {
+        this.#modalRegistrations.forEach(this.#createNewUrlBuilder);
     }
-    #generateNewUrlBuilder = (modalRegistration) => {
+    #createNewUrlBuilder = (modalRegistration) => {
         if (!this.#routerBasePath)
             return;
         const routeBasePath = this.#routerBasePath.endsWith('/') ? this.#routerBasePath : this.#routerBasePath + '/';
@@ -119,7 +119,7 @@ export class UmbRouteContext extends UmbBaseController {
                 : this.#routerActiveLocalPath + '/'
             : '';
         const localPath = routeBasePath + routeActiveLocalPath + modalRegistration.generateModalPath();
-        const urlBuilder = generateRoutePathBuilder(localPath);
+        const urlBuilder = createRoutePathBuilder(localPath);
         modalRegistration._internal_setRouteBuilder(urlBuilder);
     };
 }

package/dist-cms/shared/utils/diff.type.d.ts

@@ -0,0 +1,5 @@
+type FilterKeys<T, U> = {
+    [K in keyof T]: K extends keyof U ? never : K;
+};
+export type Diff<U, T> = Pick<T, FilterKeys<T, U>[keyof T]>;
+export {};

package/dist-cms/shared/utils/diff.type.js

@@ -0,0 +1 @@
+export {};

package/dist-cms/shared/utils/ensure-path-ends-with-slash.function.d.ts

@@ -0,0 +1 @@
+export declare function ensurePathEndsWithSlash(path: string): string;

package/dist-cms/shared/utils/ensure-path-ends-with-slash.function.js

@@ -0,0 +1,3 @@
+export function ensurePathEndsWithSlash(path) {
+    return path.endsWith('/') ? path : path + '/';
+}

package/dist-cms/shared/utils/index.d.ts

@@ -1,9 +1,12 @@
+export * from './diff.type.js';
+export * from './ensure-path-ends-with-slash.function.js';
 export * from './generate-umbraco-alias.function.js';
 export * from './increment-string.function.js';
-export * from './selection-manager.js';
 export * from './media-helper.service.js';
+export * from './path-folder-name.function.js';
+export * from './selection-manager.js';
 export * from './udi-service.js';
-export * from './umbraco-path.js';
+export * from './umbraco-path.function.js';
 declare global {
     interface Window {
         Umbraco: any;

package/dist-cms/shared/utils/index.js

@@ -1,6 +1,9 @@
+export * from './diff.type.js';
+export * from './ensure-path-ends-with-slash.function.js';
 export * from './generate-umbraco-alias.function.js';
 export * from './increment-string.function.js';
-export * from './selection-manager.js';
 export * from './media-helper.service.js';
+export * from './path-folder-name.function.js';
+export * from './selection-manager.js';
 export * from './udi-service.js';
-export * from './umbraco-path.js';
+export * from './umbraco-path.function.js';

package/dist-cms/shared/utils/media-helper.service.d.ts

@@ -1,4 +1,4 @@
-import { Editor, EditorEvent } from "../../tinymce";
+import { Editor, EditorEvent } from '../../tinymce';
 export declare class UmbMediaHelper {
     /**
      *

package/dist-cms/shared/utils/media-helper.service.js

@@ -1,5 +1,6 @@
 // TODO => this is NOT a full reimplementation of the existing media helper service, currently
 // contains only functions referenced by the TinyMCE editor
+// TODO: This should not be done in this way, we need to split this into seperate defined helper methods. This is also very specific to TinyMCE, so should be named that way.
 export class UmbMediaHelper {
     /**
      *
@@ -66,7 +67,7 @@ export class UmbMediaHelper {
         }
         // TODO => use backend cli when available
         const result = await fetch('/umbraco/management/api/v1/images/GetProcessedImageUrl');
-        const url = await result.json();
+        const url = (await result.json());
         return url;
     }
     /**

package/dist-cms/shared/utils/path-folder-name.function.d.ts

@@ -0,0 +1,2 @@
+import { generateAlias } from './generate-umbraco-alias.function.js';
+export declare const pathFolderName: typeof generateAlias;

package/dist-cms/shared/utils/path-folder-name.function.js

@@ -0,0 +1,2 @@
+import { generateAlias } from './generate-umbraco-alias.function.js';
+export const pathFolderName = generateAlias;