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

Fix process cloud page (#4075)

Browse Source 
* Fix process cloud page

* Use FilterParamModel

* Rollback method

* Fix core unit test related to identity service

* Fix process filters cloud
Get user info from different keys

* Select the my-task filter in case the task has been created

* Add family_name and given_name to the jwt token
This commit is contained in:
Maurizio Vitale
2018-12-12 15:43:57 +00:00
committed by Eugenio Romano
parent 511087f6b1
commit e241779f3a
29 changed files with 261 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/userinfo/components/user-info.component.spec.ts
View File

@@ -548,7 +548,7 @@ describe('User info component', () => {
beforeEach(async(() => {
spyOn(authService, 'isOauth').and.returnValue(true);
spyOn(authService, 'isLoggedIn').and.returnValue(true);
getCurrentUserInfoStub = spyOn(identityUserService, 'getCurrentUserInfo').and.returnValue(of(identityUserMock));
getCurrentUserInfoStub = spyOn(identityUserService, 'getCurrentUserInfo').and.returnValue(identityUserMock);
}));
it('should able to fetch identity userInfo', async(() => {
@@ -583,7 +583,7 @@ describe('User info component', () => {
it('should show last name if first name is null', async(() => {
fixture.detectChanges();
let fakeIdentityUser: IdentityUserModel = new IdentityUserModel(identityUserWithOutFirstNameMock);
getCurrentUserInfoStub.and.returnValue(of(fakeIdentityUser));
getCurrentUserInfoStub.and.returnValue(fakeIdentityUser);
fixture.detectChanges();
fixture.whenStable().then(() => {

4
lib/core/userinfo/components/user-info.component.ts
View File

@@ -23,7 +23,7 @@ import { IdentityUserModel } from './../models/identity-user.model';
import { BpmUserService } from './../services/bpm-user.service';
import { EcmUserService } from './../services/ecm-user.service';
import { IdentityUserService } from '../services/identity-user.service';
import { Observable } from 'rxjs';
import { of, Observable } from 'rxjs';
@Component({
selector: 'adf-userinfo',
@@ -100,7 +100,7 @@ export class UserInfoComponent implements OnInit {
}
loadIdentityUserInfo() {
this.identityUser$ = this.identityUserService.getCurrentUserInfo();
this.identityUser$ = of(this.identityUserService.getCurrentUserInfo());
}
stopClosing(event) {