From 999b36473c933c3029fb54c983d05babca9f39a6 Mon Sep 17 00:00:00 2001 From: jonaswinkler Date: Tue, 15 Dec 2020 03:29:23 +0100 Subject: [PATCH] more refactoring and bug fixing. --- .../filter-editor/filter-editor.component.ts | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src-ui/src/app/components/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/filter-editor/filter-editor.component.ts index f98b9517f..a11f0736a 100644 --- a/src-ui/src/app/components/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/filter-editor/filter-editor.component.ts @@ -200,24 +200,21 @@ export class FilterEditorComponent implements OnInit, OnDestroy { } setDateFilter(date: NgbDateStruct, dateRuleTypeID: number) { - let filterRules = this.filterRules - let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID) + let existingRule = this.filterRules.find(rule => rule.rule_type == dateRuleTypeID) let newValue = this.dateParser.format(date) if (existingRule) { existingRule.value = newValue } else { - filterRules.push({rule_type: dateRuleTypeID, value: newValue}) + this.filterRules.push({rule_type: dateRuleTypeID, value: newValue}) } - - this.filterRules = filterRules } clearDateFilter(dateRuleTypeID: number) { - let filterRules = this.filterRules - let existingRule = filterRules.find(rule => rule.rule_type == dateRuleTypeID) - filterRules.splice(filterRules.indexOf(existingRule), 1) - this.filterRules = filterRules + let ruleIndex = this.filterRules.findIndex(rule => rule.rule_type == dateRuleTypeID) + if (ruleIndex != -1) { + this.filterRules.splice(ruleIndex, 1) + } } }