[AAE-8086] Remove form rules events that kill performance (#7583)

* [AAE-8086] Remove form rules events that kill performance

* [AAE-8086] Handle form loaded event in form rules
This commit is contained in:
Pablo Martinez Garcia
2022-04-18 16:31:48 +02:00
committed by GitHub
parent 2db6d9e506
commit 61cd711cec
4 changed files with 59 additions and 84 deletions

View File

@@ -22,6 +22,10 @@ import { TranslateModule } from '@ngx-translate/core';
import { ByPassFormRuleManager, FormRulesManager, formRulesManagerFactory, FORM_RULES_MANAGER } from '../models/form-rules.model';
import { Injector } from '@angular/core';
import { TestBed } from '@angular/core/testing';
import { FormModel } from '../components/widgets/core/form.model';
import { FormRulesEvent } from '../events/form-rules.event';
import { FormEvent } from '../events/form.event';
import { FormService } from '../services/form.service';
class CustomRuleManager extends FormRulesManager<any> {
protected getRules() {
@@ -37,6 +41,7 @@ describe('Form Rules', () => {
let injector: Injector;
const customRuleManager = new CustomRuleManager(null);
let formService: FormService;
describe('Injection token provided', () => {
setupTestBed({
@@ -55,6 +60,7 @@ describe('Form Rules', () => {
beforeEach(() => {
injector = TestBed.inject(Injector);
formService = TestBed.inject(FormService);
});
it('factory function should not return bypass service', () => {
@@ -69,9 +75,29 @@ describe('Form Rules', () => {
rulesManager.initialize(null);
expect(customRuleManager.initialize).toHaveBeenCalled();
});
it('should send the form loaded event when initialized', async (done) => {
const rulesManager = new CustomRuleManager(formService);
const getRulesSpy = spyOn<any>(rulesManager, 'getRules').and.returnValue({});
const formModel = new FormModel({ id: 'mock' }, {}, false);
const formEvent = new FormEvent(formModel);
const event = new FormRulesEvent('formLoaded', formEvent);
formService.formRulesEvent.subscribe(formRulesEvent => {
expect(formRulesEvent).toEqual(event);
done();
});
rulesManager.initialize(formModel);
expect(getRulesSpy).toHaveBeenCalled();
});
});
describe('Injection token not provided', () => {
let formModel: FormModel;
let rulesManager: FormRulesManager<any>;
let getRulesSpy: jasmine.Spy;
setupTestBed({
imports: [
TranslateModule.forRoot(),
@@ -82,12 +108,28 @@ describe('Form Rules', () => {
beforeEach(() => {
injector = TestBed.inject(Injector);
rulesManager = formRulesManagerFactory<any>(injector);
getRulesSpy = spyOn<any>(rulesManager, 'getRules');
});
it('factory function should return bypass service', () => {
const rulesManager = formRulesManagerFactory<any>(injector);
expect(rulesManager instanceof ByPassFormRuleManager).toBeTruthy();
});
it('should get rules when form is not readonly', () => {
formModel = new FormModel({}, {}, false);
rulesManager.initialize(formModel);
expect(getRulesSpy).toHaveBeenCalled();
});
it('should not get rules when form is readonly', () => {
formModel = new FormModel({}, {}, true);
rulesManager.initialize(formModel);
expect(getRulesSpy).not.toHaveBeenCalled();
});
});
});

View File

@@ -18,6 +18,7 @@
import { InjectionToken, Injector } from '@angular/core';
import { Subject } from 'rxjs';
import { filter, takeUntil } from 'rxjs/operators';
import { FormEvent } from '../events';
import { FormRulesEvent } from '../events/form-rules.event';
import { FormModel, FormService } from '../public-api';
@@ -45,16 +46,21 @@ export abstract class FormRulesManager<T> {
}
this.formModel = formModel;
const rules = this.getRules();
if (!!rules) {
this.formService.formRulesEvent
.pipe(
filter(event => !!event.form.id && event.form.id === formModel?.id),
takeUntil(this.onDestroy$)
).subscribe(event => {
this.handleRuleEvent(event, rules);
});
if (!this.formModel.readOnly) {
const rules = this.getRules();
if (!!rules) {
this.formService.formRulesEvent
.pipe(
filter(event => !!event.form.id && event.form.id === formModel?.id),
takeUntil(this.onDestroy$)
).subscribe(event => {
this.handleRuleEvent(event, rules);
});
this.formService.formRulesEvent.next(new FormRulesEvent('formLoaded', new FormEvent(formModel)));
}
}
this.initialized = true;