@trudb/tru-common-lib 0.1.159 → 0.1.161
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -72,11 +72,12 @@ export class TruBreezeValidator {
|
|
|
72
72
|
let validationTableName = validationObjectEntity.constructor.name;
|
|
73
73
|
const entityPkeyName = validationTableName + 'Ref';
|
|
74
74
|
const validationObjectEntitypkeyName = validationTableName + 'Ref';
|
|
75
|
+
let propertyName = this.config.isSubProperty ? this.config.propertyName.replace(/\./g, "") : this.config.propertyName;
|
|
75
76
|
let addedPropertyValdations = validationObject.added.filter((v) => {
|
|
76
|
-
return v.propertyName ===
|
|
77
|
+
return v.propertyName === propertyName;
|
|
77
78
|
});
|
|
78
79
|
let removedPropertyValdations = validationObject.removed.filter((v) => {
|
|
79
|
-
return v.propertyName ===
|
|
80
|
+
return v.propertyName === propertyName;
|
|
80
81
|
});
|
|
81
82
|
this.mergeData = this.getMergeData();
|
|
82
83
|
if (this.config.rootTable === validationTableName &&
|
|
@@ -102,6 +103,7 @@ export class TruBreezeValidator {
|
|
|
102
103
|
this.valErrsChanged(entities);
|
|
103
104
|
}));
|
|
104
105
|
}
|
|
106
|
+
this.entity.entityAspect.validateEntity();
|
|
105
107
|
}
|
|
106
108
|
ngOnChanges(changes) {
|
|
107
109
|
this.removeValidationDialog();
|
|
@@ -124,4 +126,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.5", ngImpor
|
|
|
124
126
|
}], config: [{
|
|
125
127
|
type: Input
|
|
126
128
|
}] } });
|
|
127
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tru-breeze-validator.js","sourceRoot":"","sources":["../../../../../../projects/tru-common-lib/src/lib/directives/breeze-validator/tru-breeze-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,SAAS,EAAc,KAAK,EAAsD,MAAM,eAAe,CAAC;AAGzJ,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAIjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0DAA0D,CAAC;AAC/F,OAAO,EAAE,yBAAyB,EAAE,MAAM,iEAAiE,CAAC;;;AAM5G,MAAM,OAAO,kBAAkB;IAKnB;IACA;IACA;IACA;IAPmB,MAAM,CAAO;IACjC,MAAM,CAAiE;IAEhF,YACU,EAAc,EACd,WAA2B,EAC3B,gBAAkC,EAClC,wBAAkD;QAHlD,OAAE,GAAF,EAAE,CAAY;QACd,gBAAW,GAAX,WAAW,CAAgB;QAC3B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,6BAAwB,GAAxB,wBAAwB,CAA0B;IAC5D,CAAC;IAED,WAAW,GAAQ,EAAE,CAAC;IACtB,SAAS,CAAM;IAEP,SAAS,GAA6B,IAAI,CAAC;IAC3C,IAAI,GAAwB,EAAE,CAAC;IAC/B,aAAa,GAA6C,IAAI,CAAC;IAC/D,OAAO,GAA+B,0BAA0B,CAAC,OAAO,CAAC;IAEzE,YAAY,GAAG,GAAgC,EAAE;QACvD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5C,IAAI,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5D,iBAAiB,CAAC,GAAG,EAAE,CAAC;YACxB,IAAI,cAAmB,CAAC;YACxB,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,IAAI,kBAAkB,GAAG,GAAG,GAAG,IAAgC,CAAC;oBAChE,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;gBACnD,CAAC;qBAAM,CAAC;oBACN,IAAI,kBAAkB,GAAG,GAAG,GAAG,IAAgC,CAAC;oBAChE,cAAc,GAAG,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,cAAc,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;gBAChD,OAAO,cAAc,CAAC,cAAc,CAAC;YACvC,CAAC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,YAAsB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QACtH,CAAC;IACH,CAAC,CAAA;IAEO,kBAAkB,GAAG,CAAC,gBAAwC,EAAU,EAAE;QAChF,IAAI,QAAQ,GAAW,EAAE,CAAC;QAC1B,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,QAAQ,IAAI,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAA;IAEO,mBAAmB,GAAG,CAAC,MAAiC,EAAE,EAAE;QAClE,IAAI,gBAAgB,GAAG,IAAI,CAAC,wBAAwB,CAAC,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;QAClG,IAAI,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAsB,gBAAgB,EAAE,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAChI,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC,CAAA;IAEO,sBAAsB,GAAG,GAAG,EAAE;QACpC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,CAAC;IACH,CAAC,CAAA;IAED,cAAc,GAAG,CAAC,gBAAqB,EAAE,EAAE;QACzC,IAAI,sBAAsB,GAAG,gBAAgB,CAAC,MAAM,CAAA;QACpD,IAAI,mBAAmB,GAAG,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC;QAGlE,MAAM,cAAc,GAAG,mBAAmB,GAAG,KAAwB,CAAC;QAGtE,MAAM,8BAA8B,GAAG,mBAAmB,GAAG,KAAwC,CAAC;QAEtG,IAAI,uBAAuB,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE;YACrE,OAAO,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,MAAM,CAAC,YAAY,CAAA;QACpD,CAAC,CAAC,CAAC;QAEH,IAAI,yBAAyB,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE;YACzE,OAAO,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,MAAM,CAAC,YAAY,CAAA;QACpD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAErC,IACE,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,mBAAmB;YAC7C,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,sBAAsB,CAAC,8BAA8B,CAAC;YACtF,CAAC,uBAAuB,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC9B,IAAI,MAAM,GAAG,IAAI,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACrE,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,YAAsB,CAAC;YACzD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;YAClC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;YACnE,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,IACE,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,mBAAmB;YAC7C,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,sBAAsB,CAAC,8BAA8B,CAAC;YACtF,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChC,CAAC;IACH,CAAC,CAAA;IAED,QAAQ,KAAW,CAAC;IAEpB,eAAe;QACb,IAAI,IAAI,CAAC,OAAO,KAAK,0BAA0B,CAAC,IAAI,EAAE,CAAC;YACrD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAC7E,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC,CAAC;QACN,CAAC;IACH,CAAC;IAED,WAAW,CAAC,OAAsB;QAChC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC;IAC5C,CAAC;IAED,WAAW;QACT,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1C,CAAC;uGA1HU,kBAAkB;2FAAlB,kBAAkB;;2FAAlB,kBAAkB;kBAH9B,SAAS;mBAAC;oBACT,QAAQ,EAAE,sBAAsB;iBACjC;kLAE8B,MAAM;sBAAlC,KAAK;uBAAC,oBAAoB;gBAClB,MAAM;sBAAd,KAAK","sourcesContent":["import { ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, OnDestroy, OnInit, SimpleChanges, ViewContainerRef } from '@angular/core';\r\nimport { ValidationError } from 'breeze-client';\r\nimport { Subscription } from 'rxjs';\r\nimport { TruValidationDialogContext } from '../../../public-api';\r\nimport { TruEditControlConfigBase } from '../../base-classes/tru-edit-control-config-base';\r\nimport { TruListControlConfigBase } from '../../base-classes/tru-list-control-config-base';\r\nimport { TruMergeDataSet } from '../../classes/tru-merge-data-set';\r\nimport { TruValidationDialog } from '../../components/validation-dialog/tru-validation-dialog';\r\nimport { TruValidationDialogConfig } from '../../components/validation-dialog/tru-validation-dialog-config';\r\nimport { TruDataContext } from '../../services/tru-data-context';\r\n\r\n@Directive({\r\n  selector: '[truBreezeValidator]'\r\n})\r\nexport class TruBreezeValidator implements OnInit, OnDestroy {\r\n  @Input('truBreezeValidator') entity!: any;\r\n  @Input() config!: TruEditControlConfigBase<any> | TruListControlConfigBase<any>;\r\n\r\n  constructor(\r\n    private el: ElementRef,\r\n    private dataContext: TruDataContext,\r\n    private viewContainerRef: ViewContainerRef,\r\n    private componentFactoryResolver: ComponentFactoryResolver) {\r\n  }\r\n\r\n  configModel: any = {};\r\n  mergeData: any;\r\n\r\n  private dialogRef: ComponentRef<any> | null = null;\r\n  private subs: Array<Subscription> = [];\r\n  private currentDialog: ComponentRef<TruValidationDialog> | null = null;\r\n  private context: TruValidationDialogContext = TruValidationDialogContext.Control;\r\n\r\n  private getMergeData = (): TruMergeDataSet | undefined => {\r\n    if (this.config.propertyPath?.includes('/')) {\r\n      let propertyNameParts = this.config.propertyPath.split('/');\r\n      propertyNameParts.pop();\r\n      let targetProperty: any;\r\n      propertyNameParts.forEach((name) => {\r\n        if (!targetProperty) {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = this.entity[targetPropertyName];\r\n        } else {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = targetProperty[targetPropertyName];\r\n        }\r\n      });\r\n      if (targetProperty && targetProperty.Merge_Data) {\r\n        return targetProperty.Merge_Data_Set;\r\n      }\r\n      return undefined;\r\n    } else {\r\n      return this.entity.Merge_Data_Set?.get(this.config.propertyName as string) ? this.entity.Merge_Data_Set : undefined;\r\n    }\r\n  }\r\n\r\n  private parseErrorMessages = (validationErrors: Array<ValidationError>): string => {\r\n    let errorMsg: string = '';\r\n    validationErrors.forEach((error) => {\r\n      errorMsg += error.errorMessage + '; ';\r\n    });\r\n    return errorMsg;\r\n  }\r\n\r\n  private addValidationDialog = (config: TruValidationDialogConfig) => {\r\n    let componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);\r\n    let component = this.viewContainerRef.createComponent<TruValidationDialog>(componentFactory, 0, this.viewContainerRef.injector);\r\n    component.instance.config = config;\r\n    this.currentDialog = component;\r\n    this.dialogRef = component;\r\n  }\r\n\r\n  private removeValidationDialog = () => {\r\n    if (this.currentDialog) {\r\n      this.currentDialog.destroy();\r\n      this.currentDialog = null;\r\n    }\r\n  }\r\n\r\n  valErrsChanged = (validationObject: any) => {\r\n    let validationObjectEntity = validationObject.entity\r\n    let validationTableName = validationObjectEntity.constructor.name;\r\n\r\n    type EntityObjectKey = keyof typeof this.entity;\r\n    const entityPkeyName = validationTableName + 'Ref' as EntityObjectKey;\r\n\r\n    type ValidationObjectEntityObjectKey = keyof typeof validationObjectEntity;\r\n    const validationObjectEntitypkeyName = validationTableName + 'Ref' as ValidationObjectEntityObjectKey;\r\n\r\n    let addedPropertyValdations = validationObject.added.filter((v: any) => {\r\n      return v.propertyName === this.config.propertyName\r\n    });\r\n\r\n    let removedPropertyValdations = validationObject.removed.filter((v: any) => {\r\n      return v.propertyName === this.config.propertyName\r\n    });\r\n\r\n    this.mergeData = this.getMergeData();\r\n\r\n    if (\r\n      this.config.rootTable === validationTableName &&\r\n      this.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&\r\n      (addedPropertyValdations.length || this.mergeData)) {\r\n      this.removeValidationDialog();\r\n      let config = new TruValidationDialogConfig(this.entity, this.config);\r\n      config.propertyName = this.config.propertyName as string;\r\n      config.mergeData = this.mergeData;\r\n      config.errorMsg = this.parseErrorMessages(addedPropertyValdations);\r\n      this.addValidationDialog(config);\r\n    }\r\n\r\n    if (\r\n      this.config.rootTable === validationTableName &&\r\n      this.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&\r\n      (removedPropertyValdations.length)) {\r\n      this.removeValidationDialog();\r\n    }\r\n  }\r\n\r\n  ngOnInit(): void { }\r\n\r\n  ngAfterViewInit(): void {\r\n    if (this.context !== TruValidationDialogContext.Grid) {\r\n      this.subs.push(this.dataContext.validationChangeDetection.subscribe(entities => {\r\n        this.valErrsChanged(entities);\r\n      }));\r\n    }\r\n  }\r\n\r\n  ngOnChanges(changes: SimpleChanges): void {\r\n    this.removeValidationDialog();\r\n    this.entity.entityAspect.validateEntity();\r\n  }\r\n\r\n  ngOnDestroy(): void {\r\n    this.subs.forEach(s => s.unsubscribe());\r\n  }\r\n}\r\n"]}
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tru-breeze-validator.js","sourceRoot":"","sources":["../../../../../../projects/tru-common-lib/src/lib/directives/breeze-validator/tru-breeze-validator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, OnDestroy, OnInit, SimpleChanges, ViewContainerRef } from '@angular/core';\r\nimport { ValidationError } from 'breeze-client';\r\nimport { Subscription } from 'rxjs';\r\nimport { TruValidationDialogContext } from '../../../public-api';\r\nimport { TruEditControlConfigBase } from '../../base-classes/tru-edit-control-config-base';\r\nimport { TruListControlConfigBase } from '../../base-classes/tru-list-control-config-base';\r\nimport { TruMergeDataSet } from '../../classes/tru-merge-data-set';\r\nimport { TruValidationDialog } from '../../components/validation-dialog/tru-validation-dialog';\r\nimport { TruValidationDialogConfig } from '../../components/validation-dialog/tru-validation-dialog-config';\r\nimport { TruDataContext } from '../../services/tru-data-context';\r\nimport { property } from 'underscore';\r\n\r\n@Directive({\r\n  selector: '[truBreezeValidator]'\r\n})\r\nexport class TruBreezeValidator implements OnInit, OnDestroy {\r\n  @Input('truBreezeValidator') entity!: any;\r\n  @Input() config!: TruEditControlConfigBase<any> | TruListControlConfigBase<any>;\r\n\r\n  constructor(\r\n    private el: ElementRef,\r\n    private dataContext: TruDataContext,\r\n    private viewContainerRef: ViewContainerRef,\r\n    private componentFactoryResolver: ComponentFactoryResolver) {\r\n  }\r\n\r\n  configModel: any = {};\r\n  mergeData: any;\r\n\r\n  private dialogRef: ComponentRef<any> | null = null;\r\n  private subs: Array<Subscription> = [];\r\n  private currentDialog: ComponentRef<TruValidationDialog> | null = null;\r\n  private context: TruValidationDialogContext = TruValidationDialogContext.Control;\r\n\r\n  private getMergeData = (): TruMergeDataSet | undefined => {\r\n    if (this.config.propertyPath?.includes('/')) {\r\n      let propertyNameParts = this.config.propertyPath.split('/');\r\n      propertyNameParts.pop();\r\n      let targetProperty: any;\r\n      propertyNameParts.forEach((name) => {\r\n        if (!targetProperty) {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = this.entity[targetPropertyName];\r\n        } else {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = targetProperty[targetPropertyName];\r\n        }\r\n      });\r\n      if (targetProperty && targetProperty.Merge_Data) {\r\n        return targetProperty.Merge_Data_Set;\r\n      }\r\n      return undefined;\r\n    } else {\r\n      return this.entity.Merge_Data_Set?.get(this.config.propertyName as string) ? this.entity.Merge_Data_Set : undefined;\r\n    }\r\n  }\r\n\r\n  private parseErrorMessages = (validationErrors: Array<ValidationError>): string => {\r\n    let errorMsg: string = '';\r\n    validationErrors.forEach((error) => {\r\n      errorMsg += error.errorMessage + '; ';\r\n    });\r\n    return errorMsg;\r\n  }\r\n\r\n  private addValidationDialog = (config: TruValidationDialogConfig) => {\r\n    let componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);\r\n    let component = this.viewContainerRef.createComponent<TruValidationDialog>(componentFactory, 0, this.viewContainerRef.injector);\r\n    component.instance.config = config;\r\n    this.currentDialog = component;\r\n    this.dialogRef = component;\r\n  }\r\n\r\n  private removeValidationDialog = () => {\r\n    if (this.currentDialog) {\r\n      this.currentDialog.destroy();\r\n      this.currentDialog = null;\r\n    }\r\n  }\r\n\r\n  valErrsChanged = (validationObject: any) => {\r\n    let validationObjectEntity = validationObject.entity\r\n    let validationTableName = validationObjectEntity.constructor.name;\r\n\r\n    type EntityObjectKey = keyof typeof this.entity;\r\n    const entityPkeyName = validationTableName + 'Ref' as EntityObjectKey;\r\n\r\n    type ValidationObjectEntityObjectKey = keyof typeof validationObjectEntity;\r\n    const validationObjectEntitypkeyName = validationTableName + 'Ref' as ValidationObjectEntityObjectKey;\r\n\r\n    let propertyName = this.config.isSubProperty ? this.config.propertyName!.replace(/\\./g, \"\") : this.config.propertyName;\r\n    let addedPropertyValdations = validationObject.added.filter((v: any) => {\r\n      return v.propertyName === propertyName\r\n    });\r\n\r\n    let removedPropertyValdations = validationObject.removed.filter((v: any) => {\r\n      return v.propertyName === propertyName\r\n    });\r\n\r\n    this.mergeData = this.getMergeData();\r\n\r\n    if (\r\n      this.config.rootTable === validationTableName &&\r\n      this.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&\r\n      (addedPropertyValdations.length || this.mergeData)) {\r\n      this.removeValidationDialog();\r\n      let config = new TruValidationDialogConfig(this.entity, this.config);\r\n      config.propertyName = this.config.propertyName as string;\r\n      config.mergeData = this.mergeData;\r\n      config.errorMsg = this.parseErrorMessages(addedPropertyValdations);\r\n      this.addValidationDialog(config);\r\n    }\r\n\r\n    if (\r\n      this.config.rootTable === validationTableName &&\r\n      this.entity[entityPkeyName] === validationObjectEntity[validationObjectEntitypkeyName] &&\r\n      (removedPropertyValdations.length)) {\r\n      this.removeValidationDialog();\r\n    }\r\n  }\r\n\r\n  ngOnInit(): void { }\r\n\r\n  ngAfterViewInit(): void {\r\n    if (this.context !== TruValidationDialogContext.Grid) {\r\n      this.subs.push(this.dataContext.validationChangeDetection.subscribe(entities => {\r\n        this.valErrsChanged(entities);\r\n      }));\r\n    }\r\n    this.entity.entityAspect.validateEntity();\r\n  }\r\n\r\n  ngOnChanges(changes: SimpleChanges): void {\r\n    this.removeValidationDialog();\r\n    this.entity.entityAspect.validateEntity();\r\n  }\r\n\r\n  ngOnDestroy(): void {\r\n    this.subs.forEach(s => s.unsubscribe());\r\n  }\r\n}\r\n"]}
|
|
@@ -7407,11 +7407,12 @@ class TruBreezeValidator {
|
|
|
7407
7407
|
let validationTableName = validationObjectEntity.constructor.name;
|
|
7408
7408
|
const entityPkeyName = validationTableName + 'Ref';
|
|
7409
7409
|
const validationObjectEntitypkeyName = validationTableName + 'Ref';
|
|
7410
|
+
let propertyName = this.config.isSubProperty ? this.config.propertyName.replace(/\./g, "") : this.config.propertyName;
|
|
7410
7411
|
let addedPropertyValdations = validationObject.added.filter((v) => {
|
|
7411
|
-
return v.propertyName ===
|
|
7412
|
+
return v.propertyName === propertyName;
|
|
7412
7413
|
});
|
|
7413
7414
|
let removedPropertyValdations = validationObject.removed.filter((v) => {
|
|
7414
|
-
return v.propertyName ===
|
|
7415
|
+
return v.propertyName === propertyName;
|
|
7415
7416
|
});
|
|
7416
7417
|
this.mergeData = this.getMergeData();
|
|
7417
7418
|
if (this.config.rootTable === validationTableName &&
|
|
@@ -7437,6 +7438,7 @@ class TruBreezeValidator {
|
|
|
7437
7438
|
this.valErrsChanged(entities);
|
|
7438
7439
|
}));
|
|
7439
7440
|
}
|
|
7441
|
+
this.entity.entityAspect.validateEntity();
|
|
7440
7442
|
}
|
|
7441
7443
|
ngOnChanges(changes) {
|
|
7442
7444
|
this.removeValidationDialog();
|