From a66d4d44e892428708f96eeee2facfb543049189 Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Mon, 14 Nov 2016 17:21:39 +0000
Subject: [PATCH] #987 flatten FilterRepresentationModel

---
 .../activiti/activiti-demo.component.html     |  8 ++-
 .../activiti-tasklist.component.html          |  4 +-
 .../components/activiti-tasklist.component.ts | 56 +++++++++++--------
 .../src/models/filter.model.ts                |  4 ++
 4 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
index 11f6544900..ff8e279604 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -36,7 +36,13 @@
                     </div>
                     <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp">
                         <span>Task List</span>
-                        <activiti-tasklist [taskFilter]="taskFilter" [data]="dataTasks"
+                        <activiti-tasklist *ngIf="taskFilter && taskFilter.hasFilter()" [appId]="taskFilter.appId"
+                                           [processDefinitionId]="taskFilter.filter.processDefinitionId"
+                                           [name]="taskFilter.filter.name"
+                                           [assignment]="taskFilter.filter.assignment"
+                                           [state]="taskFilter.filter.state"
+                                           [sort]="taskFilter.filter.sort"
+                                           [data]="dataTasks"
                                            (rowClick)="onTaskRowClick($event)" (onSuccess)="onSuccessTaskList($event)"
                                            #activititasklist></activiti-tasklist>
                     </div>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
index 9dbfa195b6..a92efe7e67 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.html
@@ -1,5 +1,5 @@
-<div *ngIf="!taskFilter">{{ 'TASK_FILTERS.MESSAGES.NONE' | translate }}</div>
-<div *ngIf="taskFilter">
+<div *ngIf="!requestNode">{{ 'TASK_FILTERS.MESSAGES.NONE' | translate }}</div>
+<div *ngIf="requestNode">
     <div *ngIf="!isTaskListEmpty()">
         <alfresco-datatable
                 [data]="data"
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
index 2b0c2d8c4b..a9dd614e23 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.ts
@@ -19,7 +19,7 @@ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChange
 import { AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
-import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model';
+import { TaskQueryRequestRepresentationModel } from '../models/filter.model';
 
 declare let componentHandler: any;
 
@@ -32,7 +32,24 @@ declare let componentHandler: any;
 export class ActivitiTaskList implements OnInit, OnChanges {
 
     @Input()
-    taskFilter: FilterRepresentationModel;
+    appId: string;
+
+    @Input()
+    processDefinitionId: string;
+
+    @Input()
+    state: string;
+
+    @Input()
+    assignment: string;
+
+    @Input()
+    sort: string;
+
+    @Input()
+    name: string;
+
+    requestNode: TaskQueryRequestRepresentationModel;
 
     @Input()
     data: DataTableAdapter;
@@ -70,29 +87,20 @@ export class ActivitiTaskList implements OnInit, OnChanges {
             );
         }
 
-        if (this.taskFilter) {
-            let requestNode = this.convertTaskUserToTaskQuery(this.taskFilter);
-            this.load(new TaskQueryRequestRepresentationModel(requestNode));
-        }
+        this.requestNode = this.createRequestNode();
+        this.load(this.requestNode);
     }
 
     ngOnChanges(changes: SimpleChanges) {
-        let taskFilter = changes['taskFilter'];
-        if (taskFilter && taskFilter.currentValue) {
-            let requestNode = this.convertTaskUserToTaskQuery(taskFilter.currentValue);
-            this.load(new TaskQueryRequestRepresentationModel(requestNode));
-            return;
-        }
+        this.requestNode = this.createRequestNode();
+        this.load(this.requestNode);
     }
 
     public reload() {
-        if (this.taskFilter) {
-            let requestNode = this.convertTaskUserToTaskQuery(this.taskFilter);
-            this.load(new TaskQueryRequestRepresentationModel(requestNode));
-        }
+        this.load(this.requestNode);
     }
 
-    public load(requestNode: TaskQueryRequestRepresentationModel) {
+    private load(requestNode: TaskQueryRequestRepresentationModel) {
         this.activiti.getTotalTasks(requestNode).subscribe(
             (res) => {
                 requestNode.size = res.total;
@@ -191,14 +199,14 @@ export class ActivitiTaskList implements OnInit, OnChanges {
         return tasks;
     }
 
-    private convertTaskUserToTaskQuery(userTask: FilterRepresentationModel) {
+    private createRequestNode() {
         let requestNode = {
-            appDefinitionId: userTask.appId,
-            processDefinitionId: userTask.filter.processDefinitionId,
-            text: userTask.filter.name,
-            assignment: userTask.filter.assignment,
-            state: userTask.filter.state,
-            sort: userTask.filter.sort
+            appDefinitionId: this.appId,
+            processDefinitionId: this.processDefinitionId,
+            text: this.name,
+            assignment: this.assignment,
+            state: this.state,
+            sort: this.sort
         };
         return new TaskQueryRequestRepresentationModel(requestNode);
     }
diff --git a/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts b/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts
index 72fd681bcd..09a8c88256 100644
--- a/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/models/filter.model.ts
@@ -70,6 +70,10 @@ export class FilterRepresentationModel {
         this.filter = new FilterParamRepresentationModel(obj.filter);
         this.index = obj && obj.index;
     }
+
+    hasFilter() {
+        return this.filter ? true : false;
+    }
 }
 
 /**