@decaf-ts/for-angular 0.0.79 → 0.0.80

package/fesm2022/decaf-ts-for-angular.mjs

@@ -25,7 +25,6 @@ import { addIcons } from 'ionicons';
 import * as allIcons from 'ionicons/icons';
 import { chevronUpOutline, chevronDownOutline, createOutline, trashOutline, addOutline, alertCircleOutline, arrowUpOutline, arrowDownOutline, searchOutline, closeOutline, chevronForwardOutline, chevronBackOutline, arrowBackOutline, arrowForwardOutline } from 'ionicons/icons';
 import { modalController } from '@ionic/core';
-import { getModelAndRepository as getModelAndRepository$1, ActionRoles as ActionRoles$1, ComponentEventNames as ComponentEventNames$1 } from 'src/lib/engine';
 
 const DB_ADAPTER_FLAVOUR_TOKEN = 'DbAdapterFlavour';
 /**
@@ -2044,7 +2043,13 @@ class NgxFormService {
                 if (!parentProps.required) {
                     parent.setErrors(null);
                     parent.updateValueAndValidity({ emitEvent: true });
-                    childControl.disable();
+                    const hasValue = parentProps.isMultiple &&
+                        Object.keys(childControl.value).some((key) => childControl.value[key] !== null &&
+                            childControl.value[key] !== undefined &&
+                            childControl.value[key] !== '');
+                    if (!hasValue) {
+                        childControl.disable();
+                    }
                 }
                 else {
                     this.validateFields(childControl);
@@ -3668,8 +3673,21 @@ class NgxRepositoryDirective extends DecafComponent {
         this._data = {};
     }
     async initialize() {
-        if (this.repository && this.filter) {
-            this._data = await this.query(this.filter.eq(this.modelId));
+        if (this.repository && this.modelId) {
+            if (this.filter) {
+                this._data = await this.query(this.filter.eq(this.modelId));
+                if (this._data) {
+                    await this.refresh();
+                }
+            }
+            else {
+                // if (String(this.modelName) === this.model?.constructor.name) {
+                //   const model = await this.repository.read(this.modelId as PrimaryKeyType);
+                //   if (model) {
+                //     await this.refresh(model);
+                //   }
+                // }
+            }
         }
     }
     set context(context) {
@@ -3685,6 +3703,12 @@ class NgxRepositoryDirective extends DecafComponent {
         }
         return this._context;
     }
+    async refresh(model) {
+        if (model) {
+            this.model = Model.build(model, this.modelName);
+            this._data = model;
+        }
+    }
     buildCondition(attr) {
         if (!attr) {
             attr = (this.filterBy || this.pk);
@@ -3736,7 +3760,10 @@ class NgxRepositoryDirective extends DecafComponent {
         const handler = this.handlers?.[hook] || undefined;
         const model = this.buildTransactionModel(data || {}, repository, operation);
         if (handler && typeof handler === 'function') {
-            (await handler.bind(this)(model, repository, this.modelId));
+            const result = (await handler.bind(this)(model, repository, this.modelId));
+            if (result === false) {
+                return undefined;
+            }
         }
         return model;
     }
@@ -3799,11 +3826,13 @@ class NgxRepositoryDirective extends DecafComponent {
         return this.getModelPropertyType(clazz, Model.pk(clazz));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: NgxRepositoryDirective, deps: null, target: i0.ɵɵFactoryTarget.Directive }); }
-    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.3.16", type: NgxRepositoryDirective, isStandalone: true, inputs: { pk: "pk", filter: "filter", filterBy: "filterBy", start: "start", limit: "limit", sortDirection: "sortDirection", sortBy: "sortBy", indexes: "indexes", _data: "_data" }, usesInheritance: true, ngImport: i0 }); }
+    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.3.16", type: NgxRepositoryDirective, isStandalone: true, inputs: { modelName: "modelName", pk: "pk", filter: "filter", filterBy: "filterBy", start: "start", limit: "limit", sortDirection: "sortDirection", sortBy: "sortBy", indexes: "indexes", _data: "_data" }, usesInheritance: true, ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: NgxRepositoryDirective, decorators: [{
             type: Directive
-        }], propDecorators: { pk: [{
+        }], propDecorators: { modelName: [{
+                type: Input
+            }], pk: [{
                 type: Input
             }], filter: [{
                 type: Input
@@ -4745,7 +4774,7 @@ class NgxComponentDirective extends NgxRepositoryDirective {
         await this.initialize();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: NgxComponentDirective, deps: [{ token: CPTKN }, { token: CPTKN }], target: i0.ɵɵFactoryTarget.Directive }); }
-    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.3.16", type: NgxComponentDirective, isStandalone: true, inputs: { enableDarkMode: "enableDarkMode", isDarkMode: "isDarkMode", name: "name", childOf: "childOf", uid: "uid", model: "model", modelName: "modelName", modelId: "modelId", formGroup: "formGroup", value: "value", mapper: "mapper", operations: "operations", operation: "operation", row: "row", col: "col", className: "className", translatable: "translatable", locale: "locale", item: "item", props: "props", route: "route", borders: "borders", isModalChild: "isModalChild", handlers: "handlers", events: "events", propsMapperFn: "propsMapperFn" }, outputs: { listenEvent: "listenEvent", refreshEvent: "refreshEvent" }, host: { properties: { "attr.id": "uid" } }, viewQueries: [{ propertyName: "component", first: true, predicate: ["component"], descendants: true, read: ElementRef, static: true }], usesInheritance: true, usesOnChanges: true, ngImport: i0 }); }
+    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.3.16", type: NgxComponentDirective, isStandalone: true, inputs: { enableDarkMode: "enableDarkMode", isDarkMode: "isDarkMode", name: "name", childOf: "childOf", uid: "uid", model: "model", modelId: "modelId", formGroup: "formGroup", value: "value", mapper: "mapper", operations: "operations", operation: "operation", row: "row", col: "col", className: "className", translatable: "translatable", locale: "locale", item: "item", props: "props", route: "route", borders: "borders", isModalChild: "isModalChild", handlers: "handlers", events: "events", propsMapperFn: "propsMapperFn" }, outputs: { listenEvent: "listenEvent", refreshEvent: "refreshEvent" }, host: { properties: { "attr.id": "uid" } }, viewQueries: [{ propertyName: "component", first: true, predicate: ["component"], descendants: true, read: ElementRef, static: true }], usesInheritance: true, usesOnChanges: true, ngImport: i0 }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: NgxComponentDirective, decorators: [{
             type: Directive,
@@ -4771,8 +4800,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                 type: Input
             }], model: [{
                 type: Input
-            }], modelName: [{
-                type: Input
             }], modelId: [{
                 type: Input
             }], formGroup: [{
@@ -4844,7 +4871,7 @@ class NgxPageDirective extends NgxComponentDirective {
      * @param {boolean} [hasMenu=true] - Whether this page should display the menu
      * @memberOf module:lib/engine/NgxPageDirective
      */
-    constructor(localeRoot = "NgxPageDirective", hasMenu = true) {
+    constructor(localeRoot = 'NgxPageDirective', hasMenu = true) {
         super(localeRoot);
         /**
          * @description Page title text for the current view.
@@ -4855,7 +4882,7 @@ class NgxPageDirective extends NgxComponentDirective {
          * @default ''
          * @memberOf module:lib/engine/NgxPageDirective
          */
-        this.title = "";
+        this.title = '';
         /**
          * @description Ionic menu controller service for menu management.
          * @summary Injected service that provides programmatic control over Ionic menu components.
@@ -4917,7 +4944,7 @@ class NgxPageDirective extends NgxComponentDirective {
     async initialize() {
         await super.initialize();
         // connect component to media service for color scheme toggling
-        this.currentRoute = this.router.url.replace("/", "");
+        this.currentRoute = this.router.url.replace('/', '');
         if (!this.route)
             this.route = this.currentRoute;
         this.setPageTitle(this.currentRoute);
@@ -4936,23 +4963,23 @@ class NgxPageDirective extends NgxComponentDirective {
             .pipe(takeUntil$1(this.destroySubscriptions$), shareReplay$1(1))
             .subscribe(async (event) => {
             if (event instanceof NavigationEnd) {
-                const url = (event?.url || "").replace("/", "");
+                const url = (event?.url || '').replace('/', '');
                 this.currentRoute = url;
                 if (this.hasMenu)
-                    this.hasMenu = url !== "login" && url !== "";
+                    this.hasMenu = url !== 'login' && url !== '';
                 this.title = this.pageTitle;
                 await this.setPageTitle(url);
                 this.changeDetectorRef.detectChanges();
             }
             if (event instanceof NavigationStart) {
-                const url = (event?.url || "").replace("/", "");
+                const url = (event?.url || '').replace('/', '');
                 if (this.hasMenu)
-                    this.hasMenu = url !== "login" && url !== "";
+                    this.hasMenu = url !== 'login' && url !== '';
                 removeFocusTrap();
             }
         });
         if (!this.route)
-            this.route = this.router.url.replace("/", "");
+            this.route = this.router.url.replace('/', '');
         await this.menuController.enable(this.hasMenu);
     }
     /**
@@ -4970,13 +4997,13 @@ class NgxPageDirective extends NgxComponentDirective {
      */
     async setPageTitle(route, menu) {
         if (!route)
-            route = this.router.url.replace("/", "");
+            route = this.router.url.replace('/', '');
         if (!menu)
             menu = this.menu;
         const activeMenu = menu.find((item) => item?.url?.includes(route));
         if (activeMenu) {
-            const label = `${(activeMenu?.title || activeMenu?.label || "").toLowerCase()}`;
-            const title = `${await this.translate(label ? "menu." + label : label)} ${this.appName ? `- ${this.appName}` : ""}`;
+            const label = `${(activeMenu?.title || activeMenu?.label || '').toLowerCase()}`;
+            const title = `${await this.translate(label ? 'menu.' + label : label)} ${this.appName ? `- ${this.appName}` : ''}`;
             this.titleService.setTitle(title);
             if (!this.title)
                 this.title = title;
@@ -5273,41 +5300,17 @@ class NgxModelPageDirective extends NgxPageDirective {
                         .select()
                         .where(Condition.attribute(this.pk).eq(uid))
                         .execute();
-                    const data = query?.length ? (query?.length === 1 ? query[0] : query) : undefined;
                     if (modelName === this.modelName) {
                         const data = query?.length ? (query?.length === 1 ? query[0] : query) : undefined;
                         model[prop] = data;
                         this.model = Model.build({ [prop]: data }, modelName);
                     }
                     else {
-                        model[parent] = {
-                            ...model[parent],
-                            [prop]: data,
-                        };
+                        // model[parent] = {
+                        //   ...model[parent],
+                        //   [prop]: data,
+                        // };
                     }
-                    // if (data) {
-                    //   if (modelName === this.modelName) {
-                    //     model[prop] = data;
-                    //     this.model = Model.build({ [prop]: data }, modelName);
-                    //   } else {
-                    //     model[parent] = {
-                    //       ...model[parent],
-                    //       [prop]: data,
-                    //     };
-                    //   }
-                    // }
-                    // const data = query?.length ? (query?.length === 1 ? query[0] : query) : undefined;
-                    // if (data) {
-                    //   if (modelName === this.modelName) {
-                    //     model[prop] = data;
-                    //     this.model = Model.build({ [prop]: data }, modelName);
-                    //   } else {
-                    //     model[parent] = {
-                    //       ...model[parent],
-                    //       [prop]: data,
-                    //     };
-                    //   }
-                    // }
                 }
                 // this._data = model;
                 // this.changeDetectorRef.detectChanges();
@@ -5422,6 +5425,14 @@ class NgxModelPageDirective extends NgxPageDirective {
                 if (!this.modelId)
                     this.modelId = data[pk];
                 const model = await this.transactionBegin(data, repository, operation);
+                if (!model) {
+                    return {
+                        success: false,
+                        aborted: true,
+                        model: null,
+                        message: 'Operation aborted by before hook',
+                    };
+                }
                 switch (operation) {
                     case OperationKeys.CREATE:
                         result = await (!Array.isArray(model)
@@ -5463,7 +5474,7 @@ class NgxModelPageDirective extends NgxPageDirective {
                 .error(`Error during ${this.operation} operation: ${error instanceof Error ? error.message : error}`);
             message = error instanceof Error ? error.message : error;
         }
-        return { ...event, success, message, model: result };
+        return { ...event, success, message, model: result, aborted: false };
     }
     async batchOperation(context, redirect = false) {
         const { data, repository, pk } = context.context;
@@ -7742,8 +7753,8 @@ class NgxFormDirective extends NgxParentComponentDirective {
             event.preventDefault();
             event.stopImmediatePropagation();
         }
-        this.changeDetectorRef.detectChanges();
         const formGroup = this.formGroup;
+        this.changeDetectorRef.detectChanges();
         const isValid = NgxFormService.validateFields(formGroup);
         if (!isValid) {
             NgxFormService.enableAllGroupControls(formGroup);
@@ -8267,7 +8278,7 @@ let CrudFormComponent = class CrudFormComponent extends NgxFormDirective {
         this.options = Object.assign({}, DefaultFormReactiveOptions, { buttons: { submit: { text: this.operation.toLowerCase() } } }, this.options || {});
         await super.initialize();
         if (!this.pk && this.modelName) {
-            const repo = getModelAndRepository$1(this.modelName);
+            const repo = getModelAndRepository(this.modelName);
             if (repo) {
                 this.pk = repo.pk;
             }
@@ -8942,8 +8953,9 @@ let FieldsetComponent = class FieldsetComponent extends NgxFormDirective {
                     return false;
                 }, obj);
             }
-            if (!Array.isArray(this._data))
+            if (!Array.isArray(this._data)) {
                 this._data = resolvePath(this._data, this.childOf);
+            }
             if (this._data) {
                 const data = this._data || [];
                 if ([OperationKeys.READ, OperationKeys.DELETE].includes(this.operation)) {
@@ -8965,6 +8977,28 @@ let FieldsetComponent = class FieldsetComponent extends NgxFormDirective {
                     ];
                 }
                 else {
+                    //  if (Array.isArray(data)) {
+                    //   this.value = [];
+                    //   const value = data.map((v) => {
+                    //     const formGroup = this.activeFormGroup as FormGroup;
+                    //     if (data.length > (formGroup.parent as FormArray).length)
+                    //       NgxFormService.addGroupToParent(formGroup.parent as FormArray);
+                    //     if (!Object.keys(this.mapper).length) this.mapper = this.getMapper(v as KeyValue);
+                    //     Object.entries(v).forEach(([key, value]) => {
+                    //       if (key === this.pk)
+                    //         formGroup.addControl(key, new FormControl({ value: value, disabled: false }));
+                    //       const control = formGroup.get(key);
+                    //       if (control instanceof FormControl) {
+                    //         control.setValue(value);
+                    //         control.updateValueAndValidity();
+                    //         formGroup.updateValueAndValidity();
+                    //       }
+                    //     });
+                    //     this.activeFormGroupIndex = (formGroup.parent as FormArray).length - 1;
+                    //   });
+                    //   this.setValue();
+                    //   this.changeDetectorRef.detectChanges();
+                    // }
                     this.getItems(data);
                 }
             }
@@ -9150,10 +9184,10 @@ let FieldsetComponent = class FieldsetComponent extends NgxFormDirective {
                     pk: this.pk,
                     uid: value[this.pk],
                 },
-            }, ActionRoles$1.delete, this.injector);
+            }, ActionRoles.delete, this.injector);
             await modal.present();
             const { role } = await modal.onDidDismiss();
-            if (role === ActionRoles$1.confirm)
+            if (role === ActionRoles.confirm)
                 return this.handleRemoveItem(index, true, value);
             return;
         }
@@ -9249,10 +9283,10 @@ let FieldsetComponent = class FieldsetComponent extends NgxFormDirective {
             this.operation === OperationKeys.UPDATE &&
             value[this.pk] !== undefined) {
             this.listenEvent.emit({
-                name: ComponentEventNames$1.Submit,
+                name: ComponentEventNames.Submit,
                 role: operation,
                 component: this.componentName,
-                handler: this.handlers[ComponentEventNames$1.Submit] || undefined,
+                handler: this.handlers[ComponentEventNames.Submit] || undefined,
                 data: value,
                 context: {
                     repository: this._repository,
@@ -9310,9 +9344,11 @@ let FieldsetComponent = class FieldsetComponent extends NgxFormDirective {
      */
     setValue() {
         const formGroup = this.formGroup;
-        const value = formGroup.controls.map(({ value }) => value).filter((v) => this.hasValue(v));
-        this.value = value;
-        this.getItems(value, this.items);
+        if (formGroup?.length) {
+            const value = formGroup.controls.map(({ value }) => value).filter((v) => this.hasValue(v));
+            this.value = value;
+            this.getItems(value, this.items);
+        }
         this.updatingItem = undefined;
     }
     getItems(value, items = []) {