@trudb/tru-common-lib 0.0.336 → 0.0.338

package/fesm2020/trudb-tru-common-lib.mjs

@@ -1475,7 +1475,7 @@ class TruDataContext {
         this.uiNotification = uiNotification;
         this._pendingDeleteEntities = [];
         this._pendingCascadeDeleteEntities = [];
-        this.entityManagerChangeDetection = new Observable((observer) => {
+        this.validationChangeDetection = new Observable((observer) => {
             this.entityManager.validationErrorsChanged.subscribe(entities => {
                 observer.next(entities);
             });
@@ -4913,45 +4913,61 @@ class TruBreezeValidator {
         this.viewContainerRef = viewContainerRef;
         this.componentFactoryResolver = componentFactoryResolver;
         this.configModel = {};
+        this.dialogRef = null;
         this.subs = [];
-        this.valErrsChanged = (entityToValidate) => {
-            if (true) {
-                this.el.nativeElement.setCustomValidity('');
-                let previousErrEl = this.el.nativeElement.nextElementSibling;
-                let previousFlagEl = this.el.nativeElement.nextElementSibling?.nextElementSibling;
-                if (previousErrEl?.classList.contains('invalid'))
-                    previousErrEl.remove();
-                if (previousFlagEl?.classList.contains('invalid-flag'))
-                    previousFlagEl.remove();
-                let msgEl, flagEl;
-                this.el.nativeElement.classList.remove('override-disabled-invalid');
-                if (this.propertyPath?.includes('/')) {
-                    let propertyNameParts = this.propertyPath.split('/');
-                    let targetProperty;
-                    propertyNameParts.forEach((name) => {
-                        if (!targetProperty) {
-                            let targetPropertyName = 'o' + name;
-                            targetProperty = this.entity[targetPropertyName];
-                        }
-                        else {
-                            let targetPropertyName = 'o' + name;
-                            targetProperty = targetProperty[targetPropertyName];
-                        }
-                    });
-                    if (targetProperty && targetProperty.Merge_Data) {
-                        this.mergeData = JSON.parse(targetProperty.Merge_Data);
+        this.getMergeData = () => {
+            if (this.config.propertyPath?.includes('/')) {
+                let propertyNameParts = this.config.propertyPath.split('/');
+                propertyNameParts.pop();
+                let targetProperty;
+                propertyNameParts.forEach((name) => {
+                    if (!targetProperty) {
+                        let targetPropertyName = 'o' + name;
+                        targetProperty = this.entity[targetPropertyName];
+                    }
+                    else {
+                        let targetPropertyName = 'o' + name;
+                        targetProperty = targetProperty[targetPropertyName];
                     }
+                });
+                if (targetProperty && targetProperty.Merge_Data) {
+                    return JSON.parse(targetProperty.Merge_Data);
                 }
-                else {
-                    this.mergeData = JSON.parse(this.entity.Merge_Data);
+            }
+            else {
+                return JSON.parse(this.entity.Merge_Data);
+            }
+        };
+        this.addValidation = (propertyValidations) => {
+            const componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);
+            const component = this.viewContainerRef.createComponent(componentFactory, 0, this.viewContainerRef.injector);
+            this.dialogRef = component;
+        };
+        this.removeValidation = () => {
+            if (this.dialogRef) {
+                this.viewContainerRef.remove(this.viewContainerRef.indexOf(this.dialogRef.instance));
+                this.dialogRef = null;
+            }
+        };
+        this.valErrsChanged = (validationObject) => {
+            let validationTableName = validationObject.entity.constructor.name;
+            if (this.config.rootTable === validationTableName) {
+                let addedPropertyValdations = validationObject.added.find((v) => { v.propertyName === this.config.propertyName; });
+                let removedPropertyValdations = validationObject.removed.find((v) => { v.propertyName === this.config.propertyName; });
+                if (addedPropertyValdations.length) {
+                    this.addValidation(addedPropertyValdations);
                 }
-                const componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);
-                const containerRef = this.viewContainerRef.createComponent(componentFactory, 0, this.viewContainerRef.injector);
+                else if (!addedPropertyValdations.length && removedPropertyValdations.length) {
+                    this.removeValidation();
+                }
+            }
+            if (this.config.rootTable === validationTableName) {
+                this.mergeData = this.getMergeData();
             }
         };
     }
     ngOnInit() {
-        this.subs.push(this.dataContext.entityManagerChangeDetection.subscribe(entities => {
+        this.subs.push(this.dataContext.validationChangeDetection.subscribe(entities => {
             console.log(entities);
             this.valErrsChanged(entities);
         }));
@@ -4961,7 +4977,7 @@ class TruBreezeValidator {
     }
 }
 TruBreezeValidator.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruBreezeValidator, deps: [{ token: i0.ElementRef }, { token: TruDataContext }, { token: i0.ViewContainerRef }, { token: i0.ComponentFactoryResolver }], target: i0.ɵɵFactoryTarget.Directive });
-TruBreezeValidator.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.1", type: TruBreezeValidator, selector: "[truBreezeValidator]", inputs: { entity: ["truBreezeValidator", "entity"], propertyPath: "propertyPath" }, ngImport: i0 });
+TruBreezeValidator.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.1", type: TruBreezeValidator, selector: "[truBreezeValidator]", inputs: { entity: ["truBreezeValidator", "entity"], config: "config" }, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruBreezeValidator, decorators: [{
             type: Directive,
             args: [{
@@ -4970,7 +4986,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
         }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: TruDataContext }, { type: i0.ViewContainerRef }, { type: i0.ComponentFactoryResolver }]; }, propDecorators: { entity: [{
                 type: Input,
                 args: ['truBreezeValidator']
-            }], propertyPath: [{
+            }], config: [{
                 type: Input
             }] } });