AAE-29002 Allow to filter processes by parentId (#10453)

* AAE-29002 Allow to filter processes by parentId * AAE-29002 Move payload tests under describe Payload * AAE-29002 Set parentId as optional
Alfresco · Dec 3, 2024 · c92d34f · c92d34f
1 parent b3cef95
commit c92d34f
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 20 deletions.
diff --git a/lib/process-services-cloud/src/lib/i18n/en.json b/lib/process-services-cloud/src/lib/i18n/en.json
@@ -253,6 +253,7 @@
       "SUSPENDED_DATE": "Suspended Date",
       "STARTED_BY": "Started by",
       "COMPLETED_DATE": "Completed Date",
+      "MAIN_PROCESS_ID": "Main process id",
       "DATE_RANGE": {
         "NO_DATE": "No Date",
         "TODAY": "Today",

diff --git a/...s-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts b/...s-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts
@@ -691,6 +691,11 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges {
                 key: 'appVersion',
                 value: 'appVersion'
             },
+            {
+                label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.MAIN_PROCESS_ID',
+                key: 'parentId',
+                value: 'parentId'
+            },
             {
                 label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_INS_ID',
                 key: 'processInstanceId',
@@ -767,6 +772,12 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges {
                 key: 'processInstanceId',
                 value: filterModel.processInstanceId || ''
             },
+            {
+                label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.MAIN_PROCESS_ID',
+                type: 'text',
+                key: 'parentId',
+                value: filterModel.parentId
+            },
             {
                 label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_NAME',
                 type: 'text',

diff --git a/...ocess-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts b/...ocess-services-cloud/src/lib/process/process-filters/models/process-filter-cloud.model.ts
@@ -30,6 +30,7 @@ export class ProcessFilterCloudModel {
     index: number;
     appName: string;
     appVersion?: number | number[];
+    parentId?: string;
     processName: string;
     processInstanceId: string;
     initiator: string;
@@ -81,6 +82,7 @@ export class ProcessFilterCloudModel {
             }
 
             this.processInstanceId = obj.processInstanceId || null;
+            this.parentId = obj.parentId || '';
             this.processName = obj.processName || null;
             this.initiator = obj.initiator || null;
             this.status = obj.status || null;

diff --git a/...rvices-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/...rvices-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts
@@ -152,31 +152,50 @@ describe('ProcessListCloudComponent', () => {
             expect(component.rows.length).toEqual(3);
         });
 
-        it('should the payload contain the appVersion if it is defined', () => {
-            spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
-            component.appVersion = 1;
-            component.ngAfterContentInit();
-            component.reload();
+        describe('Payload', () => {
+            it('should the payload contain the appVersion if it is defined', () => {
+                spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
+                component.appVersion = 1;
+                component.ngAfterContentInit();
+                component.reload();
 
-            expect(component.requestNode.appVersion).toEqual('1');
-        });
+                expect(component.requestNode.appVersion).toEqual('1');
+            });
 
-        it('should the payload contain all the app versions joined by a comma separator', () => {
-            spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
-            component.appVersion = [1, 2, 3];
-            component.ngAfterContentInit();
-            component.reload();
+            it('should the payload contain all the app versions joined by a comma separator', () => {
+                spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
+                component.appVersion = [1, 2, 3];
+                component.ngAfterContentInit();
+                component.reload();
 
-            expect(component.requestNode.appVersion).toEqual('1,2,3');
-        });
+                expect(component.requestNode.appVersion).toEqual('1,2,3');
+            });
 
-        it('should the payload NOT contain any app version when appVersion does not have a value', () => {
-            spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
-            component.appVersion = undefined;
-            component.ngAfterContentInit();
-            component.reload();
+            it('should the payload NOT contain any app version when appVersion does not have a value', () => {
+                spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
+                component.appVersion = undefined;
+                component.ngAfterContentInit();
+                component.reload();
+
+                expect(component.requestNode.appVersion).toEqual('');
+            });
 
-            expect(component.requestNode.appVersion).toEqual('');
+            it('should the payload contain the parentId if it is defined', () => {
+                spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
+                component.parentId = 'fake-parent-id';
+                component.ngAfterContentInit();
+                component.reload();
+
+                expect(component.requestNode.parentId).toEqual('fake-parent-id');
+            });
+
+            it('should the payload contain an empty parentId if it is NOT defined', () => {
+                spyOn(processListCloudService, 'getProcessByRequest').and.returnValue(of(fakeProcessCloudList));
+                component.ngAfterContentInit();
+                component.reload();
+
+                expect(component.requestNode.parentId).toBeUndefined();
+            });
         });
 
         it('should return the results if an application name is given', (done) => {

diff --git a/...ss-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts b/...ss-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts
@@ -109,6 +109,10 @@ export class ProcessListCloudComponent
     @Input()
     name: string = '';
 
+    /** Filter the processes to display only the ones with this parentId. */
+    @Input()
+    parentId?: string;
+
     /** Filter the processes to display only the ones with this process definition ID. */
     @Input()
     processDefinitionId: string = '';
@@ -606,6 +610,7 @@ export class ProcessListCloudComponent
             id: this.id,
             environmentId: this.environmentId,
             name: this.name,
+            parentId: this.parentId,
             processDefinitionId: this.processDefinitionId,
             processDefinitionName: this.processDefinitionName,
             processDefinitionKey: this.processDefinitionKey,

diff --git a/...s-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts b/...s-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts
@@ -27,6 +27,7 @@ export class ProcessQueryCloudRequestModel {
     id?: string;
     environmentId?: string;
     name?: string;
+    parentId?: string;
     processDefinitionId?: string;
     processDefinitionName?: string;
     processDefinitionKey?: string;
@@ -56,6 +57,7 @@ export class ProcessQueryCloudRequestModel {
             this.id = obj.id;
             this.environmentId = obj.environmentId;
             this.name = obj.name;
+            this.parentId = obj.parentId;
             this.processDefinitionId = obj.processDefinitionId;
             this.processDefinitionName = obj.processDefinitionName;
             this.processDefinitionKey = obj.processDefinitionKey;