Skip to content

Commit 39db96f

Browse files
author
Micheal Harrington
committed
Removed parentValue's initial value which resulted in the first 'RuleSet' having a remove button
1 parent 417a3a4 commit 39db96f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

projects/ngx-angular-query-builder/src/lib/query-builder/query-builder.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class QueryBuilderComponent implements OnChanges, ControlValueAccessor, V
129129
@Input() emptyMessage = 'A ruleset cannot be empty. Please add a rule or remove it all together.';
130130
@Input() classNames: QueryBuilderClassNames = {};
131131
@Input() operatorMap: { [key: string]: string[] } = {};
132-
@Input() parentValue: RuleSet = { condition: 'and', rules: [] };
132+
@Input() parentValue?: RuleSet;
133133
@Input() config: QueryBuilderConfig = { fields: {} };
134134
@Input() parentArrowIconTemplate!: QueryArrowIconDirective;
135135
@Input() parentInputTemplates!: QueryList<QueryInputDirective>;
@@ -460,7 +460,7 @@ export class QueryBuilderComponent implements OnChanges, ControlValueAccessor, V
460460
parent = parent || this.parentValue;
461461
if (this.config.removeRuleSet) {
462462
this.config.removeRuleSet(ruleset, parent);
463-
} else {
463+
} else if (parent) {
464464
parent.rules = parent.rules.filter((r) => r !== ruleset);
465465
}
466466

projects/ngx-angular-query-builder/src/lib/query-builder/query-builder.interfaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export interface QueryBuilderConfig {
9595
getOptions?: (field: string) => Option[];
9696
addRuleSet?: (parent: RuleSet) => void;
9797
addRule?: (parent: RuleSet) => void;
98-
removeRuleSet?: (ruleset: RuleSet, parent: RuleSet) => void;
98+
removeRuleSet?: (ruleset: RuleSet, parent?: RuleSet) => void;
9999
removeRule?: (rule: Rule, parent: RuleSet) => void;
100100
coerceValueForOperator?: (operator: string, value: any, rule: Rule) => any;
101101
calculateFieldChangeValue?: (currentField: Field,

0 commit comments

Comments
 (0)