AAE-28801 Make "FormRulesManager.onDestroy$" available for derived classes (#10441)

This commit is contained in:
Bartosz Sekula
2024-11-28 11:06:43 -05:00
committed by GitHub
parent bf58a190cf
commit 7eb51ef58f

View File

@@ -42,7 +42,7 @@ export abstract class FormRulesManager<T> {
constructor(protected formService: FormService) {} constructor(protected formService: FormService) {}
protected formModel: FormModel; protected formModel: FormModel;
private onDestroy$ = new Subject<boolean>(); protected onDestroy$ = new Subject<boolean>();
private initialized = false; private initialized = false;
initialize(formModel: FormModel) { initialize(formModel: FormModel) {
@@ -59,14 +59,14 @@ export abstract class FormRulesManager<T> {
if (rules) { if (rules) {
this.formService.formRulesEvent this.formService.formRulesEvent
.pipe( .pipe(
filter((event) => !!event?.form?.id && event.form.id === formModel?.id), filter((event) => !!event?.form?.id && event.form.id === this.formModel?.id),
takeUntil(this.onDestroy$) takeUntil(this.onDestroy$)
) )
.subscribe((event) => { .subscribe((event) => {
this.handleRuleEvent(event, rules); this.handleRuleEvent(event, rules);
}); });
const onFormLoadedEvent = new FormEvent(formModel); const onFormLoadedEvent = new FormEvent(this.formModel);
const formRules = new FormRulesEvent('formLoaded', onFormLoadedEvent); const formRules = new FormRulesEvent('formLoaded', onFormLoadedEvent);
this.formService.formRulesEvent.next(formRules); this.formService.formRulesEvent.next(formRules);
} }