Skip to content

WEB-427: Fix Memory Leak by Unsubscribing from Form ValueChanges #2807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnvayKharb wants to merge 1 commit into
base: dev-angular-19
Choose a base branch
from
+52 −19
Open

WEB-427: Fix Memory Leak by Unsubscribing from Form ValueChanges #2807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions src/app/organization/holidays/create-holiday/create-holiday.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** Angular Imports. */
import { SelectionModel } from '@angular/cdk/collections';
import { Component, OnInit, ViewChild, Injectable } from '@angular/core';
import { Component, OnInit, OnDestroy, ViewChild, Injectable } from '@angular/core';
import {
UntypedFormBuilder,
UntypedFormGroup,
Expand All @@ -9,6 +9,8 @@ import {
ReactiveFormsModule
} from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { Dates } from 'app/core/utils/dates';
import {
MatTreeFlatDataSource,
Expand Down Expand Up @@ -52,7 +54,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
MatIcon
]
})
export class CreateHolidayComponent implements OnInit {
export class CreateHolidayComponent implements OnInit, OnDestroy {
/** Create Holiday form. */
holidayForm: UntypedFormGroup;
/** Repayment Scheduling data. */
Expand All @@ -63,6 +65,8 @@ export class CreateHolidayComponent implements OnInit {
minDate = new Date(2000, 0, 1);
/** Maximum Date allowed. */
maxDate = new Date(2100, 0, 1);
/** Subject for managing subscriptions. */
private destroy$ = new Subject<void>();
// Stores office data in a trie-like structure
officesTrie: any;
// Stores office data for access from DOM via Office ID
Expand Down Expand Up @@ -314,13 +318,16 @@ export class CreateHolidayComponent implements OnInit {
* Sets the conditional controls.
*/
buildDependencies() {
this.holidayForm.get('reschedulingType').valueChanges.subscribe((option: any) => {
if (option === 2) {
this.holidayForm.addControl('repaymentsRescheduledTo', new UntypedFormControl('', Validators.required));
} else {
this.holidayForm.removeControl('repaymentsRescheduledTo');
}
});
this.holidayForm
.get('reschedulingType')
.valueChanges.pipe(takeUntil(this.destroy$))
.subscribe((option: any) => {
if (option === 2) {
this.holidayForm.addControl('repaymentsRescheduledTo', new UntypedFormControl('', Validators.required));
} else {
this.holidayForm.removeControl('repaymentsRescheduledTo');
}
});
}

/**
Expand Down Expand Up @@ -360,4 +367,12 @@ export class CreateHolidayComponent implements OnInit {
);
});
}

/**
* Component lifecycle hook to clean up subscriptions.
*/
ngOnDestroy() {
this.destroy$.next();
this.destroy$.complete();
}
}
38 changes: 28 additions & 10 deletions src/app/organization/holidays/edit-holiday/edit-holiday.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/** Angular Imports. */
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import {
UntypedFormBuilder,
UntypedFormGroup,
Expand All @@ -8,6 +8,8 @@ import {
ReactiveFormsModule
} from '@angular/forms';
import { ActivatedRoute, Router, RouterLink } from '@angular/router';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { Dates } from 'app/core/utils/dates';

/** Custom Services. */
Expand All @@ -26,7 +28,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
...STANDALONE_SHARED_IMPORTS
]
})
export class EditHolidayComponent implements OnInit {
export class EditHolidayComponent implements OnInit, OnDestroy {
/** Edit Holiday form. */
holidayForm: UntypedFormGroup;
/** Holiday data. */
Expand All @@ -39,6 +41,8 @@ export class EditHolidayComponent implements OnInit {
minDate = new Date(2000, 0, 1);
/** Maximum Date allowed. */
maxDate = new Date();
/** Subject for managing subscriptions. */
private destroy$ = new Subject<void>();

/**
* Get holiday and holiday template from `Resolver`.
Expand Down Expand Up @@ -116,14 +120,20 @@ export class EditHolidayComponent implements OnInit {
* Get Rescheduling Type.
*/
getReschedulingType() {
this.holidayForm.get('reschedulingType').valueChanges.subscribe((option: any) => {
this.reSchedulingType = option;
if (option === 2) {
this.holidayForm.addControl('repaymentsRescheduledTo', new UntypedFormControl(new Date(), Validators.required));
} else {
this.holidayForm.removeControl('repaymentsRescheduledTo');
}
});
this.holidayForm
.get('reschedulingType')
.valueChanges.pipe(takeUntil(this.destroy$))
.subscribe((option: any) => {
this.reSchedulingType = option;
if (option === 2) {
this.holidayForm.addControl(
'repaymentsRescheduledTo',
new UntypedFormControl(new Date(), Validators.required)
);
} else {
this.holidayForm.removeControl('repaymentsRescheduledTo');
}
});
}

/**
Expand Down Expand Up @@ -160,4 +170,12 @@ export class EditHolidayComponent implements OnInit {
this.router.navigate(['../'], { relativeTo: this.route });
});
}

/**
* Component lifecycle hook to clean up subscriptions.
*/
ngOnDestroy() {
this.destroy$.next();
this.destroy$.complete();
}
}