@trudb/tru-common-lib 0.1.83 → 0.1.85

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

@@ -3946,10 +3946,11 @@ class TruDataGrid {
             this.rowData = associatedEntities.map(this.enhanceRowDataForEntity, associatedEntities);
         else
             associatedEntities = this.rowData.map((e) => { return e.$entity; });
-        let associatableTypeName = this.config.resultConfig.entityManyToManyType.name;
+        let associatableType = this.config.resultConfig.entityManyToManyType.name;
+        let associatableTypeName = this.config.resultConfig.entityManyToManyTypeName;
         let associatedMapOfAssociatable = _.map(associatedEntities, function (e) { return e['o' + associatableTypeName]; });
         this.unassociatedChoices = associatableEntities.filter(object1 => {
-            return !associatedMapOfAssociatable.some(object2 => { return object1.value.$ === object2[associatableTypeName + 'Ref']; });
+            return !associatedMapOfAssociatable.some(object2 => { return object1.value.$ === object2[associatableType + 'Ref']; });
         });
     };
     exportData = () => {
@@ -7118,6 +7119,7 @@ class TruBreezeValidator {
     dataContext;
     viewContainerRef;
     componentFactoryResolver;
+    entity;
     config;
     constructor(el, dataContext, viewContainerRef, componentFactoryResolver) {
         this.el = el;
@@ -7130,15 +7132,16 @@ class TruBreezeValidator {
     dialogRef = null;
     subs = [];
     currentDialog = null;
+    context = TruValidationDialogContext.Control;
     getMergeData = () => {
-        if (this.config.propertyConfig.propertyPath?.includes('/')) {
-            let propertyNameParts = this.config.propertyConfig.propertyPath.split('/');
+        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.config.entity[targetPropertyName];
+                    targetProperty = this.entity[targetPropertyName];
                 }
                 else {
                     let targetPropertyName = 'o' + name;
@@ -7151,7 +7154,7 @@ class TruBreezeValidator {
             return undefined;
         }
         else {
-            return this.config.entity.Merge_Data_Set?.get(this.config.propertyName) ? this.config.entity.Merge_Data_Set : undefined;
+            return this.entity.Merge_Data_Set?.get(this.config.propertyName) ? this.entity.Merge_Data_Set : undefined;
         }
     };
     parseErrorMessages = (validationErrors) => {
@@ -7180,55 +7183,58 @@ class TruBreezeValidator {
         const entityPkeyName = validationTableName + 'Ref';
         const validationObjectEntitypkeyName = validationTableName + 'Ref';
         let addedPropertyValdations = validationObject.added.filter((v) => {
-            return v.propertyName === this.config.propertyConfig.propertyName;
+            return v.propertyName === this.config.propertyName;
         });
         let removedPropertyValdations = validationObject.removed.filter((v) => {
-            return v.propertyName === this.config.propertyConfig.propertyName;
+            return v.propertyName === this.config.propertyName;
         });
         this.mergeData = this.getMergeData();
-        if (this.config.propertyConfig.rootTable === validationTableName &&
-            this.config.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&
+        if (this.config.rootTable === validationTableName &&
+            this.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&
             (addedPropertyValdations.length || this.mergeData)) {
             this.removeValidationDialog();
-            this.config.propertyName = this.config.propertyConfig.propertyName;
-            this.config.mergeData = this.mergeData;
-            this.config.errorMsg = this.parseErrorMessages(addedPropertyValdations);
-            this.addValidationDialog(this.config);
-        }
-        if (this.config.propertyConfig.rootTable === validationTableName &&
-            this.config.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&
+            let config = new TruValidationDialogConfig(this.entity, this.config);
+            config.propertyName = this.config.propertyName;
+            config.mergeData = this.mergeData;
+            config.errorMsg = this.parseErrorMessages(addedPropertyValdations);
+            this.addValidationDialog(config);
+        }
+        if (this.config.rootTable === validationTableName &&
+            this.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&
             (removedPropertyValdations.length)) {
             this.removeValidationDialog();
         }
     };
     ngOnInit() { }
     ngAfterViewInit() {
-        if (this.config.context !== TruValidationDialogContext.Grid && !this.config.isSubProperty) {
+        if (this.context !== TruValidationDialogContext.Grid && !this.config.isSubProperty) {
             this.subs.push(this.dataContext.validationChangeDetection.subscribe(entities => {
                 this.valErrsChanged(entities);
             }));
         }
     }
     ngOnChanges(changes) {
-        if (!changes.config.firstChange) {
+        if (!changes.entity.firstChange) {
             this.removeValidationDialog();
-            this.config.entity.entityAspect.validateEntity();
+            this.entity.entityAspect.validateEntity();
         }
     }
     ngOnDestroy() {
         this.subs.forEach(s => s.unsubscribe());
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.5", ngImport: i0, type: TruBreezeValidator, deps: [{ token: i0.ElementRef }, { token: TruDataContext }, { token: i0.ViewContainerRef }, { token: i0.ComponentFactoryResolver }], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.5", type: TruBreezeValidator, selector: "[truBreezeValidator]", inputs: { config: ["truBreezeValidator", "config"] }, usesOnChanges: true, ngImport: i0 });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.5", type: TruBreezeValidator, selector: "[truBreezeValidator]", inputs: { entity: ["truBreezeValidator", "entity"], config: "config" }, usesOnChanges: true, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.5", ngImport: i0, type: TruBreezeValidator, decorators: [{
             type: Directive,
             args: [{
                     selector: '[truBreezeValidator]'
                 }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: TruDataContext }, { type: i0.ViewContainerRef }, { type: i0.ComponentFactoryResolver }], propDecorators: { config: [{
+        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: TruDataContext }, { type: i0.ViewContainerRef }, { type: i0.ComponentFactoryResolver }], propDecorators: { entity: [{
                 type: Input,
                 args: ['truBreezeValidator']
+            }], config: [{
+                type: Input
             }] } });
 
 class TruBreezeValidatorModule {