@ -14,7 +14,7 @@
/// limitations under the License.
/// limitations under the License.
///
///
import { Component , ElementRef , forwardRef , Input , OnInit , ViewChild } from '@angular/core' ; import { Component , DestroyRef , ElementRef , forwardRef , Input , OnInit , ViewChild } from '@angular/core' ;
import { PageComponent } from '@shared/components/page.component' ; import { PageComponent } from '@shared/components/page.component' ;
import { Store } from '@ngrx/store' ; import { Store } from '@ngrx/store' ;
import { AppState } from '@core/core.state' ; import { AppState } from '@core/core.state' ;
@ -58,6 +58,7 @@ import { WidgetConfigComponentData } from '@home/models/widget-component.models'
import { WidgetComponentService } from '@home/components/widget/widget-component.service' ; import { WidgetComponentService } from '@home/components/widget/widget-component.service' ;
import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models' ; import { WidgetConfigCallbacks } from '@home/components/widget/config/widget-config.component.models' ;
import { isNotEmptyTbFunction , TbFunction } from '@shared/models/js-function.models' ; import { isNotEmptyTbFunction , TbFunction } from '@shared/models/js-function.models' ;
import { takeUntilDestroyed } from '@angular/core/rxjs-interop' ;
@Component ( { @Component ( {
selector : 'tb-data-key-config' , selector : 'tb-data-key-config' ,
@ -188,7 +189,8 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
private translate : TranslateService , private translate : TranslateService ,
private widgetService : WidgetService , private widgetService : WidgetService ,
private widgetComponentService : WidgetComponentService , private widgetComponentService : WidgetComponentService ,
private fb : UntypedFormBuilder ) { private fb : UntypedFormBuilder ,
private destroyRef : DestroyRef ) {
super ( store ) ; super ( store ) ;
this . functionScopeVariables = this . widgetService . getWidgetScopeVariables ( ) ; this . functionScopeVariables = this . widgetService . getWidgetScopeVariables ( ) ;
} }
@ -240,7 +242,9 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
this . dataKeySettingsFormGroup = this . fb . group ( { this . dataKeySettingsFormGroup = this . fb . group ( {
settings : [ null , [ ] ] settings : [ null , [ ] ]
} ) ; } ) ;
this . dataKeySettingsFormGroup . valueChanges . subscribe ( ( ) = > { this . dataKeySettingsFormGroup . valueChanges . pipe (
takeUntilDestroyed ( this . destroyRef )
) . subscribe ( ( ) = > {
this . updateModel ( ) ; this . updateModel ( ) ;
} ) ; } ) ;
} }
@ -260,7 +264,9 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
postFuncBody : [ null , [ ] ] postFuncBody : [ null , [ ] ]
} ) ; } ) ;
this . dataKeyFormGroup . get ( 'aggregationType' ) . valueChanges . subscribe ( this . dataKeyFormGroup . get ( 'aggregationType' ) . valueChanges . pipe (
takeUntilDestroyed ( this . destroyRef )
) . subscribe (
( aggType ) = > { ( aggType ) = > {
if ( ! this . dataKeyFormGroup . get ( 'label' ) . dirty ) { if ( ! this . dataKeyFormGroup . get ( 'label' ) . dirty ) {
let newLabel = this . dataKeyFormGroup . get ( 'name' ) . value ; let newLabel = this . dataKeyFormGroup . get ( 'name' ) . value ;
@ -274,23 +280,31 @@ export class DataKeyConfigComponent extends PageComponent implements OnInit, Con
} }
) ; ) ;
this . dataKeyFormGroup . get ( 'comparisonEnabled' ) . valueChanges . subscribe ( this . dataKeyFormGroup . get ( 'comparisonEnabled' ) . valueChanges . pipe (
takeUntilDestroyed ( this . destroyRef )
) . subscribe (
( ) = > { ( ) = > {
this . updateComparisonValues ( ) ; this . updateComparisonValues ( ) ;
} }
) ; ) ;
this . dataKeyFormGroup . get ( 'timeForComparison' ) . valueChanges . subscribe ( this . dataKeyFormGroup . get ( 'timeForComparison' ) . valueChanges . pipe (
takeUntilDestroyed ( this . destroyRef )
) . subscribe (
( ) = > { ( ) = > {
this . updateComparisonValues ( ) ; this . updateComparisonValues ( ) ;
} }
) ; ) ;
this . dataKeyFormGroup . valueChanges . subscribe ( ( ) = > { this . dataKeyFormGroup . valueChanges . pipe (
takeUntilDestroyed ( this . destroyRef )
) . subscribe ( ( ) = > {
this . updateModel ( ) ; this . updateModel ( ) ;
} ) ; } ) ;
this . dataKeyFormGroup . get ( 'usePostProcessing' ) . valueChanges . subscribe ( ( usePostProcessing : boolean ) = > { this . dataKeyFormGroup . get ( 'usePostProcessing' ) . valueChanges . pipe (
takeUntilDestroyed ( this . destroyRef )
) . subscribe ( ( usePostProcessing : boolean ) = > {
const postFuncBody : TbFunction = this . dataKeyFormGroup . get ( 'postFuncBody' ) . value ; const postFuncBody : TbFunction = this . dataKeyFormGroup . get ( 'postFuncBody' ) . value ;
if ( usePostProcessing && ! isNotEmptyTbFunction ( postFuncBody ) ) { if ( usePostProcessing && ! isNotEmptyTbFunction ( postFuncBody ) ) {
this . dataKeyFormGroup . get ( 'postFuncBody' ) . patchValue ( 'return value;' ) ; this . dataKeyFormGroup . get ( 'postFuncBody' ) . patchValue ( 'return value;' ) ;
Igor Kulikov
2 years ago