@ -94,18 +94,20 @@ export class FilterDialogComponent extends DialogComponent<FilterDialogComponent
}
}
this . allowKeyFiltersOrConditions = getCurrentAuthState ( this . store ) . allowKeyFiltersOrConditions !== false ;
this . allowKeyFiltersOrConditions = getCurrentAuthState ( this . store ) . allowKeyFiltersOrConditions !== false ;
const initialOperation = ! this . allowKeyFiltersOrConditions ? ComplexOperation . AND
: ( this . filter . keyFiltersOperation ? ? ComplexOperation . AND ) ;
this . filterFormGroup = this . fb . group ( {
this . filterFormGroup = this . fb . group ( {
filter : [ this . filter . filter , [ this . validateDuplicateFilterName ( ) , Validators . required ] ] ,
filter : [ this . filter . filter , [ this . validateDuplicateFilterName ( ) , Validators . required ] ] ,
editable : [ this . filter . editable ] ,
editable : [ this . filter . editable ] ,
keyFilters : [ this . filter . keyFilters , Validators . required ] ,
keyFilters : [ this . filter . keyFilters , Validators . required ] ,
keyFiltersOperation : [ in itial Operation ]
keyFiltersOperation : [ this . f ilter . keyF iltersOpera tion ? ? Complex Operation. AND ]
} ) ;
} ) ;
if ( ! this . allowKeyFiltersOrConditions && this . filter . keyFiltersOperation === ComplexOperation . OR ) {
this . filterFormGroup . get ( 'keyFiltersOperation' ) . setValue ( ComplexOperation . AND ) ;
this . filterFormGroup . markAsDirty ( ) ;
}
if ( ! this . allowKeyFiltersOrConditions ) {
if ( ! this . allowKeyFiltersOrConditions ) {
this . filterFormGroup . get ( 'keyFiltersOperation' ) . valueChanges . subscribe ( value = > {
this . filterFormGroup . get ( 'keyFiltersOperation' ) . valueChanges . subscribe ( value = > {
if ( value === ComplexOperation . OR ) {
if ( value === ComplexOperation . OR ) {
this . filterFormGroup . get ( 'keyFiltersOperation' ) . setValue ( ComplexOperation . AND , { emitEvent : false } ) ;
this . filterFormGroup . get ( 'keyFiltersOperation' ) . setValue ( ComplexOperation . AND ) ;
}
}
} ) ;
} ) ;
}
}