@umbraco-cms/backoffice 14.0.0-rc2 → 14.0.0-rc4

package/dist-cms/packages/core/utils/pagination-manager/pagination.manager.js

@@ -1,34 +1,38 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UmbPaginationManager_instances, _UmbPaginationManager_pageSize, _UmbPaginationManager_totalItems, _UmbPaginationManager_totalPages, _UmbPaginationManager_currentPage, _UmbPaginationManager_skip, _UmbPaginationManager_calculateTotalPages, _UmbPaginationManager_calculateSkip;
 import { UmbChangeEvent } from '../../event/index.js';
 import { UmbNumberState } from '../../../../libs/observable-api/index.js';
 export class UmbPaginationManager extends EventTarget {
     constructor() {
         super(...arguments);
-        _UmbPaginationManager_instances.add(this);
-        _UmbPaginationManager_pageSize.set(this, new UmbNumberState(10));
-        this.pageSize = __classPrivateFieldGet(this, _UmbPaginationManager_pageSize, "f").asObservable();
-        _UmbPaginationManager_totalItems.set(this, new UmbNumberState(0));
-        this.totalItems = __classPrivateFieldGet(this, _UmbPaginationManager_totalItems, "f").asObservable();
-        _UmbPaginationManager_totalPages.set(this, new UmbNumberState(1));
-        this.totalPages = __classPrivateFieldGet(this, _UmbPaginationManager_totalPages, "f").asObservable();
-        _UmbPaginationManager_currentPage.set(this, new UmbNumberState(1));
-        this.currentPage = __classPrivateFieldGet(this, _UmbPaginationManager_currentPage, "f").asObservable();
-        _UmbPaginationManager_skip.set(this, new UmbNumberState(0));
-        this.skip = __classPrivateFieldGet(this, _UmbPaginationManager_skip, "f").asObservable();
+        this.#defaultValues = {
+            totalItems: 0,
+            totalPages: 1,
+            currentPage: 1,
+        };
+        this.#pageSize = new UmbNumberState(10);
+        this.pageSize = this.#pageSize.asObservable();
+        this.#totalItems = new UmbNumberState(this.#defaultValues.totalItems);
+        this.totalItems = this.#totalItems.asObservable();
+        this.#totalPages = new UmbNumberState(this.#defaultValues.totalPages);
+        this.totalPages = this.#totalPages.asObservable();
+        this.#currentPage = new UmbNumberState(this.#defaultValues.currentPage);
+        this.currentPage = this.#currentPage.asObservable();
+        this.#skip = new UmbNumberState(0);
+        this.skip = this.#skip.asObservable();
     }
+    #defaultValues;
+    #pageSize;
+    #totalItems;
+    #totalPages;
+    #currentPage;
+    #skip;
     /**
      * Sets the number of items per page and recalculates the total number of pages
      * @param {number} pageSize
      * @memberof UmbPaginationManager
      */
     setPageSize(pageSize) {
-        __classPrivateFieldGet(this, _UmbPaginationManager_pageSize, "f").setValue(pageSize);
-        __classPrivateFieldGet(this, _UmbPaginationManager_instances, "m", _UmbPaginationManager_calculateTotalPages).call(this);
+        this.#pageSize.setValue(pageSize);
+        this.#calculateTotalPages();
     }
     /**
      * Gets the number of items per page
@@ -36,7 +40,7 @@ export class UmbPaginationManager extends EventTarget {
      * @memberof UmbPaginationManager
      */
     getPageSize() {
-        return __classPrivateFieldGet(this, _UmbPaginationManager_pageSize, "f").getValue();
+        return this.#pageSize.getValue();
     }
     /**
      * Gets the total number of items
@@ -44,7 +48,7 @@ export class UmbPaginationManager extends EventTarget {
      * @memberof UmbPaginationManager
      */
     getTotalItems() {
-        return __classPrivateFieldGet(this, _UmbPaginationManager_totalItems, "f").getValue();
+        return this.#totalItems.getValue();
     }
     /**
      * Sets the total number of items and recalculates the total number of pages
@@ -52,8 +56,8 @@ export class UmbPaginationManager extends EventTarget {
      * @memberof UmbPaginationManager
      */
     setTotalItems(totalItems) {
-        __classPrivateFieldGet(this, _UmbPaginationManager_totalItems, "f").setValue(totalItems);
-        __classPrivateFieldGet(this, _UmbPaginationManager_instances, "m", _UmbPaginationManager_calculateTotalPages).call(this);
+        this.#totalItems.setValue(totalItems);
+        this.#calculateTotalPages();
     }
     /**
      * Gets the total number of pages
@@ -61,7 +65,7 @@ export class UmbPaginationManager extends EventTarget {
      * @memberof UmbPaginationManager
      */
     getTotalPages() {
-        return __classPrivateFieldGet(this, _UmbPaginationManager_totalPages, "f").getValue();
+        return this.#totalPages.getValue();
     }
     /**
      * Gets the current page number
@@ -69,7 +73,7 @@ export class UmbPaginationManager extends EventTarget {
      * @memberof UmbPaginationManager
      */
     getCurrentPageNumber() {
-        return __classPrivateFieldGet(this, _UmbPaginationManager_currentPage, "f").getValue();
+        return this.#currentPage.getValue();
     }
     /**
      * Sets the current page number
@@ -80,11 +84,11 @@ export class UmbPaginationManager extends EventTarget {
         if (pageNumber < 1) {
             pageNumber = 1;
         }
-        if (pageNumber > __classPrivateFieldGet(this, _UmbPaginationManager_totalPages, "f").getValue()) {
-            pageNumber = __classPrivateFieldGet(this, _UmbPaginationManager_totalPages, "f").getValue();
+        if (pageNumber > this.#totalPages.getValue()) {
+            pageNumber = this.#totalPages.getValue();
         }
-        __classPrivateFieldGet(this, _UmbPaginationManager_currentPage, "f").setValue(pageNumber);
-        __classPrivateFieldGet(this, _UmbPaginationManager_instances, "m", _UmbPaginationManager_calculateSkip).call(this);
+        this.#currentPage.setValue(pageNumber);
+        this.#calculateSkip();
         this.dispatchEvent(new UmbChangeEvent());
     }
     /**
@@ -93,19 +97,34 @@ export class UmbPaginationManager extends EventTarget {
      * @memberof UmbPaginationManager
      */
     getSkip() {
-        return __classPrivateFieldGet(this, _UmbPaginationManager_skip, "f").getValue();
+        return this.#skip.getValue();
     }
-}
-_UmbPaginationManager_pageSize = new WeakMap(), _UmbPaginationManager_totalItems = new WeakMap(), _UmbPaginationManager_totalPages = new WeakMap(), _UmbPaginationManager_currentPage = new WeakMap(), _UmbPaginationManager_skip = new WeakMap(), _UmbPaginationManager_instances = new WeakSet(), _UmbPaginationManager_calculateTotalPages = function _UmbPaginationManager_calculateTotalPages() {
-    let totalPages = Math.ceil(__classPrivateFieldGet(this, _UmbPaginationManager_totalItems, "f").getValue() / __classPrivateFieldGet(this, _UmbPaginationManager_pageSize, "f").getValue());
-    totalPages = totalPages === 0 ? 1 : totalPages;
-    __classPrivateFieldGet(this, _UmbPaginationManager_totalPages, "f").setValue(totalPages);
-    /* If we currently are on a page higher than the total pages. We need to reset the current page to the last page.
-This can happen if we have a filter that returns less items than the current page size. */
-    if (this.getCurrentPageNumber() > totalPages) {
-        this.setCurrentPageNumber(totalPages);
+    /**
+     * Clears the pagination manager values and resets them to their default values
+     * @memberof UmbPaginationManager
+     */
+    clear() {
+        this.#totalItems.setValue(this.#defaultValues.totalItems);
+        this.#totalPages.setValue(this.#defaultValues.totalPages);
+        this.#currentPage.setValue(this.#defaultValues.currentPage);
+        this.#skip.setValue(0);
     }
-}, _UmbPaginationManager_calculateSkip = function _UmbPaginationManager_calculateSkip() {
-    const skip = Math.max(0, (__classPrivateFieldGet(this, _UmbPaginationManager_currentPage, "f").getValue() - 1) * __classPrivateFieldGet(this, _UmbPaginationManager_pageSize, "f").getValue());
-    __classPrivateFieldGet(this, _UmbPaginationManager_skip, "f").setValue(skip);
-};
+    /**
+     * Calculates the total number of pages
+     * @memberof UmbPaginationManager
+     */
+    #calculateTotalPages() {
+        let totalPages = Math.ceil(this.#totalItems.getValue() / this.#pageSize.getValue());
+        totalPages = totalPages === 0 ? 1 : totalPages;
+        this.#totalPages.setValue(totalPages);
+        /* If we currently are on a page higher than the total pages. We need to reset the current page to the last page.
+    This can happen if we have a filter that returns less items than the current page size. */
+        if (this.getCurrentPageNumber() > totalPages) {
+            this.setCurrentPageNumber(totalPages);
+        }
+    }
+    #calculateSkip() {
+        const skip = Math.max(0, (this.#currentPage.getValue() - 1) * this.#pageSize.getValue());
+        this.#skip.setValue(skip);
+    }
+}

package/dist-cms/packages/core/utils/path/ensure-local-path.function.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Ensure that the path is a local path.
+ */
+export declare function ensureLocalPath(path: URL | string, fallbackPath?: URL | string): URL;

package/dist-cms/packages/core/utils/path/ensure-local-path.function.js

@@ -0,0 +1,10 @@
+/**
+ * Ensure that the path is a local path.
+ */
+export function ensureLocalPath(path, fallbackPath) {
+    const url = new URL(path, window.location.origin);
+    if (url.origin === window.location.origin) {
+        return url;
+    }
+    return fallbackPath ? new URL(fallbackPath) : new URL(window.location.origin);
+}

package/dist-cms/packages/core/utils/path/stored-path.function.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Retrieve the stored path from the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ */
+export declare function retrieveStoredPath(): URL | null;
+/**
+ * Store the path in the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ * @remark The path must be a local path, otherwise it is not stored.
+ */
+export declare function setStoredPath(path: string): void;

package/dist-cms/packages/core/utils/path/stored-path.function.js

@@ -0,0 +1,27 @@
+import { ensureLocalPath } from './ensure-local-path.function.js';
+import { UMB_STORAGE_REDIRECT_URL } from '../../auth/index.js';
+/**
+ * Retrieve the stored path from the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ */
+export function retrieveStoredPath() {
+    let currentRoute = '';
+    const savedRoute = sessionStorage.getItem(UMB_STORAGE_REDIRECT_URL);
+    if (savedRoute) {
+        sessionStorage.removeItem(UMB_STORAGE_REDIRECT_URL);
+        currentRoute = savedRoute.endsWith('logout') ? currentRoute : savedRoute;
+    }
+    return currentRoute ? ensureLocalPath(currentRoute) : null;
+}
+/**
+ * Store the path in the session storage.
+ * @remark This is used to redirect the user to the correct page after login.
+ * @remark The path must be a local path, otherwise it is not stored.
+ */
+export function setStoredPath(path) {
+    const url = new URL(path, window.location.origin);
+    if (url.origin !== window.location.origin) {
+        return;
+    }
+    sessionStorage.setItem(UMB_STORAGE_REDIRECT_URL, url.toString());
+}

package/dist-cms/packages/core/utils/path/url-pattern-to-string.function.d.ts

@@ -0,0 +1,4 @@
+export type UrlParametersRecord = Record<string, string | number | {
+    toString: () => string;
+} | null>;
+export declare function umbUrlPatternToString(pattern: string, params: UrlParametersRecord | null): string;

package/dist-cms/packages/core/utils/path/url-pattern-to-string.function.js

@@ -0,0 +1,10 @@
+const PARAM_IDENTIFIER = /:([^/]+)/g;
+export function umbUrlPatternToString(pattern, params) {
+    return params
+        ? pattern.replace(PARAM_IDENTIFIER, (_substring, ...args) => {
+            const segmentValue = params[args[0]]; // (segmentValue is the value to replace the parameter)
+            // Replace the path-segment with the value from the params object or 'null' if it doesn't exist
+            return segmentValue === undefined ? `:${args[0]}` : segmentValue === null ? 'null' : segmentValue.toString();
+        })
+        : pattern;
+}

package/dist-cms/packages/core/utils/selection-manager/selection.manager.js

@@ -1,9 +1,3 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _UmbSelectionManager_selectable, _UmbSelectionManager_selection, _UmbSelectionManager_multiple;
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 import { UmbDeselectedEvent, UmbSelectedEvent, UmbSelectionChangeEvent } from '../../event/index.js';
 import { UmbArrayState, UmbBooleanState } from '../../../../libs/observable-api/index.js';
@@ -13,14 +7,17 @@ import { UmbArrayState, UmbBooleanState } from '../../../../libs/observable-api/
  * @class UmbSelectionManager
  */
 export class UmbSelectionManager extends UmbControllerBase {
+    #selectable;
+    #selection;
+    #multiple;
     constructor(host) {
         super(host);
-        _UmbSelectionManager_selectable.set(this, new UmbBooleanState(true));
-        this.selectable = __classPrivateFieldGet(this, _UmbSelectionManager_selectable, "f").asObservable();
-        _UmbSelectionManager_selection.set(this, new UmbArrayState([], (x) => x));
-        this.selection = __classPrivateFieldGet(this, _UmbSelectionManager_selection, "f").asObservable();
-        _UmbSelectionManager_multiple.set(this, new UmbBooleanState(false));
-        this.multiple = __classPrivateFieldGet(this, _UmbSelectionManager_multiple, "f").asObservable();
+        this.#selectable = new UmbBooleanState(true);
+        this.selectable = this.#selectable.asObservable();
+        this.#selection = new UmbArrayState([], (x) => x);
+        this.selection = this.#selection.asObservable();
+        this.#multiple = new UmbBooleanState(false);
+        this.multiple = this.#multiple.asObservable();
     }
     /**
      * Returns whether items can be selected.
@@ -28,7 +25,7 @@ export class UmbSelectionManager extends UmbControllerBase {
      * @memberof UmbSelectionManager
      */
     getSelectable() {
-        return __classPrivateFieldGet(this, _UmbSelectionManager_selectable, "f").getValue();
+        return this.#selectable.getValue();
     }
     /**
      * Sets whether items can be selected.
@@ -36,7 +33,7 @@ export class UmbSelectionManager extends UmbControllerBase {
      * @memberof UmbSelectionManager
      */
     setSelectable(value) {
-        __classPrivateFieldGet(this, _UmbSelectionManager_selectable, "f").setValue(value);
+        this.#selectable.setValue(value);
     }
     /**
      * Returns the current selection.
@@ -44,7 +41,7 @@ export class UmbSelectionManager extends UmbControllerBase {
      * @memberof UmbSelectionManager
      */
     getSelection() {
-        return __classPrivateFieldGet(this, _UmbSelectionManager_selection, "f").getValue();
+        return this.#selection.getValue();
     }
     /**
      * Sets the current selection.
@@ -57,7 +54,7 @@ export class UmbSelectionManager extends UmbControllerBase {
         if (value === undefined)
             throw new Error('Value cannot be undefined');
         const newSelection = this.getMultiple() ? value : value.slice(0, 1);
-        __classPrivateFieldGet(this, _UmbSelectionManager_selection, "f").setValue(newSelection);
+        this.#selection.setValue(newSelection);
     }
     /**
      * Returns whether multiple items can be selected.
@@ -65,7 +62,7 @@ export class UmbSelectionManager extends UmbControllerBase {
      * @memberof UmbSelectionManager
      */
     getMultiple() {
-        return __classPrivateFieldGet(this, _UmbSelectionManager_multiple, "f").getValue();
+        return this.#multiple.getValue();
     }
     /**
      * Sets whether multiple items can be selected.
@@ -73,7 +70,7 @@ export class UmbSelectionManager extends UmbControllerBase {
      * @memberof UmbSelectionManager
      */
     setMultiple(value) {
-        __classPrivateFieldGet(this, _UmbSelectionManager_multiple, "f").setValue(value);
+        this.#multiple.setValue(value);
         /* If multiple is set to false, and the current selection is more than one,
         then we need to set the selection to the first item. */
         if (value === false && this.getSelection().length > 1) {
@@ -103,7 +100,7 @@ export class UmbSelectionManager extends UmbControllerBase {
         if (this.isSelected(unique))
             return;
         const newSelection = this.getMultiple() ? [...this.getSelection(), unique] : [unique];
-        __classPrivateFieldGet(this, _UmbSelectionManager_selection, "f").setValue(newSelection);
+        this.#selection.setValue(newSelection);
         this.getHostElement().dispatchEvent(new UmbSelectedEvent(unique));
         this.getHostElement().dispatchEvent(new UmbSelectionChangeEvent());
     }
@@ -116,7 +113,7 @@ export class UmbSelectionManager extends UmbControllerBase {
         if (this.getSelectable() === false)
             return;
         const newSelection = this.getSelection().filter((x) => x !== unique);
-        __classPrivateFieldGet(this, _UmbSelectionManager_selection, "f").setValue(newSelection);
+        this.#selection.setValue(newSelection);
         this.getHostElement().dispatchEvent(new UmbDeselectedEvent(unique));
         this.getHostElement().dispatchEvent(new UmbSelectionChangeEvent());
     }
@@ -136,7 +133,6 @@ export class UmbSelectionManager extends UmbControllerBase {
     clearSelection() {
         if (this.getSelectable() === false)
             return;
-        __classPrivateFieldGet(this, _UmbSelectionManager_selection, "f").setValue([]);
+        this.#selection.setValue([]);
     }
 }
-_UmbSelectionManager_selectable = new WeakMap(), _UmbSelectionManager_selection = new WeakMap(), _UmbSelectionManager_multiple = new WeakMap();

package/dist-cms/packages/core/utils/type/deep-partial-object.type.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Deep partial object type, making objects and their properties optional, but only until a property of a different type is encountered.
+ * This means if an object holds a property with an array that holds objects, the array will be made optional, but the properties of the objects inside the array will not be changed.
+ * @type UmbDeepPartialObject
+ * @generic T - The object to make partial.
+ * @returns A type with all properties of objects made optional.
+ */
+export type UmbDeepPartialObject<T> = T extends Function ? T : T extends {
+    [key: string]: any;
+} ? UmbDeepPartialObjectProperty<T> : T | undefined;
+type UmbDeepPartialObjectProperty<Thing> = {
+    [Key in keyof Thing]?: UmbDeepPartialObject<Thing[Key]>;
+};
+export {};

package/dist-cms/packages/core/utils/type/deep-partial-object.type.js

@@ -0,0 +1,7 @@
+/*export type DeepPartial<T> = T extends { [key: string]: any }
+    ? {
+            [P in keyof T]?: DeepPartial<T[P]>;
+        }
+    : T;
+*/
+export {};

package/dist-cms/packages/core/utils/type/index.d.ts

@@ -1,2 +1,3 @@
+export * from './deep-partial-object.type.js';
 export * from './diff.type.js';
 export * from './partial-some.type.js';

package/dist-cms/packages/core/utils/type/index.js

@@ -1,2 +1,3 @@
+export * from './deep-partial-object.type.js';
 export * from './diff.type.js';
 export * from './partial-some.type.js';

package/dist-cms/packages/core/utils/type/partial-some.type.d.ts

@@ -1 +1 @@
-export type PartialSome<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+export type UmbPartialSome<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;

package/dist-cms/packages/core/validation/context/server-model-validation.context.js

@@ -1,122 +1,112 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _UmbServerModelValidationContext_validatePromise, _UmbServerModelValidationContext_validatePromiseResolve, _UmbServerModelValidationContext_context, _UmbServerModelValidationContext_isValid, _UmbServerModelValidationContext_data, _UmbServerModelValidationContext_translators, _UmbServerModelValidationContext_serverFeedback, _UmbServerModelValidationContext_executeTranslatorsOnFeedback;
 import { UMB_VALIDATION_CONTEXT } from './validation.context-token.js';
 import { UMB_SERVER_MODEL_VALIDATION_CONTEXT } from './server-model-validation.context-token.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 export class UmbServerModelValidationContext extends UmbContextBase {
+    #validatePromise;
+    #validatePromiseResolve;
+    #context;
+    #isValid = true;
+    #data;
     getData() {
-        return __classPrivateFieldGet(this, _UmbServerModelValidationContext_data, "f");
+        return this.#data;
     }
+    #translators = [];
+    // Hold server feedback...
+    #serverFeedback = [];
     constructor(host) {
         super(host, UMB_SERVER_MODEL_VALIDATION_CONTEXT);
-        _UmbServerModelValidationContext_validatePromise.set(this, void 0);
-        _UmbServerModelValidationContext_validatePromiseResolve.set(this, void 0);
-        _UmbServerModelValidationContext_context.set(this, void 0);
-        _UmbServerModelValidationContext_isValid.set(this, true);
-        _UmbServerModelValidationContext_data.set(this, void 0);
-        _UmbServerModelValidationContext_translators.set(this, []);
-        // Hold server feedback...
-        _UmbServerModelValidationContext_serverFeedback.set(this, []);
-        _UmbServerModelValidationContext_executeTranslatorsOnFeedback.set(this, (feedback) => {
-            return __classPrivateFieldGet(this, _UmbServerModelValidationContext_translators, "f").flatMap((translator) => {
-                let newPath;
-                if ((newPath = translator.translate(feedback.path))) {
-                    // TODO: I might need to restructure this part for adjusting existing feedback with a part-translation.
-                    // Detect if some part is unhandled?
-                    // If so only make a partial translation on the feedback, add a message for the handled part.
-                    // then return [ of the partial translated feedback, and the partial handled part. ];
-                    //  TODO:Check if there was any temporary messages base on this path, like if it was partial-translated at one point..
-                    __classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f")?.messages.addMessages('server', newPath, feedback.messages);
-                    // by not returning anything this feedback gets removed from server feedback..
-                    return [];
-                }
-                return feedback;
-            });
-        });
         this.consumeContext(UMB_VALIDATION_CONTEXT, (context) => {
-            if (__classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f")) {
-                __classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f").removeValidator(this);
+            if (this.#context) {
+                this.#context.removeValidator(this);
             }
-            __classPrivateFieldSet(this, _UmbServerModelValidationContext_context, context, "f");
+            this.#context = context;
             context.addValidator(this);
             // Run translators?
         });
     }
     async askServerForValidation(data, requestPromise) {
-        __classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f")?.messages.removeMessagesByType('server');
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_serverFeedback, [], "f");
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_isValid, false, "f");
+        this.#context?.messages.removeMessagesByType('server');
+        this.#serverFeedback = [];
+        this.#isValid = false;
         //this.#validatePromiseReject?.();
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_validatePromise, new Promise((resolve) => {
-            __classPrivateFieldSet(this, _UmbServerModelValidationContext_validatePromiseResolve, resolve, "f");
-        }), "f");
+        this.#validatePromise = new Promise((resolve) => {
+            this.#validatePromiseResolve = resolve;
+        });
         // Store this state of the data for translator look ups:
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_data, data, "f");
+        this.#data = data;
         // Ask the server for validation...
         const { error } = await requestPromise;
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_isValid, error ? false : true, "f");
-        if (!__classPrivateFieldGet(this, _UmbServerModelValidationContext_isValid, "f")) {
+        this.#isValid = error ? false : true;
+        if (!this.#isValid) {
             // We are missing some typing here, but we will just go wild with 'as any': [NL]
             const readErrorBody = error.body;
-            Object.keys(readErrorBody.errors).forEach((path) => {
-                __classPrivateFieldGet(this, _UmbServerModelValidationContext_serverFeedback, "f").push({ path, messages: readErrorBody.errors[path] });
-            });
+            // Check if there are validation errors, since the error might be a generic ApiError
+            if (readErrorBody?.errors) {
+                Object.keys(readErrorBody.errors).forEach((path) => {
+                    this.#serverFeedback.push({ path, messages: readErrorBody.errors[path] });
+                });
+            }
         }
-        __classPrivateFieldGet(this, _UmbServerModelValidationContext_validatePromiseResolve, "f")?.call(this);
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_validatePromiseResolve, undefined, "f");
+        this.#validatePromiseResolve?.();
+        this.#validatePromiseResolve = undefined;
         // Translate feedback:
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_serverFeedback, __classPrivateFieldGet(this, _UmbServerModelValidationContext_serverFeedback, "f").flatMap(__classPrivateFieldGet(this, _UmbServerModelValidationContext_executeTranslatorsOnFeedback, "f")), "f");
+        this.#serverFeedback = this.#serverFeedback.flatMap(this.#executeTranslatorsOnFeedback);
     }
+    #executeTranslatorsOnFeedback = (feedback) => {
+        return this.#translators.flatMap((translator) => {
+            let newPath;
+            if ((newPath = translator.translate(feedback.path))) {
+                // TODO: I might need to restructure this part for adjusting existing feedback with a part-translation.
+                // Detect if some part is unhandled?
+                // If so only make a partial translation on the feedback, add a message for the handled part.
+                // then return [ of the partial translated feedback, and the partial handled part. ];
+                //  TODO:Check if there was any temporary messages base on this path, like if it was partial-translated at one point..
+                this.#context?.messages.addMessages('server', newPath, feedback.messages);
+                // by not returning anything this feedback gets removed from server feedback..
+                return [];
+            }
+            return feedback;
+        });
+    };
     addTranslator(translator) {
-        if (__classPrivateFieldGet(this, _UmbServerModelValidationContext_translators, "f").indexOf(translator) === -1) {
-            __classPrivateFieldGet(this, _UmbServerModelValidationContext_translators, "f").push(translator);
+        if (this.#translators.indexOf(translator) === -1) {
+            this.#translators.push(translator);
         }
         // execute translators here?
     }
     removeTranslator(translator) {
-        const index = __classPrivateFieldGet(this, _UmbServerModelValidationContext_translators, "f").indexOf(translator);
+        const index = this.#translators.indexOf(translator);
         if (index !== -1) {
-            __classPrivateFieldGet(this, _UmbServerModelValidationContext_translators, "f").splice(index, 1);
+            this.#translators.splice(index, 1);
         }
     }
     get isValid() {
-        return __classPrivateFieldGet(this, _UmbServerModelValidationContext_isValid, "f");
+        return this.#isValid;
     }
     async validate() {
-        if (__classPrivateFieldGet(this, _UmbServerModelValidationContext_validatePromise, "f")) {
-            await __classPrivateFieldGet(this, _UmbServerModelValidationContext_validatePromise, "f");
+        if (this.#validatePromise) {
+            await this.#validatePromise;
         }
-        return __classPrivateFieldGet(this, _UmbServerModelValidationContext_isValid, "f") ? Promise.resolve() : Promise.reject();
+        return this.#isValid ? Promise.resolve() : Promise.reject();
     }
     reset() { }
     focusFirstInvalidElement() { }
     hostConnected() {
         super.hostConnected();
-        if (__classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f")) {
-            __classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f").addValidator(this);
+        if (this.#context) {
+            this.#context.addValidator(this);
         }
     }
     hostDisconnected() {
         super.hostDisconnected();
-        if (__classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f")) {
-            __classPrivateFieldGet(this, _UmbServerModelValidationContext_context, "f").removeValidator(this);
-            __classPrivateFieldSet(this, _UmbServerModelValidationContext_context, undefined, "f");
+        if (this.#context) {
+            this.#context.removeValidator(this);
+            this.#context = undefined;
         }
     }
     destroy() {
         // TODO: make sure we destroy things properly:
-        __classPrivateFieldSet(this, _UmbServerModelValidationContext_translators, [], "f");
+        this.#translators = [];
         super.destroy();
     }
 }
-_UmbServerModelValidationContext_validatePromise = new WeakMap(), _UmbServerModelValidationContext_validatePromiseResolve = new WeakMap(), _UmbServerModelValidationContext_context = new WeakMap(), _UmbServerModelValidationContext_isValid = new WeakMap(), _UmbServerModelValidationContext_data = new WeakMap(), _UmbServerModelValidationContext_translators = new WeakMap(), _UmbServerModelValidationContext_serverFeedback = new WeakMap(), _UmbServerModelValidationContext_executeTranslatorsOnFeedback = new WeakMap();