Ticket #93 : Display CMMN instance

Author: habarthierry-hue

src/CaseManagement.CMMN.Persistence.EF/Persistence/CasePlanInstanceQueryRepository.cs

@@ -42,6 +42,11 @@ public async Task<FindResponse<CasePlanInstanceAggregate>> Find(FindCasePlanInst
                     result = result.Where(r => r.CasePlanId == parameter.CasePlanId);
                 }
 
+                if (!string.IsNullOrWhiteSpace(parameter.CaseFileId))
+                {
+                    result = result.Where(r => r.CaseFileId == parameter.CaseFileId);
+                }
+
                 if (MAPPING_WORKFLOWINSTANCE_TO_PROPERTYNAME.ContainsKey(parameter.OrderBy))
                 {
                     result = result.InvokeOrderBy(MAPPING_WORKFLOWINSTANCE_TO_PROPERTYNAME[parameter.OrderBy], parameter.Order);

src/CaseManagement.CMMN/CasePlanInstance/Queries/Handlers/SearchCasePlanInstanceQueryHandler.cs

@@ -23,6 +23,7 @@ public async Task<SearchResult<CasePlanInstanceResult>> Handle(SearchCasePlanIns
             var result = await _casePlanInstanceQueryRepository.Find(new FindCasePlanInstancesParameter
             {
                 CasePlanId = request.CasePlanId,
+                CaseFileId = request.CaseFileId,
                 Count = request.Count,
                 Order = request.Order,
                 OrderBy = request.OrderBy,

src/CaseManagement.CMMN/CasePlanInstance/Queries/SearchCasePlanInstanceQuery.cs

@@ -8,5 +8,6 @@ namespace CaseManagement.CMMN.CasePlanInstance.Queries
     public class SearchCasePlanInstanceQuery : BaseSearchParameter, IRequest<SearchResult<CasePlanInstanceResult>>
     {
         public string CasePlanId { get; set; }
+        public string CaseFileId { get; set; }
     }
 }

src/CaseManagement.CMMN/Persistence/InMemory/InMemoryCaseInstanceQueryRepository.cs

@@ -33,6 +33,11 @@ public Task<FindResponse<CasePlanInstanceAggregate>> Find(FindCasePlanInstancesP
                 result = result.Where(_ => _.CasePlanId == parameter.CasePlanId);
             }
 
+            if (!string.IsNullOrWhiteSpace(parameter.CaseFileId))
+            {
+                result = result.Where(_ => _.CaseFileId == parameter.CaseFileId);
+            }
+
             if (MAPPING_WORKFLOWINSTANCE_TO_PROPERTYNAME.ContainsKey(parameter.OrderBy))
             {
                 result = result.InvokeOrderBy(MAPPING_WORKFLOWINSTANCE_TO_PROPERTYNAME[parameter.OrderBy], parameter.Order);

src/CaseManagement.CMMN/Persistence/Parameters/FindCasePlanInstancesParameter.cs

@@ -5,5 +5,6 @@ namespace CaseManagement.CMMN.Persistence.Parameters
     public class FindCasePlanInstancesParameter : BaseSearchParameter
     {
         public string CasePlanId { get; set; }
+        public string CaseFileId { get; set; }
     }
 }

src/CaseManagement.Website/angularApp/app/bpmns/listfiles/listfiles.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { MatPaginator, MatSort } from '@angular/material';
 import * as fromAppState from '@app/stores/appstate';
 import * as fromBpmnFileActions from '@app/stores/bpmnfiles/actions/bpmn-files.actions';
@@ -12,7 +12,8 @@ import { merge } from 'rxjs';
     templateUrl: './listfiles.component.html',
     styleUrls: ['./listfiles.component.scss']
 })
-export class ListBpmnFilesComponent implements OnInit {
+export class ListBpmnFilesComponent implements OnInit, OnDestroy {
+    bpmnFilesListener: any;
     displayedColumns: string[] = [ 'name', 'nbInstances', 'version', 'status', 'create_datetime', 'update_datetime' ];
     @ViewChild(MatPaginator) paginator: MatPaginator;
     @ViewChild(MatSort) sort: MatSort;
@@ -23,7 +24,7 @@ export class ListBpmnFilesComponent implements OnInit {
     }
 
     ngOnInit() {
-        this.store.pipe(select(fromAppState.selectBpmnFilesResult)).subscribe((searchBpmnFilesResult: SearchBpmnFilesResult) => {
+        this.bpmnFilesListener = this.store.pipe(select(fromAppState.selectBpmnFilesResult)).subscribe((searchBpmnFilesResult: SearchBpmnFilesResult) => {
             if (!searchBpmnFilesResult) {
                 return;
             }
@@ -34,6 +35,10 @@ export class ListBpmnFilesComponent implements OnInit {
         this.refresh();
     }
 
+    ngOnDestroy(): void {
+        this.bpmnFilesListener.unsubscribe();
+    }
+
     onSubmit() {
         this.refresh();
     }

src/CaseManagement.Website/angularApp/app/bpmns/viewfile/viewfile.component.ts

@@ -26,6 +26,8 @@ let caseMgtBpmnModdle = require('@app/moddlextensions/casemanagement-bpmn');
     styleUrls: ['./viewfile.component.scss']
 })
 export class ViewBpmnFileComponent implements OnInit, OnDestroy {
+    bpmnInstancesListener: any;
+    bpmnFileListener: any;
     displayedColumns: string[] = ['status', 'create_datetime', 'update_datetime', 'nbExecutionPath', 'actions'];
     @ViewChild(MatPaginator) paginator: MatPaginator;
     @ViewChild(MatSort) sort: MatSort;
@@ -97,15 +99,15 @@ export class ViewBpmnFileComponent implements OnInit, OnDestroy {
             this.bpmnInstances$ = searchBpmnInstancesResult.content;
             this.length = searchBpmnInstancesResult.totalLength;
         });
-        this.store.pipe(select(fromAppState.selectBpmnFilesResult)).subscribe((res: SearchBpmnFilesResult) => {
+        this.bpmnInstancesListener = this.store.pipe(select(fromAppState.selectBpmnFilesResult)).subscribe((res: SearchBpmnFilesResult) => {
             if (!res) {
                 return;
             }
 
             this.bpmnFiles = res.content;
             this.versionFormControl.setValue(this.bpmnFile.version);
         });
-        this.store.pipe(select(fromAppState.selectBpmnFileResult)).subscribe((bpmnFile: BpmnFile) => {
+        this.bpmnFileListener = this.store.pipe(select(fromAppState.selectBpmnFileResult)).subscribe((bpmnFile: BpmnFile) => {
             if (!bpmnFile) {
                 return;
             }
@@ -207,6 +209,8 @@ export class ViewBpmnFileComponent implements OnInit, OnDestroy {
 
     ngOnDestroy(): void {
         this.paramsSub.unsubscribe();
+        this.bpmnInstancesListener.unsubscribe();
+        this.bpmnFileListener.unsubscribe();
     }
 
     ngAfterViewInit() {

src/CaseManagement.Website/angularApp/app/bpmns/viewinstance/view.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { MatSnackBar, MatTableDataSource, MatSort, MatDialog } from '@angular/material';
 import { ActivatedRoute, Router } from '@angular/router';
 import * as fromAppState from '@app/stores/appstate';
@@ -21,7 +21,9 @@ declare var $: any;
     templateUrl: './view.component.html',
     styleUrls: ['./view.component.scss']
 })
-export class ViewBpmnInstanceComponent implements OnInit {
+export class ViewBpmnInstanceComponent implements OnInit, OnDestroy {
+    bpmnFileListener: any;
+    bpmnInstanceListener: any;
     activityStatesDisplayedColumns: string[] = ['state', 'executionDateTime', 'message'];
     incomingTokensDisplayedColumns: string[] = ['name', 'content'];
     outgoingTokensDisplayedColumns: string[] = ['name', 'content'];
@@ -66,7 +68,7 @@ export class ViewBpmnInstanceComponent implements OnInit {
                     duration: 2000
                 });
             });
-        this.store.pipe(select(fromAppState.selectBpmnFileResult)).subscribe((e: BpmnFile) => {
+        this.bpmnFileListener = this.store.pipe(select(fromAppState.selectBpmnFileResult)).subscribe((e: BpmnFile) => {
             if (!e || !e.payload) {
                 return;
             }
@@ -75,7 +77,7 @@ export class ViewBpmnInstanceComponent implements OnInit {
             this.refreshCanvas();
 
         });
-        this.store.pipe(select(fromAppState.selectBpmnInstanceResult)).subscribe((e: BpmnInstance) => {
+        this.bpmnInstanceListener = this.store.pipe(select(fromAppState.selectBpmnInstanceResult)).subscribe((e: BpmnInstance) => {
             if (!e) {
                 return;
             }
@@ -96,6 +98,11 @@ export class ViewBpmnInstanceComponent implements OnInit {
         this.refresh();
     }
 
+    ngOnDestroy(): void {
+        this.bpmnFileListener.unsubscribe();
+        this.bpmnInstanceListener.unsubscribe();
+    }
+
     ngAfterViewInit() {
         this.activityStates$.sort = this.activityStatesSort;
     }