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

[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)

Browse Source 
* upgrade to HttpClient

* upgrade to Renderer2

* upgrade Document reference

* remove useless test with deprecated ReflectiveInjector

* upgrade to latest typescript

* upgrade libs

* upgrade package scripts

* remove rxjs blacklists and duplicate rules

* add rxjs compat to help with migration

* fix breaking changes

* fix breaking changes in material

* fix breaking changes (material 6)

* upgrade rxjs, ngx-translate and flex layout

* update unit tests

* restore providers

* upgrade deprecated Observable.error

* rebase
fix first configuration problems

* fix style issues commented

* fix core build

* fix lib template errors

* move lib test execution in angular.json

* ignore

* karma conf files

* fix import statement test

* single run option

* update packages reporter

* restore report

* increase timeout

* improve karma conf test configuration

* fix test issues about lint

* fix test analytics

* fix process service test

* content service fix test

* fix logout directive test

* fix core test

* fix build

* update node-sass to latest

* update angular cli dependencies

* improve build script

create directorites and move files only if previous command succeded

* upgrade individual libs to 6.0

* remove old webpack files

* revert sass change

* fix type issues
fix style issues

* fix tslint demo shell issue

* fix peerdependencies

* fix test e2e BC

* package upate

* fix style import issue

* extract-text-webpack-plugin beta

* fix test dist build command

* remove alpha js-api

* fix tslint issue
add banner tslint rule

* upload service fix

* change BC script

* fix test dist script

* increase demo shell timeout test

* verbose copy

* path absolute

* fix script bc

* fix copy part

* fix path warning
fix monaco editor

* remove duplicate header

* remove unused import

* fix align and check ago tests

* add missing import

* fix notification button selector

* [ANGULAR6] fixed core tests

* fix CS test

* fix cs test step 2

* increase travis_wait for dist

* fix attachment PS

* fix checklist test

* use pdf min
This commit is contained in:
Denys Vuika
2018-08-07 11:58:16 +01:00
committed by Eugenio Romano
parent c510ec864d
commit 6b24bfb1d4
371 changed files with 16287 additions and 24504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/content-services/permission-manager/services/node-permission-dialog.service.spec.ts
View File

@@ -19,8 +19,7 @@ import { TestBed } from '@angular/core/testing';
import { AppConfigService, setupTestBed, ContentService } from '@alfresco/adf-core';
import { NodePermissionDialogService } from './node-permission-dialog.service';
import { MatDialog } from '@angular/material';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import { Subject, of, throwError } from 'rxjs';
import { ContentTestingModule } from '../../testing/content.testing.module';
import { NodePermissionService } from './node-permission.service';
import { Node } from 'alfresco-js-api';
@@ -49,7 +48,7 @@ describe('NodePermissionDialogService', () => {
contentService = TestBed.get(ContentService);
spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({
afterOpen: () => afterOpenObservable,
afterClosed: () => Observable.of({}),
afterClosed: () => of({}),
componentInstance: {
error: new Subject<any>()
}
@@ -74,9 +73,9 @@ describe('NodePermissionDialogService', () => {
});
it('should return the updated node', (done) => {
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({id : 'fake-node-updated'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(Observable.of({}));
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakePermissionNode));
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({id : 'fake-node-updated'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(of({}));
spyOn(contentService, 'getNode').and.returnValue(of(fakePermissionNode));
service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe((node) => {
expect(node.id).toBe('fake-node-updated');
done();
@@ -84,11 +83,11 @@ describe('NodePermissionDialogService', () => {
});
it('should throw an error if the update of the node fails', (done) => {
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.throw({error : 'error'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(Observable.of({}));
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakePermissionNode));
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(throwError({error : 'error'}));
spyOn(service, 'openAddPermissionDialog').and.returnValue(of({}));
spyOn(contentService, 'getNode').and.returnValue(of(fakePermissionNode));
service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe(() => {
Observable.throw('This call should fail');
throwError('This call should fail');
}, (error) => {
expect(error.error).toBe('error');
done();
@@ -110,9 +109,9 @@ describe('NodePermissionDialogService', () => {
});
it('should return the updated node', (done) => {
spyOn(contentService, 'getNode').and.returnValue(Observable.of(fakeForbiddenNode));
spyOn(contentService, 'getNode').and.returnValue(of(fakeForbiddenNode));
service.updateNodePermissionByDialog('fake-node-id', 'fake-title').subscribe((node) => {
Observable.throw('This call should fail');
throwError('This call should fail');
},
(error) => {
expect(error.message).toBe('PERMISSION_MANAGER.ERROR.NOT-ALLOWED');

22
lib/content-services/permission-manager/services/node-permission-dialog.service.ts
View File

@@ -17,13 +17,13 @@
import { MatDialog } from '@angular/material';
import { Injectable } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Observable } from 'rxjs/Observable';
import { Subject, Observable, throwError } from 'rxjs';
import { AddPermissionDialogComponent } from '../components/add-permission/add-permission-dialog.component';
import { AddPermissionDialogData } from '../components/add-permission/add-permission-dialog-data.interface';
import { MinimalNodeEntity, MinimalNodeEntryEntity, Node } from 'alfresco-js-api';
import { NodePermissionService } from './node-permission.service';
import { ContentService, PermissionsEnum } from '@alfresco/adf-core';
import { switchMap } from 'rxjs/operators';
@Injectable()
export class NodePermissionDialogService {
@@ -58,7 +58,7 @@ export class NodePermissionDialogService {
} else {
let errors = new Error(JSON.stringify({ error: { statusCode: 403 } }));
errors.message = 'PERMISSION_MANAGER.ERROR.NOT-ALLOWED';
return Observable.throw(errors);
return throwError(errors);
}
}
@@ -80,10 +80,16 @@ export class NodePermissionDialogService {
* @returns Node with updated permissions
*/
updateNodePermissionByDialog(nodeId?: string, title?: string): Observable<MinimalNodeEntryEntity> {
return this.contentService.getNode(nodeId, { include: ['allowableOperations'] }).switchMap((node) => {
return this.openAddPermissionDialog(node.entry, title).switchMap((selection) => {
return this.nodePermissionService.updateNodePermissions(nodeId, selection);
});
});
return this.contentService.getNode(nodeId, { include: ['allowableOperations'] })
.pipe(
switchMap(node => {
return this.openAddPermissionDialog(node.entry, title)
.pipe(
switchMap(selection => {
return this.nodePermissionService.updateNodePermissions(nodeId, selection);
})
);
})
);
}
}

16
lib/content-services/permission-manager/services/node-permission.service.spec.ts
View File

@@ -19,7 +19,7 @@ import { async, TestBed } from '@angular/core/testing';
import { NodePermissionService } from './node-permission.service';
import { SearchService, NodesApiService, setupTestBed, CoreModule } from '@alfresco/adf-core';
import { MinimalNodeEntryEntity, PermissionElement } from 'alfresco-js-api';
import { Observable } from 'rxjs/Observable';
import { of } from 'rxjs';
import { fakeEmptyResponse, fakeNodeWithOnlyLocally, fakeSiteRoles, fakeSiteNodeResponse,
fakeNodeToRemovePermission, fakeNodeWithoutPermissions } from '../../mock/permission-list.component.mock';
import { fakeAuthorityResults } from '../../mock/add-permission.component.mock';
@@ -55,12 +55,12 @@ describe('NodePermissionService', () => {
let fakeNode: MinimalNodeEntryEntity = {};
fakeNode.id = 'fake-updated-node';
fakeNode.permissions = nodeBody.permissions;
return Observable.of(fakeNode);
return of(fakeNode);
}
it('should return a list of roles taken from the site groups', async(() => {
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
service.getNodeRoles(fakeNodeWithOnlyLocally).subscribe((roleArray: string[]) => {
expect(roleArray).not.toBeNull();
@@ -70,7 +70,7 @@ describe('NodePermissionService', () => {
}));
it('should return a list of settable if node has no site', async(() => {
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
service.getNodeRoles(fakeNodeWithOnlyLocally).subscribe((roleArray: string[]) => {
expect(roleArray).not.toBeNull();
@@ -119,10 +119,10 @@ describe('NodePermissionService', () => {
it('should be able to update locally set permissions on the node by node id', async(() => {
const fakeNodeCopy = JSON.parse(JSON.stringify(fakeNodeWithOnlyLocally));
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeCopy));
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeCopy));
spyOn(nodeService, 'updateNode').and.callFake((nodeId, permissionBody) => returnUpdatedNode(nodeId, permissionBody));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
spyOn(service, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
service.updateNodePermissions('fake-node-id', fakeAuthorityResults).subscribe((node: MinimalNodeEntryEntity) => {
expect(node).not.toBeNull();

44
lib/content-services/permission-manager/services/node-permission.service.ts
View File

@@ -16,12 +16,10 @@
*/
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Observable, of, from, throwError } from 'rxjs';
import { AlfrescoApiService, SearchService, NodesApiService, TranslationService } from '@alfresco/adf-core';
import { QueryBody, MinimalNodeEntryEntity, MinimalNodeEntity, PathElement, GroupMemberEntry, GroupsPaging, GroupMemberPaging, PermissionElement } from 'alfresco-js-api';
import 'rxjs/add/operator/switchMap';
import { of } from 'rxjs/observable/of';
import { switchMap } from 'rxjs/operators';
import { switchMap, map } from 'rxjs/operators';
@Injectable()
export class NodePermissionService {
@@ -40,14 +38,16 @@ export class NodePermissionService {
getNodeRoles(node: MinimalNodeEntryEntity): Observable<string[]> {
const retrieveSiteQueryBody: QueryBody = this.buildRetrieveSiteQueryBody(node.path.elements);
return this.searchApiService.searchByQueryBody(retrieveSiteQueryBody)
.switchMap((siteNodeList: any) => {
if ( siteNodeList.list.entries.length > 0 ) {
let siteName = siteNodeList.list.entries[0].entry.name;
return this.getGroupMembersBySiteName(siteName);
} else {
return Observable.of(node.permissions.settable);
}
});
.pipe(
switchMap((siteNodeList: any) => {
if ( siteNodeList.list.entries.length > 0 ) {
let siteName = siteNodeList.list.entries[0].entry.name;
return this.getGroupMembersBySiteName(siteName);
} else {
return of(node.permissions.settable);
}
})
);
}
/**
@@ -86,7 +86,7 @@ export class NodePermissionService {
if (duplicatedPermissions.length > 0) {
const list = duplicatedPermissions.map((permission) => 'authority -> ' + permission.authorityId + ' / role -> ' + permission.name).join(', ');
const duplicatePermissionMessage: string = this.translation.instant('PERMISSION_MANAGER.ERROR.DUPLICATE-PERMISSION', {list});
return Observable.throw(duplicatePermissionMessage);
return throwError(duplicatePermissionMessage);
}
permissionBody.permissions.locallySet = node.permissions.locallySet ? node.permissions.locallySet.concat(permissionList) : permissionList;
return this.nodeService.updateNode(node.id, permissionBody);
@@ -137,13 +137,15 @@ export class NodePermissionService {
private getGroupMembersBySiteName(siteName: string): Observable<string[]> {
const groupName = 'GROUP_site_' + siteName;
return this.getGroupMemeberByGroupName(groupName)
.map((res: GroupsPaging) => {
let displayResult: string[] = [];
res.list.entries.forEach((member: GroupMemberEntry) => {
displayResult.push(this.formattedRoleName(member.entry.displayName, 'site_' + siteName));
});
return displayResult;
});
.pipe(
map((res: GroupsPaging) => {
let displayResult: string[] = [];
res.list.entries.forEach((member: GroupMemberEntry) => {
displayResult.push(this.formattedRoleName(member.entry.displayName, 'site_' + siteName));
});
return displayResult;
})
);
}
/**
@@ -153,7 +155,7 @@ export class NodePermissionService {
* @returns List of members
*/
getGroupMemeberByGroupName(groupName: string, opts?: any): Observable<GroupMemberPaging> {
return Observable.fromPromise(this.apiService.groupsApi.getGroupMembers(groupName, opts));
return from<GroupMemberPaging>(this.apiService.groupsApi.getGroupMembers(groupName, opts));
}
private formattedRoleName(displayName, siteName): string {