@trudb/tru-common-lib 0.0.340 → 0.0.342

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

@@ -106,6 +106,7 @@ class TruEntityBase {
         this.CreatedRef = -1;
         this.Updated = undefined;
         this.UpdatedRef = undefined;
+        this.Merge_Data_Set = undefined;
     }
 }
 
@@ -4835,60 +4836,66 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
                 }] }]; } });
 
 class TruValidationDialog {
-    constructor() {
+    constructor(elementRef, util) {
+        this.elementRef = elementRef;
+        this.util = util;
+        this.errorMsg = '';
         this.onAcceptAll = () => {
-            let entity = this.entity;
+            let entity = this.config.entity;
             let originalValues = entity.entityAspect.originalValues;
-            Object.keys(this.mergeData).forEach((key) => {
-                let propertyNameKey = key;
-                entity[key] = this.mergeData[propertyNameKey].value;
+            for (const key in this.config.mergeData) {
+                entity[key] = this.config.mergeData.getData(key).value;
                 if (originalValues.hasOwnProperty(key))
                     delete originalValues[key];
-            });
+            }
+            ;
             if (Object.keys(originalValues).length === 0 && originalValues.constructor === Object)
                 entity.entityAspect.setUnchanged();
-            let propertiesToValidate = Object.getOwnPropertyNames(this.mergeData);
-            entity.Merge_Data = JSON.stringify({});
-            propertiesToValidate.forEach(function (key) {
+            entity.Merge_Data_Set = JSON.stringify({});
+            for (const key in this.config.mergeData) {
                 entity.entityAspect.validateProperty(key);
-            });
+            }
+            ;
         };
         this.onAccept = () => {
-            let entity = this.entity;
-            let originalValues = entity.entityAspect.originalValues;
-            let propertyName = '';
-            this.mergeData = JSON.parse(entity.Merge_Data);
-            let propertyNameKey = propertyName;
-            entity[propertyName] = this.mergeData[propertyNameKey].value;
-            delete this.mergeData[propertyNameKey];
-            if (originalValues.hasOwnProperty(propertyName) && (Object.keys(originalValues).length === 0 && originalValues.constructor === Object))
-                delete originalValues[propertyName];
-            if (!Object.keys(this.mergeData).length)
-                entity.entityAspect.setUnchanged();
-            entity.Merge_Data = JSON.stringify(this.mergeData);
-            entity.entityAspect.validateProperty(propertyName);
+            //let entity = this.config.entity as any;
+            //let originalValues = entity.entityAspect.originalValues;
+            //let propertyName = '';
+            //let mergeData = JSON.parse(entity.Merge_Data_Set);
+            //let propertyNameKey = propertyName as keyof typeof this.mergeData;
+            //entity[propertyName] = this.config.mergeData?.getData(propertyNameKey)!.value;
+            //delete this.mergeData[propertyNameKey];
+            //if (originalValues.hasOwnProperty(propertyName) && (Object.keys(originalValues).length === 0 && originalValues.constructor === Object))
+            //  delete originalValues[propertyName];
+            //if (!Object.keys(this.mergeData).length)
+            //  entity.entityAspect.setUnchanged();
+            //entity.Merge_Data = JSON.stringify(this.mergeData);
+            //entity.entityAspect.validateProperty(propertyName);
         };
         this.onDecline = () => {
-            let entity = this.entity;
-            let propertyName = '';
-            this.mergeData = JSON.parse(entity.Merge_Data);
-            let propertyNameKey = propertyName;
-            delete this.mergeData[propertyNameKey];
-            entity.Merge_Data = JSON.stringify(this.mergeData);
-            entity.entityAspect.validateProperty(propertyName);
+            //let entity = this.entity as any;
+            //let propertyName = '';
+            //this.mergeData = JSON.parse(entity.Merge_Data);
+            //let propertyNameKey = propertyName as keyof typeof this.mergeData;
+            //delete this.mergeData[propertyNameKey];
+            //entity.Merge_Data = JSON.stringify(this.mergeData);
+            //entity.entityAspect.validateProperty(propertyName);
         };
     }
     ngOnInit() {
+        this.util.findClosestAncestorByClass(this.elementRef.nativeElement, '.mat-mdc-form-field-flex').classList.add('invalid');
+        this.errorMsg = this.config.errorMsg;
+    }
+    ngOnDestroy() {
+        this.util.findClosestAncestorByClass(this.elementRef.nativeElement, '.mat-mdc-form-field-flex').classList.remove('invalid');
     }
 }
-TruValidationDialog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, deps: [], target: i0.ɵɵFactoryTarget.Component });
-TruValidationDialog.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.1", type: TruValidationDialog, selector: "tru-validation-dialog", inputs: { entity: "entity", mergeData: "mergeData" }, ngImport: i0, template: "<span class=\"invalid\">\r\n  <i class=\"icon-warning-sign icon-white\"></i>%error%\r\n  <div>\r\n    <button style=\"margin: 5px;background-color:#fff;\" class=\"md-primary md-button ng-scope md-ink-ripple\" (click)=\"onAcceptAll()\">Accept All</button>\r\n    <button style=\"margin: 5px;background-color:#fff;\" class=\"md-primary md-button ng-scope md-ink-ripple\" (click)=\"onAccept()\">Accept</button>\r\n    <button style=\"margin: 5px;background-color:#fff;\" class=\"md-primary md-button ng-scope md-ink-ripple\" (click)=\"onDecline()\">Decline</button>\r\n  </div>\r\n</span>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}\n"] });
+TruValidationDialog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, deps: [{ token: i0.ElementRef }, { token: TruUtil }], target: i0.ɵɵFactoryTarget.Component });
+TruValidationDialog.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.1", type: TruValidationDialog, selector: "tru-validation-dialog", inputs: { config: "config" }, ngImport: i0, template: "<div class=\"invalid\">\r\n  <i class=\"icon-warning-sign icon-white\"></i>{{config.errorMsg}}\r\n  <div>\r\n    <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAcceptAll()\">Accept All</button>\r\n    <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAccept()\">Accept</button>\r\n    <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onDecline()\">Decline</button>\r\n  </div>\r\n</div>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}.merge-button{margin:5px;background-color:#fff}\n"] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, decorators: [{
             type: Component,
-            args: [{ selector: 'tru-validation-dialog', template: "<span class=\"invalid\">\r\n  <i class=\"icon-warning-sign icon-white\"></i>%error%\r\n  <div>\r\n    <button style=\"margin: 5px;background-color:#fff;\" class=\"md-primary md-button ng-scope md-ink-ripple\" (click)=\"onAcceptAll()\">Accept All</button>\r\n    <button style=\"margin: 5px;background-color:#fff;\" class=\"md-primary md-button ng-scope md-ink-ripple\" (click)=\"onAccept()\">Accept</button>\r\n    <button style=\"margin: 5px;background-color:#fff;\" class=\"md-primary md-button ng-scope md-ink-ripple\" (click)=\"onDecline()\">Decline</button>\r\n  </div>\r\n</span>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}\n"] }]
-        }], ctorParameters: function () { return []; }, propDecorators: { entity: [{
-                type: Input
-            }], mergeData: [{
+            args: [{ selector: 'tru-validation-dialog', template: "<div class=\"invalid\">\r\n  <i class=\"icon-warning-sign icon-white\"></i>{{config.errorMsg}}\r\n  <div>\r\n    <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAcceptAll()\">Accept All</button>\r\n    <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAccept()\">Accept</button>\r\n    <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onDecline()\">Decline</button>\r\n  </div>\r\n</div>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}.merge-button{margin:5px;background-color:#fff}\n"] }]
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: TruUtil }]; }, propDecorators: { config: [{
                 type: Input
             }] } });
 
@@ -4906,6 +4913,27 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
                 }]
         }] });
 
+class TruValidationDialogConfig {
+    get entity() {
+        return this._entity;
+    }
+    get propertyName() {
+        return this._propertyName;
+    }
+    get errorMsg() {
+        return this._errorMsg;
+    }
+    get mergeData() {
+        return this._mergeData;
+    }
+    constructor(entity, propertyName, errorMsg, mergeData = null) {
+        this._entity = entity;
+        this._propertyName = propertyName;
+        this._errorMsg = errorMsg;
+        this._mergeData = mergeData;
+    }
+}
+
 class TruBreezeValidator {
     constructor(el, dataContext, viewContainerRef, componentFactoryResolver) {
         this.el = el;
@@ -4931,19 +4959,28 @@ class TruBreezeValidator {
                     }
                 });
                 if (targetProperty && targetProperty.Merge_Data) {
-                    return JSON.parse(targetProperty.Merge_Data);
+                    return targetProperty.Merge_Data_Set;
                 }
+                return undefined;
             }
             else {
-                return JSON.parse(this.entity.Merge_Data);
+                return this.entity.Merge_Data_Set;
             }
         };
-        this.addValidation = (propertyValidations) => {
+        this.parseErrorMessages = (validationErrors) => {
+            let errorMsg = '';
+            validationErrors.forEach((error) => {
+                errorMsg += error.errorMessage + '; ';
+            });
+            return errorMsg;
+        };
+        this.addValidationDialog = (config) => {
             const componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);
             const component = this.viewContainerRef.createComponent(componentFactory, 0, this.viewContainerRef.injector);
+            component.instance.config = config;
             this.dialogRef = component;
         };
-        this.removeValidation = () => {
+        this.removeValidationDialog = () => {
             if (this.dialogRef) {
                 this.dialogRef.destroy();
                 this.dialogRef = null;
@@ -4959,11 +4996,11 @@ class TruBreezeValidator {
                 let removedPropertyValdations = validationObject.removed.filter((v) => {
                     return v.propertyName === this.config.propertyName;
                 });
-                if (addedPropertyValdations.length) {
-                    this.addValidation(addedPropertyValdations);
+                if (addedPropertyValdations.length || this.mergeData) {
+                    this.addValidationDialog(new TruValidationDialogConfig(this.entity, this.config.propertyName, this.parseErrorMessages(addedPropertyValdations), this.mergeData));
                 }
                 else if (!addedPropertyValdations.length && removedPropertyValdations.length) {
-                    this.removeValidation();
+                    this.removeValidationDialog();
                 }
             }
         };