From d26772172428c445a520faec2889c9e2e02da69e Mon Sep 17 00:00:00 2001
From: Nacho <JoseIgnacio.RecuerdaCambil@novatec-gmbh.de>
Date: Tue, 31 Jul 2018 17:27:36 +0200
Subject: [PATCH] TSK-661 - Filtering of distribution target selection does not
 work

---
 .../distribution-targets.component.spec.ts     |  3 ++-
 .../distribution-targets.component.ts          |  5 +++--
 .../dual-list/dual-list.component.html         |  2 +-
 .../dual-list/dual-list.component.ts           |  4 ++--
 .../workbasket-list-toolbar.component.html     |  2 +-
 .../user-information.component.html            |  4 ++--
 .../app/shared/animations/expand.animation.ts  | 18 ++----------------
 .../tasklist-toolbar.component.html            |  2 +-
 8 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts
index e90422afc..aa6d68c8e 100644
--- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts
+++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts
@@ -93,7 +93,8 @@ describe('DistributionTargetsComponent', () => {
 		expect(repeteadElemens).toBeFalsy();
 	});
 	it('should filter left list and keep selected elements as selected', () => {
-		component.performFilter({ filterBy: new FilterModel(), side: Side.LEFT });
+		component.performFilter({ filterBy: new FilterModel({
+      name: 'someName', owner: 'someOwner', description: 'someDescription', key: 'someKey'}), side: Side.LEFT });
 		component.distributionTargetsLeft = new Array<WorkbasketSummary>(
 			new WorkbasketSummary('id1', '', '', '', '', '', '', '', '', '', '', '', new Links({ 'href': 'someurl' }))
 		)
diff --git a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts
index 6e5dc70f8..d22af5eb2 100644
--- a/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts
+++ b/web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts
@@ -148,8 +148,9 @@ export class DistributionTargetsComponent implements OnChanges, OnDestroy {
 		dualListFilter.side === Side.RIGHT ? this.distributionTargetsRight = undefined : this.distributionTargetsLeft = undefined;
 		this.onRequest(dualListFilter.side, false);
 		this.workbasketFilterSubscription = this.workbasketService.getWorkBasketsSummary(true, undefined, undefined, undefined,
-			dualListFilter.filterBy.name, dualListFilter.filterBy.description, undefined, dualListFilter.filterBy.owner,
-			dualListFilter.filterBy.type, undefined, dualListFilter.filterBy.key, undefined, true).subscribe(resultList => {
+      dualListFilter.filterBy.filterParams.name, dualListFilter.filterBy.filterParams.description, undefined,
+      dualListFilter.filterBy.filterParams.owner,	dualListFilter.filterBy.filterParams.type, undefined,
+      dualListFilter.filterBy.filterParams.key, undefined, true).subscribe(resultList => {
 				(dualListFilter.side === Side.RIGHT) ?
 					this.distributionTargetsRight = (resultList._embedded ? resultList._embedded.workbaskets : []) :
 					this.distributionTargetsLeft = (resultList._embedded ? resultList._embedded.workbaskets : []);
diff --git a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html
index 9e2bcb592..beaf0bf0a 100644
--- a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html
+++ b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html
@@ -15,7 +15,7 @@
 			</button>
 		</div>
 	</div>
-	<div [@toggleDownWithoutNgIf]="toolbarState" class="row">
+	<div [@toggleDown]="toolbarState" class="row">
 		<taskana-filter class="col-xs-12" (performFilter)="performAvailableFilter($event)"></taskana-filter>
 	</div>
 	<taskana-spinner [isRunning]="requestInProgress" positionClass="centered-spinner" class="floating"></taskana-spinner>
diff --git a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts
index e4e3326ac..1897480a2 100644
--- a/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts
+++ b/web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts
@@ -2,13 +2,13 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { WorkbasketSummary } from 'app/models/workbasket-summary';
 import { FilterModel } from 'app/models/filter';
 import { Side } from '../distribution-targets.component';
-import { expandDownWithoutNgIf } from 'app/shared/animations/expand.animation';
+import { expandDown } from 'app/shared/animations/expand.animation';
 
 @Component({
 	selector: 'taskana-dual-list',
 	templateUrl: './dual-list.component.html',
 	styleUrls: ['./dual-list.component.scss'],
-	animations: [expandDownWithoutNgIf]
+	animations: [expandDown]
 })
 export class DualListComponent implements OnInit {
 
diff --git a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html
index 18b37154c..f4d3e5f26 100644
--- a/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html
+++ b/web/src/app/administration/workbasket/master/list/workbasket-list-toolbar/workbasket-list-toolbar.component.html
@@ -18,7 +18,7 @@
     </div>
 
   </div>
-  <div [@toggleDown]="toolbarState" *ngIf="toolbarState" class="row no-overflow">
+  <div [@toggleDown]="toolbarState" class="row no-overflow">
     <taskana-filter (performFilter)="filtering($event)"></taskana-filter>
   </div>
 </li>
diff --git a/web/src/app/components/user-information/user-information.component.html b/web/src/app/components/user-information/user-information.component.html
index dfa275d4b..4a133c9aa 100644
--- a/web/src/app/components/user-information/user-information.component.html
+++ b/web/src/app/components/user-information/user-information.component.html
@@ -10,7 +10,7 @@
       <span>Roles</span>
     </button>
   </div>
-  <div class="white pull-right roles col-xs-12" [@toggleDown]="showRoles" *ngIf="showRoles">
+  <div class="white pull-right roles col-xs-12" [@toggleDown]="showRoles">
     <span><i>{{roles}}</i></span>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/web/src/app/shared/animations/expand.animation.ts b/web/src/app/shared/animations/expand.animation.ts
index b16eded5b..89c404a86 100644
--- a/web/src/app/shared/animations/expand.animation.ts
+++ b/web/src/app/shared/animations/expand.animation.ts
@@ -2,21 +2,7 @@ import { trigger, style, transition, animate, keyframes, state } from '@angular/
 
 export const expandDown =
     trigger('toggleDown', [
-        state('*', style({ opacity: '1' })),
-        state('void', style({ opacity: '0' })),
-        transition('void => *', animate('300ms ease-in', keyframes([
-            style({ opacity: 0, height: '0px' }),
-            style({ opacity: 0.5, height: '50px' }),
-            style({ opacity: 1, height: '*' })]))),
-        transition('* => void', animate('300ms ease-out', keyframes([
-            style({ opacity: 1, height: '*' }),
-            style({ opacity: 0.5, height: '50px' }),
-            style({ opacity: 0, height: '0px' })])))
-    ]);
-
-export const expandDownWithoutNgIf =
-  trigger('toggleDownWithoutNgIf', [
-      state('true', style({ opacity: '1', display: 'block' })),
+      state('true', style({ opacity: '1', display: 'initial' })),
       state('false', style({ opacity: '0', display: 'none' })),
       transition('false => true', animate('300ms ease-in', keyframes([
           style({ opacity: 0, height: '0px' }),
@@ -26,7 +12,7 @@ export const expandDownWithoutNgIf =
           style({ opacity: 1, height: '*' }),
           style({ opacity: 0.5, height: '50px' }),
           style({ opacity: 0, height: '0px' })])))
-  ]);
+    ]);
 
 export const expandRight = trigger('toggleRight', [
     transition('void => *', animate('300ms ease-in', keyframes([
diff --git a/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html b/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html
index 243b78abe..6834533e6 100644
--- a/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html
+++ b/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html
@@ -25,7 +25,7 @@
     </div>
 
   </div>
-  <div [@toggleDown]="toolbarState" *ngIf="toolbarState" class="row no-overflow">
+  <div [@toggleDown]="toolbarState" class="row no-overflow">
     <taskana-filter
       [filterParams]="filterParams"
       [filterType]="filterType"