inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-4263][EditProcessFilterCloudComponent] Unit tests are failing (#4453)

Browse Source 
* [ADF-4263][EditProcessFilterCloudComponent] Unit tests are failing* Fixed failing unit test.

* * Fixed lint error in the group/people component.

* * Removed any type
This commit is contained in:
siva kumar
2019-03-20 13:33:22 +05:30
committed by Eugenio Romano
parent 814bd46d5b
commit bfc4205522
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/process-services-cloud/src/lib/group/components/group-cloud.component.ts
View File

@@ -33,7 +33,7 @@ import { Observable, of, BehaviorSubject } from 'rxjs';
import { GroupModel, GroupSearchParam } from '../models/group.model'; import { GroupModel, GroupSearchParam } from '../models/group.model';
import { GroupCloudService } from '../services/group-cloud.service'; import { GroupCloudService } from '../services/group-cloud.service';
import { debounceTime } from 'rxjs/internal/operators/debounceTime'; import { debounceTime } from 'rxjs/internal/operators/debounceTime';
import { distinctUntilChanged, switchMap, mergeMap, filter, tap } from 'rxjs/operators'; import { distinctUntilChanged, switchMap, mergeMap, filter, tap, map } from 'rxjs/operators';
@Component({ @Component({
selector: 'adf-cloud-group', selector: 'adf-cloud-group',
@@ -223,9 +223,9 @@ export class GroupCloudComponent implements OnInit, OnChanges {
filterGroupsByRoles(group: GroupModel): Observable<GroupModel> { filterGroupsByRoles(group: GroupModel): Observable<GroupModel> {
return this.groupService.checkGroupHasRole(group.id, this.roles).pipe( return this.groupService.checkGroupHasRole(group.id, this.roles).pipe(
mergeMap<boolean, Observable<GroupModel>>((hasRole) => { map((hasRole: boolean) => ({ hasRole: hasRole, group: group })),
return hasRole ? of(group) : of(); filter((filteredGroup: { hasRole: boolean, group: GroupModel }) => filteredGroup.hasRole),
})); map((filteredGroup: { hasRole: boolean, group: GroupModel }) => filteredGroup.group));
} }
onSelect(selectedGroup: GroupModel) { onSelect(selectedGroup: GroupModel) {

11
lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts
View File

@@ -71,6 +71,10 @@ describe('EditProcessFilterCloudComponent', () => {
getRunningApplicationsSpy = spyOn(appsService, 'getDeployedApplicationsByStatus').and.returnValue(of(fakeApplicationInstance)); getRunningApplicationsSpy = spyOn(appsService, 'getDeployedApplicationsByStatus').and.returnValue(of(fakeApplicationInstance));
}); });
afterEach(() => {
fixture.destroy();
});
it('should create EditProcessFilterCloudComponent', () => { it('should create EditProcessFilterCloudComponent', () => {
expect(component instanceof EditProcessFilterCloudComponent).toBeTruthy(); expect(component instanceof EditProcessFilterCloudComponent).toBeTruthy();
}); });
@@ -316,10 +320,10 @@ describe('EditProcessFilterCloudComponent', () => {
})); }));
it('should display sort properties when sort properties are specified', async(() => { it('should display sort properties when sort properties are specified', async(() => {
component.sortProperties = ['id', 'processName', 'processDefinitionId'];
fixture.detectChanges(); fixture.detectChanges();
component.sortProperties = ['id', 'processName', 'processDefinitionId'];
let processFilterIdchange = new SimpleChange(undefined, 'mock-process-filter-id', true); let processFilterIdchange = new SimpleChange(undefined, 'mock-process-filter-id', true);
component.ngOnChanges({ 'id': processFilterIdchange}); component.ngOnChanges({'id': processFilterIdchange});
fixture.detectChanges(); fixture.detectChanges();
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
fixture.detectChanges(); fixture.detectChanges();
@@ -446,8 +450,9 @@ describe('EditProcessFilterCloudComponent', () => {
it('should display default filter actions when input is empty', async(() => { it('should display default filter actions when input is empty', async(() => {
fixture.detectChanges(); fixture.detectChanges();
component.actions = [];
component.toggleFilterActions = true; component.toggleFilterActions = true;
component.actions = [];
component.id = 'mock-process-filter-id';
fixture.detectChanges(); fixture.detectChanges();
let expansionPanel = fixture.debugElement.nativeElement.querySelector('mat-expansion-panel-header'); let expansionPanel = fixture.debugElement.nativeElement.querySelector('mat-expansion-panel-header');
expansionPanel.click(); expansionPanel.click();

15
lib/process-services-cloud/src/lib/task/start-task/components/people-cloud/people-cloud.component.ts
View File

@@ -18,7 +18,7 @@
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { Component, OnInit, Output, EventEmitter, ViewEncapsulation, Input, ViewChild, ElementRef, SimpleChanges, OnChanges } from '@angular/core'; import { Component, OnInit, Output, EventEmitter, ViewEncapsulation, Input, ViewChild, ElementRef, SimpleChanges, OnChanges } from '@angular/core';
import { Observable, of, BehaviorSubject } from 'rxjs'; import { Observable, of, BehaviorSubject } from 'rxjs';
import { switchMap, debounceTime, distinctUntilChanged, mergeMap, tap, filter } from 'rxjs/operators'; import { switchMap, debounceTime, distinctUntilChanged, mergeMap, tap, filter, map } from 'rxjs/operators';
import { FullNamePipe, IdentityUserModel, IdentityUserService, LogService } from '@alfresco/adf-core'; import { FullNamePipe, IdentityUserModel, IdentityUserService, LogService } from '@alfresco/adf-core';
import { trigger, state, style, transition, animate } from '@angular/animations'; import { trigger, state, style, transition, animate } from '@angular/animations';
@@ -196,9 +196,9 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
public userExists(result: any) { public userExists(result: any) {
return result.length > 0 || return result.length > 0 ||
result.id !== undefined || result.id !== undefined ||
result.username !== undefined || result.username !== undefined ||
result.amil !== undefined; result.amil !== undefined;
} }
private initSearch() { private initSearch() {
@@ -261,10 +261,9 @@ export class PeopleCloudComponent implements OnInit, OnChanges {
filterUsersByRoles(user: IdentityUserModel): Observable<IdentityUserModel> { filterUsersByRoles(user: IdentityUserModel): Observable<IdentityUserModel> {
return this.identityUserService.checkUserHasRole(user.id, this.roles).pipe( return this.identityUserService.checkUserHasRole(user.id, this.roles).pipe(
mergeMap<boolean, Observable<IdentityUserModel>>((hasRole) => { map((hasRole: boolean) => ({ hasRole: hasRole, user: user })),
return hasRole ? of(user) : of(); filter((filteredUser: { hasRole: boolean, user: IdentityUserModel }) => filteredUser.hasRole),
}) map((filteredUser: { hasRole: boolean, user: IdentityUserModel }) => filteredUser.user));
);
} }
private isUserAlreadySelected(user: IdentityUserModel): boolean { private isUserAlreadySelected(user: IdentityUserModel): boolean {