diff --git a/frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts index 10306c75..9bea6d62 100644 --- a/frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts @@ -282,6 +282,15 @@ export class DropdownTreeViewComponent extends InputControl { } } + clearValue() { + if (this.webbpmStorage) { + this.cachedValue = null; + this.webbpmStorage.delete(this.storageKey); + } + + super.clearValue(); + } + onChange() { super.onChange(); this.valueChangeEvent.trigger(this.value); diff --git a/frontend/src/ts/account_applications/component/filter/DropdownTreeViewFilterComponent.ts b/frontend/src/ts/account_applications/component/filter/DropdownTreeViewFilterComponent.ts index d20937c5..33a67c3f 100644 --- a/frontend/src/ts/account_applications/component/filter/DropdownTreeViewFilterComponent.ts +++ b/frontend/src/ts/account_applications/component/filter/DropdownTreeViewFilterComponent.ts @@ -5,15 +5,20 @@ import {DropdownTreeViewComponent} from "../field/DropdownTreeViewComponent"; export class DropdownTreeViewFilterComponent extends FilterComponent { public isBusinessId: boolean; + private treeViewComponent: DropdownTreeViewComponent; + + initialize() { + super.initialize(); + this.treeViewComponent = this.getScript(DropdownTreeViewComponent) as DropdownTreeViewComponent; + } public getFilter(): Filter { - let treeViewComponent = this.getScript(DropdownTreeViewComponent) as DropdownTreeViewComponent; - let model = treeViewComponent.value; + let model = this.treeViewComponent.value; - if (!model && treeViewComponent.cachedValue) { + if (!model && this.treeViewComponent.cachedValue) { let value = this.isBusinessId - ? treeViewComponent.cachedValue.businessId - : treeViewComponent.cachedValue.id; + ? this.treeViewComponent.cachedValue.businessId + : this.treeViewComponent.cachedValue.id; return FilterUtil.singleValueFilter(this.getObjectId(), value, this.operation); } else if (model) { @@ -24,4 +29,10 @@ export class DropdownTreeViewFilterComponent extends FilterComponent { return null; } } + + + resetFilter(): Promise | void { + this.treeViewComponent.clearValue(); + return super.resetFilter(); + } }