Merge pull request #1267 from Alfresco/dev-mvitale-1174

Report rename

demo-shell-ng2/app/components/activiti/activiti-demo.component.html

@@ -92,10 +92,17 @@
             <div class="page-content">
                 <div class="mdl-grid">
                     <div class="mdl-cell mdl-cell--4-col task-column mdl-shadow--2dp">
-                        <analytics-report-list (reportClick)="onReportClick($event)"></analytics-report-list>
+                        <analytics-report-list
+                                (reportClick)="onReportClick($event)"
+                                #analyticsreportlist >
+                        </analytics-report-list>
                     </div>
                     <div class="mdl-cell mdl-cell--8-col task-column mdl-shadow--2dp">
-                        <activiti-analytics [appId]="appId" *ngIf="report" [reportId]="report.id"></activiti-analytics>
+                        <activiti-analytics *ngIf="report"
+                                            [appId]="appId"
+                                            [reportId]="report.id"
+                                            (editReport)="onEditReport($event)">
+                        </activiti-analytics>
                     </div>
                 </div>
             </div>

demo-shell-ng2/app/components/activiti/activiti-demo.component.ts

@@ -30,6 +30,7 @@ import {
     ActivitiStartProcessInstance,
     ProcessInstance
 } from 'ng2-activiti-processlist';
+import { AnalyticsReportListComponent } from 'ng2-activiti-analytics';
 import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs/Rx';
 import {
@@ -75,6 +76,9 @@ export class ActivitiDemoComponent implements AfterViewInit {
     @ViewChild(ActivitiStartProcessInstance)
     activitiStartProcess: ActivitiStartProcessInstance;
 
+    @ViewChild(AnalyticsReportListComponent)
+    analyticsreportlist: AnalyticsReportListComponent;
+
     @Input()
     appId: number;
 
@@ -183,6 +187,10 @@ export class ActivitiDemoComponent implements AfterViewInit {
         this.currentProcessInstanceId = processInstanceId;
     }
 
+    onEditReport(name: string) {
+        this.analyticsreportlist.reload();
+    }
+
     navigateStartProcess() {
         this.currentProcessInstanceId = currentProcessIdNew;
     }

ng2-components/ng2-activiti-analytics/src/components/analytics-report-list.component.ts

@@ -57,13 +57,21 @@ export class AnalyticsReportListComponent implements  OnInit {
             this.reports.push(report);
         });
 
-        this.getReportListByAppId();
+        this.getReportList();
     }
 
     /**
-     * Get the report list by app id
+     * Reload the component
      */
-    getReportListByAppId() {
+    reload() {
+        this.reset();
+        this.getReportList();
+    }
+
+    /**
+     * Get the report list
+     */
+    getReportList() {
         this.analyticsService.getReportList().subscribe(
             (res: ReportParametersModel[]) => {
                 if (res && res.length === 0) {
@@ -108,6 +116,15 @@ export class AnalyticsReportListComponent implements  OnInit {
         return this.reports === undefined || (this.reports && this.reports.length === 0);
     }
 
+    /**
+     * Reset the list
+     */
+    private reset() {
+        if (!this.isReportsEmpty()) {
+            this.reports = [];
+        }
+    }
+
     /**
      * Select the current report
      * @param report

ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.css

@@ -21,3 +21,7 @@
 .dropdown-widget__invalid .mdl-textfield__error {
     visibility: visible !important;
 }
+
+.large {
+    font-size: x-large;
+}

ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html

@@ -1,7 +1,18 @@
 <div class="col-md-6">
     <div *ngIf="reportParameters">
         <form [formGroup]="reportForm" novalidate>
-        <h4>{{reportParameters.name}}</h4>
+        <div *ngIf="isEditable">
+            <input
+                    type="text"
+                    class="mdl-textfield__input large"
+                    id="reportName"
+                    data-automation-id="reportName"
+                    [value]="reportParameters.name"
+                    (input)="reportParameters.name=$event.target.value"
+                    (blur)="editTitle($event)"
+                    />
+        </div>
+        <h4 *ngIf="!isEditable" (click)="editEnable()">{{reportParameters.name}}</h4>
         <div *ngFor="let field of reportParameters.definition.parameters">
             <div [ngSwitch]="field.type">
                 <div *ngSwitchCase="'integer'">

ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.ts

@@ -47,6 +47,9 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges {
     @Output()
     onError = new EventEmitter();
 
+    @Output()
+    onEdit = new EventEmitter();
+
     @Output()
     onFormValueChanged = new EventEmitter();
 
@@ -63,6 +66,7 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges {
     private dropDownSub;
     private reportParamsSub;
     private paramOpts;
+    private isEditable: boolean = false;
 
     constructor(private translate: AlfrescoTranslationService,
                 private analyticsService: AnalyticsService,
@@ -210,4 +214,25 @@ export class AnalyticsReportParametersComponent implements OnInit, OnChanges {
             this.reportParamsSub.unsubscribe();
         }
     }
+
+    public editEnable() {
+        this.isEditable =  true;
+    }
+
+    public editDisable() {
+        this.isEditable = false;
+    }
+
+    public editTitle() {
+        this.reportParamsSub = this.analyticsService.updateReport(this.reportParameters.id, this.reportParameters.name).subscribe(
+            (res: ReportParametersModel) => {
+                this.editDisable();
+                this.onEdit.emit(this.reportParameters.name);
+            },
+            (err: any) => {
+                console.log(err);
+                this.onError.emit(err);
+            }
+        );
+    }
 }

ng2-components/ng2-activiti-analytics/src/components/analytics.component.html

@@ -1,6 +1,9 @@
 <div class="col-md-6">
     <analytics-report-parameters [appId]="appId" [reportId]="reportId"
-                                 (onFormValueChanged)="reset()" (onSuccess)="showReport($event)"></analytics-report-parameters>
+                                 (onFormValueChanged)="reset()"
+                                 (onSuccess)="showReport($event)"
+                                 (onEdit)="onEditReport($event)">
+    </analytics-report-parameters>
 
     <div *ngIf="reports">
         <div *ngFor="let report of reports">

ng2-components/ng2-activiti-analytics/src/components/analytics.component.ts

@@ -41,12 +41,15 @@ export class AnalyticsComponent implements OnChanges {
     @Output()
     onSuccess = new EventEmitter();
 
+    @Output()
+    editReport = new EventEmitter();
+
     @Output()
     onError = new EventEmitter();
 
     reportParamQuery = new ReportQuery();
 
-    reports: any[];
+    reports: Chart[];
 
     public barChartOptions: any = {
         responsive: true,
@@ -107,4 +110,8 @@ export class AnalyticsComponent implements OnChanges {
         let clone = JSON.parse(JSON.stringify(report));
         report.datasets = clone.datasets;
     }
+
+    public onEditReport(name: string) {
+        this.editReport.emit(name);
+    }
 }

ng2-components/ng2-activiti-analytics/src/services/analytics.service.ts

@@ -178,6 +178,13 @@ export class AnalyticsService {
             .catch(this.handleError);
     }
 
+    public updateReport(reportId: number, name: string): Observable<any> {
+        return Observable.fromPromise(this.apiService.getInstance().activiti.reportApi.updateReport(reportId, name))
+            .map((res: any) => {
+                console.log('upload');
+            }).catch(this.handleError);
+    }
+
     private handleError(error: Response) {
         console.error(error);
         return Observable.throw(error.json().error || 'Server error');