[AAE-1501] EditProcessCloud/EditTaskCloud - Ability to fetch applications by role (#5380)

* ProcessFilter - Be able to fetch applications based on the role

* TaskFilter - be able to fetch the applications by role

lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts

@@ -40,8 +40,8 @@ export class AppsProcessCloudService {
      * @param status Required status value
      * @returns The list of deployed apps
      */
-    getDeployedApplicationsByStatus(status: string): Observable<ApplicationInstanceModel[]> {
+    getDeployedApplicationsByStatus(status: string, role?: string): Observable<ApplicationInstanceModel[]> {
-        return this.hasDeployedApps() ? of(this.deployedApps) : this.getApplicationsByStatus(status);
+        return this.hasDeployedApps() ? of(this.deployedApps) : this.getApplicationsByStatus(status, role);
     }
 
     hasDeployedApps(): boolean {
@@ -57,13 +57,13 @@ export class AppsProcessCloudService {
         this.deployedApps = apps;
     }
 
-    private getApplicationsByStatus(status: string): Observable<ApplicationInstanceModel[]> {
+    private getApplicationsByStatus(status: string, role?: string): Observable<ApplicationInstanceModel[]> {
         if (status === '') {
             return of([]);
         }
         const api: Oauth2Auth = this.apiService.getInstance().oauth2Auth;
         const path = this.getApplicationUrl();
-        const pathParams = {}, queryParams = { status: status, sort: 'name' },
+        const pathParams = {}, queryParams = { status: status, roles : role, sort: 'name' },
             headerParams = {}, formParams = {}, bodyParam = {},
             contentTypes = ['application/json'], accepts = ['application/json'];
 

lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts

@@ -28,6 +28,7 @@ import { ProcessFilterCloudModel, ProcessFilterProperties, ProcessFilterAction,
 import { TranslationService, UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';
 import { ProcessFilterCloudService } from '../services/process-filter-cloud.service';
 import { ProcessFilterDialogCloudComponent } from './process-filter-dialog-cloud.component';
+import { ApplicationInstanceModel } from '../../../app/models/application-instance.model';
 
 @Component({
     selector: 'adf-cloud-edit-process-filter',
@@ -53,6 +54,9 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
     @Input()
     appName: string = '';
 
+    @Input()
+    role: string = '';
+
     /** Id of the process instance filter. */
     @Input()
     id: string;
@@ -116,7 +120,8 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
         private userPreferencesService: UserPreferencesService,
         private translateService: TranslationService,
         private processFilterCloudService: ProcessFilterCloudService,
-        private appsProcessCloudService: AppsProcessCloudService) { }
+        private appsProcessCloudService: AppsProcessCloudService) {
+    }
 
     ngOnInit() {
         this.userPreferencesService
@@ -132,9 +137,11 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
         }
     }
 
-    /**
+    ngOnDestroy() {
-     * Build process filter edit form
+        this.onDestroy$.next(true);
-     */
+        this.onDestroy$.complete();
+    }
+
     buildForm(processFilterProperties: ProcessFilterProperties[]) {
         this.formHasBeenChanged = false;
         this.editProcessFilterForm = this.formBuilder.group(this.getFormControlsConfig(processFilterProperties));
@@ -155,7 +162,10 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
         this.isLoading = true;
         this.processFilterCloudService
             .getFilterById(this.appName, this.id)
-            .pipe(finalize(() => this.isLoading = false))
+            .pipe(
+                finalize(() => this.isLoading = false),
+                takeUntil(this.onDestroy$)
+            )
             .subscribe(response => {
                 this.processFilter = new ProcessFilterCloudModel(response);
                 this.processFilterProperties = this.createAndFilterProperties();
@@ -295,8 +305,9 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
 
     getRunningApplications() {
         this.appsProcessCloudService
-            .getDeployedApplicationsByStatus(EditProcessFilterCloudComponent.APP_RUNNING_STATUS)
+            .getDeployedApplicationsByStatus(EditProcessFilterCloudComponent.APP_RUNNING_STATUS, this.role)
-            .subscribe(applications => {
+            .pipe(takeUntil(this.onDestroy$))
+            .subscribe((applications: ApplicationInstanceModel[]) => {
                 if (applications && applications.length > 0) {
                     applications.map((application) => {
                         this.applicationNames.push({ label: application.name, value: application.name });
@@ -315,12 +326,10 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
         }
     }
 
-    /**
-     * Save a process instance filter
-     */
     save(saveAction: ProcessFilterAction) {
         this.processFilterCloudService
             .updateFilter(this.changedProcessFilter)
+            .pipe(takeUntil(this.onDestroy$))
             .subscribe(() => {
                 saveAction.filter = this.changedProcessFilter;
                 this.action.emit(saveAction);
@@ -334,6 +343,7 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
     delete(deleteAction: ProcessFilterAction) {
         this.processFilterCloudService
             .deleteFilter(this.processFilter)
+            .pipe(takeUntil(this.onDestroy$))
             .subscribe(() => {
                 deleteAction.filter = this.processFilter;
                 this.action.emit(deleteAction);
@@ -364,6 +374,7 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
                 const resultFilter: ProcessFilterCloudModel = Object.assign({}, this.changedProcessFilter, newFilter);
                 this.processFilterCloudService
                     .addFilter(resultFilter)
+                    .pipe(takeUntil(this.onDestroy$))
                     .subscribe(() => {
                         saveAsAction.filter = resultFilter;
                         this.action.emit(saveAsAction);
@@ -540,8 +551,4 @@ export class EditProcessFilterCloudComponent implements OnInit, OnChanges, OnDes
         ];
     }
 
-    ngOnDestroy() {
-        this.onDestroy$.next(true);
-        this.onDestroy$.complete();
-    }
 }

lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filter-cloud.component.ts

@@ -54,6 +54,10 @@ export class EditTaskFilterCloudComponent implements OnInit, OnChanges, OnDestro
     @Input()
     appName: string = '';
 
+    /** user role. */
+    @Input()
+    role: string = '';
+
     /** (required) ID of the task filter. */
     @Input()
     id: string;
@@ -317,9 +321,9 @@ export class EditTaskFilterCloudComponent implements OnInit, OnChanges, OnDestro
         return JSON.stringify(editedQuery).toLowerCase() === JSON.stringify(currentQuery).toLowerCase();
     }
 
-    getRunningApplications(): void {
+    getRunningApplications() {
         this.appsProcessCloudService
-            .getDeployedApplicationsByStatus(EditTaskFilterCloudComponent.APP_RUNNING_STATUS)
+            .getDeployedApplicationsByStatus(EditTaskFilterCloudComponent.APP_RUNNING_STATUS, this.role)
             .pipe(takeUntil(this.onDestroy$))
             .subscribe((applications: ApplicationInstanceModel[]) => {
                 if (applications && applications.length > 0) {