@ecodev/natural 58.0.2 → 58.0.4

package/fesm2022/ecodev-natural.mjs

@@ -2302,14 +2302,16 @@ function money(control) {
  * Cumulate all changes made to an object over time
  */
 class CumulativeChanges {
-    #original = {};
-    #diff = {};
+    constructor() {
+        this.original = {};
+        this.diff = {};
+    }
     /**
      * Initialize the original values, should be called exactly one time per instance
      */
     initialize(originalValues) {
-        this.#original = cloneDeep(originalValues);
-        this.#diff = {};
+        this.original = cloneDeep(originalValues);
+        this.diff = {};
     }
     /**
      * Returns a literal that contains only the keys whose values have been changed by this call or any previous calls.
@@ -2323,25 +2325,25 @@ class CumulativeChanges {
      */
     differences(newValues) {
         Object.keys(newValues).forEach(key => {
-            if (key in this.#diff ||
+            if (key in this.diff ||
                 (newValues[key] !== undefined &&
-                    (!(key in this.#original) || !isEqual(this.#original[key], newValues[key])))) {
-                this.#diff[key] = newValues[key];
+                    (!(key in this.original) || !isEqual(this.original[key], newValues[key])))) {
+                this.diff[key] = newValues[key];
             }
         });
-        return Object.keys(this.#diff).length ? this.#diff : null;
+        return Object.keys(this.diff).length ? this.diff : null;
     }
     /**
      * Commit the given new values, so they are not treated as differences anymore.
      */
     commit(newValues) {
-        this.#original = {
-            ...this.#original,
+        this.original = {
+            ...this.original,
             ...cloneDeep(newValues),
         };
         Object.keys(newValues).forEach(key => {
-            if (key in this.#diff && isEqual(this.#diff[key], newValues[key])) {
-                delete this.#diff[key];
+            if (key in this.diff && isEqual(this.diff[key], newValues[key])) {
+                delete this.diff[key];
             }
         });
     }
@@ -2355,14 +2357,6 @@ function isNaturalDialogTriggerProvidedData(dialogData) {
 }
 // @dynamic
 class NaturalAbstractDetail extends NaturalAbstractPanel {
-    #dialogData;
-    /**
-     * Once set, this must not change anymore, especially not right after the creation mutation,
-     * so the form does not switch from creation mode to update mode without an actual reload of
-     * model from DB (by navigating to update page).
-     */
-    #isUpdatePage;
-    #changes;
     constructor(key, service) {
         super();
         this.key = key;
@@ -2401,14 +2395,14 @@ class NaturalAbstractDetail extends NaturalAbstractPanel {
          * Injected service
          */
         this.route = inject(ActivatedRoute);
-        this.#dialogData = inject(MAT_DIALOG_DATA, { optional: true });
+        this._dialogData = inject(MAT_DIALOG_DATA, { optional: true });
         /**
          * Once set, this must not change anymore, especially not right after the creation mutation,
          * so the form does not switch from creation mode to update mode without an actual reload of
          * model from DB (by navigating to update page).
          */
-        this.#isUpdatePage = false;
-        this.#changes = new CumulativeChanges();
+        this._isUpdatePage = false;
+        this.changes = new CumulativeChanges();
     }
     /**
      * You probably should not override this method. Instead, consider overriding `initForm()`.
@@ -2418,8 +2412,8 @@ class NaturalAbstractDetail extends NaturalAbstractPanel {
             this.initForm();
         }
         else {
-            const route = isNaturalDialogTriggerProvidedData(this.#dialogData)
-                ? this.#dialogData.activatedRoute
+            const route = isNaturalDialogTriggerProvidedData(this._dialogData)
+                ? this._dialogData.activatedRoute
                 : this.route;
             this.#subscribeToModelFromResolvedData(route);
         }
@@ -2455,7 +2449,7 @@ class NaturalAbstractDetail extends NaturalAbstractPanel {
      * This should be used instead of checking `data.model.id` directly, in order to type guard and get proper typing
      */
     isUpdatePage() {
-        return this.#isUpdatePage;
+        return this._isUpdatePage;
     }
     /**
      * Update the object on the server with the values from the form fields that were modified since
@@ -2471,15 +2465,15 @@ class NaturalAbstractDetail extends NaturalAbstractPanel {
         ifValid(this.form).subscribe(() => {
             const newValues = this.form.getRawValue();
             if (submitAllFields) {
-                this.#changes.initialize({});
+                this.changes.initialize({});
             }
             const toSubmit = {
                 id: this.data.model.id,
-                ...this.#changes.differences(newValues),
+                ...this.changes.differences(newValues),
             };
             const update = now ? this.service.updateNow(toSubmit) : this.service.update(toSubmit);
             update.subscribe(model => {
-                this.#changes.commit(newValues);
+                this.changes.commit(newValues);
                 this.alertService.info($localize `Mis à jour`);
                 this.postUpdate(model);
             });
@@ -2565,9 +2559,9 @@ class NaturalAbstractDetail extends NaturalAbstractPanel {
      * will incorrectly be called exactly 1 time per component instance, even if the object changes via route navigation.
      */
     initForm() {
-        this.#isUpdatePage = !!this.data.model.id;
+        this._isUpdatePage = !!this.data.model.id;
         this.form = this.service.getFormGroup(this.data.model);
-        this.#changes.initialize(this.form.getRawValue());
+        this.changes.initialize(this.form.getRawValue());
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.5", ngImport: i0, type: NaturalAbstractDetail, deps: "invalid", target: i0.ɵɵFactoryTarget.Directive }); }
     static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.5", type: NaturalAbstractDetail, usesInheritance: true, ngImport: i0 }); }
@@ -4538,21 +4532,36 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.5", ngImpor
         }] });
 
 class NaturalAbstractModelService {
-    #plural;
-    constructor(name, oneQuery, allQuery, createMutation, updateMutation, deleteMutation, plural = null) {
+    /**
+     *
+     * @param name service and single object query name (eg. userForFront or user).
+     * @param oneQuery GraphQL query to fetch a single object from ID (eg. userForCrudQuery).
+     * @param allQuery GraphQL query to fetch a filtered list of objects (eg. usersForCrudQuery).
+     * @param createMutation GraphQL mutation to create an object.
+     * @param updateMutation GraphQL mutation to update an object.
+     * @param deleteMutation GraphQL mutation to delete a list of objects.
+     * @param plural list query name (eg. usersForFront or users).
+     * @param createName create object mutation name (eg. createUser).
+     * @param updateName update object mutation name (eg. updateUser).
+     * @param deleteName delete object mutation name (eg. deleteUsers).
+     */
+    constructor(name, oneQuery, allQuery, createMutation, updateMutation, deleteMutation, plural = null, createName = null, updateName = null, deleteName = null) {
         this.name = name;
         this.oneQuery = oneQuery;
         this.allQuery = allQuery;
         this.createMutation = createMutation;
         this.updateMutation = updateMutation;
         this.deleteMutation = deleteMutation;
+        this.createName = createName;
+        this.updateName = updateName;
+        this.deleteName = deleteName;
         /**
          * Store the creation mutations that are pending
          */
         this.creatingCache = new Map();
         this.apollo = inject(Apollo);
         this.naturalDebounceService = inject(NaturalDebounceService);
-        this.#plural = plural ?? makePlural(this.name);
+        this.plural = plural ?? makePlural(this.name);
     }
     /**
      * List of individual fields validators
@@ -4648,7 +4657,7 @@ class NaturalAbstractModelService {
      * You must subscribe to start getting results (and fetch from network).
      */
     getOne(id) {
-        return this.#prepareOneQuery(id, 'cache-and-network').pipe(takeWhile(result => result.networkStatus !== NetworkStatus.ready, true), map(result => result.data[this.name]));
+        return this.prepareOneQuery(id, 'cache-and-network').pipe(takeWhile(result => result.networkStatus !== NetworkStatus.ready, true), map(result => result.data[this.name]));
     }
     /**
      * Watch a single object
@@ -4661,9 +4670,9 @@ class NaturalAbstractModelService {
      * You **MUST** unsubscribe.
      */
     watchOne(id, fetchPolicy = 'cache-and-network') {
-        return this.#prepareOneQuery(id, fetchPolicy).pipe(map(result => result.data[this.name]));
+        return this.prepareOneQuery(id, fetchPolicy).pipe(map(result => result.data[this.name]));
     }
-    #prepareOneQuery(id, fetchPolicy) {
+    prepareOneQuery(id, fetchPolicy) {
         this.throwIfObservable(id);
         this.throwIfNotQuery(this.oneQuery);
         return this.getVariablesForOne(id).pipe(switchMap(variables => {
@@ -4890,11 +4899,11 @@ class NaturalAbstractModelService {
      * This is used for the unique validator
      */
     count(queryVariablesManager) {
-        const queryName = 'Count' + upperCaseFirstLetter(this.#plural);
+        const queryName = 'Count' + upperCaseFirstLetter(this.plural);
         const filterType = upperCaseFirstLetter(this.name) + 'Filter';
         const query = gql `
             query ${queryName} ($filter: ${filterType}) {
-            count: ${this.#plural} (filter: $filter, pagination: {pageSize: 0, pageIndex: 0}) {
+            count: ${this.plural} (filter: $filter, pagination: {pageSize: 0, pageIndex: 0}) {
             length
             }
             }`;
@@ -4937,27 +4946,27 @@ class NaturalAbstractModelService {
      * This is used to extract only the array of fetched objects out of the entire fetched data
      */
     mapAll() {
-        return map(result => result.data[this.#plural]); // See https://github.com/apollographql/apollo-client/issues/5662
+        return map(result => result.data[this.plural]); // See https://github.com/apollographql/apollo-client/issues/5662
     }
     /**
      * This is used to extract only the created object out of the entire fetched data
      */
     mapCreation(result) {
-        const name = 'create' + upperCaseFirstLetter(this.name);
+        const name = this.createName ?? 'create' + upperCaseFirstLetter(this.name);
         return result.data[name]; // See https://github.com/apollographql/apollo-client/issues/5662
     }
     /**
      * This is used to extract only the updated object out of the entire fetched data
      */
     mapUpdate(result) {
-        const name = 'update' + upperCaseFirstLetter(this.name);
+        const name = this.updateName ?? 'update' + upperCaseFirstLetter(this.name);
         return result.data[name]; // See https://github.com/apollographql/apollo-client/issues/5662
     }
     /**
      * This is used to extract only flag when deleting an object
      */
     mapDelete(result) {
-        const name = 'delete' + upperCaseFirstLetter(this.#plural);
+        const name = this.deleteName ?? 'delete' + upperCaseFirstLetter(this.plural);
         return result.data[name]; // See https://github.com/apollographql/apollo-client/issues/5662
     }
     /**
@@ -5534,7 +5543,6 @@ function getTabId(tab) {
  * </mat-tab-group>
  */
 class NaturalLinkableTabDirective extends NaturalAbstractController {
-    #isLoadingRouteConfig;
     constructor(component, route, router) {
         super();
         this.component = component;
@@ -5544,13 +5552,13 @@ class NaturalLinkableTabDirective extends NaturalAbstractController {
          * If false, disables the persistent navigation
          */
         this.naturalLinkableTab = true;
-        this.#isLoadingRouteConfig = false;
+        this.isLoadingRouteConfig = false;
         router.events.pipe(takeUntilDestroyed()).subscribe(event => {
             if (event instanceof RouteConfigLoadStart) {
-                this.#isLoadingRouteConfig = true;
+                this.isLoadingRouteConfig = true;
             }
             else if (event instanceof RouteConfigLoadEnd) {
-                this.#isLoadingRouteConfig = false;
+                this.isLoadingRouteConfig = false;
             }
         });
     }
@@ -5570,7 +5578,7 @@ class NaturalLinkableTabDirective extends NaturalAbstractController {
         });
         // When mat-tab-groups selected tab change, update url
         this.component.selectedTabChange.pipe(takeUntil$1(this.ngUnsubscribe)).subscribe(event => {
-            if (this.#isLoadingRouteConfig) {
+            if (this.isLoadingRouteConfig) {
                 return;
             }
             const activatedTabName = getTabId(event.tab);
@@ -9869,14 +9877,13 @@ const fallbackIfNoOpenedPanels = (segments) => {
  * </natural-relations>
  */
 class NaturalRelationsComponent extends NaturalAbstractController {
-    #service;
     get service() {
-        return this.#service;
+        return this._service;
     }
     set service(service) {
-        this.#service = service;
+        this._service = service;
         this.loading = true;
-        const items$ = this.#service.watchAll(this.variablesManager).pipe(takeUntil(this.ngUnsubscribe), tap({
+        const items$ = this._service.watchAll(this.variablesManager).pipe(takeUntil(this.ngUnsubscribe), tap({
             next: () => (this.loading = false),
             complete: () => (this.loading = false),
             error: () => (this.loading = false),
@@ -10303,7 +10310,6 @@ function assert(value) {
  * Maybe the better is to wait next release
  */
 class NaturalSidenavService extends NaturalAbstractController {
-    #isMobileView;
     constructor(breakpointObserver, router, sessionStorage, naturalSidenavStackService) {
         super();
         this.breakpointObserver = breakpointObserver;
@@ -10343,7 +10349,7 @@ class NaturalSidenavService extends NaturalAbstractController {
         this.openedStorageKey = 'menu-opened';
         this.minimizedStorageKeyWithName = null;
         this.openedStorageKeyWithName = null;
-        this.#isMobileView = false;
+        this._isMobileView = false;
     }
     get activeMode() {
         return this.mode;
@@ -10373,8 +10379,8 @@ class NaturalSidenavService extends NaturalAbstractController {
             .observe([Breakpoints.XSmall, Breakpoints.Small])
             .pipe(takeUntil$1(this.ngUnsubscribe))
             .subscribe(r => {
-            this.#isMobileView = r.matches;
-            const isBig = !this.#isMobileView;
+            this._isMobileView = r.matches;
+            const isBig = !this._isMobileView;
             this.mode = isBig ? this.modes[0] : this.modes[1];
             if (oldIsBig === null || isBig !== oldIsBig) {
                 oldIsBig = isBig;
@@ -10399,13 +10405,13 @@ class NaturalSidenavService extends NaturalAbstractController {
         }
     }
     isMobileView() {
-        return this.#isMobileView;
+        return this._isMobileView;
     }
     /**
      * Close nav on mobile view after a click
      */
     navItemClicked() {
-        if (this.#isMobileView) {
+        if (this._isMobileView) {
             this.close();
         }
     }
@@ -10442,7 +10448,7 @@ class NaturalSidenavService extends NaturalAbstractController {
         assert(this.openedStorageKeyWithName);
         const value = this.sessionStorage.getItem(this.openedStorageKeyWithName);
         if (value === null) {
-            return !this.#isMobileView;
+            return !this._isMobileView;
         }
         else {
             return value === 'true';
@@ -10463,10 +10469,10 @@ class NaturalSidenavService extends NaturalAbstractController {
     }
     setOpened(value) {
         this.opened = value;
-        if (this.opened && this.#isMobileView) {
+        if (this.opened && this._isMobileView) {
             this.minimized = false;
         }
-        else if (!this.#isMobileView) {
+        else if (!this._isMobileView) {
             assert(this.openedStorageKeyWithName);
             this.sessionStorage.setItem(this.openedStorageKeyWithName, this.opened ? 'true' : 'false');
         }