@fundamental-ngx/platform 0.48.0-rc.21 → 0.48.0-rc.23

package/fesm2022/fundamental-ngx-platform-wizard-generator.mjs

@@ -1,9 +1,10 @@
 import * as i0 from '@angular/core';
-import { Injectable, EventEmitter, Directive, Input, Output, Component, ViewEncapsulation, ChangeDetectionStrategy, ViewChildren, inject, ViewChild, TemplateRef, ContentChild, NgModule } from '@angular/core';
-import { Subject, BehaviorSubject, of, firstValueFrom } from 'rxjs';
-import { take, map, debounceTime, takeUntil, finalize, filter } from 'rxjs/operators';
+import { Injectable, EventEmitter, DestroyRef, inject, Directive, Input, Output, Component, ViewEncapsulation, ChangeDetectionStrategy, ViewChildren, ViewChild, TemplateRef, ContentChild, NgModule } from '@angular/core';
+import { take, map, debounceTime, finalize, filter } from 'rxjs/operators';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ContentDensityMode, ContentDensityDirective } from '@fundamental-ngx/core/content-density';
 import { cloneDeep, uniq, mergeWith, concat } from 'lodash-es';
+import { Subject, BehaviorSubject, of, firstValueFrom } from 'rxjs';
 import * as i6 from '@fundamental-ngx/cdk/utils';
 import { isFunction, selectStrategy, InitialFocusDirective, RepeatDirective } from '@fundamental-ngx/cdk/utils';
 import * as i2 from '@fundamental-ngx/platform/form';
@@ -641,21 +642,21 @@ class BaseWizardGenerator {
          * @hidden
          * An RxJS Subject that will kill the data stream upon component’s destruction (for unsubscribing)
          */
-        this._onDestroy$ = new Subject();
+        this._destroyRef = inject(DestroyRef);
         /**
          * @hidden
          */
         this._navigationButtonLabels = DEFAULT_WIZARD_NAVIGATION_BUTTONS;
         this._wizardGeneratorService
             .getVisibleSteps()
-            .pipe(debounceTime(10), takeUntil(this._onDestroy$))
+            .pipe(debounceTime(10), takeUntilDestroyed(this._destroyRef))
             .subscribe((visibleSteps) => {
             this.visibleItems = visibleSteps;
             this._cd.detectChanges();
         });
         this._wizardGeneratorService
             .trackStepsComponents()
-            .pipe(debounceTime(10), takeUntil(this._onDestroy$))
+            .pipe(debounceTime(10), takeUntilDestroyed(this._destroyRef))
             .subscribe(async (stepsComponents) => {
             if (stepsComponents.size === this.items?.length) {
                 await this._setVisibleSteps();
@@ -663,31 +664,24 @@ class BaseWizardGenerator {
         });
         this._wizardGeneratorService
             .trackAppendToWizardState()
-            .pipe(takeUntil(this._onDestroy$))
+            .pipe(takeUntilDestroyed(this._destroyRef))
             .subscribe((value) => {
             this._appendToWizard = value;
         });
         this._wizardGeneratorService
             .trackStepsOrder()
-            .pipe(takeUntil(this._onDestroy$))
+            .pipe(takeUntilDestroyed(this._destroyRef))
             .subscribe((newNextStep) => {
             this._nextStepIndex = newNextStep;
             this._stepsOrderChanged = true;
         });
         this._wizardGeneratorService
             .trackNextStepIndex()
-            .pipe(takeUntil(this._onDestroy$))
+            .pipe(takeUntilDestroyed(this._destroyRef))
             .subscribe((index) => {
             this._nextStepIndex = index;
         });
     }
-    /**
-     * @hidden
-     */
-    ngOnDestroy() {
-        this._onDestroy$.next();
-        this._onDestroy$.complete();
-    }
     /**
      * @description Reverts Wizard progress one step back.
      */
@@ -715,7 +709,7 @@ class BaseWizardGenerator {
         const nextStepIndex = this._nextStepIndex;
         this._wizardGeneratorService
             .validateStepForms()
-            .pipe(takeUntil(this._onDestroy$))
+            .pipe(takeUntilDestroyed(this._destroyRef))
             .subscribe(async (result) => {
             if (!result) {
                 return;
@@ -756,7 +750,7 @@ class BaseWizardGenerator {
         }
         this._wizardGeneratorService
             .validateStepForms()
-            .pipe(takeUntil(this._onDestroy$))
+            .pipe(takeUntilDestroyed(this._destroyRef))
             .subscribe(async (result) => {
             if (!result) {
                 return;
@@ -844,7 +838,7 @@ class WizardGeneratorStepComponent {
          * @hidden
          * An RxJS Subject that will kill the data stream upon component’s destruction (for unsubscribing)
          */
-        this._onDestroy$ = new Subject();
+        this._destroyRef = inject(DestroyRef);
     }
     /**
      * @hidden
@@ -857,8 +851,6 @@ class WizardGeneratorStepComponent {
      */
     ngOnDestroy() {
         this._wizardGeneratorService.removeWizardStepComponent(this.item.id);
-        this._onDestroy$.next();
-        this._onDestroy$.complete();
     }
     /** @hidden */
     async ngOnChanges(changes) {
@@ -949,7 +941,9 @@ class WizardGeneratorStepComponent {
                 const refreshSteps = strategies[WizardGeneratorRefreshStrategy.REFRESH_STEP_VISIBILITY] !== undefined;
                 const revalidateForms = strategies[WizardGeneratorRefreshStrategy.REVALIDATE_STEP_FORMS];
                 const refreshFormVisibility = strategies[WizardGeneratorRefreshStrategy.REFRESH_FORM_VISIBILITY];
-                control?.valueChanges.pipe(debounceTime(50), takeUntil(this._onDestroy$)).subscribe(async () => {
+                control?.valueChanges
+                    .pipe(debounceTime(50), takeUntilDestroyed(this._destroyRef))
+                    .subscribe(async () => {
                     if (refreshSteps) {
                         await this._wizardGeneratorService.refreshStepVisibility();
                     }
@@ -1226,7 +1220,7 @@ class WizardBodyComponent {
          * @hidden
          * An RxJS Subject that will kill the data stream upon component’s destruction (for unsubscribing)
          */
-        this._onDestroy$ = new Subject();
+        this._destroyRef = inject(DestroyRef);
         /**
          * @hidden
          */
@@ -1260,19 +1254,12 @@ class WizardBodyComponent {
     ngOnInit() {
         this._wizardGeneratorService
             .getVisibleSteps()
-            .pipe(debounceTime(50), takeUntil(this._onDestroy$))
+            .pipe(debounceTime(50), takeUntilDestroyed(this._destroyRef))
             .subscribe((visibleSteps) => {
             this._visibleItems = visibleSteps;
             this._cd.detectChanges();
         });
     }
-    /**
-     * @hidden
-     */
-    ngOnDestroy() {
-        this._onDestroy$.next();
-        this._onDestroy$.complete();
-    }
     /**
      * @description Callback function for status change.
      * @param id step ID.
@@ -1431,7 +1418,7 @@ class DialogWizardGeneratorComponent extends BaseWizardGenerator {
         const template = this.confirmationDialogTemplate || this.defaultConfirmationDialogTemplate;
         const messageBoxRef = this._messageBoxService.open(template, { responsivePadding: true });
         messageBoxRef.afterClosed
-            .pipe(filter((result) => result), takeUntil(this._onDestroy$))
+            .pipe(filter((result) => result), takeUntilDestroyed(this._destroyRef))
             .subscribe(() => {
             this._dialogRef.dismiss();
         });
@@ -1447,7 +1434,7 @@ class DialogWizardGeneratorComponent extends BaseWizardGenerator {
         }
         const currentStepId = this._wizardGeneratorService.getCurrentStepId();
         this.submitStepForms(currentStepId)
-            .pipe(takeUntil(this._onDestroy$))
+            .pipe(takeUntilDestroyed(this._destroyRef))
             .subscribe(async (result) => {
             if (result && Object.values(result).some((r) => !r.success)) {
                 return;